优化代码结构

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkUserMapper.java

@@ -5,6 +5,7 @@ import cn.wisenergy.model.app.WorkUser;
 import cn.wisenergy.model.dto.StatisticsTableDto;
 import cn.wisenergy.model.dto.UserRoleDto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -37,7 +38,7 @@ public interface WorkUserMapper extends BaseMapper<WorkUser> {
      */
     List<StatisticsTableDto> getStatisticsTableDtos(List<Integer> userIds);
 
-    List<UserRoleDto> getUserRoleDto(Integer status);
+    List<UserRoleDto> getUserRoleDto(@Param("status") Integer status,@Param("key") String key);
 
 
     List<WorkRole> getUserRole(Integer id);

wisenergy-mapper/src/main/resources/mapper/WorkUserMapper.xml

@@ -115,12 +115,16 @@
     </resultMap>
 
     <select id="getUserRoleDto" resultMap="UserRoleMap">
+
       select u.id as 'id',u.name as 'name',u.status as 'status',r.id as 'role_id',r.name as 'role_name'
 from work_user u LEFT JOIN (select role_id,user_id FROM work_user_role GROUP BY user_id) ur ON u.id = ur.user_id
 LEFT JOIN work_role r on ur.role_id = r.id
         <where>
             <if test="null !=status">
-                status = #{status}
+            AND  u.status = #{status}
+            </if>
+            <if test="null !=key">
+            AND  u.name like concat('%',#{key},'%')
             </if>
         </where>
     </select>

wisenergy-service/src/main/java/cn/wisenergy/service/WorkUserService.java

@@ -55,7 +55,7 @@ public interface WorkUserService {
      */
     List<OrganizationStructureDto> getOrganizationStructure();
 
-    AllRoleAndUserRoleDto getUserRoleDto(Integer userId,Integer page, Integer pageSize,Integer status);
+    AllRoleAndUserRoleDto getUserRoleDto(Integer userId,Integer page, Integer pageSize,Integer status,String key);
 
     Boolean modifyRole(Integer userId, List<Integer> roleIds,Integer status);
 

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -69,8 +69,6 @@ public class WorkProjectServiceImpl implements WorkProjectService {
     @Autowired
     private WorkProjectChangeService workProjectChangeService;
 
-    @Autowired
-    private UserRoleLevelUtils userRoleLevelUtils;
 
     /**
      * 功能：根据项目id获取项目
@@ -149,7 +147,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
         WorkUser user = workUserService.getById(userId);
-        List<Integer> role = userRoleLevelUtils.getRole(user.getId());
+        List<Integer> role = UserRoleLevelUtils.getRole(user.getId());
         //普通用户
         if (role.contains(ManagerEnum.NOT_MANAGER.getCode())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
@@ -235,7 +233,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         Integer isConclusion = gmpv.getIsConclusion();
         List<ManagerProjectsDto> managerProjectsDto;
 
-        // 中心负责人
+        // 中心级
         if (rank.equals(LevelRankEnum.CENTRAL_LEVEL.getRank())) {
             List<Integer> deptIds = new ArrayList<>();
             WorkCentre workCentre = workCentreMapper.getByManagerId(user.getId());
@@ -250,14 +248,14 @@ public class WorkProjectServiceImpl implements WorkProjectService {
 
         PageHelper.startPage(page, pageSize);
 
-        // 部门经理
+        // 部门级
         if (rank.equals(LevelRankEnum.DEPARTMENT_LEVEL.getRank())) {
             List<Integer> deptIds = new ArrayList<>();
             deptIds.add(user.getDeptId());
             managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), gmpv.getType(), isConclusion, deptIds);
             return returnPageInfo(managerProjectsDto);
         }
-        // 项目经理
+        // 项目级
         if (rank.equals(LevelRankEnum.PROJECT_LEVEL.getRank())) {
             managerProjectsDto = workProjectMapper.getManagerProjectsDto(gmpv.getUserId(), gmpv.getType(), isConclusion, null);
             return returnPageInfo(managerProjectsDto);
@@ -431,12 +429,11 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         return workUserProjectService.insertBatch(createProjectVo.getUserIds(), workProject.getId());
     }
 
-    private PageInfo returnPageInfo(List<ManagerProjectsDto> managerProjectsDto) {
-
+    private PageInfo<ManagerProjectsDto> returnPageInfo(List<ManagerProjectsDto> managerProjectsDto) {
         if (CollectionUtils.isEmpty(managerProjectsDto)) {
             return null;
         }
-        PageInfo pageInfo = new PageInfo<>(managerProjectsDto);
+        PageInfo<ManagerProjectsDto> pageInfo = new PageInfo<>(managerProjectsDto);
         pageInfo.setList(managerProjectsDto);
         return pageInfo;
     }

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java

@@ -152,15 +152,15 @@ public class WorkUserServiceImpl implements WorkUserService {
     }
 
     @Override
-    public AllRoleAndUserRoleDto getUserRoleDto(Integer userId, Integer page, Integer pageSize,Integer status) {
-        log.info("WorkUserServiceImpl[]getUserRoleDto[]input.param.userId:{},page:{},pageSize:{},status:{}" + userId, page, pageSize,status);
+    public AllRoleAndUserRoleDto getUserRoleDto(Integer userId, Integer page, Integer pageSize,Integer status,String key) {
+        log.info("WorkUserServiceImpl[]getUserRoleDto[]input.param.userId:{},page:{},pageSize:{},status:{},key:{}" + userId, page, pageSize,status,key);
         if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.ACCOUNTMANAGEMENT.getLevelName())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
         }
         page = page == null ? 1 : page;
         pageSize = pageSize == null ? 10 : pageSize;
         Page<UserRoleDto> startPage = PageHelper.startPage(page, pageSize);
-        List<UserRoleDto> userRoleDtos = workUserMapper.getUserRoleDto(status);
+        List<UserRoleDto> userRoleDtos = workUserMapper.getUserRoleDto(status,key);
         if (CollectionUtils.isEmpty(userRoleDtos)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_DATA_IS_NULL);
         }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SystemController.java

@@ -90,12 +90,13 @@ public class SystemController extends BaseController {
             @ApiImplicitParam(name = "userId",value = "管理员id",dataType = "int",required = true),
             @ApiImplicitParam(name = "page", value = "当前页", dataType = "int",required = true),
             @ApiImplicitParam(name = "pageSize",value = "记录数",dataType = "int",required = true),
-            @ApiImplicitParam(name = "status",value = "账号状态",dataType = "int")
+            @ApiImplicitParam(name = "status",value = "账号状态",dataType = "int"),
+            @ApiImplicitParam(name = "key",value = "模糊搜索",dataType = "string")
     })
     @GetMapping("/getAllRole")
-    public Result<AllRoleAndUserRoleDto> getAllRole(Integer userId,Integer page,Integer pageSize,Integer status) {
-        log.info("SystemController[]getAllRole[]input.param.userId:{},page:{},pageSize:{},status:{}" + userId, page, pageSize,status);
-        AllRoleAndUserRoleDto allRoleAndUserRoleDto = workUserService.getUserRoleDto(userId,page,pageSize,status);
+    public Result<AllRoleAndUserRoleDto> getAllRole(Integer userId,Integer page,Integer pageSize,Integer status,String key) {
+        log.info("SystemController[]getAllRole[]input.param.userId:{},page:{},pageSize:{},status:{},key:{}" + userId, page, pageSize,status,key);
+        AllRoleAndUserRoleDto allRoleAndUserRoleDto = workUserService.getUserRoleDto(userId,page,pageSize,status,key);
         return getResult(allRoleAndUserRoleDto);
     }
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkTimeOrderController.java

@@ -86,7 +86,7 @@ public class WorkTimeOrderController extends BaseController {
         }
         List<Integer> lists = null;
         if (!StringUtils.isEmpty(status)) {
-            String[] split = status.split("\\,");
+            String[] split = status.split(",");
             Integer[] newIds = (Integer[]) ConvertUtils.convert(split, Integer.class);
             lists = new ArrayList<>(Arrays.asList(newIds));
         }
@@ -117,7 +117,7 @@ public class WorkTimeOrderController extends BaseController {
         if (null == reviewerId || StringUtils.isEmpty(ids)) {
             throw new CustomException(RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-        String[] split = ids.split("\\,");
+        String[] split = ids.split(",");
         Integer[] newIds = (Integer[]) ConvertUtils.convert(split, Integer.class);
         List<Integer> lists = new ArrayList<>(Arrays.asList(newIds));
         Boolean aBoolean = workTimeOrderService.examineByIds(reviewerId, lists);