feat: 控制层优化

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -46,12 +46,8 @@ public class InvWarehouseController extends BaseController {
     @Resource
     DeptService deptService;
     @Resource
-    CustomerService customerService;
-    @Resource
     private WarehouseUserService warehouseUserService;
     @Resource
-    private SystemParamConfigService systemParamConfigService;
-    @Resource
     private WarehouseBussinessTypeService warehouseBussinessTypeService;
     @Resource
     private IBasicBussinessTypeService basicBussinessTypeService;
@@ -172,11 +168,7 @@ public class InvWarehouseController extends BaseController {
      */
     @GetMapping("spms/inv/warehouse/findInvListByUser")
     public BaseResponse findInvListByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
-        Long userId = getUserId();
+        filterInvWarehouseRequest.setUserId(getUserId());
-        if (null == userId) {
-            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
-        }
-        filterInvWarehouseRequest.setUserId(userId);
         List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
         return ResultVOUtils.success(list);
     }
@@ -189,11 +181,7 @@ public class InvWarehouseController extends BaseController {
      */
     @GetMapping("spms/inv/warehouse/findInvListByUserOptimize")
     public BaseResponse findInvListByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
-        Long userId = getUserId();
+        filterInvWarehouseRequest.setUserId(getUserId());
-        if (null == userId) {
-            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
-        }
-        filterInvWarehouseRequest.setUserId(userId);
         List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
         List<DictDto> reList = list.stream().map(s -> {
             DictDto dictDto = new DictDto(s.getCode(), s.getName());
@@ -209,11 +197,7 @@ public class InvWarehouseController extends BaseController {
      */
     @GetMapping("spms/inv/warehouse/findAllInvByUserOptimize")
     public BaseResponse findAllInvByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
-        Long userId = getUserId();
         List<InvWarehouseEntity> list = new ArrayList<>();
-        if (null == userId) {
-            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
-        }
         if (filterInvWarehouseRequest.getAdvanceType() == 2 || filterInvWarehouseRequest.getAdvanceType() == 3) {
             FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
             BeanUtils.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest);
@@ -222,7 +206,7 @@ public class InvWarehouseController extends BaseController {
             FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
             filterInvSubWarehouseRequest.setFilterAdvanceType(1);
             List<InvWarehouseEntity> preInList = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
-            filterInvWarehouseRequest.setUserId(userId);
+            filterInvWarehouseRequest.setUserId(getUserId());
             List<InvWarehouseEntity> myList = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
             list = myList.stream().filter(invWarehouseEntity ->
                     preInList.stream().anyMatch(preIn -> !preIn.getCode().equals(invWarehouseEntity.getCode()))
@@ -243,11 +227,7 @@ public class InvWarehouseController extends BaseController {
      */
     @GetMapping("spms/inv/warehouse/findAllInvByUser")
     public BaseResponse findAllInvByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
-        Long userId = getUserId();
         List<InvWarehouseEntity> list = new ArrayList<>();
-        if (null == userId) {
-            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
-        }
         if (filterInvWarehouseRequest.getAdvanceType() == 2 || filterInvWarehouseRequest.getAdvanceType() == 3) {
             FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
             BeanUtils.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest);
@@ -256,7 +236,7 @@ public class InvWarehouseController extends BaseController {
             FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
             filterInvSubWarehouseRequest.setFilterAdvanceType(1);
             List<InvWarehouseEntity> preInList = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
-            filterInvWarehouseRequest.setUserId(userId);
+            filterInvWarehouseRequest.setUserId(getUserId());
             List<InvWarehouseEntity> myList = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
             List<InvWarehouseEntity> resultList = myList.stream().filter(invWarehouseEntity ->
                     preInList.stream().anyMatch(preIn -> !preIn.getCode().equals(invWarehouseEntity.getCode()))
@@ -451,7 +431,6 @@ public class InvWarehouseController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复！");
         }
 
-
         //更新仓库信息
         invWarehouseEntity.setUpdateTime(new Date());
         boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
@@ -712,8 +691,7 @@ public class InvWarehouseController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/warehouse/inout/delWarehouseUser")
     public BaseResponse deleteWarehouseUser(Long id) {
-        if (null == id)
+        if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id);
 
         List<InvBusUserEntity> invBusUserEntities = invBusUserService.selectByUnion(warehouseUserEntity.getUserid() + "", warehouseUserEntity.getCode());

src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java

@@ -140,7 +140,6 @@ public class SysCustomConfigController extends BaseController {
         SysCustomConfigDetailRequest detailRequest = new SysCustomConfigDetailRequest();
         detailRequest.setConfigId(sysCustomConfigEntity.getId().toString());
         detailRequest.setIsShow("1");
-//        detailRequest.setType(request.getType());
         List<SysCustomConfigDetailEntity> detailList = sysCustomConfigDetailService.filterSysCustomConfigDetail(detailRequest);
         Map<String, List<SysCustomConfigDetailEntity>> map = detailList.stream().collect(
                 Collectors.groupingBy(SysCustomConfigDetailEntity::getType));

src/main/java/com/glxp/api/controller/auth/SysMenuController.java

@@ -30,8 +30,6 @@ public class SysMenuController extends BaseController {
 
     @Resource
     ISysMenuService menuService;
-    @Resource
-    CustomerService customerService;
 
 
     /**

src/main/java/com/glxp/api/controller/auth/SysRoleController.java

@@ -115,8 +115,6 @@ public class SysRoleController extends BaseController {
     public BaseResponse dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
-
-
         int i = roleService.authDataScope(role);
         return ResultVOUtils.success("修改成功！");
     }
@@ -152,7 +150,6 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:query")
     @GetMapping("/optionselect")
     public BaseResponse optionselect() {
-
         return ResultVOUtils.success(roleService.selectRoleAll());
 
     }
@@ -162,8 +159,6 @@ public class SysRoleController extends BaseController {
      */
     @GetMapping("/authUser/allocatedList")
     public BaseResponse allocatedList(FilterAuthUserRequest filterAuthUserRequest) {
-
-
         List<AuthAdmin> authAdminList = userService.selectAllocatedList(filterAuthUserRequest);
         PageInfo<AuthAdmin> pageInfo = new PageInfo<>(authAdminList);
         PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
@@ -177,8 +172,6 @@ public class SysRoleController extends BaseController {
      */
     @GetMapping("/authUser/unallocatedList")
     public BaseResponse unallocatedList(FilterAuthUserRequest filterAuthUserRequest) {
-
-
         List<AuthAdmin> authAdminList = userService.selectUnallocatedList(filterAuthUserRequest);
         PageInfo<AuthAdmin> pageInfo = new PageInfo<>(authAdminList);
         PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
@@ -205,7 +198,6 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @PutMapping("/authUser/cancelAll")
     public BaseResponse cancelAuthUserAll(Long roleId, Long[] userIds) {
-
         int i = roleService.deleteAuthUsers(roleId, userIds);
         return ResultVOUtils.success("取消成功！");
     }

src/main/java/com/glxp/api/controller/auth/SysUserController.java

@@ -56,7 +56,6 @@ public class SysUserController extends BaseController {
     private final ISysRoleService roleService;
     @Resource
     ISysRoleService sysRoleService;
-
     @Resource
     WarehouseUserService warehouseUserService;
 
@@ -67,7 +66,6 @@ public class SysUserController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<AuthAdmin> authAdminList = userService.listAdminPage(filterAuthUserRequest);
-//        List<AuthAdmin> authAdminList1  = userService.getDepts(filterAuthUserRequest);
         //查询对应角色和部门
         List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> {
             AuthAdminResponse authAdminResponse = new AuthAdminResponse();

src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java

@@ -60,7 +60,6 @@ import java.util.Map;
 @RestController
 public class SysWorkplaceQueueController extends BaseController {
 
-
     @Resource
     SysWorkplaceQueueService sysWorkplaceQueueService;
     @Resource

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -289,6 +289,7 @@ public class BasicBussinessTypeController extends BaseController {
             return ResultVOUtils.success(pageSimpleResponse);
         } else {
 
+
             List<BasicBussinessTypeResponse> bussinessTypeEntities;
             //判断是否是医院用户
             bussinessTypeFilterRequest.setUserId(getUserId());