优化代码结构

wisenergy-model/src/main/java/cn/wisenergy/model/enums/LevelEnum.java

@@ -8,6 +8,9 @@ public enum LevelEnum {
     EXAMINE("审批"),
     STATISTICS("统计"),
     PROJECT_MANAGER( "项目/商机管理"),
+    TIMEEXPORT("工时导出"),
+    SYSTEMSETTINGS("系统设置"),
+    ACCOUNTMANAGEMENT("账号管理"),
 
     ;
 

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

@@ -22,5 +22,5 @@ public interface WorkHolidayService {
 
     Boolean deleteHoliday(Integer id);
 
-    HolidayAndAutoDto getHolidayAll();
+    HolidayAndAutoDto getHolidayAll(Integer userId);
 }

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

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

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

@@ -6,8 +6,10 @@ import cn.wisenergy.mapper.WorkHolidayMapper;
 import cn.wisenergy.model.app.WorkHoliday;
 import cn.wisenergy.model.app.WorkSubmitAdopt;
 import cn.wisenergy.model.dto.HolidayAndAutoDto;
+import cn.wisenergy.model.enums.LevelEnum;
 import cn.wisenergy.service.WorkHolidayService;
 import cn.wisenergy.service.WorkSubmitAdoptService;
+import cn.wisenergy.service.utils.UserRoleLevelUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -111,8 +113,11 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
     }
 
     @Override
-    public HolidayAndAutoDto getHolidayAll() {
-        log.info("WorkHolidayServiceImpl[]getHolidayAll[]");
+    public HolidayAndAutoDto getHolidayAll(Integer userId) {
+        log.info("WorkHolidayServiceImpl[]getHolidayAll[]input.param.userId:{}" + userId);
+        if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.SYSTEMSETTINGS.getLevelName())) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
+        }
         HolidayAndAutoDto holidayAndAutoDto = new HolidayAndAutoDto();
         QueryWrapper<WorkHoliday> wrapper = new QueryWrapper<>();
         wrapper.eq("day_type", 1);

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

@@ -10,6 +10,7 @@ import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.dto.ManagerProjectsDto;
 import cn.wisenergy.model.dto.ProjectDto;
 import cn.wisenergy.model.dto.UserProjectDto;
+import cn.wisenergy.model.enums.LevelEnum;
 import cn.wisenergy.model.enums.LevelRankEnum;
 import cn.wisenergy.model.enums.ManagerEnum;
 import cn.wisenergy.model.vo.CreateProjectVo;
@@ -207,13 +208,10 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         if (CollectionUtils.isEmpty(workLevels)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.LEAVE_JOB_USER);
         }
-        for (WorkLevel workLevel : workLevels) {
-            System.out.println("workLevel = " + workLevel);
-        }
 
         Integer rank = null;
         for (WorkLevel level : workLevels) {
-            if ("项目/商机管理".equals(level.getName())) {
+            if (LevelEnum.PROJECT_MANAGER.getLevelName().equals(level.getName())) {
                 rank = level.getRank();
                 break;
             }
@@ -266,8 +264,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
     @Override
     public Boolean endProject(Integer userId, Integer projectId) {
         log.info("WorkProjectServiceImpl[]endProject[]input.param.userId：{},projectId:{}" + userId, projectId);
-        List<Integer> role = UserRoleLevelUtils.getRole(userId);
-        if (role.get(0).equals(ManagerEnum.NOT_MANAGER.getCode())) {
+        if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.PROJECT_MANAGER.getLevelName())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
         }
         if (null == projectId) {
@@ -354,7 +351,6 @@ public class WorkProjectServiceImpl implements WorkProjectService {
 
         // 更新workUserProject数据
         if (!userIds.containsAll(modifyProjectVo.getUserIds()) || !modifyProjectVo.getUserIds().containsAll(userIds)) {
-            System.out.println("玛纳卡吧");
             // 先删除,后插入
             if (!workUserProjectService.deleteByProjectId(modifyProjectVo.getProjectId())) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.DELETE_OLD_WORK_ORDER_FAIL);

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

@@ -387,8 +387,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             }
             return getDto(workTimeOrders);
         }
-
-
         throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_END);
     }
 

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

@@ -11,6 +11,7 @@ import cn.wisenergy.model.app.WorkRole;
 import cn.wisenergy.model.app.WorkSubmitAdopt;
 import cn.wisenergy.model.app.WorkUser;
 import cn.wisenergy.model.dto.*;
+import cn.wisenergy.model.enums.LevelEnum;
 import cn.wisenergy.model.enums.ManagerEnum;
 import cn.wisenergy.service.WorkDeptService;
 import cn.wisenergy.service.WorkSubmitAdoptService;
@@ -147,8 +148,11 @@ public class WorkUserServiceImpl implements WorkUserService {
     }
 
     @Override
-    public AllRoleAndUserRoleDto getUserRoleDto(Integer page, Integer pageSize) {
-        log.info("WorkUserServiceImpl[]getUserRoleDto[]");
+    public AllRoleAndUserRoleDto getUserRoleDto(Integer userId,Integer page, Integer pageSize) {
+        log.info("WorkUserServiceImpl[]getUserRoleDto[]input.param.userId:{},page:{},pageSize:{}" + userId, page, pageSize);
+        if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.ACCOUNTMANAGEMENT.getLevelName())) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.MANAGER_NOT_PROJECT);
+        }
         page = page == null ? 1 : page;
         pageSize = pageSize == null ? 10 : pageSize;
         Page<UserRoleDto> startPage = PageHelper.startPage(page, pageSize);

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

@@ -70,10 +70,11 @@ public class SystemController extends BaseController {
     }
 
     @ApiOperation(value = "获取工作日历和审批时限", notes = "获取工作日历和审批时限", httpMethod = "GET")
+    @ApiImplicitParam(name = "userId", value = "管理员id", dataType = "int", required = true)
     @GetMapping("/getHolidayAndAuto")
-    public Result<HolidayAndAutoDto> getHolidayAndAuto() {
-        log.info("SystemController[]getHolidayAndAuto[]" );
-        HolidayAndAutoDto holidayAll = workHolidayService.getHolidayAll();
+    public Result<HolidayAndAutoDto> getHolidayAndAuto(Integer userId) {
+        log.info("SystemController[]getHolidayAndAuto[]input.param.userId:{}" + userId);
+        HolidayAndAutoDto holidayAll = workHolidayService.getHolidayAll(userId);
         return getResult(holidayAll);
     }
 
@@ -88,13 +89,14 @@ public class SystemController extends BaseController {
 
     @ApiOperation(value = "获取账号列表", notes = "获取账号列表", httpMethod = "GET")
     @ApiImplicitParams({
+            @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)
     })
     @GetMapping("/getAllRole")
-    public Result<AllRoleAndUserRoleDto> getAllRole(Integer page,Integer pageSize) {
-        log.info("SystemController[]getAllRole[]");
-        AllRoleAndUserRoleDto allRoleAndUserRoleDto = workUserService.getUserRoleDto(page,pageSize);
+    public Result<AllRoleAndUserRoleDto> getAllRole(Integer userId,Integer page,Integer pageSize) {
+        log.info("SystemController[]getAllRole[]input.param.userId:{},page:{},pageSize:{}" + userId, page, pageSize);
+        AllRoleAndUserRoleDto allRoleAndUserRoleDto = workUserService.getUserRoleDto(userId,page,pageSize);
         return getResult(allRoleAndUserRoleDto);
     }
 

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

@@ -82,7 +82,6 @@ public class WorkProjectController  extends BaseController {
     @PostMapping(value = "/addProject")
     public Result<Boolean> addProject(@RequestBody CreateProjectVo createProjectVo) {
         log.info("WorkProjectController[]addProject[]input.param.createProjectVo:{}" + createProjectVo);
-
         Boolean aBoolean = workProjectService.addProject(createProjectVo);
         return getResult(aBoolean);
     }