qmthboot框架升级

sop-server/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.reflect.TypeToken;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.boot.core.cache.service.CacheService;
@@ -16,7 +15,10 @@ import com.qmth.sop.business.bean.dto.OrgDtoNotTree;
 import com.qmth.sop.business.bean.dto.RoleDto;
 import com.qmth.sop.business.bean.dto.UserDto;
 import com.qmth.sop.business.bean.params.LoginParam;
-import com.qmth.sop.business.bean.result.*;
+import com.qmth.sop.business.bean.result.AttachmentResult;
+import com.qmth.sop.business.bean.result.EditResult;
+import com.qmth.sop.business.bean.result.LoginResult;
+import com.qmth.sop.business.bean.result.MenuResult;
 import com.qmth.sop.business.cache.CommonCacheService;
 import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.service.*;
@@ -96,7 +98,7 @@ public class SysController {
     @ApiOperation(value = "登录")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = LoginResult.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result login(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody LoginParam login, BindingResult bindingResult) throws NoSuchAlgorithmException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -224,7 +226,7 @@ public class SysController {
     @ApiOperation(value = "发送验证码")
     @RequestMapping(value = "/get_verify_code", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result getVerifyCode(@RequestBody LoginParam login) {
         Optional.ofNullable(login.getMobileNumber()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("手机号不能为空"));
         List<SysUser> userList = sysUserService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getMobileNumber, login.getMobileNumber()));
@@ -258,7 +260,7 @@ public class SysController {
     @ApiOperation(value = "获取服务器时间")
     @RequestMapping(value = "/get_system_time", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     public Result getSystemTime() {
         return ResultUtil.ok(System.currentTimeMillis());
     }
@@ -305,7 +307,7 @@ public class SysController {
     @ApiOperation(value = "忘记密码")
     @RequestMapping(value = "/forget_password", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    @Aac(auth = BOOL.FALSE)
+    @Aac(auth = false)
     @Transactional
     public Result forgetPassword(@RequestBody LoginParam login) throws NoSuchAlgorithmException {
         Optional.ofNullable(login.getMobileNumber()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("手机号不能为空"));

sop-server/src/main/java/com/qmth/sop/server/api/SysCustomController.java

@@ -4,12 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.SysCustomResult;
 import com.qmth.sop.business.entity.SysCustom;
-import com.qmth.sop.business.entity.SysSupplier;
 import com.qmth.sop.business.entity.TBTask;
 import com.qmth.sop.business.service.SysCustomRoleService;
 import com.qmth.sop.business.service.SysCustomService;
@@ -59,7 +56,7 @@ public class SysCustomController {
     @Resource
     SysCustomRoleService sysCustomRoleService;
 
-   
+
     @ApiOperation(value = "客户表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "客户表列表信息", response = SysCustomResult.class)})
@@ -74,7 +71,7 @@ public class SysCustomController {
         return ResultUtil.ok(resultIPage);
     }
 
-   
+
     @ApiOperation(value = "新增客户表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增客户表信息", response = Object.class)})
@@ -86,7 +83,7 @@ public class SysCustomController {
         return ResultUtil.ok();
     }
 
-   
+
     @ApiOperation(value = "修改客户表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改客户表信息", response = Object.class)})
@@ -97,7 +94,7 @@ public class SysCustomController {
         sysCustomService.update(sysCustom);
         return ResultUtil.ok();
     }
-   
+
     @ApiOperation(value = "删除客户表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除客户表信息", response = Object.class)})
@@ -108,21 +105,22 @@ public class SysCustomController {
 
     /**
      * 获取单个客户
+     *
      * @param id
      * @return
      */
-   
+
     @ApiOperation(value = "获取单个客户")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "获取单个客户", response = SysCustomResult.class)})
     public Result detail(@ApiParam(value = "客户id", required = true) @RequestParam(required = true) long id) {
         SysCustom sysCustom = sysCustomService.getById(id);
-        SysCustomResult sysCustomResult= JSON.toJavaObject((JSON) JSON.toJSON(sysCustom),SysCustomResult.class);
+        SysCustomResult sysCustomResult = JSON.toJavaObject((JSON) JSON.toJSON(sysCustom), SysCustomResult.class);
         sysCustomResult.setRoleList(sysCustomRoleService.getList(sysCustom.getId()));
         return ResultUtil.ok(sysCustomResult);
     }
 
-   
+
     @ApiOperation(value = "客户表导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
@@ -136,10 +134,10 @@ public class SysCustomController {
     //按照类型状态查询客户
     @ApiOperation(value = "客户表查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysCustom.class )})
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysCustom.class)})
     public Result list(@ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Boolean enable,
                        @ApiParam(value = "类型", required = false) @RequestParam(required = false) ProductTypeEnum type) {
-        return ResultUtil.ok(sysCustomService.list(new QueryWrapper<SysCustom>().lambda().eq(Objects.nonNull(enable),SysCustom::getEnable, enable).eq(Objects.nonNull(type),SysCustom::getType, type)));
+        return ResultUtil.ok(sysCustomService.list(new QueryWrapper<SysCustom>().lambda().eq(Objects.nonNull(enable), SysCustom::getEnable, enable).eq(Objects.nonNull(type), SysCustom::getType, type)));
     }
 
 

sop-server/src/main/java/com/qmth/sop/server/api/SysDeviceController.java

@@ -1,25 +1,17 @@
 package com.qmth.sop.server.api;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.sop.business.bean.result.EditResult;
 import com.qmth.sop.business.bean.result.SysDeviceResult;
 import com.qmth.sop.business.entity.SysDevice;
-import com.qmth.sop.business.entity.SysLevel;
-import com.qmth.sop.business.entity.TFCustomFlow;
 import com.qmth.sop.business.service.SysDeviceService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -30,7 +22,7 @@ import java.util.Objects;
 
 /**
  * 设备配置表 控制器.
- * 
+ *
  * @author: shudonghui
  * @date: 2023-08-02 14:37:23
  * @version: 1.0
@@ -39,27 +31,27 @@ import java.util.Objects;
  */
 @Api(tags = "设备配置表 Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_DEVICE)
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_DEVICE)
 public class SysDeviceController {
 
 
     @Resource
     SysDeviceService sysDeviceService;
 
-   
+
     @ApiOperation(value = "设备配置表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "设备配置表列表信息", response = SysDeviceResult.class)})
     public Result query(
-                @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String query,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<SysDeviceResult> resultIPage = sysDeviceService.query(new Page<>(pageNumber, pageSize),query);
+            @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String query,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        IPage<SysDeviceResult> resultIPage = sysDeviceService.query(new Page<>(pageNumber, pageSize), query);
 
         return ResultUtil.ok(resultIPage);
     }
 
-   
+
     @ApiOperation(value = "新增设备配置表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增设备配置表信息", response = Object.class)})
@@ -72,7 +64,6 @@ public class SysDeviceController {
     }
 
 
-   
     @ApiOperation(value = "修改设备配置表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改设备配置表信息", response = Object.class)})
@@ -84,7 +75,7 @@ public class SysDeviceController {
         return ResultUtil.ok();
     }
 
-   
+
     @ApiOperation(value = "删除设备配置表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除设备配置表信息", response = Object.class)})
@@ -96,12 +87,12 @@ public class SysDeviceController {
     /*
      * 设备配置表列表
      */
-   
+
     @ApiOperation(value = "设备配置表列表接口")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "设备配置表列表", response = SysDevice.class)})
     public Result list(@ApiParam(value = "查询条件", required = false) @RequestParam(required = false) Boolean enable) {
-        return ResultUtil.ok(sysDeviceService.list(new QueryWrapper<SysDevice>().lambda().eq(Objects.nonNull(enable),SysDevice::getEnable, enable)));
+        return ResultUtil.ok(sysDeviceService.list(new QueryWrapper<SysDevice>().lambda().eq(Objects.nonNull(enable), SysDevice::getEnable, enable)));
     }
 
     /**
@@ -114,8 +105,10 @@ public class SysDeviceController {
         sysDeviceService.disable(id);
         return ResultUtil.ok();
     }
+
     /**
      * 获取单个
+     *
      * @param id
      * @return
      */
@@ -128,9 +121,4 @@ public class SysDeviceController {
     }
 
 
-
-
-
-
-
 }

sop-server/src/main/java/com/qmth/sop/server/api/SysDingDateController.java

@@ -2,30 +2,25 @@ package com.qmth.sop.server.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
-import com.qmth.sop.business.bean.result.EditResult;
+import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.entity.SysDingDate;
 import com.qmth.sop.business.service.SysDingDateService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 考勤特殊日期 控制器
- * 
+ *
  * @author: shudonghui
  * @date: 2023-08-15 10:03:13
  * @version: 1.0
@@ -34,27 +29,27 @@ import java.util.Objects;
  */
 @Api(tags = "考勤特殊日期 Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+"/sys/ding/date")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/sys/ding/date")
 public class SysDingDateController {
 
 
     @Resource
     SysDingDateService sysDingDateService;
 
-    @Aac(auth= BOOL.FALSE)
+    @Aac(auth = false)
     @ApiOperation(value = "考勤特殊日期查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤特殊日期查询结果", response = SysDingDate.class)})
     public Result query(
-                @ApiParam(value = "模糊查询条件", required = false) @RequestParam(required = false) String query,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<SysDingDate> resultIPage = sysDingDateService.query(new Page<>(pageNumber, pageSize),query);
+            @ApiParam(value = "模糊查询条件", required = false) @RequestParam(required = false) String query,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        IPage<SysDingDate> resultIPage = sysDingDateService.query(new Page<>(pageNumber, pageSize), query);
 
         return ResultUtil.ok(resultIPage);
     }
 
-    @Aac(auth= BOOL.FALSE)
+    @Aac(auth = false)
     @ApiOperation(value = "考勤特殊日期新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
@@ -66,7 +61,7 @@ public class SysDingDateController {
     }
 
 
-    @Aac(auth= BOOL.FALSE)
+    @Aac(auth = false)
     @ApiOperation(value = "考勤特殊日期删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
@@ -75,7 +70,7 @@ public class SysDingDateController {
     }
 
 
-    @Aac(auth= BOOL.FALSE)
+    @Aac(auth = false)
     @ApiOperation(value = "考勤特殊日期获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤特殊日期信息", response = SysDingDate.class)})

sop-server/src/main/java/com/qmth/sop/server/api/SysDingGroupController.java

@@ -4,34 +4,27 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.sop.business.bean.result.EditResult;
 import com.qmth.sop.business.bean.result.SysDingGroupResult;
-import com.qmth.sop.business.bean.result.SysLevelResult;
-import com.qmth.sop.business.entity.*;
+import com.qmth.sop.business.entity.SysDingGroup;
 import com.qmth.sop.business.service.SysDingGroupService;
 import com.qmth.sop.business.service.SysDingObjService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.List;
 import java.util.Objects;
 
 /**
  * 考勤组表 控制器.
- * 
+ *
  * @author: shudonghui
  * @date: 2023-08-02 14:37:24
  * @version: 1.0
@@ -40,7 +33,7 @@ import java.util.Objects;
  */
 @Api(tags = "考勤组表 Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_DING_GROUP)
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_DING_GROUP)
 public class SysDingGroupController {
 
 
@@ -50,21 +43,21 @@ public class SysDingGroupController {
     @Resource
     SysDingObjService sysDingObjService;
 
-    
+
     @ApiOperation(value = "考勤组表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤组表列表信息", response = SysDingGroupResult.class)})
     public Result query(
-                @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String query,
-                @ApiParam(value = "服务单元id", required = false) @RequestParam(required = false) Long serviceId,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<SysDingGroupResult> resultIPage = sysDingGroupService.query(new Page<>(pageNumber, pageSize),query,serviceId);
+            @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String query,
+            @ApiParam(value = "服务单元id", required = false) @RequestParam(required = false) Long serviceId,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        IPage<SysDingGroupResult> resultIPage = sysDingGroupService.query(new Page<>(pageNumber, pageSize), query, serviceId);
 
         return ResultUtil.ok(resultIPage);
     }
 
-    
+
     @ApiOperation(value = "新增考勤组表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增考勤组表信息", response = Object.class)})
@@ -77,7 +70,6 @@ public class SysDingGroupController {
     }
 
 
-    
     @ApiOperation(value = "修改考勤组表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改考勤组表信息", response = Object.class)})
@@ -90,7 +82,6 @@ public class SysDingGroupController {
     }
 
 
-    
     @ApiOperation(value = "删除考勤组表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除考勤组表信息", response = Object.class)})
@@ -102,25 +93,27 @@ public class SysDingGroupController {
     /*列表
 
      */
-    
+
     @ApiOperation(value = "考勤组表列表接口")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤组表列表", response = SysDingGroup.class, responseContainer = "List")})
     public Result list(@ApiParam(value = "查询条件", required = false) @RequestParam(required = false) Boolean enable) {
-        return ResultUtil.ok(sysDingGroupService.list(new QueryWrapper<SysDingGroup>().lambda().eq(Objects.nonNull(enable),SysDingGroup::getEnable, enable)));
+        return ResultUtil.ok(sysDingGroupService.list(new QueryWrapper<SysDingGroup>().lambda().eq(Objects.nonNull(enable), SysDingGroup::getEnable, enable)));
     }
+
     /**
      * 获取单个
+     *
      * @param id
      * @return
      */
-    
+
     @ApiOperation(value = "获取单个考勤组表信息")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤组表信息", response = SysDingGroupResult.class)})
     public Result get(@ApiParam(value = "id", required = true) @RequestParam(value = "id") long id) {
         SysDingGroup sysDingGroup = sysDingGroupService.getById(id);
-        SysDingGroupResult sysDingGroupResult= JSON.toJavaObject((JSON) JSON.toJSON(sysDingGroup),SysDingGroupResult.class);
+        SysDingGroupResult sysDingGroupResult = JSON.toJavaObject((JSON) JSON.toJSON(sysDingGroup), SysDingGroupResult.class);
         sysDingGroupResult.setDingObjs(sysDingObjService.getList(id));
         return ResultUtil.ok(sysDingGroupResult);
     }

sop-server/src/main/java/com/qmth/sop/server/api/SysLevelController.java

@@ -4,12 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.SysLevelResult;
 import com.qmth.sop.business.entity.SysLevel;
-import com.qmth.sop.business.entity.SysLevelRole;
 import com.qmth.sop.business.service.SysLevelRoleService;
 import com.qmth.sop.business.service.SysLevelService;
 import com.qmth.sop.common.contant.SystemConstant;
@@ -18,7 +15,6 @@ import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -61,7 +57,7 @@ public class SysLevelController {
         return ResultUtil.ok(resultIPage);
     }
 
-   
+
     @ApiOperation(value = "新增档位表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增档位表信息", response = Object.class)})
@@ -73,7 +69,7 @@ public class SysLevelController {
         return ResultUtil.ok();
     }
 
-   
+
     @ApiOperation(value = "修改档位表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改档位表信息", response = Object.class)})
@@ -85,7 +81,7 @@ public class SysLevelController {
         return ResultUtil.ok();
     }
 
-   
+
     @ApiOperation(value = "删除档位表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除档位表信息", response = Object.class)})
@@ -99,13 +95,13 @@ public class SysLevelController {
      *
      * @return
      */
-   
+
     @ApiOperation(value = "获取档位表列表接口")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "档位表列表", response = SysLevel.class)})
     public Result list(@ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Boolean enable,
                        @ApiParam(value = "类型", required = false) @RequestParam(required = false) ProductTypeEnum type) {
-        return ResultUtil.ok(sysLevelService.list(new QueryWrapper<SysLevel>().lambda().eq(Objects.nonNull(enable),SysLevel::getEnable, enable).eq(Objects.nonNull(type),SysLevel::getType, type)));
+        return ResultUtil.ok(sysLevelService.list(new QueryWrapper<SysLevel>().lambda().eq(Objects.nonNull(enable), SysLevel::getEnable, enable).eq(Objects.nonNull(type), SysLevel::getType, type)));
     }
 
     /**
@@ -114,13 +110,13 @@ public class SysLevelController {
      * @param id
      * @return
      */
-   
+
     @ApiOperation(value = "获取单个档位表接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "档位表", response = SysLevelResult.class)})
     public Result get(@ApiParam(value = "档位表id", required = true) @RequestParam long id) {
-        SysLevel sysLevel =sysLevelService.getById(id);
-        SysLevelResult sysLevelResult= JSON.toJavaObject((JSON) JSON.toJSON(sysLevel),SysLevelResult.class);
+        SysLevel sysLevel = sysLevelService.getById(id);
+        SysLevelResult sysLevelResult = JSON.toJavaObject((JSON) JSON.toJSON(sysLevel), SysLevelResult.class);
         sysLevelResult.setRoleList(sysLevelRoleService.getList(sysLevelResult.getId()));
         return ResultUtil.ok(sysLevelResult);
     }

sop-server/src/main/java/com/qmth/sop/server/api/SysNoticeController.java

@@ -2,8 +2,6 @@ package com.qmth.sop.server.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.SysNoticeResult;
 import com.qmth.sop.business.entity.SysNotice;
@@ -15,7 +13,6 @@ import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -25,7 +22,7 @@ import javax.validation.constraints.Min;
 
 /**
  * 公告表 控制器
- * 
+ *
  * @author: shudonghui
  * @date: 2023-08-07 13:53:29
  * @version: 1.0
@@ -34,31 +31,31 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "公告表 Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_NOTICE)
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_NOTICE)
 public class SysNoticeController {
 
 
     @Resource
     SysNoticeService sysNoticeService;
 
-   
+
     @ApiOperation(value = "公告表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "公告表查询结果", response = SysNoticeResult.class)})
     public Result query(
-                @ApiParam(value = "模糊查询条件", required = false) @RequestParam(required = false) String query,
-                @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) NoticeStatusEnum status,
-                @ApiParam(value = "发布类型", required = false) @RequestParam(required = false) NoticeTypeEnum type,
-                @ApiParam(value = "发布时间开始", required = false) @RequestParam(required = false) Long startTime,
-                @ApiParam(value = "发布时间结束", required = false) @RequestParam(required = false) Long endTime,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<SysNoticeResult> resultIPage = sysNoticeService.query(new Page<>(pageNumber, pageSize),query,status,type,startTime,endTime);
+            @ApiParam(value = "模糊查询条件", required = false) @RequestParam(required = false) String query,
+            @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) NoticeStatusEnum status,
+            @ApiParam(value = "发布类型", required = false) @RequestParam(required = false) NoticeTypeEnum type,
+            @ApiParam(value = "发布时间开始", required = false) @RequestParam(required = false) Long startTime,
+            @ApiParam(value = "发布时间结束", required = false) @RequestParam(required = false) Long endTime,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        IPage<SysNoticeResult> resultIPage = sysNoticeService.query(new Page<>(pageNumber, pageSize), query, status, type, startTime, endTime);
 
         return ResultUtil.ok(resultIPage);
     }
 
-   
+
     @ApiOperation(value = "公告表新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
@@ -70,7 +67,6 @@ public class SysNoticeController {
     }
 
 
-   
     @ApiOperation(value = "公告表删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
@@ -80,26 +76,26 @@ public class SysNoticeController {
     /*
         批量禁用
      */
-   
+
     @ApiOperation(value = "公告表批量禁用接口")
     @RequestMapping(value = "/disable", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public  Result disable(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long[] ids) {
+    public Result disable(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long[] ids) {
         return ResultUtil.ok(sysNoticeService.disable(ids));
     }
 
     /*
         发布或者撤销发布
      */
-   
+
     @ApiOperation(value = "公告表发布或者撤销发布接口")
     @RequestMapping(value = "/publishOrUnpublish", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public  Result publishOrUnpublish(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long id) {
+    public Result publishOrUnpublish(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long id) {
         return ResultUtil.ok(sysNoticeService.publishOrUnpublish(id));
     }
 
-   
+
     @ApiOperation(value = "公告表获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "公告表信息", response = SysNotice.class)})

sop-server/src/main/java/com/qmth/sop/server/api/TBDelayWarnController.java

@@ -3,32 +3,27 @@ package com.qmth.sop.server.api;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
-import com.qmth.sop.business.bean.result.EditResult;
 import com.qmth.sop.business.bean.result.TBDelayWarnResult;
 import com.qmth.sop.business.entity.TBDelayWarn;
 import com.qmth.sop.business.service.TBDelayWarnService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.DelayWarnStatusEnum;
 import com.qmth.sop.common.enums.DelayWarnTypeEnum;
-import com.qmth.sop.common.enums.MessageTypeEnum;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
-import org.springframework.util.CollectionUtils; 
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import javax.annotation.Resource;
-import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 延期预警跟进表 控制器
- * 
+ *
  * @author: shudonghui
  * @date: 2023-08-08 16:02:21
  * @version: 1.0
@@ -37,45 +32,44 @@ import java.util.Objects;
  */
 @Api(tags = "延期预警跟进表 Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_DELAY_WARN)
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_DELAY_WARN)
 public class TBDelayWarnController {
 
 
     @Resource
     TBDelayWarnService tBDelayWarnService;
 
-    
+
     @ApiOperation(value = "延期预警跟进表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警跟进表查询结果", response = TBDelayWarnResult.class)})
     public Result query(
-                @ApiParam(value = "预警类型", required = false) @RequestParam(required = false) DelayWarnTypeEnum type,
-                @ApiParam(value = "跟进状态", required = false) @RequestParam(required = false) DelayWarnStatusEnum status,
-                @ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
-                @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
-                @ApiParam(value = "预警字段（模糊查询）", required = false) @RequestParam(required = false) String fieldObj,
-                @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo,
-                @ApiParam(value = "预警时间开始", required = false) @RequestParam(required = false) Long startTime,
-                @ApiParam(value = "预警时间结束", required = false) @RequestParam(required = false) Long endTime,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<TBDelayWarnResult> resultIPage = tBDelayWarnService.query(new Page<>(pageNumber, pageSize),type,status,serviceId,custom,fieldObj,sopNo,startTime,endTime,null);
+            @ApiParam(value = "预警类型", required = false) @RequestParam(required = false) DelayWarnTypeEnum type,
+            @ApiParam(value = "跟进状态", required = false) @RequestParam(required = false) DelayWarnStatusEnum status,
+            @ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
+            @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
+            @ApiParam(value = "预警字段（模糊查询）", required = false) @RequestParam(required = false) String fieldObj,
+            @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo,
+            @ApiParam(value = "预警时间开始", required = false) @RequestParam(required = false) Long startTime,
+            @ApiParam(value = "预警时间结束", required = false) @RequestParam(required = false) Long endTime,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        IPage<TBDelayWarnResult> resultIPage = tBDelayWarnService.query(new Page<>(pageNumber, pageSize), type, status, serviceId, custom, fieldObj, sopNo, startTime, endTime, null);
 
         return ResultUtil.ok(resultIPage);
     }
 
 
-    
     @ApiOperation(value = "延期预警跟进表获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警跟进表信息", response = TBDelayWarnResult.class)})
     public Result get(@ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
-        IPage<TBDelayWarnResult> resultIPage = tBDelayWarnService.query(new Page<>(1, 1),null,null,null,null,null,null,null,null,id);
+        IPage<TBDelayWarnResult> resultIPage = tBDelayWarnService.query(new Page<>(1, 1), null, null, null, null, null, null, null, null, id);
         return ResultUtil.ok(resultIPage.getRecords().get(0));
     }
 
     //关闭延期预警跟进
-    
+
     @ApiOperation(value = "关闭延期预警跟进")
     @RequestMapping(value = "/close", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "关闭成功")})
@@ -86,7 +80,7 @@ public class TBDelayWarnController {
         return ResultUtil.ok();
     }
     //重启延期预警跟进
-    
+
     @ApiOperation(value = "重启延期预警跟进")
     @RequestMapping(value = "/restart", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "重启成功")})

sop-server/src/main/java/com/qmth/sop/server/api/TBDelayWarnDetailController.java

@@ -1,8 +1,6 @@
 package com.qmth.sop.server.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.entity.TBDelayWarnDetail;
 import com.qmth.sop.business.service.TBDelayWarnDetailService;
@@ -11,7 +9,6 @@ import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -36,7 +33,7 @@ public class TBDelayWarnDetailController {
     @Resource
     TBDelayWarnDetailService tBDelayWarnDetailService;
 
-   
+
     @ApiOperation(value = "延期预警明细表查询接口")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警明细表查询结果", response = TBDelayWarnDetail.class)})
@@ -45,7 +42,7 @@ public class TBDelayWarnDetailController {
         return ResultUtil.ok(resultIPage);
     }
 
-   
+
     @ApiOperation(value = "延期预警明细表新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})

sop-server/src/main/java/com/qmth/sop/server/api/TBDingController.java

@@ -2,12 +2,9 @@ package com.qmth.sop.server.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.TBDingCountQueryResult;
 import com.qmth.sop.business.bean.result.TBDingCountResult;
-import com.qmth.sop.business.entity.TBDing;
 import com.qmth.sop.business.entity.TBTask;
 import com.qmth.sop.business.service.TBDingService;
 import com.qmth.sop.business.service.TBTaskService;
@@ -17,14 +14,12 @@ import com.qmth.sop.common.enums.TaskTypeEnum;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Map;
@@ -73,7 +68,6 @@ public class TBDingController {
     }
 
 
-
     @ApiOperation(value = "考勤打卡统计接口")
     @RequestMapping(value = "/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤打卡统计结果", response = TBDingCountResult.class)})
@@ -83,7 +77,7 @@ public class TBDingController {
                         @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
                         @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
                         @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo
-                       ) {
+    ) {
         TBDingCountResult result = tBDingService.count(serviceId, createId, userName, supplierId, custom, sopNo);
 
         return ResultUtil.ok(result);

sop-server/src/main/java/com/qmth/sop/server/api/TBProductController.java

@@ -2,20 +2,14 @@ package com.qmth.sop.server.api;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.sop.business.entity.SysLevel;
 import com.qmth.sop.business.entity.TBProduct;
-import com.qmth.sop.business.service.SysLevelService;
 import com.qmth.sop.business.service.TBProductService;
 import com.qmth.sop.common.contant.SystemConstant;
-import com.qmth.sop.common.enums.ProductTypeEnum;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,7 +40,7 @@ public class TBProductController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "产品信息列表", response = TBProduct.class)})
     public Result list(@ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Boolean enable) {
-        return ResultUtil.ok(tbProductService.list(new QueryWrapper<TBProduct>().lambda().eq(Objects.nonNull(enable),TBProduct::getEnable, enable)));
+        return ResultUtil.ok(tbProductService.list(new QueryWrapper<TBProduct>().lambda().eq(Objects.nonNull(enable), TBProduct::getEnable, enable)));
     }
 
 }

sop-server/src/main/java/com/qmth/sop/server/api/TBViolationController.java

@@ -2,8 +2,6 @@ package com.qmth.sop.server.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.TBViolationResult;
 import com.qmth.sop.business.entity.TBViolation;
@@ -15,7 +13,6 @@ import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -25,7 +22,7 @@ import javax.validation.constraints.Min;
 
 /**
  * sop违规登记表 控制器
- * 
+ *
  * @author: shudonghui
  * @date: 2023-08-09 10:33:08
  * @version: 1.0
@@ -34,37 +31,35 @@ import javax.validation.constraints.Min;
  */
 @Api(tags = "sop违规登记表 Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_VIOLATION)
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_VIOLATION)
 public class TBViolationController {
 
 
     @Resource
     TBViolationService tBViolationService;
 
-   
+
     @ApiOperation(value = "sop违规登记表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "sop违规登记表查询结果", response = TBViolationResult.class)})
     public Result query(
-                @ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
-                @ApiParam(value = "违规类型", required = false) @RequestParam(required = false) ViolationTypeEnum type,
-                @ApiParam(value = "跟进状态", required = false) @RequestParam(required = false) ViolationStatusEnum status,
-                @ApiParam(value = "节点负责人", required = false) @RequestParam(required = false) Long userId,
-                @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
-                @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo,
-                @ApiParam(value = "登记人", required = false) @RequestParam(required = false) Long createId,
-                @ApiParam(value = "登记时间开始", required = false) @RequestParam(required = false) Long startTime,
-                @ApiParam(value = "登记时间结束", required = false) @RequestParam(required = false) Long endTime,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<TBViolationResult> resultIPage = tBViolationService.query(new Page<>(pageNumber, pageSize),serviceId,type,status,userId,custom,sopNo,createId,startTime,endTime,null);
+            @ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
+            @ApiParam(value = "违规类型", required = false) @RequestParam(required = false) ViolationTypeEnum type,
+            @ApiParam(value = "跟进状态", required = false) @RequestParam(required = false) ViolationStatusEnum status,
+            @ApiParam(value = "节点负责人", required = false) @RequestParam(required = false) Long userId,
+            @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
+            @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo,
+            @ApiParam(value = "登记人", required = false) @RequestParam(required = false) Long createId,
+            @ApiParam(value = "登记时间开始", required = false) @RequestParam(required = false) Long startTime,
+            @ApiParam(value = "登记时间结束", required = false) @RequestParam(required = false) Long endTime,
+            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        IPage<TBViolationResult> resultIPage = tBViolationService.query(new Page<>(pageNumber, pageSize), serviceId, type, status, userId, custom, sopNo, createId, startTime, endTime, null);
 
         return ResultUtil.ok(resultIPage);
     }
 
 
-
-   
     @ApiOperation(value = "sop违规登记表新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
@@ -77,35 +72,33 @@ public class TBViolationController {
 
 
     //关闭违规登记
-   
+
     @ApiOperation(value = "关闭违规登记")
     @RequestMapping(value = "/close", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "关闭成功")})
     public Result close(@ApiParam(value = "违规登记id", required = true) @RequestParam(required = true) long id) {
-        TBViolation  tBViolation = tBViolationService.getById(id);
+        TBViolation tBViolation = tBViolationService.getById(id);
         tBViolation.setStatus(ViolationStatusEnum.CLOSE);
         return ResultUtil.ok(tBViolationService.saveTBViolation(tBViolation));
     }
 
     //重启违规登记
-   
+
     @ApiOperation(value = "重启违规登记")
     @RequestMapping(value = "/restart", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "重启成功")})
     public Result restart(@ApiParam(value = "违规登记id", required = true) @RequestParam(required = true) long id) {
-        TBViolation  tBViolation = tBViolationService.getById(id);
+        TBViolation tBViolation = tBViolationService.getById(id);
         tBViolation.setStatus(ViolationStatusEnum.RESTART);
         return ResultUtil.ok(tBViolationService.saveTBViolation(tBViolation));
     }
 
 
-
-   
     @ApiOperation(value = "sop违规登记表获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "sop违规登记表信息", response = TBViolationResult.class)})
     public Result get(@ApiParam(value = "sop违规登记表id", required = true) @RequestParam long id) {
-        IPage<TBViolationResult> resultIPage = tBViolationService.query(new Page<>(1, 1),null,null,null,null,null,null,null,null,null,null);
+        IPage<TBViolationResult> resultIPage = tBViolationService.query(new Page<>(1, 1), null, null, null, null, null, null, null, null, null, null);
         return ResultUtil.ok(resultIPage.getRecords().get(0));
     }
 

sop-server/src/main/java/com/qmth/sop/server/api/TBViolationDetailController.java

@@ -1,33 +1,23 @@
 package com.qmth.sop.server.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
-import com.qmth.sop.business.bean.result.EditResult;
-import com.qmth.sop.business.entity.TBDelayWarnDetail;
 import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.business.service.TBViolationDetailService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
 import io.swagger.annotations.*;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 违规明细表 控制器
- * 
+ *
  * @author: shudonghui
  * @date: 2023-08-09 10:33:08
  * @version: 1.0
@@ -36,14 +26,14 @@ import java.util.Objects;
  */
 @Api(tags = "违规明细表 Controller")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_VIOLATION_DETAIL)
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_VIOLATION_DETAIL)
 public class TBViolationDetailController {
 
 
     @Resource
     TBViolationDetailService tBViolationDetailService;
 
-   
+
     @ApiOperation(value = "违规明细表查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "违规明细表查询结果", response = TBViolationDetail.class)})
@@ -53,11 +43,11 @@ public class TBViolationDetailController {
         return ResultUtil.ok(resultIPage);
     }
 
-   
+
     @ApiOperation(value = "违规明细表新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result save(@Valid  @ApiParam(value = "违规明细表信息", required = true) @RequestBody(required = true) TBViolationDetail tBViolationDetail, BindingResult bindingResult) throws InterruptedException {
+    public Result save(@Valid @ApiParam(value = "违规明细表信息", required = true) @RequestBody(required = true) TBViolationDetail tBViolationDetail, BindingResult bindingResult) throws InterruptedException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
@@ -65,5 +55,4 @@ public class TBViolationDetailController {
     }
 
 
-
 }

sop-server/src/main/java/com/qmth/sop/server/api/TDFormWidgetController.java

@@ -3,7 +3,6 @@ package com.qmth.sop.server.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.reflect.TypeToken;
 import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.bean.result.FlowFormWidgetResult;
 import com.qmth.sop.business.bean.result.FlowTablePropResult;
@@ -34,7 +33,7 @@ import java.util.stream.Collectors;
 @Api(tags = "系统控件Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_WIDGET)
-@Aac(auth = BOOL.FALSE)
+@Aac(auth = false)
 public class TDFormWidgetController {
 
     @Resource