优化代码结构

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

@@ -7,6 +7,7 @@ public interface WorkCentreMapper extends BaseMapper<WorkCentre> {
 
     WorkCentre getByManagerId(Integer userId);
 
+    int updateManagerIdIsNullById(Integer id);
 
 
 }

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

@@ -22,4 +22,7 @@ public interface WorkDeptMapper extends BaseMapper<WorkDept> {
     List<OrganizationStructureDto> getAllDeptByAllCentre();
 
     WorkDept getById(Integer deptId);
+
+    int updateManagerIdISNullById(Integer id);
+
 }

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

@@ -19,5 +19,5 @@ public interface WorkHolidayMapper extends BaseMapper<WorkHoliday> {
 
     List<WorkHoliday> getByDate(@Param("startDay") Date startDay,@Param("endDay") Date endDay);
 
-    List<WorkHoliday> getByTypeAndStartDate(@Param("type") Integer type,@Param("date") Date date);
+    List<WorkHoliday> getByTypeAndStartDate( Date date);
 }

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

@@ -13,6 +13,11 @@
     <sql id="vals">
         id, centre_name, centre_manager_id, create_time, modify_time
     </sql>
+    <update id="updateManagerIdIsNullById">
+        UPDATE work_centre
+        SET centre_manager_id = NULL
+        WHERE id = #{id}
+    </update>
 
     <select id="getByManagerId" resultMap="BaseResultMap" parameterType="integer">
         select <include refid="vals"/>

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

@@ -49,6 +49,11 @@
     <sql id="Base_Column_List">
         id,dept_name, oa_dept_id,centre_id, dept_name, create_time, modify_time
     </sql>
+    <update id="updateManagerIdISNullById">
+        UPDATE <include refid="table"/>
+        SET dept_manager_id = NULL
+        WHERE id = #{id}
+    </update>
 
     <select id="getDeptByCondition" resultMap="BaseResultMap" parameterType="integer">
         select <include refid="cols_all"/>

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

@@ -29,7 +29,7 @@
     <select id="getByTypeAndStartDate" resultType="cn.wisenergy.model.app.WorkHoliday">
         SELECT <include refid="Base_Column_List"/>
         FROM <include refid="table"/>
-        WHERE year(day_start) = year(#{date}) AND day_type = #{type}
+        WHERE year(day_start) = year(#{date})
         ORDER BY day_start
     </select>
 

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkCentre.java

@@ -29,8 +29,8 @@ public class WorkCentre implements Serializable {
     @ApiModelProperty(name = "centreName",value = "中心名称")
     private String centreName;
 
-    @ApiModelProperty(name = "centre_manager_id", value = "中心管理员主键")
-    private Integer centre_manager_id;
+    @ApiModelProperty(name = "centreManagerId", value = "中心管理员主键")
+    private Integer centreManagerId;
 
     @ApiModelProperty(name = "createTime",value = "创建时间")
     private Date createTime;

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

@@ -11,4 +11,6 @@ public interface WorkCentreService {
     WorkCentre getCentreById(Integer id);
 
     Boolean updateManagerIdIsNullById(Integer id);
+
+    Boolean updateById(WorkCentre workCentre);
 }

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

@@ -27,4 +27,6 @@ public interface WorkDeptService {
     List<OrganizationStructureDto> getAllDeptByAllCentreId();
 
     Boolean updateManagerIdISNullById(Integer id);
+
+    Boolean updateById(WorkDept workDept);
 }

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

@@ -40,10 +40,17 @@ public class WorkCentreServiceImpl implements WorkCentreService {
         if (null == id) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-        WorkCentre workCentre = new WorkCentre();
-        workCentre.setId(id);
-        workCentre.setCentre_manager_id(null);
-        int i = workCentreMapper.updateById(workCentre);
+        int i = workCentreMapper.updateManagerIdIsNullById(id);
         return i>0;
     }
+
+    @Override
+    public Boolean updateById(WorkCentre workCentre) {
+        log.info("WorkCentreServiceImpl[]updateById[]input.param.workCentre" + workCentre);
+        if (null == workCentre || null == workCentre.getId()) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
+        }
+        int updateRow = workCentreMapper.updateById(workCentre);
+        return updateRow>0;
+    }
 }

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

@@ -74,10 +74,17 @@ public class WorkDeptServiceImpl implements WorkDeptService {
         if (null == id) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-        WorkDept workDept = new WorkDept();
-        workDept.setId(id);
-        workDept.setDeptManagerId(null);
-        int i = workDeptMapper.updateById(workDept);
+        int i = workDeptMapper.updateManagerIdISNullById(id);
         return i > 0;
     }
+
+    @Override
+    public Boolean updateById(WorkDept workDept) {
+        log.info("WorkDeptServiceImpl[]updateById[]input.param.workDept:{}" + workDept);
+        if (null == workDept || null == workDept.getId()) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
+        }
+        int i = workDeptMapper.updateById(workDept);
+        return i>0;
+    }
 }

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

@@ -76,7 +76,7 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
     private Boolean addHoliday(WorkHoliday workHoliday) {
         log.info("WorkHolidayServiceImpl[]addHoliday[]input.param.workHoliday:{}" + workHoliday);
         verificationDate(workHoliday);
-        List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate(1, new Date());
+        List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate( new Date());
         if (!CollectionUtils.isEmpty(holidays)) {
             for (WorkHoliday holiday : holidays) {
                 if (workHoliday.getDes().equals(holiday.getDes())) {
@@ -107,7 +107,7 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
             if (null == workHoliday.getId()) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
             }
-            List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate(1, new Date());
+            List<WorkHoliday> holidays = workHolidayMapper.getByTypeAndStartDate( new Date());
             if (!CollectionUtils.isEmpty(holidays)) {
                 for (WorkHoliday holiday : holidays) {
                     if (holiday.getId().equals(workHoliday.getId())) {
@@ -152,7 +152,7 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
         }
         HolidayAndAutoDto holidayAndAutoDto = new HolidayAndAutoDto();
-        List<WorkHoliday> workHolidays = workHolidayMapper.getByTypeAndStartDate(1, new Date());
+        List<WorkHoliday> workHolidays = workHolidayMapper.getByTypeAndStartDate(new Date());
         WorkSubmitAdopt submitAdopt = workSubmitAdoptService.getById(1);
         holidayAndAutoDto.setWorkHolidays(workHolidays).setWorkSubmitAdopt(submitAdopt);
         List<WorkType> workTypes = workTypeService.getAll();
@@ -172,6 +172,9 @@ public class WorkHolidayServiceImpl implements WorkHolidayService {
         if (null == workHoliday.getDayEnd()) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
+        if (null == workHoliday.getDayType()) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
+        }
         /*if (null == workHoliday.getDayType()) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }*/

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

@@ -151,7 +151,7 @@ public class WorkUserServiceImpl implements WorkUserService {
     }
 
     @Override
-    public AllRoleAndUserRoleDto getUserRoleDto(Integer userId,Integer page, Integer pageSize) {
+    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.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
@@ -194,18 +194,24 @@ public class WorkUserServiceImpl implements WorkUserService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_DATA_IS_NULL);
         }
         WorkDept workDept = workDeptService.getById(workUser.getDeptId());
-
         WorkCentre centre = workCentreService.getCentreById(workDept.getCentreId());
         List<Integer> roles = workUserRoleMapper.getRole(userId);
+        // 如果当前用户有部门和中心权限，则删除对应表的管理
+        int DeptUpdateIndex = 0;
+        int centreUpdateIndex = 0;
+
         if (!CollectionUtils.isEmpty(roles)) {
             for (Integer role : roles) {
                 // 部门经理
-                // TODO
                 if (2 == role) {
-                    workDeptService.updateManagerIdISNullById(workDept.getDeptManagerId());
+                    workDeptService.updateManagerIdISNullById(workDept.getId());
+                    System.out.println("部门经理被我设置为空了");
+                    DeptUpdateIndex++;
                 }
+                // 中心管理
                 if (3 == role) {
                     workCentreService.updateManagerIdIsNullById(centre.getId());
+                    centreUpdateIndex++;
                 }
             }
         }
@@ -220,23 +226,24 @@ public class WorkUserServiceImpl implements WorkUserService {
                 }
             }
         }
-
-
+        //判断当前是否已经有部门经理和中心管理
         for (Integer roleId : roleIds) {
             // 设置部门经理
             if (2 == roleId) {
-                if (!(null == workDept.getDeptManagerId() || userId.equals(workDept.getDeptManagerId()))) {
+                if (0 == DeptUpdateIndex && null !=workDept.getDeptManagerId()) {
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.DEPARTMENT_MANAGER_ALREADY_EXISTS);
                 }
+                workDept.setDeptManagerId(userId);
+                workDeptService.updateById(workDept);
             }
             // 设置中心管理员
-
             if (3 == roleId) {
-                if (!(null == centre.getCentre_manager_id() || userId.equals(centre.getCentre_manager_id()))) {
+                if (0 == centreUpdateIndex && null !=centre.getCentreManagerId()) {
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.CENTERMANAGERALREADYEXISTS);
                 }
+                centre.setCentreManagerId(userId);
+                workCentreService.updateById(centre);
             }
-
         }
 
         workUserRoleMapper.insertBatch(userId, roleIds);

wisenergy-service/src/main/java/cn/wisenergy/service/utils/UserRoleLevelUtils.java

@@ -149,6 +149,7 @@ public class UserRoleLevelUtils {
         if (null == userId || StringUtils.isEmpty(levelEnum)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
+        // 获取当前用户的角色、权限、管理范围
         List<UserRoleLevelDto> roleUserLevel = UserRoleLevelUtils.getRoleUserLevel(userId);
         if (CollectionUtils.isEmpty(roleUserLevel)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);