.idea/dataSources.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="myframe@localhost" uuid="846be58b-eba5-4d40-b7e9-7c7402ae0aae">
+    <data-source source="LOCAL" name="myframe@matrix34.tpddns.cn" uuid="846be58b-eba5-4d40-b7e9-7c7402ae0aae">
       <driver-ref>mysql.8</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://localhost:3306/myframe</jdbc-url>
+      <jdbc-url>jdbc:mysql://matrix34.tpddns.cn:13306/myframe</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>

application/src/main/java/com/ctsi/Auth/web/login.java

@@ -64,7 +64,7 @@ public class login {
             SysUser User = sysUserService.queryByUserName(userForm.getUserName());
             if (User == null)
                 return ApiResult.result(ErrorCodeEnum.USER_NOT_FOUND);
-            if (!PasswordEncoderUtil.checkPassword(userForm.getPassword(), User.getPassword()))
+            if (PasswordEncoderUtil.isPasswordWrong(userForm.getPassword(), User.getPassword()))
                 return ApiResult.result(ErrorCodeEnum.PASSWORD_INVALID);
             boolean rememberMe = userForm.getRememberMe() != null && userForm.getRememberMe();
             StpUtil.login(User.getId(), rememberMe);

application/src/main/java/com/ctsi/utils/CaptchaUtil.java

@@ -17,7 +17,7 @@ public class CaptchaUtil {
      * 生成验证码
      *
      * @param captcha 验证码
-     * @return 验证码图片二进制流
+     * @ return 验证码图片二进制流
      */
     public static byte[] generateCaptcha(String captcha) throws IOException {
         BufferedImage image = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
@@ -53,8 +53,7 @@ public class CaptchaUtil {
 
     /**
      * 生成随机4位字符串
-     *
-     * @return 随机字符串
+     * @ return 随机字符串
      */
     public static String generateRandomString() {
         String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";

core/src/main/java/com/ctsi/Enum/ErrorCodeEnum.java

@@ -1,15 +1,18 @@
 package com.ctsi.Enum;
 
+import lombok.Getter;
+
+@Getter
 public enum ErrorCodeEnum {
     // 定义具体的错误代码和对应的描述
     USER_NOT_FOUND(1001, "用户名不存在"),
     PASSWORD_INVALID(1002, "密码错误"),
     CAPTCHA_INVALID(1003, "验证码错误，请重新获取"),
     CAPTCHA_EXPIRED(1004, "验证码已过期，请重新获取");
-    // 可以继续添加其他错误代码
 
     // 枚举的成员变量
     private final Integer code;
+    // 获取错误描述
     private final String message;
 
     // 构造函数
@@ -18,14 +21,5 @@ public enum ErrorCodeEnum {
         this.message = message;
     }
 
-    // 获取错误代码
-    public Integer getCode() {
-        return code;
-    }
-
-    // 获取错误描述
-    public String getMessage() {
-        return message;
-    }
 }
 

core/src/main/java/com/ctsi/System/Password/entity/UpdatePasswordVO.java

@@ -2,27 +2,13 @@ package com.ctsi.System.Password.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel("修改密码")
+@Data
 public class UpdatePasswordVO {
-    @ApiModelProperty(value = "旧密码",notes = "")
+    @ApiModelProperty(value = "旧密码")
     private String oldPassword;
-    @ApiModelProperty(value = "新密码",notes = "")
+    @ApiModelProperty(value = "新密码")
     private String newPassword;
-
-    public String getOldPassword() {
-        return this.oldPassword;
-    }
-
-    public String getNewPassword() {
-        return this.newPassword;
-    }
-
-    public void setOldPassword(String oldPassword) {
-        this.oldPassword = oldPassword;
-    }
-
-    public void setNewPassword(String newPassword) {
-        this.newPassword = newPassword;
-    }
 }

core/src/main/java/com/ctsi/System/Password/password.java

@@ -20,7 +20,7 @@ public class password {
     private SysUserService sysUserService;
     @ApiOperation("修改密码")
     @PostMapping(value = "/updatePassword",name = "修改密码")
-    public ApiResult updatePassword(@RequestBody UpdatePasswordVO updatePasswordVO){
+    public ApiResult<String> updatePassword(@RequestBody UpdatePasswordVO updatePasswordVO){
         try {
             return sysUserService.updatePassword(updatePasswordVO);
         } catch (Exception e) {

core/src/main/java/com/ctsi/System/SysDic/controller/SysDicController.java

@@ -30,11 +30,11 @@ public class SysDicController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysDic> queryById(Long id){
+    public ApiResult<SysDic> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysDicService.queryById(id));
         } catch (Exception e) {
@@ -47,7 +47,7 @@ public class SysDicController{
      * 分页查询
      *
      * @param sysDic 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -64,7 +64,7 @@ public class SysDicController{
      * 新增数据
      *
      * @param sysDic 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -81,7 +81,7 @@ public class SysDicController{
      * 更新数据
      *
      * @param sysDic 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -98,7 +98,7 @@ public class SysDicController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping

core/src/main/java/com/ctsi/System/SysDic/entity/SysDic.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysDic.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,87 +16,31 @@ import java.util.Date;
  * @author : machaoyi
  * @date : 2024-1-16
  */
-@ApiModel(value = "字典表",description = "")
+@ApiModel(value = "字典表")
 @TableName("sys_dic")
-public class SysDic implements Serializable,Cloneable{
+@Data
+public class SysDic implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 创建人userid */
-    @ApiModelProperty(value = "创建人userid",notes = "")
+    @ApiModelProperty(value = "创建人userid")
     private Long createdBy ;
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间",notes = "")
+    @ApiModelProperty(value = "创建时间")
     private Date createdTime ;
     /** 逻辑删除 */
-    @ApiModelProperty(value = "逻辑删除",notes = "")
+    @ApiModelProperty(value = "逻辑删除")
     private Integer delFlag ;
     /** 字典名称 */
-    @ApiModelProperty(value = "字典名称",notes = "")
+    @ApiModelProperty(value = "字典名称")
     private String dicName ;
     /** 字典编码 */
-    @ApiModelProperty(value = "字典编码",notes = "")
+    @ApiModelProperty(value = "字典编码")
     private String dicCode ;
     /** 排序 */
-    @ApiModelProperty(value = "排序",notes = "")
+    @ApiModelProperty(value = "排序")
     private Integer dicSort ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 创建人userid */
-    public Long getCreatedBy(){
-        return this.createdBy;
-    }
-    /** 创建人userid */
-    public void setCreatedBy(Long createdBy){
-        this.createdBy=createdBy;
-    }
-    /** 创建时间 */
-    public Date getCreatedTime(){
-        return this.createdTime;
-    }
-    /** 创建时间 */
-    public void setCreatedTime(Date createdTime){
-        this.createdTime=createdTime;
-    }
-    /** 逻辑删除 */
-    public Integer getDelFlag(){
-        return this.delFlag;
-    }
-    /** 逻辑删除 */
-    public void setDelFlag(Integer delFlag){
-        this.delFlag=delFlag;
-    }
-    /** 字典名称 */
-    public String getDicName(){
-        return this.dicName;
-    }
-    /** 字典名称 */
-    public void setDicName(String dicName){
-        this.dicName=dicName;
-    }
-    /** 字典编码 */
-    public String getDicCode(){
-        return this.dicCode;
-    }
-    /** 字典编码 */
-    public void setDicCode(String dicCode){
-        this.dicCode=dicCode;
-    }
-    /** 排序 */
-    public Integer getDicSort(){
-        return this.dicSort;
-    }
-    /** 排序 */
-    public void setDicSort(Integer dicSort){
-        this.dicSort=dicSort;
-    }
 }

core/src/main/java/com/ctsi/System/SysDic/mapper/SysDicMapper.java

@@ -20,7 +20,7 @@ public interface SysDicMapper  extends BaseMapper<SysDic>{
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysDic> selectByPage(IPage<SysDic> page , @Param(Constants.WRAPPER) Wrapper<SysDic> wrapper);
 }

core/src/main/java/com/ctsi/System/SysDic/service/SysDicService.java

@@ -14,7 +14,7 @@ public interface SysDicService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysDic queryById(Long id);
     
@@ -24,28 +24,28 @@ public interface SysDicService{
      * @param sysDic 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysDic> paginQuery(SysDic sysDic, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysDic 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysDic insert(SysDic sysDic);
     /** 
      * 更新数据
      *
      * @param sysDic 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysDic update(SysDic sysDic);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 }

core/src/main/java/com/ctsi/System/SysDic/service/impl/SysDicServiceImpl.java

@@ -26,7 +26,7 @@ public class SysDicServiceImpl implements SysDicService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysDic queryById(Long id){
         return sysDicMapper.selectById(id);
@@ -38,7 +38,7 @@ public class SysDicServiceImpl implements SysDicService{
      * @param sysDic 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysDic> paginQuery(SysDic sysDic, long current, long size){
         //1. 构建动态查询条件
@@ -63,7 +63,7 @@ public class SysDicServiceImpl implements SysDicService{
      * 新增数据
      *
      * @param sysDic 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysDic insert(SysDic sysDic){
         sysDicMapper.insert(sysDic);
@@ -74,11 +74,11 @@ public class SysDicServiceImpl implements SysDicService{
      * 更新数据
      *
      * @param sysDic 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysDic update(SysDic sysDic){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysDic> chainWrapper = new LambdaUpdateChainWrapper<SysDic>(sysDicMapper);
+        LambdaUpdateChainWrapper<SysDic> chainWrapper = new LambdaUpdateChainWrapper<>(sysDicMapper);
         if(StrUtil.isNotBlank(sysDic.getDicName())){
             chainWrapper.set(SysDic::getDicName, sysDic.getDicName());
         }
@@ -100,7 +100,7 @@ public class SysDicServiceImpl implements SysDicService{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysDicMapper.deleteById(id);

core/src/main/java/com/ctsi/System/SysDicItem/controller/SysDicItemController.java

@@ -33,11 +33,11 @@ public class SysDicItemController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysDicItem> queryById(Long id){
+    public ApiResult<SysDicItem> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysDicItemService.queryById(id));
         } catch (Exception e) {
@@ -50,7 +50,7 @@ public class SysDicItemController{
      * 分页查询
      *
      * @param sysDicItem 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -67,7 +67,7 @@ public class SysDicItemController{
      * 新增数据
      *
      * @param sysDicItem 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -84,7 +84,7 @@ public class SysDicItemController{
      * 更新数据
      *
      * @param sysDicItem 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -101,7 +101,7 @@ public class SysDicItemController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping
@@ -118,7 +118,7 @@ public class SysDicItemController{
       * 根据字典id查询字典项列表
       *
       * @param dicId 字典id
-      * @return 查询结果
+      * @ return 查询结果
       */
      @ApiOperation("根据字典id查询字典项列表")
      @GetMapping("/getDicItemListByDicId")
@@ -137,7 +137,7 @@ public class SysDicItemController{
      * 根据字典code查询字典项列表
      *
      * @param dicCode 字典code
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("根据字典code查询字典项列表")
     @GetMapping("/getDicItemListByDicCode")

core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItem.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysDicItem.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,109 +16,37 @@ import java.util.Date;
  * @author : machaoyi
  * @date : 2024-1-16
  */
-@ApiModel(value = "字典项表",description = "")
+@ApiModel(value = "字典项表")
 @TableName("sys_dic_item")
-public class SysDicItem implements Serializable,Cloneable{
+@Data
+public class SysDicItem implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 创建人userid */
-    @ApiModelProperty(value = "创建人userid",notes = "")
+    @ApiModelProperty(value = "创建人userid")
     private Long createdBy ;
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间",notes = "")
+    @ApiModelProperty(value = "创建时间")
     private Date createdTime ;
     /** 逻辑删除 */
-    @ApiModelProperty(value = "逻辑删除",notes = "")
+    @ApiModelProperty(value = "逻辑删除")
     private Integer delFlag ;
     /** 字典表id */
-    @ApiModelProperty(value = "字典表id",notes = "")
+    @ApiModelProperty(value = "字典表id")
     private Long dicId ;
     /** 字典项编码 */
-    @ApiModelProperty(value = "字典项编码",notes = "")
+    @ApiModelProperty(value = "字典项编码")
     private String itemCode ;
     /** 字典值 */
-    @ApiModelProperty(value = "字典值",notes = "")
+    @ApiModelProperty(value = "字典值")
     private String itemValue ;
     /** 字典项排序 */
-    @ApiModelProperty(value = "字典项排序",notes = "")
+    @ApiModelProperty(value = "字典项排序")
     private Integer itemSort ;
     /** 字典项父级id */
-    @ApiModelProperty(value = "字典项父级id(没有就不填)",notes = "")
+    @ApiModelProperty(value = "字典项父级id(没有就不填)")
     private Long itemParentId ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 创建人userid */
-    public Long getCreatedBy(){
-        return this.createdBy;
-    }
-    /** 创建人userid */
-    public void setCreatedBy(Long createdBy){
-        this.createdBy=createdBy;
-    }
-    /** 创建时间 */
-    public Date getCreatedTime(){
-        return this.createdTime;
-    }
-    /** 创建时间 */
-    public void setCreatedTime(Date createdTime){
-        this.createdTime=createdTime;
-    }
-    /** 逻辑删除 */
-    public Integer getDelFlag(){
-        return this.delFlag;
-    }
-    /** 逻辑删除 */
-    public void setDelFlag(Integer delFlag){
-        this.delFlag=delFlag;
-    }
-    /** 字典表id */
-    public Long getDicId(){
-        return this.dicId;
-    }
-    /** 字典表id */
-    public void setDicId(Long dicId){
-        this.dicId=dicId;
-    }
-    /** 字典项编码 */
-    public String getItemCode(){
-        return this.itemCode;
-    }
-    /** 字典项编码 */
-    public void setItemCode(String itemCode){
-        this.itemCode=itemCode;
-    }
-    /** 字典值 */
-    public String getItemValue(){
-        return this.itemValue;
-    }
-    /** 字典值 */
-    public void setItemValue(String itemValue){
-        this.itemValue=itemValue;
-    }
-    /** 字典项排序 */
-    public Integer getItemSort(){
-        return this.itemSort;
-    }
-    /** 字典项排序 */
-    public void setItemSort(Integer itemSort){
-        this.itemSort=itemSort;
-    }
-    /** 字典项父级id */
-    public Long getItemParentId(){
-        return this.itemParentId;
-    }
-    /** 字典项父级id */
-    public void setItemParentId(Long itemParentId){
-        this.itemParentId=itemParentId;
-    }
 }

core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchPO.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysDicItem.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,120 +17,40 @@ import java.util.List;
 * @author : machaoyi
 * @date : 2024-1-16
 */
-@ApiModel(value = "字典项表",description = "")
+@ApiModel(value = "字典项表")
 @TableName("sys_dic_item")
-public class SysDicItemSearchPO implements Serializable,Cloneable{
+@Data
+public class SysDicItemSearchPO implements Serializable{
    /** 主键id */
-   @ApiModelProperty(value = "主键id",notes = "")
+   @ApiModelProperty(value = "主键id")
    @TableId
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long id ;
    /** 创建人userid */
-   @ApiModelProperty(value = "创建人userid",notes = "")
+   @ApiModelProperty(value = "创建人userid")
    private Long createdBy ;
    /** 创建时间 */
-   @ApiModelProperty(value = "创建时间",notes = "")
+   @ApiModelProperty(value = "创建时间")
    private Date createdTime ;
    /** 逻辑删除 */
-   @ApiModelProperty(value = "逻辑删除",notes = "")
+   @ApiModelProperty(value = "逻辑删除")
    private Integer delFlag ;
    /** 字典表id */
-   @ApiModelProperty(value = "字典表id",notes = "")
+   @ApiModelProperty(value = "字典表id")
    private Long dicId ;
    /** 字典项编码 */
-   @ApiModelProperty(value = "字典项编码",notes = "")
+   @ApiModelProperty(value = "字典项编码")
    private String itemCode ;
    /** 字典值 */
-   @ApiModelProperty(value = "字典值",notes = "")
+   @ApiModelProperty(value = "字典值")
    private String itemValue ;
    /** 字典项排序 */
-   @ApiModelProperty(value = "字典项排序",notes = "")
+   @ApiModelProperty(value = "字典项排序")
    private Integer itemSort ;
    /** 字典项父级id */
-   @ApiModelProperty(value = "字典项父级id",notes = "")
+   @ApiModelProperty(value = "字典项父级id")
    private Long itemParentId ;
    /** 子级 */
-   @ApiModelProperty(value = "子级",notes = "")
+   @ApiModelProperty(value = "子级")
    private List<SysDicItemSearchPO> children ;
-
-   /** 主键id */
-   public Long getId(){
-       return this.id;
-   }
-   /** 主键id */
-   public void setId(Long id){
-       this.id=id;
-   }
-   /** 创建人userid */
-   public Long getCreatedBy(){
-       return this.createdBy;
-   }
-   /** 创建人userid */
-   public void setCreatedBy(Long createdBy){
-       this.createdBy=createdBy;
-   }
-   /** 创建时间 */
-   public Date getCreatedTime(){
-       return this.createdTime;
-   }
-   /** 创建时间 */
-   public void setCreatedTime(Date createdTime){
-       this.createdTime=createdTime;
-   }
-   /** 逻辑删除 */
-   public Integer getDelFlag(){
-       return this.delFlag;
-   }
-   /** 逻辑删除 */
-   public void setDelFlag(Integer delFlag){
-       this.delFlag=delFlag;
-   }
-   /** 字典表id */
-   public Long getDicId(){
-       return this.dicId;
-   }
-   /** 字典表id */
-   public void setDicId(Long dicId){
-       this.dicId=dicId;
-   }
-   /** 字典项编码 */
-   public String getItemCode(){
-       return this.itemCode;
-   }
-   /** 字典项编码 */
-   public void setItemCode(String itemCode){
-       this.itemCode=itemCode;
-   }
-   /** 字典值 */
-   public String getItemValue(){
-       return this.itemValue;
-   }
-   /** 字典值 */
-   public void setItemValue(String itemValue){
-       this.itemValue=itemValue;
-   }
-   /** 字典项排序 */
-   public Integer getItemSort(){
-       return this.itemSort;
-   }
-   /** 字典项排序 */
-   public void setItemSort(Integer itemSort){
-       this.itemSort=itemSort;
-   }
-   /** 字典项父级id */
-   public Long getItemParentId(){
-       return this.itemParentId;
-   }
-   /** 字典项父级id */
-   public void setItemParentId(Long itemParentId){
-       this.itemParentId=itemParentId;
-   }
-
-   public List<SysDicItemSearchPO> getChildren() {
-      return children;
-   }
-
-   public void setChildren(List<SysDicItemSearchPO> children) {
-      this.children = children;
-   }
 }

core/src/main/java/com/ctsi/System/SysDicItem/entity/SysDicItemSearchVO.java

@@ -1,7 +1,7 @@
 package com.ctsi.System.SysDicItem.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,17 +14,17 @@ import java.io.Serializable;
 * @author : machaoyi
 * @date : 2024-1-16
 */
-@ApiModel(value = "字典表查询字典项列表",description = "")
+@ApiModel(value = "字典表查询字典项列表")
 @TableName("sys_dic")
 @Data
 public class SysDicItemSearchVO implements Serializable {
    /** 字典表id */
-   @ApiModelProperty(value = "字典表id",notes = "")
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @ApiModelProperty(value = "字典表id")
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long dicId ;
    /** 字典表code */
-   @ApiModelProperty(value = "字典表code",notes = "")
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @ApiModelProperty(value = "字典表code")
+   @JsonSerialize(using = LongToStringSerialize.class)
    private String dicCode ;
 
 }

core/src/main/java/com/ctsi/System/SysDicItem/mapper/SysDicItemMapper.java

@@ -20,7 +20,7 @@ public interface SysDicItemMapper  extends MPJBaseMapper<SysDicItem> {
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysDicItem> selectByPage(IPage<SysDicItem> page , @Param(Constants.WRAPPER) Wrapper<SysDicItem> wrapper);
 }

core/src/main/java/com/ctsi/System/SysDicItem/service/SysDicItemService.java

@@ -18,7 +18,7 @@ public interface SysDicItemService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysDicItem queryById(Long id);
     
@@ -28,28 +28,28 @@ public interface SysDicItemService{
      * @param sysDicItem 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysDicItem> paginQuery(SysDicItem sysDicItem, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysDicItem 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysDicItem insert(SysDicItem sysDicItem);
     /** 
      * 更新数据
      *
      * @param sysDicItem 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysDicItem update(SysDicItem sysDicItem);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 

core/src/main/java/com/ctsi/System/SysDicItem/service/impl/SysDicItemServiceImpl.java

@@ -31,7 +31,7 @@ public class SysDicItemServiceImpl implements SysDicItemService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysDicItem queryById(Long id){
         return sysDicItemMapper.selectById(id);
@@ -43,7 +43,7 @@ public class SysDicItemServiceImpl implements SysDicItemService{
      * @param sysDicItem 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysDicItem> paginQuery(SysDicItem sysDicItem, long current, long size){
         //1. 构建动态查询条件
@@ -68,7 +68,7 @@ public class SysDicItemServiceImpl implements SysDicItemService{
      * 新增数据
      *
      * @param sysDicItem 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysDicItem insert(SysDicItem sysDicItem){
         sysDicItemMapper.insert(sysDicItem);
@@ -79,11 +79,11 @@ public class SysDicItemServiceImpl implements SysDicItemService{
      * 更新数据
      *
      * @param sysDicItem 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysDicItem update(SysDicItem sysDicItem){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysDicItem> chainWrapper = new LambdaUpdateChainWrapper<SysDicItem>(sysDicItemMapper);
+        LambdaUpdateChainWrapper<SysDicItem> chainWrapper = new LambdaUpdateChainWrapper<>(sysDicItemMapper);
         if(StrUtil.isNotBlank(sysDicItem.getItemCode())){
             chainWrapper.set(SysDicItem::getItemCode, sysDicItem.getItemCode());
         }
@@ -105,7 +105,7 @@ public class SysDicItemServiceImpl implements SysDicItemService{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysDicItemMapper.deleteById(id);
@@ -115,8 +115,8 @@ public class SysDicItemServiceImpl implements SysDicItemService{
      /**
       * 查询字典项列表
       *
-      * @param
-      * @return 是否成功
+      * @param sysDicItemSearchVO
+      * @ return 是否成功
       */
      public List<SysDicItemSearchPO> getDicItemList(SysDicItemSearchVO sysDicItemSearchVO){
          MPJLambdaWrapper<SysDicItem> wrapper = new MPJLambdaWrapper<>();

core/src/main/java/com/ctsi/System/SysMenu/controller/SysMenuController.java

@@ -32,11 +32,11 @@ public class SysMenuController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysMenu> queryById(Long id){
+    public ApiResult<SysMenu> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysMenuService.queryById(id));
         } catch (Exception e) {
@@ -49,7 +49,7 @@ public class SysMenuController{
      * 分页查询
      *
      * @param sysMenu 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -66,7 +66,7 @@ public class SysMenuController{
      * 新增数据
      *
      * @param sysMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -84,7 +84,7 @@ public class SysMenuController{
      * 更新数据
      *
      * @param sysMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -101,7 +101,7 @@ public class SysMenuController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping

core/src/main/java/com/ctsi/System/SysMenu/entity/PO/SysMenuSearchPO.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysMenu.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -15,99 +16,35 @@ import java.util.List;
 * @author : machaoyi
 * @date : 2024-1-10
 */
-@ApiModel(value = "菜单信息查询PO",description = "")
+@ApiModel(value = "菜单信息查询PO")
 @TableName("sys_menu")
-public class SysMenuSearchPO implements Serializable,Cloneable{
+@Data
+public class SysMenuSearchPO implements Serializable{
    /** 主键id */
-   @ApiModelProperty(value = "主键id",notes = "")
+   @ApiModelProperty(value = "主键id")
    @TableId
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long id ;
    /** 标题 */
-   @ApiModelProperty(value = "标题",notes = "")
+   @ApiModelProperty(value = "标题")
    private String menuTitle ;
    /** 父级 */
-   @ApiModelProperty(value = "父级",notes = "")
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @ApiModelProperty(value = "父级")
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long parentId ;
    /** 编码 */
-   @ApiModelProperty(value = "编码",notes = "")
+   @ApiModelProperty(value = "编码")
    private String menuCode ;
    /** 名称 */
-   @ApiModelProperty(value = "名称",notes = "")
+   @ApiModelProperty(value = "名称")
    private String menuName ;
    /** 图标 */
-   @ApiModelProperty(value = "图标",notes = "")
+   @ApiModelProperty(value = "图标")
    private String menuIcon ;
    /** 排序 */
-   @ApiModelProperty(value = "排序",notes = "")
+   @ApiModelProperty(value = "排序")
    private Integer orderBy ;
    /** 子菜单 */
-    @ApiModelProperty(value = "子菜单",notes = "")
+    @ApiModelProperty(value = "子菜单")
     private List<SysMenuSearchPO> children;
-
-   /** 主键id */
-   public Long getId(){
-       return this.id;
-   }
-   /** 主键id */
-   public void setId(Long id){
-       this.id=id;
-   }
-   /** 标题 */
-   public String getMenuTitle(){
-       return this.menuTitle;
-   }
-   /** 标题 */
-   public void setMenuTitle(String menuTitle){
-       this.menuTitle=menuTitle;
-   }
-   /** 父级 */
-   public Long getParentId(){
-       return this.parentId;
-   }
-   /** 父级 */
-   public void setParentId(Long parentId){
-       this.parentId=parentId;
-   }
-   /** 编码 */
-   public String getMenuCode(){
-       return this.menuCode;
-   }
-   /** 编码 */
-   public void setMenuCode(String menuCode){
-       this.menuCode=menuCode;
-   }
-   /** 名称 */
-   public String getMenuName(){
-       return this.menuName;
-   }
-   /** 名称 */
-   public void setMenuName(String menuName){
-       this.menuName=menuName;
-   }
-   /** 图标 */
-   public String getMenuIcon(){
-       return this.menuIcon;
-   }
-   /** 图标 */
-   public void setMenuIcon(String menuIcon){
-       this.menuIcon=menuIcon;
-   }
-   /** 排序 */
-   public Integer getOrderBy(){
-       return this.orderBy;
-   }
-   /** 排序 */
-   public void setOrderBy(Integer orderBy){
-       this.orderBy=orderBy;
-   }
-
-   public List<SysMenuSearchPO> getChildren() {
-      return children;
-   }
-
-   public void setChildren(List<SysMenuSearchPO> children) {
-      this.children = children;
-   }
 }

core/src/main/java/com/ctsi/System/SysMenu/entity/SysMenu.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysMenu.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,121 +16,41 @@ import java.util.Date;
  * @author : machaoyi
  * @date : 2024-1-10
  */
-@ApiModel(value = "菜单",description = "")
+@ApiModel(value = "菜单")
 @TableName("sys_menu")
-public class SysMenu implements Serializable,Cloneable{
+@Data
+public class SysMenu implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 创建人userid */
-    @ApiModelProperty(value = "创建人userid",notes = "")
+    @ApiModelProperty(value = "创建人userid")
     private Long createdBy ;
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间",notes = "")
+    @ApiModelProperty(value = "创建时间")
     private Date createdTime ;
     /** 标题 */
-    @ApiModelProperty(value = "标题",notes = "")
+    @ApiModelProperty(value = "标题")
     private String menuTitle ;
     /** 父级 */
-    @ApiModelProperty(value = "父级",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "父级")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long parentId ;
     /** 编码 */
-    @ApiModelProperty(value = "编码",notes = "")
+    @ApiModelProperty(value = "编码")
     private String menuCode ;
     /** 名称 */
-    @ApiModelProperty(value = "名称",notes = "")
+    @ApiModelProperty(value = "名称")
     private String menuName ;
     /** 图标 */
-    @ApiModelProperty(value = "图标",notes = "")
+    @ApiModelProperty(value = "图标")
     private String menuIcon ;
     /** 逻辑删除 */
-    @ApiModelProperty(value = "逻辑删除",notes = "")
+    @ApiModelProperty(value = "逻辑删除")
     private Integer delFlag ;
     /** 排序 */
-    @ApiModelProperty(value = "排序",notes = "")
+    @ApiModelProperty(value = "排序")
     private Integer orderBy ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 创建人userid */
-    public Long getCreatedBy(){
-        return this.createdBy;
-    }
-    /** 创建人userid */
-    public void setCreatedBy(Long createdBy){
-        this.createdBy=createdBy;
-    }
-    /** 创建时间 */
-    public Date getCreatedTime(){
-        return this.createdTime;
-    }
-    /** 创建时间 */
-    public void setCreatedTime(Date createdTime){
-        this.createdTime=createdTime;
-    }
-    /** 标题 */
-    public String getMenuTitle(){
-        return this.menuTitle;
-    }
-    /** 标题 */
-    public void setMenuTitle(String menuTitle){
-        this.menuTitle=menuTitle;
-    }
-    /** 父级 */
-    public Long getParentId(){
-        return this.parentId;
-    }
-    /** 父级 */
-    public void setParentId(Long parentId){
-        this.parentId=parentId;
-    }
-    /** 编码 */
-    public String getMenuCode(){
-        return this.menuCode;
-    }
-    /** 编码 */
-    public void setMenuCode(String menuCode){
-        this.menuCode=menuCode;
-    }
-    /** 名称 */
-    public String getMenuName(){
-        return this.menuName;
-    }
-    /** 名称 */
-    public void setMenuName(String menuName){
-        this.menuName=menuName;
-    }
-    /** 图标 */
-    public String getMenuIcon(){
-        return this.menuIcon;
-    }
-    /** 图标 */
-    public void setMenuIcon(String menuIcon){
-        this.menuIcon=menuIcon;
-    }
-    /** 逻辑删除 */
-    public Integer getDelFlag(){
-        return this.delFlag;
-    }
-    /** 逻辑删除 */
-    public void setDelFlag(Integer delFlag){
-        this.delFlag=delFlag;
-    }
-    /** 排序 */
-    public Integer getOrderBy(){
-        return this.orderBy;
-    }
-    /** 排序 */
-    public void setOrderBy(Integer orderBy){
-        this.orderBy=orderBy;
-    }
 }

core/src/main/java/com/ctsi/System/SysMenu/mapper/SysMenuMapper.java

@@ -20,7 +20,7 @@ public interface SysMenuMapper  extends MPJBaseMapper<SysMenu> {
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysMenu> selectByPage(IPage<SysMenu> page , @Param(Constants.WRAPPER) Wrapper<SysMenu> wrapper);
 }

core/src/main/java/com/ctsi/System/SysMenu/service/SysMenuService.java

@@ -17,7 +17,7 @@ public interface SysMenuService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysMenu queryById(Long id);
     
@@ -27,28 +27,28 @@ public interface SysMenuService{
      * @param sysMenu 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysMenuSearchPO> paginQuery(SysMenu sysMenu, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysMenu insert(SysMenu sysMenu);
     /** 
      * 更新数据
      *
      * @param sysMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysMenu update(SysMenu sysMenu);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 

core/src/main/java/com/ctsi/System/SysMenu/service/impl/SysMenuServiceImpl.java

@@ -30,7 +30,7 @@ public class SysMenuServiceImpl implements SysMenuService{
      * 通过ID查询单条数据
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysMenu queryById(Long id){
         return sysMenuMapper.selectById(id);
@@ -42,7 +42,7 @@ public class SysMenuServiceImpl implements SysMenuService{
      * @param sysMenu 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysMenuSearchPO> paginQuery(SysMenu sysMenu, long current, long size){
         //1. 构建动态查询条件
@@ -75,7 +75,7 @@ public class SysMenuServiceImpl implements SysMenuService{
      * 新增数据
      *
      * @param sysMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysMenu insert(SysMenu sysMenu){
         sysMenuMapper.insert(sysMenu);
@@ -86,11 +86,11 @@ public class SysMenuServiceImpl implements SysMenuService{
      * 更新数据
      *
      * @param sysMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysMenu update(SysMenu sysMenu){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysMenu> chainWrapper = new LambdaUpdateChainWrapper<SysMenu>(sysMenuMapper);
+        LambdaUpdateChainWrapper<SysMenu> chainWrapper = new LambdaUpdateChainWrapper<>(sysMenuMapper);
         if(StrUtil.isNotBlank(sysMenu.getMenuTitle())){
             chainWrapper.set(SysMenu::getMenuTitle, sysMenu.getMenuTitle());
         }
@@ -118,7 +118,7 @@ public class SysMenuServiceImpl implements SysMenuService{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysMenuMapper.deleteById(id);
@@ -161,7 +161,7 @@ public class SysMenuServiceImpl implements SysMenuService{
     }
 
     public List<SysMenuSearchPO> getMenuTree(Long userId){
-        MPJLambdaWrapper<SysMenu> chainWrapper = new MPJLambdaWrapper<SysMenu>();
+        MPJLambdaWrapper<SysMenu> chainWrapper = new MPJLambdaWrapper<>();
         chainWrapper.leftJoin(SysRoleMenu.class, SysRoleMenu::getMenuId, SysMenu::getId);
         chainWrapper.leftJoin(SysUserRole.class, SysUserRole::getRoleId, SysRoleMenu::getRoleId);
         chainWrapper.eq(SysUserRole::getUserId, userId);

core/src/main/java/com/ctsi/System/SysOrg/controller/SysOrgController.java

@@ -32,11 +32,11 @@ public class SysOrgController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysOrg> queryById(Long id){
+    public ApiResult<SysOrg> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysOrgService.queryById(id));
         } catch (Exception e) {
@@ -49,7 +49,7 @@ public class SysOrgController{
      * 分页查询
      *
      * @param sysOrg 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -66,7 +66,7 @@ public class SysOrgController{
      * 新增数据
      *
      * @param sysOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -84,7 +84,7 @@ public class SysOrgController{
      * 更新数据
      *
      * @param sysOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -101,7 +101,7 @@ public class SysOrgController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping

core/src/main/java/com/ctsi/System/SysOrg/entity/PO/SysOrgSearchPO.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysOrg.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -15,98 +16,34 @@ import java.util.List;
 * @author : machaoyi
 * @date : 2024-1-10
 */
-@ApiModel(value = "部门信息表查询PO",description = "")
+@ApiModel(value = "部门信息表查询PO")
 @TableName("sys_org")
-public class SysOrgSearchPO implements Serializable,Cloneable{
+@Data
+public class SysOrgSearchPO implements Serializable{
    /** 主键id */
-   @ApiModelProperty(value = "主键id",notes = "")
+   @ApiModelProperty(value = "主键id")
    @TableId
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long id ;
    /** 部门名称 */
-   @ApiModelProperty(value = "部门名称",notes = "")
+   @ApiModelProperty(value = "部门名称")
    private String orgName ;
    /** 描述 */
-   @ApiModelProperty(value = "描述",notes = "")
+   @ApiModelProperty(value = "描述")
    private String description ;
    /** 父级 */
-   @ApiModelProperty(value = "父级",notes = "")
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @ApiModelProperty(value = "父级")
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long parentId ;
-   @ApiModelProperty(value = "子部门",notes = "")
+   @ApiModelProperty(value = "子部门")
    private List<SysOrgSearchPO> children;
    /** 排序 */
-    @ApiModelProperty(value = "排序",notes = "")
+    @ApiModelProperty(value = "排序")
     private Integer orderBy ;
    /** 部门负责人 */
-   @ApiModelProperty(value = "部门负责人",notes = "")
+   @ApiModelProperty(value = "部门负责人")
    private String orgLeader ;
    /** 联系方式 */
-   @ApiModelProperty(value = "联系方式",notes = "")
+   @ApiModelProperty(value = "联系方式")
    private String orgLeaderPhone ;
-
-   /** 主键id */
-   public Long getId(){
-       return this.id;
-   }
-   /** 主键id */
-   public void setId(Long id){
-       this.id=id;
-   }
-   /** 部门名称 */
-   public String getOrgName(){
-       return this.orgName;
-   }
-   /** 部门名称 */
-   public void setOrgName(String orgName){
-       this.orgName=orgName;
-   }
-   /** 描述 */
-   public String getDescription(){
-       return this.description;
-   }
-   /** 描述 */
-   public void setDescription(String description){
-       this.description=description;
-   }
-   /** 父级 */
-   public Long getParentId(){
-       return this.parentId;
-   }
-   /** 父级 */
-   public void setParentId(Long parentId){
-       this.parentId=parentId;
-   }
-
-   public List<SysOrgSearchPO> getChildren() {
-      return children;
-   }
-
-   public void setChildren(List<SysOrgSearchPO> children) {
-      this.children = children;
-   }
-
-   public Integer getOrderBy() {
-      return orderBy;
-   }
-
-   public void setOrderBy(Integer orderBy) {
-      this.orderBy = orderBy;
-   }
-   /** 部门负责人 */
-   public String getOrgLeader(){
-      return this.orgLeader;
-   }
-   /** 部门负责人 */
-   public void setOrgLeader(String orgLeader){
-      this.orgLeader=orgLeader;
-   }
-   /** 联系方式 */
-   public String getOrgLeaderPhone(){
-      return this.orgLeaderPhone;
-   }
-   /** 联系方式 */
-   public void setOrgLeaderPhone(String orgLeaderPhone){
-      this.orgLeaderPhone=orgLeaderPhone;
-   }
 }

core/src/main/java/com/ctsi/System/SysOrg/entity/SysOrg.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysOrg.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,121 +16,41 @@ import java.util.Date;
  * @author : machaoyi
  * @date : 2024-1-10
  */
-@ApiModel(value = "部门信息表",description = "")
+@ApiModel(value = "部门信息表")
 @TableName("sys_org")
-public class SysOrg implements Serializable,Cloneable{
+@Data
+public class SysOrg implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 创建人userid */
-    @ApiModelProperty(value = "创建人userid",notes = "")
+    @ApiModelProperty(value = "创建人userid")
     private Long createdBy ;
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间",notes = "")
+    @ApiModelProperty(value = "创建时间")
     private Date createdTime ;
     /** 逻辑删除 */
-    @ApiModelProperty(value = "逻辑删除",notes = "")
+    @ApiModelProperty(value = "逻辑删除")
     private Integer delFlag ;
     /** 部门名称 */
-    @ApiModelProperty(value = "部门名称",notes = "")
+    @ApiModelProperty(value = "部门名称")
     private String orgName ;
     /** 描述 */
-    @ApiModelProperty(value = "描述",notes = "")
+    @ApiModelProperty(value = "描述")
     private String description ;
     /** 父级 */
-    @ApiModelProperty(value = "父级",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "父级")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long parentId ;
     /** 排序 */
-    @ApiModelProperty(value = "排序",notes = "")
+    @ApiModelProperty(value = "排序")
     private Integer orderBy ;
     /** 部门负责人 */
-    @ApiModelProperty(value = "部门负责人",notes = "")
+    @ApiModelProperty(value = "部门负责人")
     private String orgLeader ;
     /** 联系方式 */
-    @ApiModelProperty(value = "联系方式",notes = "")
+    @ApiModelProperty(value = "联系方式")
     private String orgLeaderPhone ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 创建人userid */
-    public Long getCreatedBy(){
-        return this.createdBy;
-    }
-    /** 创建人userid */
-    public void setCreatedBy(Long createdBy){
-        this.createdBy=createdBy;
-    }
-    /** 创建时间 */
-    public Date getCreatedTime(){
-        return this.createdTime;
-    }
-    /** 创建时间 */
-    public void setCreatedTime(Date createdTime){
-        this.createdTime=createdTime;
-    }
-    /** 逻辑删除 */
-    public Integer getDelFlag(){
-        return this.delFlag;
-    }
-    /** 逻辑删除 */
-    public void setDelFlag(Integer delFlag){
-        this.delFlag=delFlag;
-    }
-    /** 部门名称 */
-    public String getOrgName(){
-        return this.orgName;
-    }
-    /** 部门名称 */
-    public void setOrgName(String orgName){
-        this.orgName=orgName;
-    }
-    /** 描述 */
-    public String getDescription(){
-        return this.description;
-    }
-    /** 描述 */
-    public void setDescription(String description){
-        this.description=description;
-    }
-    /** 父级 */
-    public Long getParentId(){
-        return this.parentId;
-    }
-    /** 父级 */
-    public void setParentId(Long parentId){
-        this.parentId=parentId;
-    }
-    /** 排序 */
-    public Integer getOrderBy(){
-        return this.orderBy;
-    }
-    /** 排序 */
-    public void setOrderBy(Integer orderBy){
-        this.orderBy=orderBy;
-    }
-    /** 部门负责人 */
-    public String getOrgLeader(){
-        return this.orgLeader;
-    }
-    /** 部门负责人 */
-    public void setOrgLeader(String orgLeader){
-        this.orgLeader=orgLeader;
-    }
-    /** 联系方式 */
-    public String getOrgLeaderPhone(){
-        return this.orgLeaderPhone;
-    }
-    /** 联系方式 */
-    public void setOrgLeaderPhone(String orgLeaderPhone){
-        this.orgLeaderPhone=orgLeaderPhone;
-    }
 }

core/src/main/java/com/ctsi/System/SysOrg/mapper/SysOrgMapper.java

@@ -20,7 +20,7 @@ public interface SysOrgMapper  extends MPJBaseMapper<SysOrg> {
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysOrg> selectByPage(IPage<SysOrg> page , @Param(Constants.WRAPPER) Wrapper<SysOrg> wrapper);
 }

core/src/main/java/com/ctsi/System/SysOrg/service/SysOrgService.java

@@ -15,7 +15,7 @@ public interface SysOrgService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysOrg queryById(Long id);
     
@@ -25,28 +25,28 @@ public interface SysOrgService{
      * @param sysOrg 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysOrgSearchPO> paginQuery(SysOrg sysOrg, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysOrg insert(SysOrg sysOrg);
     /** 
      * 更新数据
      *
      * @param sysOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysOrg update(SysOrg sysOrg);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 }

core/src/main/java/com/ctsi/System/SysOrg/service/impl/SysOrgServiceImpl.java

@@ -28,7 +28,7 @@ public class SysOrgServiceImpl implements SysOrgService {
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysOrg queryById(Long id){
         return sysOrgMapper.selectById(id);
@@ -40,7 +40,7 @@ public class SysOrgServiceImpl implements SysOrgService {
      * @param sysOrg 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysOrgSearchPO> paginQuery(SysOrg sysOrg, long current, long size){
         //1. 构建动态查询条件
@@ -68,7 +68,7 @@ public class SysOrgServiceImpl implements SysOrgService {
      * 新增数据
      *
      * @param sysOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysOrg insert(SysOrg sysOrg){
         sysOrgMapper.insert(sysOrg);
@@ -79,11 +79,11 @@ public class SysOrgServiceImpl implements SysOrgService {
      * 更新数据
      *
      * @param sysOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysOrg update(SysOrg sysOrg){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysOrg> chainWrapper = new LambdaUpdateChainWrapper<SysOrg>(sysOrgMapper);
+        LambdaUpdateChainWrapper<SysOrg> chainWrapper = new LambdaUpdateChainWrapper<>(sysOrgMapper);
         if(StrUtil.isNotBlank(sysOrg.getOrgName())){
             chainWrapper.set(SysOrg::getOrgName, sysOrg.getOrgName());
         }
@@ -111,7 +111,7 @@ public class SysOrgServiceImpl implements SysOrgService {
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysOrgMapper.deleteById(id);

core/src/main/java/com/ctsi/System/SysRole/controller/SysRoleController.java

@@ -36,11 +36,11 @@ public class SysRoleController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysRole> queryById(Long id){
+    public ApiResult<SysRole> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysRoleService.queryById(id));
         } catch (Exception e) {
@@ -53,7 +53,7 @@ public class SysRoleController{
      * 分页查询
      *
      * @param sysRole 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -70,7 +70,7 @@ public class SysRoleController{
      * 新增数据
      *
      * @param sysRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -88,7 +88,7 @@ public class SysRoleController{
      * 更新数据
      *
      * @param sysRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -105,7 +105,7 @@ public class SysRoleController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping
@@ -122,7 +122,7 @@ public class SysRoleController{
       * 角色菜单绑定
       *
       * @param SysRoleMenuAddVO 实例对象
-      * @return 实例对象
+      * @ return 实例对象
       */
      @ApiOperation("角色菜单绑定")
      @PostMapping("/roleMenuAdd")
@@ -139,7 +139,7 @@ public class SysRoleController{
       * 获取角色菜单信息
       *
       * @param roleId 角色id
-      * @return 实例对象
+      * @ return 实例对象
       */
      @ApiOperation("获取角色菜单信息")
      @GetMapping("/getRoleMenus")

core/src/main/java/com/ctsi/System/SysRole/entity/PO/SysRoleMenuAddPO.java

@@ -1,10 +1,11 @@
 package com.ctsi.System.SysRole.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -14,31 +15,15 @@ import java.util.List;
 * @author : machaoyi
 * @date : 2024-1-12
 */
-@ApiModel(value = "角色菜单表新增PO",description = "")
+@ApiModel(value = "角色菜单表新增PO")
 @TableName("sys_role_menu")
-public class SysRoleMenuAddPO implements Serializable,Cloneable{
+@Data
+public class SysRoleMenuAddPO implements Serializable{
    /** 角色id */
-   @ApiModelProperty(value = "角色id",notes = "")
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @ApiModelProperty(value = "角色id")
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long roleId ;
    /** 菜单id */
-   @ApiModelProperty(value = "菜单id",notes = "")
+   @ApiModelProperty(value = "菜单id")
    private List<String> menuId ;
-
-   /** 角色id */
-   public Long getRoleId(){
-       return this.roleId;
-   }
-   /** 角色id */
-   public void setRoleId(Long roleId){
-       this.roleId=roleId;
-   }
-   /** 菜单id */
-   public List<String> getMenuId(){
-       return this.menuId;
-   }
-   /** 菜单id */
-   public void setMenuId(List<String> menuId){
-       this.menuId=menuId;
-   }
 }

core/src/main/java/com/ctsi/System/SysRole/entity/SysRole.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysRole.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,65 +16,25 @@ import java.util.Date;
  * @author : machaoyi
  * @date : 2024-1-11
  */
-@ApiModel(value = "角色表",description = "")
+@ApiModel(value = "角色表")
 @TableName("sys_role")
-public class SysRole implements Serializable,Cloneable{
+@Data
+public class SysRole implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 创建人userid */
-    @ApiModelProperty(value = "创建人userid",notes = "")
+    @ApiModelProperty(value = "创建人userid")
     private Long createdBy ;
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间",notes = "")
+    @ApiModelProperty(value = "创建时间")
     private Date createdTime ;
     /** 逻辑删除 */
-    @ApiModelProperty(value = "逻辑删除",notes = "")
+    @ApiModelProperty(value = "逻辑删除")
     private Integer delFlag ;
     /** 角色名称 */
-    @ApiModelProperty(value = "角色名称",notes = "")
+    @ApiModelProperty(value = "角色名称")
     private String roleName ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 创建人userid */
-    public Long getCreatedBy(){
-        return this.createdBy;
-    }
-    /** 创建人userid */
-    public void setCreatedBy(Long createdBy){
-        this.createdBy=createdBy;
-    }
-    /** 创建时间 */
-    public Date getCreatedTime(){
-        return this.createdTime;
-    }
-    /** 创建时间 */
-    public void setCreatedTime(Date createdTime){
-        this.createdTime=createdTime;
-    }
-    /** 逻辑删除 */
-    public Integer getDelFlag(){
-        return this.delFlag;
-    }
-    /** 逻辑删除 */
-    public void setDelFlag(Integer delFlag){
-        this.delFlag=delFlag;
-    }
-    /** 角色名称 */
-    public String getRoleName(){
-        return this.roleName;
-    }
-    /** 角色名称 */
-    public void setRoleName(String roleName){
-        this.roleName=roleName;
-    }
 }

core/src/main/java/com/ctsi/System/SysRole/entity/VO/SysRoleMenuAddVO.java

@@ -3,6 +3,7 @@ package com.ctsi.System.SysRole.entity.VO;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -12,30 +13,14 @@ import java.util.List;
 * @author : machaoyi
 * @date : 2024-1-12
 */
-@ApiModel(value = "角色菜单表新增VO",description = "")
+@ApiModel(value = "角色菜单表新增VO")
 @TableName("sys_role_menu")
-public class SysRoleMenuAddVO implements Serializable,Cloneable{
+@Data
+public class SysRoleMenuAddVO implements Serializable{
    /** 角色id */
-   @ApiModelProperty(value = "角色id",notes = "")
+   @ApiModelProperty(value = "角色id")
    private Long roleId ;
    /** 菜单id */
-   @ApiModelProperty(value = "菜单id",notes = "")
+   @ApiModelProperty(value = "菜单id")
    private List<Long> menuId ;
-
-   /** 角色id */
-   public Long getRoleId(){
-       return this.roleId;
-   }
-   /** 角色id */
-   public void setRoleId(Long roleId){
-       this.roleId=roleId;
-   }
-   /** 菜单id */
-   public List<Long> getMenuId(){
-       return this.menuId;
-   }
-   /** 菜单id */
-   public void setMenuId(List<Long> menuId){
-       this.menuId=menuId;
-   }
 }

core/src/main/java/com/ctsi/System/SysRole/mapper/SysRoleMapper.java

@@ -20,7 +20,7 @@ public interface SysRoleMapper  extends BaseMapper<SysRole>{
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysRole> selectByPage(IPage<SysRole> page , @Param(Constants.WRAPPER) Wrapper<SysRole> wrapper);
 }

core/src/main/java/com/ctsi/System/SysRole/service/SysRoleService.java

@@ -14,7 +14,7 @@ public interface SysRoleService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysRole queryById(Long id);
     
@@ -24,28 +24,28 @@ public interface SysRoleService{
      * @param sysRole 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysRole> paginQuery(SysRole sysRole, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysRole insert(SysRole sysRole);
     /** 
      * 更新数据
      *
      * @param sysRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysRole update(SysRole sysRole);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 }

core/src/main/java/com/ctsi/System/SysRole/service/impl/SysRoleServiceImpl.java

@@ -26,7 +26,7 @@ public class SysRoleServiceImpl implements SysRoleService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysRole queryById(Long id){
         return sysRoleMapper.selectById(id);
@@ -38,7 +38,7 @@ public class SysRoleServiceImpl implements SysRoleService{
      * @param sysRole 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysRole> paginQuery(SysRole sysRole, long current, long size){
         //1. 构建动态查询条件
@@ -60,7 +60,7 @@ public class SysRoleServiceImpl implements SysRoleService{
      * 新增数据
      *
      * @param sysRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysRole insert(SysRole sysRole){
         sysRoleMapper.insert(sysRole);
@@ -71,11 +71,11 @@ public class SysRoleServiceImpl implements SysRoleService{
      * 更新数据
      *
      * @param sysRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysRole update(SysRole sysRole){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysRole> chainWrapper = new LambdaUpdateChainWrapper<SysRole>(sysRoleMapper);
+        LambdaUpdateChainWrapper<SysRole> chainWrapper = new LambdaUpdateChainWrapper<>(sysRoleMapper);
         if(StrUtil.isNotBlank(sysRole.getRoleName())){
             chainWrapper.set(SysRole::getRoleName, sysRole.getRoleName());
         }
@@ -94,7 +94,7 @@ public class SysRoleServiceImpl implements SysRoleService{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysRoleMapper.deleteById(id);

core/src/main/java/com/ctsi/System/SysRoleMenu/controller/SysRoleMenuController.java

@@ -29,11 +29,11 @@ public class SysRoleMenuController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysRoleMenu> queryById(Long id){
+    public ApiResult<SysRoleMenu> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysRoleMenuService.queryById(id));
         } catch (Exception e) {
@@ -46,7 +46,7 @@ public class SysRoleMenuController{
      * 分页查询
      *
      * @param sysRoleMenu 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -63,7 +63,7 @@ public class SysRoleMenuController{
      * 新增数据
      *
      * @param sysRoleMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -80,7 +80,7 @@ public class SysRoleMenuController{
      * 更新数据
      *
      * @param sysRoleMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -97,7 +97,7 @@ public class SysRoleMenuController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping

core/src/main/java/com/ctsi/System/SysRoleMenu/entity/SysRoleMenu.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysRoleMenu.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -14,45 +15,21 @@ import java.io.Serializable;
  * @author : machaoyi
  * @date : 2024-1-12
  */
-@ApiModel(value = "角色菜单表",description = "")
+@ApiModel(value = "角色菜单表")
 @TableName("sys_role_menu")
-public class SysRoleMenu implements Serializable,Cloneable{
+@Data
+public class SysRoleMenu implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 角色id */
-    @ApiModelProperty(value = "角色id",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "角色id")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long roleId ;
     /** 菜单id */
-    @ApiModelProperty(value = "菜单id",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "菜单id")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long menuId ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 角色id */
-    public Long getRoleId(){
-        return this.roleId;
-    }
-    /** 角色id */
-    public void setRoleId(Long roleId){
-        this.roleId=roleId;
-    }
-    /** 菜单id */
-    public Long getMenuId(){
-        return this.menuId;
-    }
-    /** 菜单id */
-    public void setMenuId(Long menuId){
-        this.menuId=menuId;
-    }
 }

core/src/main/java/com/ctsi/System/SysRoleMenu/mapper/SysRoleMenuMapper.java

@@ -20,7 +20,7 @@ public interface SysRoleMenuMapper  extends BaseMapper<SysRoleMenu>{
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysRoleMenu> selectByPage(IPage<SysRoleMenu> page , @Param(Constants.WRAPPER) Wrapper<SysRoleMenu> wrapper);
 }

core/src/main/java/com/ctsi/System/SysRoleMenu/service/SysRoleMenuService.java

@@ -16,7 +16,7 @@ public interface SysRoleMenuService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysRoleMenu queryById(Long id);
     
@@ -26,28 +26,28 @@ public interface SysRoleMenuService{
      * @param sysRoleMenu 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysRoleMenu> paginQuery(SysRoleMenu sysRoleMenu, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysRoleMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysRoleMenu insert(SysRoleMenu sysRoleMenu);
     /** 
      * 更新数据
      *
      * @param sysRoleMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysRoleMenu update(SysRoleMenu sysRoleMenu);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 

core/src/main/java/com/ctsi/System/SysRoleMenu/service/impl/SysRoleMenuServiceImpl.java

@@ -29,7 +29,7 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysRoleMenu queryById(Long id){
         return sysRoleMenuMapper.selectById(id);
@@ -41,7 +41,7 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
      * @param sysRoleMenu 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysRoleMenu> paginQuery(SysRoleMenu sysRoleMenu, long current, long size){
         //1. 构建动态查询条件
@@ -60,7 +60,7 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
      * 新增数据
      *
      * @param sysRoleMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysRoleMenu insert(SysRoleMenu sysRoleMenu){
         sysRoleMenuMapper.insert(sysRoleMenu);
@@ -71,11 +71,11 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
      * 更新数据
      *
      * @param sysRoleMenu 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysRoleMenu update(SysRoleMenu sysRoleMenu){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysRoleMenu> chainWrapper = new LambdaUpdateChainWrapper<SysRoleMenu>(sysRoleMenuMapper);
+        LambdaUpdateChainWrapper<SysRoleMenu> chainWrapper = new LambdaUpdateChainWrapper<>(sysRoleMenuMapper);
         //2. 设置主键，并更新
         chainWrapper.eq(SysRoleMenu::getId, sysRoleMenu.getId());
         boolean ret = chainWrapper.update();
@@ -91,7 +91,7 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysRoleMenuMapper.deleteById(id);
@@ -102,7 +102,7 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
       * 保存角色菜单
       *
       * @param SysRoleMenuAddVO 实例对象
-      * @return 实例对象
+      * @ return 实例对象
       */
      public SysRoleMenuAddVO save(SysRoleMenuAddVO SysRoleMenuAddVO){
          LambdaQueryWrapper<SysRoleMenu> queryWrapper = new LambdaQueryWrapper<>();
@@ -121,7 +121,7 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
       * 获取角色菜单信息
       *
       * @param roleId 角色id
-      * @return 实例对象
+      * @ return 实例对象
       */
      public SysRoleMenuAddPO getRoleMenus(Long roleId){
          SysRoleMenuAddPO sysRoleMenuAddPO = new SysRoleMenuAddPO();

core/src/main/java/com/ctsi/System/SysUser/controller/SysUserController.java

@@ -49,11 +49,11 @@ public class SysUserController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<UserDetailPO> queryById(Long id){
+    public ApiResult<UserDetailPO> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysUserService.queryById(id));
         } catch (Exception e) {
@@ -66,7 +66,7 @@ public class SysUserController{
      * 分页查询
      *
      * @param sysUser 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -83,7 +83,7 @@ public class SysUserController{
      * 新增数据
      *
      * @param userAddVO 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -126,7 +126,7 @@ public class SysUserController{
      * 更新数据
      *
      * @param userEditVO 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -160,7 +160,7 @@ public class SysUserController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping
@@ -177,7 +177,7 @@ public class SysUserController{
       * 用户角色绑定
       *
       * @param sysUserRoleAddVO 实例对象
-      * @return 实例对象
+      * @ return 实例对象
       */
      @ApiOperation("用户角色绑定")
      @PostMapping("/userRoleAdd")
@@ -194,7 +194,7 @@ public class SysUserController{
       * 获取用户角色信息
       *
       * @param id 用户id
-      * @return 实例对象
+      * @ return 实例对象
       */
      @ApiOperation("获取用户角色信息")
      @GetMapping("/getUserRoles")

core/src/main/java/com/ctsi/System/SysUser/entity/PO/UserDetailPO.java

@@ -1,10 +1,11 @@
 package com.ctsi.System.SysUser.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -14,131 +15,43 @@ import java.util.List;
 * @author : machaoyi
 * @date : 2024-1-10
 */
-@ApiModel(value = "用户信息表PO",description = "")
-public class UserDetailPO implements Serializable,Cloneable{
+@ApiModel(value = "用户信息表PO")
+@Data
+public class UserDetailPO implements Serializable{
    /** 主键id */
-   @ApiModelProperty(value = "主键id",notes = "")
+   @ApiModelProperty(value = "主键id")
    @TableId
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long id ;
    /** 用户名 */
-   @ApiModelProperty(value = "用户名",notes = "")
+   @ApiModelProperty(value = "用户名")
    private String userName ;
    /** 姓名 */
-   @ApiModelProperty(value = "姓名",notes = "")
+   @ApiModelProperty(value = "姓名")
    private String name ;
    /** 性别 */
-   @ApiModelProperty(value = "性别",notes = "")
+   @ApiModelProperty(value = "性别")
    private String gender ;
    /** 手机号 */
-   @ApiModelProperty(value = "手机号",notes = "")
+   @ApiModelProperty(value = "手机号")
    private String phone ;
    /** 邮箱 */
-   @ApiModelProperty(value = "邮箱",notes = "")
+   @ApiModelProperty(value = "邮箱")
    private String email ;
    /** 出生日期 */
-   @ApiModelProperty(value = "出生日期",notes = "")
+   @ApiModelProperty(value = "出生日期")
    private String birthDate ;
    /** 部门id */
-   @ApiModelProperty(value = "部门id",notes = "")
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @ApiModelProperty(value = "部门id")
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long orgId ;
    /** 部门名称 */
-   @ApiModelProperty(value = "部门名称",notes = "")
+   @ApiModelProperty(value = "部门名称")
    private String orgName ;
    /** 角色id */
-   @ApiModelProperty(value = "角色id",notes = "")
+   @ApiModelProperty(value = "角色id")
    private List<String> roleId ;
    /** 角色名称 */
-   @ApiModelProperty(value = "角色名称",notes = "")
+   @ApiModelProperty(value = "角色名称")
    private List<String> roleName ;
-
-   /** 主键id */
-   public Long getId(){
-       return this.id;
-   }
-   /** 主键id */
-   public void setId(Long id){
-       this.id=id;
-   }
-   /** 用户名 */
-   public String getUserName(){
-      return this.userName;
-   }
-   /** 用户名 */
-   public void setUserName(String userName){
-      this.userName=userName;
-   }
-   /** 姓名 */
-   public String getName(){
-       return this.name;
-   }
-   /** 姓名 */
-   public void setName(String name){
-       this.name=name;
-   }
-   /** 性别 */
-   public String getGender(){
-       return this.gender;
-   }
-   /** 性别 */
-   public void setGender(String gender){
-       this.gender=gender;
-   }
-   /** 手机号 */
-   public String getPhone(){
-       return this.phone;
-   }
-   /** 手机号 */
-   public void setPhone(String phone){
-       this.phone=phone;
-   }
-   /** 邮箱 */
-   public String getEmail(){
-       return this.email;
-   }
-   /** 邮箱 */
-   public void setEmail(String email){
-       this.email=email;
-   }
-   /** 出生日期 */
-   public String getBirthDate(){
-       return this.birthDate;
-   }
-   /** 出生日期 */
-   public void setBirthDate(String birthDate){
-       this.birthDate=birthDate;
-   }
-
-   public Long getOrgId() {
-      return orgId;
-   }
-
-   public void setOrgId(Long orgId) {
-      this.orgId = orgId;
-   }
-
-   public String getOrgName() {
-      return orgName;
-   }
-
-   public void setOrgName(String orgName) {
-      this.orgName = orgName;
-   }
-
-   public List<String> getRoleId() {
-      return roleId;
-   }
-
-   public void setRoleId(List<String> roleId) {
-      this.roleId = roleId;
-   }
-
-   public List<String> getRoleName() {
-      return roleName;
-   }
-
-   public void setRoleName(List<String> roleName) {
-      this.roleName = roleName;
-   }
 }

core/src/main/java/com/ctsi/System/SysUser/entity/SysUser.java

@@ -3,10 +3,11 @@ package com.ctsi.System.SysUser.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -15,55 +16,23 @@ import java.io.Serializable;
  * @author : machaoyi
  * @date : 2024-1-10
  */
-@ApiModel(value = "用户表",description = "")
+@ApiModel(value = "用户表")
 @TableName("sys_user")
-public class SysUser implements Serializable,Cloneable{
+@Data
+public class SysUser implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 用户名 */
-    @ApiModelProperty(value = "用户名",notes = "")
+    @ApiModelProperty(value = "用户名")
     private String userName ;
     /** 密码 */
-    @ApiModelProperty(value = "密码",notes = "")
+    @ApiModelProperty(value = "密码")
     private String password ;
     /** 逻辑删除 */
-    @ApiModelProperty(value = "逻辑删除",notes = "")
+    @ApiModelProperty(value = "逻辑删除")
     @TableLogic
     private Integer delFlag ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 用户名 */
-    public String getUserName(){
-        return this.userName;
-    }
-    /** 用户名 */
-    public void setUserName(String userName){
-        this.userName=userName;
-    }
-    /** 密码 */
-    public String getPassword(){
-        return this.password;
-    }
-    /** 密码 */
-    public void setPassword(String password){
-        this.password=password;
-    }
-    /** 逻辑删除 */
-    public Integer getDelFlag(){
-        return this.delFlag;
-    }
-    /** 逻辑删除 */
-    public void setDelFlag(Integer delFlag){
-        this.delFlag=delFlag;
-    }
 }

core/src/main/java/com/ctsi/System/SysUser/entity/VO/UserAddVO.java

@@ -1,6 +1,6 @@
 package com.ctsi.System.SysUser.entity.VO;
 
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,28 +12,28 @@ import java.util.List;
 @Data
 public class UserAddVO {
     /** 用户名 */
-    @ApiModelProperty(value = "用户名",notes = "")
+    @ApiModelProperty(value = "用户名")
     private String userName ;
     /** 姓名 */
-    @ApiModelProperty(value = "姓名",notes = "")
+    @ApiModelProperty(value = "姓名")
     private String name ;
     /** 性别 */
-    @ApiModelProperty(value = "性别",notes = "")
+    @ApiModelProperty(value = "性别")
     private String gender ;
     /** 手机号 */
-    @ApiModelProperty(value = "手机号",notes = "")
+    @ApiModelProperty(value = "手机号")
     private String phone ;
     /** 邮箱 */
-    @ApiModelProperty(value = "邮箱",notes = "")
+    @ApiModelProperty(value = "邮箱")
     private String email ;
     /** 出生日期 */
-    @ApiModelProperty(value = "出生日期",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "出生日期")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long birthDate ;
     /** 角色id */
-    @ApiModelProperty(value = "角色id",notes = "")
+    @ApiModelProperty(value = "角色id")
     private List<Long> roleId ;
     /** 部门id */
-    @ApiModelProperty(value = "部门id",notes = "")
+    @ApiModelProperty(value = "部门id")
     private Long orgId ;
 }

core/src/main/java/com/ctsi/System/SysUser/entity/VO/UserEditVO.java

@@ -1,7 +1,7 @@
 package com.ctsi.System.SysUser.entity.VO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,30 +13,30 @@ import java.util.List;
 @Data
 public class UserEditVO {
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 姓名 */
-    @ApiModelProperty(value = "姓名",notes = "")
+    @ApiModelProperty(value = "姓名")
     private String name ;
     /** 性别 */
-    @ApiModelProperty(value = "性别",notes = "")
+    @ApiModelProperty(value = "性别")
     private String gender ;
     /** 手机号 */
-    @ApiModelProperty(value = "手机号",notes = "")
+    @ApiModelProperty(value = "手机号")
     private String phone ;
     /** 邮箱 */
-    @ApiModelProperty(value = "邮箱",notes = "")
+    @ApiModelProperty(value = "邮箱")
     private String email ;
     /** 出生日期 */
-    @ApiModelProperty(value = "出生日期",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "出生日期")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long birthDate ;
     /** 角色id */
-    @ApiModelProperty(value = "角色id",notes = "")
+    @ApiModelProperty(value = "角色id")
     private List<Long> roleId ;
     /** 部门id */
-    @ApiModelProperty(value = "部门id",notes = "")
+    @ApiModelProperty(value = "部门id")
     private Long orgId ;
 }

core/src/main/java/com/ctsi/System/SysUser/entity/VO/UserSearchVO.java

@@ -4,24 +4,23 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
 
 @ApiModel("用户查询条件")
 @Data
 public class UserSearchVO {
     /** 用户名 */
-    @ApiModelProperty(value = "用户名",notes = "")
+    @ApiModelProperty(value = "用户名")
     private String userName ;
     /** 姓名 */
-    @ApiModelProperty(value = "姓名",notes = "")
+    @ApiModelProperty(value = "姓名")
     private String name ;
     /** 手机号 */
-    @ApiModelProperty(value = "手机号",notes = "")
+    @ApiModelProperty(value = "手机号")
     private String phone ;
     /** 部门id */
-    @ApiModelProperty(value = "部门id",notes = "")
+    @ApiModelProperty(value = "部门id")
     private Long orgId ;
     /** 角色id */
-    @ApiModelProperty(value = "角色id 用“,”隔开",notes = "")
+    @ApiModelProperty(value = "角色id 用“,”隔开")
     private String roleIds ;
 }

core/src/main/java/com/ctsi/System/SysUser/mapper/SysUserMapper.java

@@ -20,7 +20,7 @@ public interface SysUserMapper  extends MPJBaseMapper<SysUser> {
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysUser> selectByPage(IPage<SysUser> page , @Param(Constants.WRAPPER) Wrapper<SysUser> wrapper);
 }

core/src/main/java/com/ctsi/System/SysUser/service/SysUserService.java

@@ -18,7 +18,7 @@ public interface SysUserService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     UserDetailPO queryById(Long id);
     
@@ -28,30 +28,30 @@ public interface SysUserService{
      * @param sysUser 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<UserDetailPO> paginQuery(UserSearchVO sysUser, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysUser 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUser insert(SysUser sysUser);
 
-    ApiResult updatePassword(UpdatePasswordVO updatePasswordVO);
+    ApiResult<String> updatePassword(UpdatePasswordVO updatePasswordVO);
     /** 
      * 更新数据
      *
      * @param sysUser 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     UserDetailPO update(SysUser sysUser);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 

core/src/main/java/com/ctsi/System/SysUser/service/impl/SysUserServiceImpl.java

@@ -47,10 +47,10 @@ public class SysUserServiceImpl implements SysUserService {
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public UserDetailPO queryById(Long id){
-        MPJLambdaWrapper<SysUser> queryWrapper = new MPJLambdaWrapper<SysUser>();
+        MPJLambdaWrapper<SysUser> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.eq(SysUser::getId, id);
         queryWrapper.selectAll(SysUserDetail.class);
         queryWrapper.select(SysUser::getUserName);
@@ -70,11 +70,11 @@ public class SysUserServiceImpl implements SysUserService {
      * @param sysUser 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<UserDetailPO> paginQuery(UserSearchVO sysUser, long current, long size){
         //1. 构建动态查询条件
-        MPJLambdaWrapper<SysUser> queryWrapper = new MPJLambdaWrapper<SysUser>();
+        MPJLambdaWrapper<SysUser> queryWrapper = new MPJLambdaWrapper<>();
         if(StrUtil.isNotBlank(sysUser.getUserName())){
             queryWrapper.like(SysUser::getUserName, sysUser.getUserName());
         }
@@ -119,7 +119,7 @@ public class SysUserServiceImpl implements SysUserService {
      * 新增数据
      *
      * @param sysUser 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUser insert(SysUser sysUser){
         // 新增用户时如果没有特别设定密码，则使用默认密码
@@ -138,13 +138,13 @@ public class SysUserServiceImpl implements SysUserService {
      * 修改当前用户密码
      *
      * @param updatePasswordVO 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
-    public ApiResult updatePassword(UpdatePasswordVO updatePasswordVO){
+    public ApiResult<String> updatePassword(UpdatePasswordVO updatePasswordVO){
         SysUser sysUser = sysUserMapper.selectById(StpUtil.getLoginIdAsLong());
         if (sysUser == null)
             return ApiResult.failure("用户不存在",null);
-        if (!PasswordEncoderUtil.checkPassword(updatePasswordVO.getOldPassword(), sysUser.getPassword()))
+        if (PasswordEncoderUtil.isPasswordWrong(updatePasswordVO.getOldPassword(), sysUser.getPassword()))
             return ApiResult.failure("原密码错误",null);
         PasswordUtils passwordUtils = PasswordUtils.isValid(updatePasswordVO.getNewPassword(), sysUser.getUserName());
         if (!passwordUtils.getIsValidPassword()) {
@@ -161,11 +161,11 @@ public class SysUserServiceImpl implements SysUserService {
      * 更新数据
      *
      * @param sysUser 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public UserDetailPO update(SysUser sysUser){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysUser> chainWrapper = new LambdaUpdateChainWrapper<SysUser>(sysUserMapper);
+        LambdaUpdateChainWrapper<SysUser> chainWrapper = new LambdaUpdateChainWrapper<>(sysUserMapper);
         if(StrUtil.isNotBlank(sysUser.getUserName())){
             chainWrapper.set(SysUser::getUserName, sysUser.getUserName());
         }
@@ -183,7 +183,7 @@ public class SysUserServiceImpl implements SysUserService {
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysUserMapper.deleteById(id);

core/src/main/java/com/ctsi/System/SysUserDetail/controller/SysUserDetailController.java

@@ -29,11 +29,11 @@ public class SysUserDetailController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysUserDetail> queryById(Long id){
+    public ApiResult<SysUserDetail> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysUserDetailService.queryById(id));
         } catch (Exception e) {
@@ -46,7 +46,7 @@ public class SysUserDetailController{
      * 分页查询
      *
      * @param sysUserDetail 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -63,7 +63,7 @@ public class SysUserDetailController{
      * 新增数据
      *
      * @param sysUserDetail 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -80,7 +80,7 @@ public class SysUserDetailController{
      * 更新数据
      *
      * @param sysUserDetail 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -97,7 +97,7 @@ public class SysUserDetailController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping

core/src/main/java/com/ctsi/System/SysUserDetail/entity/SysUserDetail.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysUserDetail.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -14,77 +15,29 @@ import java.io.Serializable;
  * @author : machaoyi
  * @date : 2024-1-10
  */
-@ApiModel(value = "用户信息表",description = "")
+@ApiModel(value = "用户信息表")
 @TableName("sys_user_detail")
-public class SysUserDetail implements Serializable,Cloneable{
+@Data
+public class SysUserDetail implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 姓名 */
-    @ApiModelProperty(value = "姓名",notes = "")
+    @ApiModelProperty(value = "姓名")
     private String name ;
     /** 性别 */
-    @ApiModelProperty(value = "性别",notes = "")
+    @ApiModelProperty(value = "性别")
     private String gender ;
     /** 手机号 */
-    @ApiModelProperty(value = "手机号",notes = "")
+    @ApiModelProperty(value = "手机号")
     private String phone ;
     /** 邮箱 */
-    @ApiModelProperty(value = "邮箱",notes = "")
+    @ApiModelProperty(value = "邮箱")
     private String email ;
     /** 出生日期 */
-    @ApiModelProperty(value = "出生日期",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "出生日期")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long birthDate ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 姓名 */
-    public String getName(){
-        return this.name;
-    }
-    /** 姓名 */
-    public void setName(String name){
-        this.name=name;
-    }
-    /** 性别 */
-    public String getGender(){
-        return this.gender;
-    }
-    /** 性别 */
-    public void setGender(String gender){
-        this.gender=gender;
-    }
-    /** 手机号 */
-    public String getPhone(){
-        return this.phone;
-    }
-    /** 手机号 */
-    public void setPhone(String phone){
-        this.phone=phone;
-    }
-    /** 邮箱 */
-    public String getEmail(){
-        return this.email;
-    }
-    /** 邮箱 */
-    public void setEmail(String email){
-        this.email=email;
-    }
-    /** 出生日期 */
-    public Long getBirthDate(){
-        return this.birthDate;
-    }
-    /** 出生日期 */
-    public void setBirthDate(Long birthDate){
-        this.birthDate=birthDate;
-    }
 }

core/src/main/java/com/ctsi/System/SysUserDetail/entity/VO/SysUserDetailAddVO.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysUserDetail.entity.VO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -14,76 +15,28 @@ import java.io.Serializable;
 * @author : machaoyi
 * @date : 2024-1-10
 */
-@ApiModel(value = "用户信息表新增VO",description = "")
+@ApiModel(value = "用户信息表新增VO")
 @TableName("sys_user_detail")
-public class SysUserDetailAddVO implements Serializable,Cloneable{
+@Data
+public class SysUserDetailAddVO implements Serializable{
    /** 主键id */
-   @ApiModelProperty(value = "主键id",notes = "")
+   @ApiModelProperty(value = "主键id")
    @TableId
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long id ;
    /** 姓名 */
-   @ApiModelProperty(value = "姓名",notes = "")
+   @ApiModelProperty(value = "姓名")
    private String name ;
    /** 性别 */
-   @ApiModelProperty(value = "性别",notes = "")
+   @ApiModelProperty(value = "性别")
    private String gender ;
    /** 手机号 */
-   @ApiModelProperty(value = "手机号",notes = "")
+   @ApiModelProperty(value = "手机号")
    private String phone ;
    /** 邮箱 */
-   @ApiModelProperty(value = "邮箱",notes = "")
+   @ApiModelProperty(value = "邮箱")
    private String email ;
    /** 出生日期 */
-   @ApiModelProperty(value = "出生日期",notes = "")
+   @ApiModelProperty(value = "出生日期")
    private String birthDate ;
-
-   /** 主键id */
-   public Long getId(){
-       return this.id;
-   }
-   /** 主键id */
-   public void setId(Long id){
-       this.id=id;
-   }
-   /** 姓名 */
-   public String getName(){
-       return this.name;
-   }
-   /** 姓名 */
-   public void setName(String name){
-       this.name=name;
-   }
-   /** 性别 */
-   public String getGender(){
-       return this.gender;
-   }
-   /** 性别 */
-   public void setGender(String gender){
-       this.gender=gender;
-   }
-   /** 手机号 */
-   public String getPhone(){
-       return this.phone;
-   }
-   /** 手机号 */
-   public void setPhone(String phone){
-       this.phone=phone;
-   }
-   /** 邮箱 */
-   public String getEmail(){
-       return this.email;
-   }
-   /** 邮箱 */
-   public void setEmail(String email){
-       this.email=email;
-   }
-   /** 出生日期 */
-   public String getBirthDate(){
-       return this.birthDate;
-   }
-   /** 出生日期 */
-   public void setBirthDate(String birthDate){
-       this.birthDate=birthDate;
-   }
 }

core/src/main/java/com/ctsi/System/SysUserDetail/mapper/SysUserDetailMapper.java

@@ -20,7 +20,7 @@ public interface SysUserDetailMapper  extends BaseMapper<SysUserDetail>{
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysUserDetail> selectByPage(IPage<SysUserDetail> page , @Param(Constants.WRAPPER) Wrapper<SysUserDetail> wrapper);
 }

core/src/main/java/com/ctsi/System/SysUserDetail/service/SysUserDetailService.java

@@ -14,7 +14,7 @@ public interface SysUserDetailService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserDetail queryById(Long id);
     
@@ -24,28 +24,28 @@ public interface SysUserDetailService{
      * @param sysUserDetail 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysUserDetail> paginQuery(SysUserDetail sysUserDetail, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysUserDetail 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserDetail insert(SysUserDetail sysUserDetail);
     /** 
      * 更新数据
      *
      * @param sysUserDetail 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserDetail update(SysUserDetail sysUserDetail);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 }

core/src/main/java/com/ctsi/System/SysUserDetail/service/impl/SysUserDetailServiceImpl.java

@@ -26,7 +26,7 @@ public class SysUserDetailServiceImpl implements SysUserDetailService {
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserDetail queryById(Long id){
         return sysUserDetailMapper.selectById(id);
@@ -38,7 +38,7 @@ public class SysUserDetailServiceImpl implements SysUserDetailService {
      * @param sysUserDetail 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysUserDetail> paginQuery(SysUserDetail sysUserDetail, long current, long size){
         //1. 构建动态查询条件
@@ -69,7 +69,7 @@ public class SysUserDetailServiceImpl implements SysUserDetailService {
      * 新增数据
      *
      * @param sysUserDetail 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserDetail insert(SysUserDetail sysUserDetail){
         sysUserDetailMapper.insert(sysUserDetail);
@@ -80,11 +80,11 @@ public class SysUserDetailServiceImpl implements SysUserDetailService {
      * 更新数据
      *
      * @param sysUserDetail 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserDetail update(SysUserDetail sysUserDetail){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysUserDetail> chainWrapper = new LambdaUpdateChainWrapper<SysUserDetail>(sysUserDetailMapper);
+        LambdaUpdateChainWrapper<SysUserDetail> chainWrapper = new LambdaUpdateChainWrapper<>(sysUserDetailMapper);
         if(StrUtil.isNotBlank(sysUserDetail.getName())){
             chainWrapper.set(SysUserDetail::getName, sysUserDetail.getName());
         }
@@ -112,7 +112,7 @@ public class SysUserDetailServiceImpl implements SysUserDetailService {
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysUserDetailMapper.deleteById(id);

core/src/main/java/com/ctsi/System/SysUserOrg/controller/SysUserOrgController.java

@@ -29,11 +29,11 @@ public class SysUserOrgController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysUserOrg> queryById(Long id){
+    public ApiResult<SysUserOrg> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysUserOrgService.queryById(id));
         } catch (Exception e) {
@@ -46,7 +46,7 @@ public class SysUserOrgController{
      * 分页查询
      *
      * @param sysUserOrg 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -63,7 +63,7 @@ public class SysUserOrgController{
      * 新增数据
      *
      * @param sysUserOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -80,7 +80,7 @@ public class SysUserOrgController{
      * 更新数据
      *
      * @param sysUserOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -97,7 +97,7 @@ public class SysUserOrgController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping

core/src/main/java/com/ctsi/System/SysUserOrg/entity/SysUserOrg.java

@@ -2,57 +2,34 @@ package com.ctsi.System.SysUserOrg.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
  /**
- * 用户部门表;
+ * 用户部门;
  * @author : machaoyi
  * @date : 2024-1-11
  */
-@ApiModel(value = "用户部门表",description = "")
+@ApiModel(value = "用户部门表")
 @TableName("sys_user_org")
-public class SysUserOrg implements Serializable,Cloneable{
+@Data
+public class SysUserOrg implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 用户id */
-    @ApiModelProperty(value = "用户id",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "用户id")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long userId ;
     /** 部门id */
-    @ApiModelProperty(value = "部门id",notes = "")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @ApiModelProperty(value = "部门id")
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long orgId ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 用户id */
-    public Long getUserId(){
-        return this.userId;
-    }
-    /** 用户id */
-    public void setUserId(Long userId){
-        this.userId=userId;
-    }
-    /** 部门id */
-    public Long getOrgId(){
-        return this.orgId;
-    }
-    /** 部门id */
-    public void setOrgId(Long orgId){
-        this.orgId=orgId;
-    }
 }

core/src/main/java/com/ctsi/System/SysUserOrg/mapper/SysUserOrgMapper.java

@@ -20,7 +20,7 @@ public interface SysUserOrgMapper  extends BaseMapper<SysUserOrg>{
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysUserOrg> selectByPage(IPage<SysUserOrg> page , @Param(Constants.WRAPPER) Wrapper<SysUserOrg> wrapper);
 }

core/src/main/java/com/ctsi/System/SysUserOrg/service/SysUserOrgService.java

@@ -14,7 +14,7 @@ public interface SysUserOrgService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserOrg queryById(Long id);
 
@@ -26,28 +26,28 @@ public interface SysUserOrgService{
      * @param sysUserOrg 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysUserOrg> paginQuery(SysUserOrg sysUserOrg, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysUserOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserOrg insert(SysUserOrg sysUserOrg);
     /** 
      * 更新数据
      *
      * @param sysUserOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserOrg update(SysUserOrg sysUserOrg);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 }

core/src/main/java/com/ctsi/System/SysUserOrg/service/impl/SysUserOrgServiceImpl.java

@@ -25,7 +25,7 @@ public class SysUserOrgServiceImpl implements SysUserOrgService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserOrg queryById(Long id){
         return sysUserOrgMapper.selectById(id);
@@ -43,7 +43,7 @@ public class SysUserOrgServiceImpl implements SysUserOrgService{
      * @param sysUserOrg 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysUserOrg> paginQuery(SysUserOrg sysUserOrg, long current, long size){
         //1. 构建动态查询条件
@@ -62,7 +62,7 @@ public class SysUserOrgServiceImpl implements SysUserOrgService{
      * 新增数据
      *
      * @param sysUserOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserOrg insert(SysUserOrg sysUserOrg){
         sysUserOrgMapper.insert(sysUserOrg);
@@ -73,11 +73,11 @@ public class SysUserOrgServiceImpl implements SysUserOrgService{
      * 更新数据
      *
      * @param sysUserOrg 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserOrg update(SysUserOrg sysUserOrg){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysUserOrg> chainWrapper = new LambdaUpdateChainWrapper<SysUserOrg>(sysUserOrgMapper);
+        LambdaUpdateChainWrapper<SysUserOrg> chainWrapper = new LambdaUpdateChainWrapper<>(sysUserOrgMapper);
         //2. 根据userId更新
         chainWrapper.eq(SysUserOrg::getUserId, sysUserOrg.getUserId());
         chainWrapper.set(SysUserOrg::getOrgId, sysUserOrg.getOrgId());
@@ -94,7 +94,7 @@ public class SysUserOrgServiceImpl implements SysUserOrgService{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysUserOrgMapper.deleteById(id);

core/src/main/java/com/ctsi/System/SysUserRole/controller/SysUserRoleController.java

@@ -29,11 +29,11 @@ public class SysUserRoleController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<SysUserRole> queryById(Long id){
+    public ApiResult<SysUserRole> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(sysUserRoleService.queryById(id));
         } catch (Exception e) {
@@ -46,7 +46,7 @@ public class SysUserRoleController{
      * 分页查询
      *
      * @param sysUserRole 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -63,7 +63,7 @@ public class SysUserRoleController{
      * 新增数据
      *
      * @param sysUserRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -80,7 +80,7 @@ public class SysUserRoleController{
      * 更新数据
      *
      * @param sysUserRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -97,7 +97,7 @@ public class SysUserRoleController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping

core/src/main/java/com/ctsi/System/SysUserRole/entity/PO/SysUserRoleAddPO.java

@@ -3,6 +3,7 @@ package com.ctsi.System.SysUserRole.entity.PO;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -12,41 +13,17 @@ import java.util.List;
 * @author : machaoyi
 * @date : 2024-1-11
 */
-@ApiModel(value = "用户角色表新增PO",description = "")
+@ApiModel(value = "用户角色表新增PO")
 @TableName("sys_user_role")
-public class SysUserRoleAddPO implements Serializable,Cloneable{
+@Data
+public class SysUserRoleAddPO implements Serializable{
    /** 用户id */
-   @ApiModelProperty(value = "用户id",notes = "")
+   @ApiModelProperty(value = "用户id")
    private Long userId ;
    /** 角色id */
-   @ApiModelProperty(value = "角色id",notes = "")
+   @ApiModelProperty(value = "角色id")
    private List<String> roleId ;
    /** 角色名称 */
-   @ApiModelProperty(value = "角色名称",notes = "")
+   @ApiModelProperty(value = "角色名称")
    private List<String> roleName ;
-
-   /** 用户id */
-   public Long getUserId(){
-       return this.userId;
-   }
-   /** 用户id */
-   public void setUserId(Long userId){
-       this.userId=userId;
-   }
-
-   public List<String> getRoleId() {
-      return roleId;
-   }
-
-   public void setRoleId(List<String> roleId) {
-      this.roleId = roleId;
-   }
-
-   public List<String> getRoleName() {
-      return roleName;
-   }
-
-   public void setRoleName(List<String> roleName) {
-      this.roleName = roleName;
-   }
 }

core/src/main/java/com/ctsi/System/SysUserRole/entity/PO/SysUserRolePO.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysUserRole.entity.PO;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -14,54 +15,22 @@ import java.io.Serializable;
 * @author : machaoyi
 * @date : 2024-1-11
 */
-@ApiModel(value = "用户角色表PO",description = "")
+@ApiModel(value = "用户角色表PO")
 @TableName("sys_user_role")
-public class SysUserRolePO implements Serializable,Cloneable{
+@Data
+public class SysUserRolePO implements Serializable{
    /** 主键id */
-   @ApiModelProperty(value = "主键id",notes = "")
+   @ApiModelProperty(value = "主键id")
    @TableId
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long id ;
    /** 用户id */
-   @ApiModelProperty(value = "用户id",notes = "")
+   @ApiModelProperty(value = "用户id")
    private Long userId ;
    /** 角色id */
-   @ApiModelProperty(value = "角色id",notes = "")
+   @ApiModelProperty(value = "角色id")
    private Long roleId ;
    /** 角色名称 */
-   @ApiModelProperty(value = "角色名称",notes = "")
+   @ApiModelProperty(value = "角色名称")
    private String roleName ;
-
-   /** 主键id */
-   public Long getId(){
-       return this.id;
-   }
-   /** 主键id */
-   public void setId(Long id){
-       this.id=id;
-   }
-   /** 用户id */
-   public Long getUserId(){
-       return this.userId;
-   }
-   /** 用户id */
-   public void setUserId(Long userId){
-       this.userId=userId;
-   }
-   /** 角色id */
-   public Long getRoleId(){
-       return this.roleId;
-   }
-   /** 角色id */
-   public void setRoleId(Long roleId){
-       this.roleId=roleId;
-   }
-
-   public String getRoleName() {
-      return roleName;
-   }
-
-   public void setRoleName(String roleName) {
-      this.roleName = roleName;
-   }
 }

core/src/main/java/com/ctsi/System/SysUserRole/entity/SysUserRole.java

@@ -2,10 +2,11 @@ package com.ctsi.System.SysUserRole.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -14,43 +15,19 @@ import java.io.Serializable;
  * @author : machaoyi
  * @date : 2024-1-11
  */
-@ApiModel(value = "用户角色表",description = "")
+@ApiModel(value = "用户角色表")
 @TableName("sys_user_role")
-public class SysUserRole implements Serializable,Cloneable{
+@Data
+public class SysUserRole implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 用户id */
-    @ApiModelProperty(value = "用户id",notes = "")
+    @ApiModelProperty(value = "用户id")
     private Long userId ;
     /** 角色id */
-    @ApiModelProperty(value = "角色id",notes = "")
+    @ApiModelProperty(value = "角色id")
     private Long roleId ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 用户id */
-    public Long getUserId(){
-        return this.userId;
-    }
-    /** 用户id */
-    public void setUserId(Long userId){
-        this.userId=userId;
-    }
-    /** 角色id */
-    public Long getRoleId(){
-        return this.roleId;
-    }
-    /** 角色id */
-    public void setRoleId(Long roleId){
-        this.roleId=roleId;
-    }
 }

core/src/main/java/com/ctsi/System/SysUserRole/entity/VO/SysUserRoleAddVO.java

@@ -3,6 +3,7 @@ package com.ctsi.System.SysUserRole.entity.VO;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
@@ -12,41 +13,17 @@ import java.util.List;
 * @author : machaoyi
 * @date : 2024-1-11
 */
-@ApiModel(value = "用户角色表新增VO",description = "")
+@ApiModel(value = "用户角色表新增VO")
 @TableName("sys_user_role")
-public class SysUserRoleAddVO implements Serializable,Cloneable{
+@Data
+public class SysUserRoleAddVO implements Serializable{
    /** 用户id */
-   @ApiModelProperty(value = "用户id",notes = "")
+   @ApiModelProperty(value = "用户id")
    private Long userId ;
    /** 角色id */
-   @ApiModelProperty(value = "角色id",notes = "")
+   @ApiModelProperty(value = "角色id")
    private List<Long> roleId ;
    /** 角色名称 */
-   @ApiModelProperty(value = "角色名称",notes = "")
+   @ApiModelProperty(value = "角色名称")
    private List<String> roleName ;
-
-   /** 用户id */
-   public Long getUserId(){
-       return this.userId;
-   }
-   /** 用户id */
-   public void setUserId(Long userId){
-       this.userId=userId;
-   }
-
-   public List<Long> getRoleId() {
-      return roleId;
-   }
-
-   public void setRoleId(List<Long> roleId) {
-      this.roleId = roleId;
-   }
-
-   public List<String> getRoleName() {
-      return roleName;
-   }
-
-   public void setRoleName(List<String> roleName) {
-      this.roleName = roleName;
-   }
 }

core/src/main/java/com/ctsi/System/SysUserRole/mapper/SysUserRoleMapper.java

@@ -20,7 +20,7 @@ public interface SysUserRoleMapper  extends MPJBaseMapper<SysUserRole> {
      *
      * @param page 分页参数
      * @param wrapper 动态查询条件
-     * @return 分页对象列表
+     * @ return 分页对象列表
      */
     IPage<SysUserRole> selectByPage(IPage<SysUserRole> page , @Param(Constants.WRAPPER) Wrapper<SysUserRole> wrapper);
 }

core/src/main/java/com/ctsi/System/SysUserRole/service/SysUserRoleService.java

@@ -16,7 +16,7 @@ public interface SysUserRoleService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserRole queryById(Long id);
     
@@ -26,28 +26,28 @@ public interface SysUserRoleService{
      * @param sysUserRole 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<SysUserRole> paginQuery(SysUserRole sysUserRole, long current, long size);
     /** 
      * 新增数据
      *
      * @param sysUserRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserRole insert(SysUserRole sysUserRole);
     /** 
      * 更新数据
      *
      * @param sysUserRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     SysUserRole update(SysUserRole sysUserRole);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 

core/src/main/java/com/ctsi/System/SysUserRole/service/impl/SysUserRoleServiceImpl.java

@@ -32,7 +32,7 @@ public class SysUserRoleServiceImpl implements SysUserRoleService {
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserRole queryById(Long id){
         return sysUserRoleMapper.selectById(id);
@@ -44,7 +44,7 @@ public class SysUserRoleServiceImpl implements SysUserRoleService {
      * @param sysUserRole 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<SysUserRole> paginQuery(SysUserRole sysUserRole, long current, long size){
         //1. 构建动态查询条件
@@ -63,7 +63,7 @@ public class SysUserRoleServiceImpl implements SysUserRoleService {
      * 新增数据
      *
      * @param sysUserRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserRole insert(SysUserRole sysUserRole){
         sysUserRoleMapper.insert(sysUserRole);
@@ -74,11 +74,11 @@ public class SysUserRoleServiceImpl implements SysUserRoleService {
      * 更新数据
      *
      * @param sysUserRole 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public SysUserRole update(SysUserRole sysUserRole){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<SysUserRole> chainWrapper = new LambdaUpdateChainWrapper<SysUserRole>(sysUserRoleMapper);
+        LambdaUpdateChainWrapper<SysUserRole> chainWrapper = new LambdaUpdateChainWrapper<>(sysUserRoleMapper);
         //2. 设置主键，并更新
         chainWrapper.eq(SysUserRole::getId, sysUserRole.getId());
         boolean ret = chainWrapper.update();
@@ -94,7 +94,7 @@ public class SysUserRoleServiceImpl implements SysUserRoleService {
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = sysUserRoleMapper.deleteById(id);
@@ -105,7 +105,7 @@ public class SysUserRoleServiceImpl implements SysUserRoleService {
       * 保存用户角色
       *
       * @param sysUserRoleAddVO 实例对象
-      * @return 实例对象
+      * @ return 实例对象
       */
      public SysUserRoleAddVO save(SysUserRoleAddVO sysUserRoleAddVO){
          LambdaQueryWrapper<SysUserRole> queryWrapper = new LambdaQueryWrapper<>();
@@ -124,7 +124,7 @@ public class SysUserRoleServiceImpl implements SysUserRoleService {
       * 获取用户角色
       *
       * @param id userid
-      * @return 实例对象
+      * @ return 实例对象
       */
      public SysUserRoleAddPO getUserRoles(Long id){
          MPJLambdaWrapper<SysUserRole> queryWrapper = new MPJLambdaWrapper<>();

core/src/main/java/com/ctsi/entity/FramePage.java

@@ -5,9 +5,9 @@ import lombok.Data;
 
 @Data
 public class FramePage {
-    @ApiModelProperty(value = "页码(从0开始)", notes = "")
+    @ApiModelProperty(value = "页码(从0开始)")
     private int pageNum;
-    @ApiModelProperty(value = "每页条数", notes = "")
+    @ApiModelProperty(value = "每页条数")
     private int pageSize;
 
     public FramePage() {

core/src/main/java/com/ctsi/log/MySlf4jImpl.java

@@ -5,20 +5,19 @@ import org.apache.ibatis.logging.Log;
 
 /**
  * @author jiafupeng
- * @create 2020/5/26 13:31
- * @desc   自定义mybatis打印sql实现类
+ * @date 2020/5/26 13:31
+ * @ desc   自定义mybatis打印sql实现类
  *         将debug日志输出成info日志 对sql进行
  **/
 @Slf4j
 public class MySlf4jImpl implements Log {
 
-    public MySlf4jImpl(String clazz) {
+    public MySlf4jImpl(String ignoredClazz) {
         // Do Nothing
     }
 
     @Override
     public boolean isDebugEnabled() {
-        // return log.isDebugEnabled();
         // 将debug级别输出权限改成info级别
         return log.isInfoEnabled();
 

core/src/main/java/com/ctsi/utils/ApiResult.java

@@ -46,7 +46,7 @@ public class ApiResult<T> {
      *
      * @param result 数据
      * @param <T>    类型
-     * @return 成功
+     * @ return 成功
      */
     public static <T> ApiResult<T> success(T result) {
         return success(DEFAULT_SUCCEED_MESSAGE, result);
@@ -58,7 +58,7 @@ public class ApiResult<T> {
      * @param message 返回信息
      * @param result  数据
      * @param <T>     类型
-     * @return 成功
+     * @ return 成功
      */
     public static <T> ApiResult<T> success(String message, T result) {
         DicCodeUtils.processResultObject(result);
@@ -71,7 +71,7 @@ public class ApiResult<T> {
      * @param message 返回信息
      * @param result  数据
      * @param <T>     类型
-     * @return 成功
+     * @ return 成功
      */
     public static <T> ApiResult<T> failure(String message, T result) {
         return new ApiResult<>(DEFAULT_FAIL_CODE, message, result);
@@ -84,23 +84,12 @@ public class ApiResult<T> {
      * @param message 操作信息
      * @param result  数据
      * @param <T>     类型
-     * @return 结果
+     * @ return 结果
      */
     public static <T> ApiResult<T> result(int code, String message, T result) {
         return new ApiResult<>(code, message, result);
     }
 
-    /**
-     * 返回结果
-     *
-     * @param code    返回状态编码
-     * @param message 操作信息
-     * @return 结果
-     */
-    public static ApiResult<Void> result(int code, String message) {
-        return result(code, message, null);
-    }
-
     public static <T> ApiResult<T> result(ErrorCodeEnum errorCodeEnum) {
         return result(errorCodeEnum.getCode(), errorCodeEnum.getMessage(), null);
     }

core/src/main/java/com/ctsi/utils/DateUtil.java

@@ -1,19 +0,0 @@
-package com.ctsi.utils;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-
-public class DateUtil {
-    public static Long getZeroTimestamp() {
-        // 获取当前日期
-        LocalDate today = LocalDate.now();
-
-        // 获取今日零点时间
-        LocalDateTime midnight = today.atTime(LocalTime.MIN);
-
-        // 获取今日零点时间戳（秒级）
-        return midnight.toInstant(ZoneOffset.UTC).toEpochMilli();
-    }
-}

core/src/main/java/com/ctsi/utils/DicCodeUtils.java

@@ -2,20 +2,34 @@ package com.ctsi.utils;
 
 import com.ctsi.System.SysDicItem.service.SysDicItemService;
 import com.ctsi.annotation.DicCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Field;
+import java.util.List;
 
 @Component
 public class DicCodeUtils implements ApplicationContextAware {
     private static ApplicationContext applicationContext;
 
+    private static final Logger log = LoggerFactory.getLogger(DicCodeUtils.class);
+
 
     public static void processResultObject(Object resultObject) {
         if (resultObject != null) {
+            if (resultObject instanceof List) {
+                @SuppressWarnings("unchecked")
+                List<Object> objectList = (List<Object>) resultObject;
+                for (Object o : objectList) {
+                    processResultObject(o);
+                }
+                return;
+            }
             SysDicItemService sysDicItemService = null;
             if (applicationContext != null) {
                 sysDicItemService = applicationContext.getBean(SysDicItemService.class);
@@ -30,16 +44,18 @@ public class DicCodeUtils implements ApplicationContextAware {
                     field.setAccessible(true);
                     try {
                         // 如果字段的类型是一个类（非基本类型），则递归遍历该字段的类
-                        if (field.getType().getName().equals("java.util.List")) {
+                        if (field.getType().getName().equals("java.util.List") || field.getType().getName().equals("java.util.ArrayList")) {
                             Object nestedObject = field.get(resultObject);
                             if (nestedObject != null) {
-                                for (Object o : (java.util.List) nestedObject) {
+                                @SuppressWarnings("unchecked")
+                                List<Object> objectList = (List<Object>) nestedObject;
+                                for (Object o : objectList) {
                                     processResultObject(o);
                                 }
                             }
                         }
                     }  catch (IllegalAccessException e) {
-                        e.printStackTrace();
+                        log.error(e.getMessage());
                     }
                     // 检查字段是否有 FieldName 注解
                     if (field.isAnnotationPresent(DicCode.class)) {
@@ -62,7 +78,7 @@ public class DicCodeUtils implements ApplicationContextAware {
                                 field.set(resultObject, sysDicItemService.getItemValueByCode(dicCode, (String) oldFileValue));
                             }
                         } catch (NoSuchFieldException | IllegalAccessException e) {
-                            e.printStackTrace();
+                            log.error(e.getMessage());
                         }
                     }
                 }
@@ -74,7 +90,7 @@ public class DicCodeUtils implements ApplicationContextAware {
     }
 
     @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
         DicCodeUtils.applicationContext = applicationContext;
     }
 }

core/src/main/java/com/ctsi/utils/LongtoStringSerialize.java → core/src/main/java/com/ctsi/utils/LongToStringSerialize.java

@@ -10,7 +10,7 @@ import java.io.IOException;
  * @author zhaoliangliang
  * @date 2021/9/14
  */
-public class LongtoStringSerialize extends JsonSerializer<Long> {
+public class LongToStringSerialize extends JsonSerializer<Long> {
 
     @Override
     public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {

core/src/main/java/com/ctsi/utils/PasswordEncoderUtil.java

@@ -10,8 +10,8 @@ public class PasswordEncoderUtil {
     }
 
     // 验证密码
-    public static boolean checkPassword(String plainPassword, String hashedPassword) {
-        return BCrypt.checkpw(plainPassword, hashedPassword);
+    public static boolean isPasswordWrong(String plainPassword, String hashedPassword) {
+        return !BCrypt.checkpw(plainPassword, hashedPassword);
     }
 }
 

core/src/main/java/com/ctsi/utils/PasswordUtils.java

@@ -23,7 +23,7 @@ public class PasswordUtils {
     private static final String[][] KEY_CODE = {
             {"`~·", "1！!", "2@@", "3#", "4$￥", "5%", "6^……", "7&", "8*", "9(（", "0）)", "-_", "=+"},
             {" ","qQ", "wW", "eE", "rR", "tT", "yY", "uU", "iI", "oO", "pP", "[{【", "]}】", "\\|、"},
-            {" ","aA", "sS", "dD", "fF", "gG", "hH", "jJ", "kK", "lL", ";:", "\'\"’“"},
+            {" ","aA", "sS", "dD", "fF", "gG", "hH", "jJ", "kK", "lL", ";:", "'\"’“"},
             {" ","zZ", "xX", "cC", "vV", "bB", "nN", "mM", ",《<", ".>》", "/?？"}
     };
 
@@ -91,8 +91,8 @@ public class PasswordUtils {
         }
         //找出给出的字符串，每个字符，在坐标系中的位置。
         char[] c = password.toCharArray();
-        List<Integer> x = new ArrayList<Integer>();
-        List<Integer> y = new ArrayList<Integer>();
+        List<Integer> x = new ArrayList<>();
+        List<Integer> y = new ArrayList<>();
         for (char temp : c) {
             toHere:
             for (int j = 0; j < KEY_CODE.length; j++) {

core/src/main/java/com/ctsi/utils/RedisUtil.java

@@ -1,9 +1,12 @@
 package com.ctsi.utils;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.*;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
@@ -18,18 +21,19 @@ import java.util.concurrent.TimeUnit;
 @Component("redisUtil")
 public class RedisUtil {
 
-    @Autowired
+    @Resource
     private RedisTemplate redisTemplate;
 
-    private static double size = Math.pow(2, 32);
+    private static final double size = Math.pow(2, 32);
+
+    private static final Logger log = LoggerFactory.getLogger(RedisUtil.class);
 
 
     /**
      * 写入缓存
      *
-     * @param key
      * @param offset 位 8Bit=1Byte
-     * @return
+     * @ return
      */
     public boolean setBit(String key, long offset, boolean isShow) {
         boolean result = false;
@@ -38,7 +42,7 @@ public class RedisUtil {
             operations.setBit(key, offset, isShow);
             result = true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage());
         }
         return result;
     }
@@ -46,9 +50,8 @@ public class RedisUtil {
     /**
      * 写入缓存
      *
-     * @param key
      * @param offset
-     * @return
+     * @ return
      */
     public boolean getBit(String key, long offset) {
         boolean result = false;
@@ -56,7 +59,7 @@ public class RedisUtil {
             ValueOperations<Serializable, Object> operations = redisTemplate.opsForValue();
             result = operations.getBit(key, offset);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage());
         }
         return result;
     }
@@ -65,9 +68,8 @@ public class RedisUtil {
     /**
      * 写入缓存
      *
-     * @param key
      * @param value
-     * @return
+     * @ return
      */
     public boolean set(final String key, Object value) {
         boolean result = false;
@@ -76,7 +78,7 @@ public class RedisUtil {
             operations.set(key, value);
             result = true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage());
         }
         return result;
     }
@@ -86,7 +88,7 @@ public class RedisUtil {
      *
      * @param key
      *            键
-     * @return 失效时间（秒）
+     * @ return 失效时间（秒）
      */
     public long getExpire(String key) {
         return redisTemplate.getExpire(key, TimeUnit.SECONDS);
@@ -97,7 +99,7 @@ public class RedisUtil {
      *
      * @param key
      * @param value
-     * @return
+     * @ return
      */
     public boolean set(final String key, Object value, Long expireTime) {
         boolean result = false;
@@ -107,7 +109,7 @@ public class RedisUtil {
             redisTemplate.expire(key, expireTime, TimeUnit.SECONDS);
             result = true;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage());
         }
         return result;
     }
@@ -139,7 +141,7 @@ public class RedisUtil {
      * 判断缓存中是否有对应的value
      *
      * @param key
-     * @return
+     * @ return
      */
     public boolean exists(final String key) {
         return redisTemplate.hasKey(key);
@@ -149,7 +151,7 @@ public class RedisUtil {
      * 读取缓存
      *
      * @param key
-     * @return
+     * @ return
      */
     public Object get(final String key) {
         Object result = null;
@@ -161,9 +163,6 @@ public class RedisUtil {
     /**
      * 哈希 添加
      *
-     * @param key
-     * @param hashKey
-     * @param value
      */
     public void hmSet(String key, Object hashKey, Object value) {
         HashOperations<String, Object, Object> hash = redisTemplate.opsForHash();
@@ -173,9 +172,8 @@ public class RedisUtil {
     /**
      * 哈希获取数据
      *
-     * @param key
      * @param hashKey
-     * @return
+     * @ return
      */
     public Object hmGet(String key, Object hashKey) {
         HashOperations<String, Object, Object> hash = redisTemplate.opsForHash();
@@ -199,7 +197,7 @@ public class RedisUtil {
      * @param k
      * @param l
      * @param l1
-     * @return
+     * @ return
      */
     public List<Object> lRange(String k, long l, long l1) {
         ListOperations<String, Object> list = redisTemplate.opsForList();
@@ -221,7 +219,7 @@ public class RedisUtil {
      * 集合获取
      *
      * @param key
-     * @return
+     * @ return
      */
     public Set<Object> setMembers(String key) {
         SetOperations<String, Object> set = redisTemplate.opsForSet();
@@ -231,9 +229,6 @@ public class RedisUtil {
     /**
      * 有序集合添加
      *
-     * @param key
-     * @param value
-     * @param scoure
      */
     public void zAdd(String key, Object value, double scoure) {
         ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
@@ -243,10 +238,8 @@ public class RedisUtil {
     /**
      * 有序集合获取
      *
-     * @param key
-     * @param scoure
      * @param scoure1
-     * @return
+     * @ return
      */
     public Set<Object> rangeByScore(String key, double scoure, double scoure1) {
         ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
@@ -294,8 +287,6 @@ public class RedisUtil {
     /**
      * 有序集合添加
      *
-     * @param key
-     * @param value
      */
     public Double zSetScore(String key, Object value) {
         ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
@@ -306,9 +297,6 @@ public class RedisUtil {
     /**
      * 有序集合添加分数
      *
-     * @param key
-     * @param value
-     * @param scoure
      */
     public void incrementScore(String key, Object value, double scoure) {
         ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
@@ -319,7 +307,6 @@ public class RedisUtil {
     /**
      * 有序集合获取排名
      *
-     * @param key
      */
     public Set<ZSetOperations.TypedTuple<Object>> reverseZRankWithScore(String key, long start, long end) {
         ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();
@@ -330,7 +317,6 @@ public class RedisUtil {
     /**
      * 有序集合获取排名
      *
-     * @param key
      */
     public Set<ZSetOperations.TypedTuple<Object>> reverseZRankWithRank(String key, long start, long end) {
         ZSetOperations<String, Object> zset = redisTemplate.opsForZSet();

work/src/main/java/com/ctsi/work/WorkAddr/controller/WorkAddrController.java

@@ -32,11 +32,11 @@ public class WorkAddrController{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<WorkAddr> queryById(Long id){
+    public ApiResult<WorkAddr> queryById(@PathVariable Long id){
         try {
             return ApiResult.success(workAddrService.queryById(id));
         } catch (Exception e) {
@@ -49,7 +49,7 @@ public class WorkAddrController{
      * 分页查询
      *
      * @param workAddr 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
@@ -66,7 +66,7 @@ public class WorkAddrController{
      * 新增数据
      *
      * @param workAddr 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
@@ -84,7 +84,7 @@ public class WorkAddrController{
      * 更新数据
      *
      * @param workAddr 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
@@ -101,7 +101,7 @@ public class WorkAddrController{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping

work/src/main/java/com/ctsi/work/WorkAddr/entity/WorkAddr.java

@@ -2,10 +2,11 @@ package com.ctsi.work.WorkAddr.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import javax.validation.constraints.Max;
 import java.io.Serializable;
@@ -16,124 +17,44 @@ import java.util.Date;
  * @author : machaoyi
  * @date : 2024-1-17
  */
-@ApiModel(value = "打卡地址表",description = "")
+@ApiModel(value = "打卡地址表")
 @TableName("work_addr")
-public class WorkAddr implements Serializable,Cloneable{
+@Data
+public class WorkAddr implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 创建人userid */
-    @ApiModelProperty(value = "创建人userid",notes = "")
+    @ApiModelProperty(value = "创建人userid")
     private Long createdBy ;
     /** 创建时间 */
-    @ApiModelProperty(value = "创建时间",notes = "")
+    @ApiModelProperty(value = "创建时间")
     private Date createdTime ;
     /** 逻辑删除 */
-    @ApiModelProperty(value = "逻辑删除",notes = "")
+    @ApiModelProperty(value = "逻辑删除")
     private Integer delFlag ;
     /** 考勤点名称 */
-    @ApiModelProperty(value = "考勤点名称",notes = "")
+    @ApiModelProperty(value = "考勤点名称")
     private String addrName ;
     /** 考勤点经度 */
-    @ApiModelProperty(value = "考勤点经度",notes = "")
+    @ApiModelProperty(value = "考勤点经度")
     private String addrLng ;
     /** 考勤点纬度 */
-    @ApiModelProperty(value = "考勤点纬度",notes = "")
+    @ApiModelProperty(value = "考勤点纬度")
     private String addrLat ;
     /** 考勤范围 */
-    @ApiModelProperty(value = "考勤范围",notes = "")
+    @ApiModelProperty(value = "考勤范围")
     private String addrRange ;
     /** 上班打卡时间 */
-    @ApiModelProperty(value = "上班打卡时间",notes = "")
+    @ApiModelProperty(value = "上班打卡时间")
     @Max(value = 86400000,message = "打卡时间不能大于24点")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long addrIn ;
     /** 下班打卡时间 */
-    @ApiModelProperty(value = "下班打卡时间",notes = "")
+    @ApiModelProperty(value = "下班打卡时间")
     @Max(value = 86400000,message = "打卡时间不能大于24点")
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long addrQuit ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 创建人userid */
-    public Long getCreatedBy(){
-        return this.createdBy;
-    }
-    /** 创建人userid */
-    public void setCreatedBy(Long createdBy){
-        this.createdBy=createdBy;
-    }
-    /** 创建时间 */
-    public Date getCreatedTime(){
-        return this.createdTime;
-    }
-    /** 创建时间 */
-    public void setCreatedTime(Date createdTime){
-        this.createdTime=createdTime;
-    }
-    /** 逻辑删除 */
-    public Integer getDelFlag(){
-        return this.delFlag;
-    }
-    /** 逻辑删除 */
-    public void setDelFlag(Integer delFlag){
-        this.delFlag=delFlag;
-    }
-    /** 考勤点名称 */
-    public String getAddrName(){
-        return this.addrName;
-    }
-    /** 考勤点名称 */
-    public void setAddrName(String addrName){
-        this.addrName=addrName;
-    }
-    /** 考勤点经度 */
-    public String getAddrLng(){
-        return this.addrLng;
-    }
-    /** 考勤点经度 */
-    public void setAddrLng(String addrLng){
-        this.addrLng=addrLng;
-    }
-    /** 考勤点纬度 */
-    public String getAddrLat(){
-        return this.addrLat;
-    }
-    /** 考勤点纬度 */
-    public void setAddrLat(String addrLat){
-        this.addrLat=addrLat;
-    }
-    /** 考勤范围 */
-    public String getAddrRange(){
-        return this.addrRange;
-    }
-    /** 考勤范围 */
-    public void setAddrRange(String addrRange){
-        this.addrRange=addrRange;
-    }
-    /** 上班打卡时间 */
-    public Long getAddrIn(){
-        return this.addrIn;
-    }
-    /** 上班打卡时间 */
-    public void setAddrIn(Long addrIn){
-        this.addrIn=addrIn;
-    }
-    /** 下班打卡时间 */
-    public Long getAddrQuit(){
-        return this.addrQuit;
-    }
-    /** 下班打卡时间 */
-    public void setAddrQuit(Long addrQuit){
-        this.addrQuit=addrQuit;
-    }
 }

work/src/main/java/com/ctsi/work/WorkAddr/mapper/WorkAddrMapper.java

@@ -1,12 +1,8 @@
 package com.ctsi.work.WorkAddr.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ctsi.work.WorkAddr.entity.WorkAddr;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
  /**
  * 打卡地址表;(work_addr)表数据库访问层
@@ -15,12 +11,5 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface WorkAddrMapper  extends BaseMapper<WorkAddr>{
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @return 分页对象列表
-     */
-    IPage<WorkAddr> selectByPage(IPage<WorkAddr> page , @Param(Constants.WRAPPER) Wrapper<WorkAddr> wrapper);
+
 }

work/src/main/java/com/ctsi/work/WorkAddr/service/WorkAddrService.java

@@ -14,7 +14,7 @@ public interface WorkAddrService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     WorkAddr queryById(Long id);
     
@@ -24,28 +24,28 @@ public interface WorkAddrService{
      * @param workAddr 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<WorkAddr> paginQuery(WorkAddr workAddr, long current, long size);
     /** 
      * 新增数据
      *
      * @param workAddr 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     WorkAddr insert(WorkAddr workAddr);
     /** 
      * 更新数据
      *
      * @param workAddr 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     WorkAddr update(WorkAddr workAddr);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 }

work/src/main/java/com/ctsi/work/WorkAddr/service/impl/WorkAddrServiceImpl.java

@@ -26,7 +26,7 @@ public class WorkAddrServiceImpl implements WorkAddrService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public WorkAddr queryById(Long id){
         return workAddrMapper.selectById(id);
@@ -38,7 +38,7 @@ public class WorkAddrServiceImpl implements WorkAddrService{
      * @param workAddr 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<WorkAddr> paginQuery(WorkAddr workAddr, long current, long size){
         //1. 构建动态查询条件
@@ -69,7 +69,7 @@ public class WorkAddrServiceImpl implements WorkAddrService{
      * 新增数据
      *
      * @param workAddr 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public WorkAddr insert(WorkAddr workAddr){
         workAddrMapper.insert(workAddr);
@@ -80,11 +80,11 @@ public class WorkAddrServiceImpl implements WorkAddrService{
      * 更新数据
      *
      * @param workAddr 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public WorkAddr update(WorkAddr workAddr){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<WorkAddr> chainWrapper = new LambdaUpdateChainWrapper<WorkAddr>(workAddrMapper);
+        LambdaUpdateChainWrapper<WorkAddr> chainWrapper = new LambdaUpdateChainWrapper<>(workAddrMapper);
         if(StrUtil.isNotBlank(workAddr.getAddrName())){
             chainWrapper.set(WorkAddr::getAddrName, workAddr.getAddrName());
         }
@@ -118,7 +118,7 @@ public class WorkAddrServiceImpl implements WorkAddrService{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = workAddrMapper.deleteById(id);

work/src/main/java/com/ctsi/work/WorkClock/controller/WorkClockController.java

@@ -7,6 +7,7 @@ import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import com.ctsi.work.WorkAddr.entity.WorkAddr;
 import com.ctsi.work.WorkAddr.service.WorkAddrService;
+import com.ctsi.work.WorkClock.entity.UserTodayWorkClockPO;
 import com.ctsi.work.WorkClock.entity.WorkClock;
 import com.ctsi.work.WorkClock.entity.WorkClockPO;
 import com.ctsi.work.WorkClock.entity.WorkClockVO;
@@ -19,164 +20,200 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 /**
  * 员工打卡表;(work_clock)表控制层
+ *
  * @author : machaoyi
  * @date : 2024-1-17
  */
 @Api(tags = "员工打卡表对象功能接口")
 @RestController
 @RequestMapping("/workClock")
-public class WorkClockController{
+public class WorkClockController {
     @Resource
     private WorkClockService workClockService;
-     @Resource
-     private WorkAddrService workAddrService;
+    @Resource
+    private WorkAddrService workAddrService;
     private static final Logger log = LoggerFactory.getLogger(WorkClockController.class);
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("{id}")
-    public ApiResult<WorkClock> queryById(Long id){
+    public ApiResult<WorkClock> queryById(@PathVariable Long id) {
         try {
             return ApiResult.success(workClockService.queryById(id));
         } catch (Exception e) {
             log.error(e.getMessage());
-            return ApiResult.failure("查询失败",null);
+            return ApiResult.failure("查询失败", null);
         }
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
      * @param workClock 筛选条件
-     * @return 查询结果
+     * @ return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping
-    public ApiResult<Page<WorkClockPO>> paginQuery(WorkClock workClock, FramePage framePage){
+    public ApiResult<Page<WorkClockPO>> paginQuery(WorkClock workClock, FramePage framePage) {
         try {
             return ApiResult.success(workClockService.paginQuery(workClock, framePage.getPageNum(), framePage.getPageSize()));
         } catch (Exception e) {
             log.error(e.getMessage());
-            return ApiResult.failure("分页查询失败",null);
-        }    
+            return ApiResult.failure("分页查询失败", null);
+        }
     }
 
     /**
      * 员工打卡记录
      *
-     * @param
-     * @return 查询结果
+     * @param framePage
+     * @ return 查询结果
      */
     @ApiOperation("员工打卡记录")
     @GetMapping("/clockRecord")
-    public ApiResult<Page<WorkClockPO>> clockRecord(FramePage framePage){
+    public ApiResult<Page<WorkClockPO>> clockRecord(FramePage framePage) {
         try {
             WorkClock workClock = new WorkClock();
             workClock.setUserId(StpUtil.getLoginIdAsLong());
             return ApiResult.success(workClockService.paginQuery(workClock, framePage.getPageNum(), framePage.getPageSize()));
         } catch (Exception e) {
             log.error(e.getMessage());
-            return ApiResult.failure("分页查询失败",null);
+            return ApiResult.failure("分页查询失败", null);
         }
     }
-    
-    /** 
+
+    /**
+     * 今日打卡状态
+     * @ return 查询结果
+     */
+    @ApiOperation("今日打卡状态")
+    @GetMapping("/todayClock")
+    public ApiResult<List<UserTodayWorkClockPO>> todayClock() {
+        try {
+            WorkClock workClock = new WorkClock();
+            workClock.setUserId(StpUtil.getLoginIdAsLong());
+            List<UserTodayWorkClockPO> userTodayWorkClockPOList = new ArrayList<>();
+            List<WorkClock> workClockList = workClockService.getUserTodayClock(workClock);
+            for (int i = 1; i <= 2; i++) {
+                UserTodayWorkClockPO userTodayWorkClockPO = new UserTodayWorkClockPO();
+                userTodayWorkClockPO.setClockType(String.valueOf(i));
+                userTodayWorkClockPO.setClockStatus("0");
+                userTodayWorkClockPO.setClockTime(0L);
+                for (WorkClock workClock1 : workClockList) {
+                    if (Objects.equals(workClock1.getClockType(), String.valueOf(i))) {
+                        userTodayWorkClockPO.setClockStatus(workClock1.getClockStatus());
+                        userTodayWorkClockPO.setClockTime(workClock1.getClockTime());
+                        break;
+                    }
+                }
+                userTodayWorkClockPOList.add(userTodayWorkClockPO);
+            }
+            return ApiResult.success(userTodayWorkClockPOList);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return ApiResult.failure("分页查询失败", null);
+        }
+    }
+
+    /**
      * 新增数据
      *
      * @param workClock 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("新增数据")
     @PostMapping
-    public ApiResult add(@RequestBody WorkClock workClock){
+    public ApiResult<WorkClock> add(@RequestBody WorkClock workClock) {
+        try {
+            return workClockService.insert(workClock);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return ApiResult.failure("新增数据失败", null);
+        }
+    }
+
+    /**
+     * 员工打卡接口
+     *
+     * @param workClockVO 实例对象
+     * @ return 实例对象
+     */
+    @ApiOperation("员工打卡接口")
+    @PostMapping("/clock")
+    public ApiResult<WorkClock> clock(@RequestBody WorkClockVO workClockVO) {
         try {
+            WorkClock workClock = new WorkClock();
+            BeanUtils.copyProperties(workClockVO, workClock);
+            workClock.setUserId(StpUtil.getLoginIdAsLong());
+            workClock.setClockTime(DateUtil.current());
+            WorkAddr workAddr = workAddrService.queryById(workClockVO.getWorkAddrId());
+            if (workAddr == null) {
+                return ApiResult.failure("打卡地址不存在", null);
+            }
+            if (Objects.equals(workClockVO.getClockType(), "1")) {//打卡上班
+                Long inTime = DateUtil.beginOfDay(DateUtil.date()).getTime() + workAddr.getAddrIn();
+                if (workClock.getClockTime() <= inTime) {//打卡时间小于上班时间，正常
+                    workClock.setClockStatus("1");
+                } else {//迟到
+                    workClock.setClockStatus("2");
+                }
+            } else if (Objects.equals(workClockVO.getClockType(), "2")) {//打卡下班
+                Long quitTIme = DateUtil.beginOfDay(DateUtil.date()).getTime() + workAddr.getAddrQuit();
+                if (workClock.getClockTime() >= quitTIme) {//打卡时间大于下班时间，正常
+                    workClock.setClockStatus("1");
+                } else {//早退
+                    workClock.setClockStatus("3");
+                }
+            }
             return workClockService.insert(workClock);
         } catch (Exception e) {
             log.error(e.getMessage());
-            return ApiResult.failure("新增数据失败",null);
+            return ApiResult.failure("新增数据失败", null);
         }
     }
 
-     /**
-      * 员工打卡接口
-      *
-      * @param workClockVO 实例对象
-      * @return 实例对象
-      */
-     @ApiOperation("员工打卡接口")
-     @PostMapping("/clock")
-     public ApiResult clock(@RequestBody WorkClockVO workClockVO){
-         try {
-             WorkClock workClock = new WorkClock();
-             BeanUtils.copyProperties(workClockVO,workClock);
-             workClock.setUserId(StpUtil.getLoginIdAsLong());
-             workClock.setClockTime(DateUtil.current());
-             WorkAddr workAddr = workAddrService.queryById(workClockVO.getWorkAddrId());
-             if (workAddr == null) {
-                 return ApiResult.failure("打卡地址不存在",null);
-             }
-             if (Objects.equals(workClockVO.getClockType(), "1")) {//打卡上班
-                 Long inTime = DateUtil.beginOfDay(DateUtil.date()).getTime() + workAddr.getAddrIn();
-                 if (workClock.getClockTime() <= inTime) {//打卡时间小于上班时间，正常
-                     workClock.setClockStatus("1");
-                 } else {//迟到
-                     workClock.setClockStatus("2");
-                 }
-             } else if (Objects.equals(workClockVO.getClockType(), "2")) {//打卡下班
-                 Long quitTIme = DateUtil.beginOfDay(DateUtil.date()).getTime() + workAddr.getAddrQuit();
-                 if (workClock.getClockTime() >= quitTIme) {//打卡时间大于下班时间，正常
-                     workClock.setClockStatus("1");
-                 } else {//早退
-                     workClock.setClockStatus("3");
-                 }
-             }
-             return workClockService.insert(workClock);
-         } catch (Exception e) {
-             log.error(e.getMessage());
-             return ApiResult.failure("新增数据失败",null);
-         }
-     }
-    
-    /** 
+    /**
      * 更新数据
      *
      * @param workClock 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping
-    public ApiResult<WorkClock> edit(@RequestBody WorkClock workClock){
+    public ApiResult<WorkClock> edit(@RequestBody WorkClock workClock) {
         try {
             return ApiResult.success(workClockService.update(workClock));
         } catch (Exception e) {
             log.error(e.getMessage());
-            return ApiResult.failure("更新数据失败",null);
+            return ApiResult.failure("更新数据失败", null);
         }
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping
-    public ApiResult<Boolean> deleteById(Long id){
+    public ApiResult<Boolean> deleteById(Long id) {
         try {
             return ApiResult.success(workClockService.deleteById(id));
         } catch (Exception e) {
             log.error(e.getMessage());
-            return ApiResult.failure("删除数据失败",null);
+            return ApiResult.failure("删除数据失败", null);
         }
     }
 }

work/src/main/java/com/ctsi/work/WorkClock/entity/UserTodayWorkClockPO.java

@@ -0,0 +1,28 @@
+package com.ctsi.work.WorkClock.entity;
+
+import com.ctsi.annotation.DicCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "员工今日打卡")
+public class UserTodayWorkClockPO {
+    /** 打卡类型 */
+    @ApiModelProperty(value = "打卡类型")
+    private String clockType ;
+    /** 打卡类型 */
+    @ApiModelProperty(value = "打卡类型")
+    @DicCode("CLOCK-TYPE")
+    private String clockTypeName ;
+    /** 打卡时间 */
+    @ApiModelProperty(value = "打卡时间")
+    private Long clockTime ;
+    /** 打卡状态 */
+    @ApiModelProperty(value = "打卡状态")
+    private String clockStatus ;
+    /** 打卡状态 */
+    @ApiModelProperty(value = "打卡状态")
+    @DicCode("CLOCK-STATUS")
+    private String clockStatusName ;
+}

work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClock.java

@@ -2,10 +2,11 @@ package com.ctsi.work.WorkClock.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -14,98 +15,34 @@ import java.io.Serializable;
  * @author : machaoyi
  * @date : 2024-1-17
  */
-@ApiModel(value = "员工打卡表",description = "")
+@ApiModel(value = "员工打卡表")
 @TableName("work_clock")
-public class WorkClock implements Serializable,Cloneable{
+@Data
+public class WorkClock implements Serializable{
     /** 主键id */
-    @ApiModelProperty(value = "主键id",notes = "")
+    @ApiModelProperty(value = "主键id")
     @TableId
-    @JsonSerialize(using = LongtoStringSerialize.class)
+    @JsonSerialize(using = LongToStringSerialize.class)
     private Long id ;
     /** 用户id */
-    @ApiModelProperty(value = "用户id",notes = "")
+    @ApiModelProperty(value = "用户id")
     private Long userId ;
     /** 打卡类型 */
-    @ApiModelProperty(value = "打卡类型",notes = "")
+    @ApiModelProperty(value = "打卡类型")
     private String clockType ;
     /** 打卡时间 */
-    @ApiModelProperty(value = "打卡时间",notes = "")
+    @ApiModelProperty(value = "打卡时间")
     private Long clockTime ;
     /** 打卡地址 */
-    @ApiModelProperty(value = "打卡地址",notes = "")
+    @ApiModelProperty(value = "打卡地址")
     private String clockAddr ;
     /** 打卡状态 */
-    @ApiModelProperty(value = "打卡状态",notes = "")
+    @ApiModelProperty(value = "打卡状态")
     private String clockStatus ;
     /** 经度 */
-    @ApiModelProperty(value = "经度",notes = "")
+    @ApiModelProperty(value = "经度")
     private String lng ;
     /** 纬度 */
-    @ApiModelProperty(value = "纬度",notes = "")
+    @ApiModelProperty(value = "纬度")
     private String lat ;
-
-    /** 主键id */
-    public Long getId(){
-        return this.id;
-    }
-    /** 主键id */
-    public void setId(Long id){
-        this.id=id;
-    }
-    /** 用户id */
-    public Long getUserId(){
-        return this.userId;
-    }
-    /** 用户id */
-    public void setUserId(Long userId){
-        this.userId=userId;
-    }
-    /** 打卡类型 */
-    public String getClockType(){
-        return this.clockType;
-    }
-    /** 打卡类型 */
-    public void setClockType(String clockType){
-        this.clockType=clockType;
-    }
-    /** 打卡时间 */
-    public Long getClockTime(){
-        return this.clockTime;
-    }
-    /** 打卡时间 */
-    public void setClockTime(Long clockTime){
-        this.clockTime=clockTime;
-    }
-    /** 打卡地址 */
-    public String getClockAddr(){
-        return this.clockAddr;
-    }
-    /** 打卡地址 */
-    public void setClockAddr(String clockAddr){
-        this.clockAddr=clockAddr;
-    }
-    /** 打卡状态 */
-    public String getClockStatus(){
-        return this.clockStatus;
-    }
-    /** 打卡状态 */
-    public void setClockStatus(String clockStatus){
-        this.clockStatus=clockStatus;
-    }
-    /** 经度 */
-    public String getLng(){
-        return this.lng;
-    }
-    /** 经度 */
-    public void setLng(String lng){
-        this.lng=lng;
-    }
-    /** 纬度 */
-    public String getLat(){
-        return this.lat;
-    }
-    /** 纬度 */
-    public void setLat(String lat){
-        this.lat=lat;
-    }
 }

work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClockPO.java

@@ -3,10 +3,11 @@ package com.ctsi.work.WorkClock.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.annotation.DicCode;
-import com.ctsi.utils.LongtoStringSerialize;
+import com.ctsi.utils.LongToStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -15,133 +16,45 @@ import java.io.Serializable;
 * @author : machaoyi
 * @date : 2024-1-17
 */
-@ApiModel(value = "员工打卡表PO",description = "")
+@ApiModel(value = "员工打卡表PO")
 @TableName("work_clock")
-public class WorkClockPO implements Serializable,Cloneable{
+@Data
+public class WorkClockPO implements Serializable{
    /** 主键id */
-   @ApiModelProperty(value = "主键id",notes = "")
+   @ApiModelProperty(value = "主键id")
    @TableId
-   @JsonSerialize(using = LongtoStringSerialize.class)
+   @JsonSerialize(using = LongToStringSerialize.class)
    private Long id ;
    /** 用户id */
-   @ApiModelProperty(value = "用户id",notes = "")
+   @ApiModelProperty(value = "用户id")
    private Long userId ;
    /** 姓名 */
-   @ApiModelProperty(value = "姓名",notes = "")
+   @ApiModelProperty(value = "姓名")
    private String name ;
    /** 打卡类型 */
-   @ApiModelProperty(value = "打卡类型",notes = "")
+   @ApiModelProperty(value = "打卡类型")
    private String clockType ;
    /** 打卡类型 */
-   @ApiModelProperty(value = "打卡类型",notes = "")
+   @ApiModelProperty(value = "打卡类型")
    @DicCode("CLOCK-TYPE")
    private String clockTypeName ;
    /** 打卡时间 */
-   @ApiModelProperty(value = "打卡时间",notes = "")
+   @ApiModelProperty(value = "打卡时间")
    private Long clockTime ;
    /** 打卡地址 */
-   @ApiModelProperty(value = "打卡地址",notes = "")
+   @ApiModelProperty(value = "打卡地址")
    private String clockAddr ;
    /** 打卡状态 */
-   @ApiModelProperty(value = "打卡状态",notes = "")
+   @ApiModelProperty(value = "打卡状态")
    private String clockStatus ;
    /** 打卡状态 */
-   @ApiModelProperty(value = "打卡状态",notes = "")
+   @ApiModelProperty(value = "打卡状态")
    @DicCode("CLOCK-STATUS")
    private String clockStatusName ;
    /** 经度 */
-   @ApiModelProperty(value = "经度",notes = "")
+   @ApiModelProperty(value = "经度")
    private String lng ;
    /** 纬度 */
-   @ApiModelProperty(value = "纬度",notes = "")
+   @ApiModelProperty(value = "纬度")
    private String lat ;
-
-   /** 主键id */
-   public Long getId(){
-       return this.id;
-   }
-   /** 主键id */
-   public void setId(Long id){
-       this.id=id;
-   }
-   /** 用户id */
-   public Long getUserId(){
-       return this.userId;
-   }
-   /** 用户id */
-   public void setUserId(Long userId){
-       this.userId=userId;
-   }
-   /** 打卡类型 */
-   public String getClockType(){
-       return this.clockType;
-   }
-   /** 打卡类型 */
-   public void setClockType(String clockType){
-       this.clockType=clockType;
-   }
-   /** 打卡时间 */
-   public Long getClockTime(){
-       return this.clockTime;
-   }
-   /** 打卡时间 */
-   public void setClockTime(Long clockTime){
-       this.clockTime=clockTime;
-   }
-   /** 打卡地址 */
-   public String getClockAddr(){
-       return this.clockAddr;
-   }
-   /** 打卡地址 */
-   public void setClockAddr(String clockAddr){
-       this.clockAddr=clockAddr;
-   }
-   /** 打卡状态 */
-   public String getClockStatus(){
-       return this.clockStatus;
-   }
-   /** 打卡状态 */
-   public void setClockStatus(String clockStatus){
-       this.clockStatus=clockStatus;
-   }
-   /** 经度 */
-   public String getLng(){
-       return this.lng;
-   }
-   /** 经度 */
-   public void setLng(String lng){
-       this.lng=lng;
-   }
-   /** 纬度 */
-   public String getLat(){
-       return this.lat;
-   }
-   /** 纬度 */
-   public void setLat(String lat){
-       this.lat=lat;
-   }
-
-   public String getClockTypeName() {
-      return clockTypeName;
-   }
-
-   public void setClockTypeName(String clockTypeName) {
-      this.clockTypeName = clockTypeName;
-   }
-
-   public String getClockStatusName() {
-      return clockStatusName;
-   }
-
-   public void setClockStatusName(String clockStatusName) {
-      this.clockStatusName = clockStatusName;
-   }
-
-   public String getName() {
-      return name;
-   }
-
-   public void setName(String name) {
-      this.name = name;
-   }
 }

work/src/main/java/com/ctsi/work/WorkClock/entity/WorkClockVO.java

@@ -3,6 +3,7 @@ package com.ctsi.work.WorkClock.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
@@ -11,63 +12,23 @@ import java.io.Serializable;
 * @author : machaoyi
 * @date : 2024-1-17
 */
-@ApiModel(value = "员工打卡VO",description = "")
+@ApiModel(value = "员工打卡VO")
 @TableName("work_clock")
-public class WorkClockVO implements Serializable,Cloneable{
+@Data
+public class WorkClockVO implements Serializable{
    /** 打卡类型 */
-   @ApiModelProperty(value = "打卡类型",notes = "")
+   @ApiModelProperty(value = "打卡类型")
    private String clockType ;
    /** 考勤地址表id */
-   @ApiModelProperty(value = "考勤地址表id",notes = "")
+   @ApiModelProperty(value = "考勤地址表id")
    private Long workAddrId ;
    /** 打卡地址 */
-   @ApiModelProperty(value = "打卡地址",notes = "")
+   @ApiModelProperty(value = "打卡地址")
    private String clockAddr ;
    /** 经度 */
-   @ApiModelProperty(value = "经度",notes = "")
+   @ApiModelProperty(value = "经度")
    private String lng ;
    /** 纬度 */
-   @ApiModelProperty(value = "纬度",notes = "")
+   @ApiModelProperty(value = "纬度")
    private String lat ;
-
-   /** 打卡类型 */
-   public String getClockType(){
-       return this.clockType;
-   }
-   /** 打卡类型 */
-   public void setClockType(String clockType){
-       this.clockType=clockType;
-   }
-   /** 打卡地址 */
-   public String getClockAddr(){
-       return this.clockAddr;
-   }
-   /** 打卡地址 */
-   public void setClockAddr(String clockAddr){
-       this.clockAddr=clockAddr;
-   }
-   /** 经度 */
-   public String getLng(){
-       return this.lng;
-   }
-   /** 经度 */
-   public void setLng(String lng){
-       this.lng=lng;
-   }
-   /** 纬度 */
-   public String getLat(){
-       return this.lat;
-   }
-   /** 纬度 */
-   public void setLat(String lat){
-       this.lat=lat;
-   }
-
-   public Long getWorkAddrId() {
-      return workAddrId;
-   }
-
-   public void setWorkAddrId(Long workAddrId) {
-      this.workAddrId = workAddrId;
-   }
 }

work/src/main/java/com/ctsi/work/WorkClock/mapper/WorkClockMapper.java

@@ -1,12 +1,8 @@
 package com.ctsi.work.WorkClock.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ctsi.work.WorkClock.entity.WorkClock;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
  /**
  * 员工打卡表;(work_clock)表数据库访问层
@@ -15,12 +11,4 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface WorkClockMapper  extends MPJBaseMapper<WorkClock> {
-    /** 
-     * 分页查询指定行数据
-     *
-     * @param page 分页参数
-     * @param wrapper 动态查询条件
-     * @return 分页对象列表
-     */
-    IPage<WorkClock> selectByPage(IPage<WorkClock> page , @Param(Constants.WRAPPER) Wrapper<WorkClock> wrapper);
-}
+ }

work/src/main/java/com/ctsi/work/WorkClock/service/WorkClockService.java

@@ -5,6 +5,8 @@ import com.ctsi.utils.ApiResult;
 import com.ctsi.work.WorkClock.entity.WorkClock;
 import com.ctsi.work.WorkClock.entity.WorkClockPO;
 
+import java.util.List;
+
 /**
  * 员工打卡表;(work_clock)表服务接口
  * @author : machaoyi
@@ -16,7 +18,7 @@ public interface WorkClockService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     WorkClock queryById(Long id);
     
@@ -26,28 +28,30 @@ public interface WorkClockService{
      * @param workClock 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     Page<WorkClockPO> paginQuery(WorkClock workClock, long current, long size);
+
+    List<WorkClock> getUserTodayClock(WorkClock workClock);
     /** 
      * 新增数据
      *
      * @param workClock 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
-    ApiResult insert(WorkClock workClock);
+    ApiResult<WorkClock> insert(WorkClock workClock);
     /** 
      * 更新数据
      *
      * @param workClock 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     WorkClock update(WorkClock workClock);
     /** 
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     boolean deleteById(Long id);
 }

work/src/main/java/com/ctsi/work/WorkClock/service/impl/WorkClockServiceImpl.java

@@ -32,7 +32,7 @@ public class WorkClockServiceImpl implements WorkClockService{
      * 通过ID查询单条数据 
      *
      * @param id 主键
-     * @return 实例对象
+     * @ return 实例对象
      */
     public WorkClock queryById(Long id){
         return workClockMapper.selectById(id);
@@ -44,7 +44,7 @@ public class WorkClockServiceImpl implements WorkClockService{
      * @param workClock 筛选条件
      * @param current 当前页码
      * @param size  每页大小
-     * @return
+     * @ return
      */
     public Page<WorkClockPO> paginQuery(WorkClock workClock, long current, long size){
         //1. 构建动态查询条件
@@ -67,21 +67,30 @@ public class WorkClockServiceImpl implements WorkClockService{
         queryWrapper.orderByDesc(WorkClock::getClockTime);
         //2. 执行分页查询
         Page<WorkClockPO> pagin = new Page<>(current , size , true);
-        IPage<WorkClockPO> selectResult = workClockMapper.selectJoinPage(pagin ,WorkClockPO.class, queryWrapper);;
+        IPage<WorkClockPO> selectResult = workClockMapper.selectJoinPage(pagin ,WorkClockPO.class, queryWrapper);
         pagin.setPages(selectResult.getPages());
         pagin.setTotal(selectResult.getTotal());
         pagin.setRecords(selectResult.getRecords());
         //3. 返回结果
         return pagin;
     }
+
+    public List<WorkClock> getUserTodayClock(WorkClock workClock) {
+        MPJLambdaWrapper<WorkClock> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.eq(WorkClock::getUserId, workClock.getUserId());
+        // 今日零点时间戳
+        Long zeroTimestamp = DateUtil.beginOfDay(DateUtil.date()).getTime();
+        queryWrapper.ge(WorkClock::getClockTime, zeroTimestamp);
+        return workClockMapper.selectList(queryWrapper);
+    }
     
     /** 
      * 新增数据
      *
      * @param workClock 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
-    public ApiResult insert(WorkClock workClock){
+    public ApiResult<WorkClock> insert(WorkClock workClock){
         Long zeroTimestamp = DateUtil.beginOfDay(DateUtil.date()).getTime();
         LambdaQueryWrapper<WorkClock> queryWrapper = new LambdaQueryWrapper<>();
         // 同一个员工，同一天，同一种打卡类型，只能打一次卡
@@ -100,11 +109,11 @@ public class WorkClockServiceImpl implements WorkClockService{
      * 更新数据
      *
      * @param workClock 实例对象
-     * @return 实例对象
+     * @ return 实例对象
      */
     public WorkClock update(WorkClock workClock){
         //1. 根据条件动态更新
-        LambdaUpdateChainWrapper<WorkClock> chainWrapper = new LambdaUpdateChainWrapper<WorkClock>(workClockMapper);
+        LambdaUpdateChainWrapper<WorkClock> chainWrapper = new LambdaUpdateChainWrapper<>(workClockMapper);
         if (workClock.getUserId() != null && workClock.getUserId() != 0) {
             chainWrapper.set(WorkClock::getUserId, workClock.getUserId());
         }
@@ -132,7 +141,7 @@ public class WorkClockServiceImpl implements WorkClockService{
      * 通过主键删除数据
      *
      * @param id 主键
-     * @return 是否成功
+     * @ return 是否成功
      */
     public boolean deleteById(Long id){
         int total = workClockMapper.deleteById(id);