岗位管理

src/main/java/com/ydtech/modules/admin/controller/SysPositionController.java

@@ -6,11 +6,14 @@ import com.ydtech.modules.admin.model.SysPosition;
 import com.ydtech.modules.admin.model.vo.SysPositionPageVo;
 import com.ydtech.modules.admin.model.vo.SysPositionVo;
 import com.ydtech.modules.admin.service.SysPositionService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -21,7 +24,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/sys/position")
 @RequiredArgsConstructor
-public class SysPositionController {
+@Api(tags = "岗位管理")
+public class SysPositionController extends BaseController {
 
     private final SysPositionService sysPositionService;
 
@@ -34,7 +38,7 @@ public class SysPositionController {
 
     @GetMapping("/page")
     @ApiOperation("分页查询岗位信息")
-    public HttpResult<BasePageResult<SysPosition>> pageQuery(@RequestBody SysPositionPageVo sysPositionPageVo) {
+    public HttpResult<BasePageResult<SysPosition>> pageQuery(@Valid SysPositionPageVo sysPositionPageVo) {
         BasePageResult<SysPosition> pageResult = sysPositionService.pageQuery(sysPositionPageVo);
         return HttpResult.ok(pageResult);
     }
@@ -42,7 +46,8 @@ public class SysPositionController {
     @PostMapping
     @ApiOperation("添加岗位")
     public HttpResult<SysPosition> add(@RequestBody SysPositionVo sysPositionVo) {
-        sysPositionService.add(sysPositionVo);
+        String userId = getUserId();
+        sysPositionService.add(sysPositionVo, userId);
         return HttpResult.ok("添加成功");
     }
 
@@ -55,8 +60,9 @@ public class SysPositionController {
 
     @PutMapping("/{positionId}")
     @ApiOperation("修改岗位信息")
-    public HttpResult<Object> modification(@PathVariable("positionId") String positionId, SysPositionVo sysPositionVo) {
-        sysPositionService.modification(positionId, sysPositionVo);
+    public HttpResult<Object> modification(@PathVariable("positionId") String positionId, @RequestBody SysPositionVo sysPositionVo) {
+        String userId = getUserId();
+        sysPositionService.modification(positionId, sysPositionVo, userId);
         return HttpResult.ok("修改成功");
     }
 

src/main/java/com/ydtech/modules/admin/model/SysPosition.java

@@ -5,76 +5,95 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ydtech.modules.admin.model.vo.SysPositionVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 岗位信息表
+ *
  * @TableName sys_position
  */
-@TableName(value ="sys_position")
+@TableName(value = "sys_position")
 @Data
+@ApiModel("岗位信息")
+@AllArgsConstructor
+@NoArgsConstructor
 public class SysPosition implements Serializable {
     /**
      * 岗位ID
      */
     @TableId(value = "post_id", type = IdType.AUTO)
+    @ApiModelProperty("岗位ID")
     private Long postId;
 
     /**
      * 岗位编码
      */
     @TableField(value = "post_code")
+    @ApiModelProperty("岗位编码")
     private String postCode;
 
     /**
      * 岗位名称
      */
     @TableField(value = "post_name")
+    @ApiModelProperty("岗位名称")
     private String postName;
 
     /**
      * 显示顺序
      */
     @TableField(value = "post_sort")
+    @ApiModelProperty("显示顺序")
     private Integer postSort;
 
     /**
      * 状态（0正常 1停用）
      */
     @TableField(value = "status")
+    @ApiModelProperty("状态（0正常 1停用）")
     private String status;
 
     /**
      * 创建者
      */
     @TableField(value = "create_by")
+    @ApiModelProperty("创建者")
     private String createBy;
 
     /**
      * 创建时间
      */
     @TableField(value = "create_time")
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
     /**
      * 更新者
      */
     @TableField(value = "update_by")
+    @ApiModelProperty("更新者")
     private String updateBy;
 
     /**
      * 更新时间
      */
     @TableField(value = "update_time")
+    @ApiModelProperty("更新时间")
+
     private Date updateTime;
 
     /**
      * 备注
      */
     @TableField(value = "remark")
+    @ApiModelProperty("备注")
     private String remark;
 
     @TableField(exist = false)
@@ -87,5 +106,6 @@ public class SysPosition implements Serializable {
         this.postName = sysPositionVo.getPostName();
         this.postSort = sysPositionVo.getPostSort();
         this.status = sysPositionVo.getStatus();
+        this.remark = sysPositionVo.getRemark();
     }
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysPositionPageVo.java

@@ -1,14 +1,12 @@
 package com.ydtech.modules.admin.model.vo;
 
-import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class SysPositionPageVo extends PageRequest {
-
+public class SysPositionPageVo{
 
     @ApiModelProperty("岗位名称")
     private String postName;
@@ -16,4 +14,10 @@ public class SysPositionPageVo extends PageRequest {
     @ApiModelProperty("状态（0正常 1停用）")
     private String status;
 
+    @ApiModelProperty(value = "每页页数")
+    private int pageSize;
+
+    @ApiModelProperty(value = "页数")
+    private int pageNum;
+
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysPositionVo.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.model.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,15 +16,16 @@ public class SysPositionVo implements Serializable {
     @ApiModelProperty("岗位编码")
     private String postCode;
 
-
     @ApiModelProperty("岗位名称")
     private String postName;
 
     @ApiModelProperty("显示顺序")
     private Integer postSort;
 
-
     @ApiModelProperty("状态（0正常 1停用）")
     private String status;
 
+    @ApiModelProperty("备注")
+    private String remark;
+
 }

src/main/java/com/ydtech/modules/admin/service/SysPositionService.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.admin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysPosition;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.vo.SysPositionPageVo;
 import com.ydtech.modules.admin.model.vo.SysPositionVo;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -21,7 +22,7 @@ public interface SysPositionService extends IService<SysPosition> {
      *
      * @param sysPositionVo 岗位信息
      */
-    void add(SysPositionVo sysPositionVo);
+    void add(SysPositionVo sysPositionVo, String userId);
 
     /**
      * 修改岗位信息
@@ -29,7 +30,7 @@ public interface SysPositionService extends IService<SysPosition> {
      * @param positionId    岗位id
      * @param sysPositionVo 岗位信息
      */
-    void modification(String positionId, SysPositionVo sysPositionVo);
+    void modification(String positionId, SysPositionVo sysPositionVo,  String userId);
 
 
     /**

src/main/java/com/ydtech/modules/admin/service/impl/SysPositionServiceImpl.java

@@ -9,12 +9,13 @@ import com.ydtech.modules.admin.model.vo.SysPositionPageVo;
 import com.ydtech.modules.admin.model.vo.SysPositionVo;
 import com.ydtech.modules.admin.service.SysPositionService;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description 针对表【sys_position(岗位信息表)】的数据库操作Service实现
@@ -25,16 +26,20 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         implements SysPositionService {
 
     @Override
-    public void add(SysPositionVo sysPositionVo) {
+    public void add(SysPositionVo sysPositionVo, String userId) {
         SysPosition sysPosition = new SysPosition(sysPositionVo);
+        sysPosition.setCreateBy(userId);
+        sysPosition.setCreateTime(new Date());
         boolean save = save(sysPosition);
         AssertionUtils.isSucceed(save, "添加失败");
     }
 
     @Override
-    public void modification(String positionId, SysPositionVo sysPositionVo) {
+    public void modification(String positionId, SysPositionVo sysPositionVo, String userId) {
         SysPosition sysPosition = isExit(positionId);
         BeanUtils.copyProperties(sysPositionVo, sysPosition);
+        sysPosition.setUpdateBy(userId);
+        sysPosition.setUpdateTime(new Date());
         boolean b = updateById(sysPosition);
         AssertionUtils.isSucceed(b, "修改失败");
     }
@@ -50,14 +55,13 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         Page<SysPosition> page = new Page<>(sysPositionPageVo.getPageNum(), sysPositionPageVo.getPageSize());
         LambdaQueryWrapper<SysPosition> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotEmpty(sysPositionPageVo.getPostName()), SysPosition::getPostName, sysPositionPageVo.getPostName())
-                        .eq(StringUtils.isNotEmpty(sysPositionPageVo.getStatus()), SysPosition::getStatus, sysPositionPageVo.getStatus());
+                .eq(StringUtils.isNotEmpty(sysPositionPageVo.getStatus()), SysPosition::getStatus, sysPositionPageVo.getStatus());
         Page<SysPosition> sysPositionPage = page(page, wrapper);
         return new BasePageResult<>(sysPositionPageVo.getPageNum(), page.getSize(), sysPositionPage.getTotal(), page.getPages(),
                 sysPositionPage.getRecords());
     }
 
 
-
 }
 
 

src/main/java/com/ydtech/modules/base/controller/BaseController.java

@@ -25,7 +25,7 @@ public class BaseController {
      * @author: lig
      * @date: 2023年06月28日 0028
      */
-    public SysUser getUser() {
+    public static SysUser getUser() {
         SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
         SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
         return sysUser;

src/main/resources/application.yml

@@ -7,8 +7,10 @@ server:
 
 spring:
   profiles:
-      active: dev
-
+    active: dev
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 
 
 # 日志配置