优化

王富生
1 parent 5b76d9ce
Showing 6 changed files with 35 additions and 99 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
@@ -8,7 +8,6 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
  
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Set;
  
@@ -19,22 +18,19 @@ public class AppInspectionPlanPageReqVO extends PageParam {
     @Schema(description = "道路名称", example = "赵六")
     private String roadName;
  
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效;4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于4")
     private Integer finishState;
  
  
     @Schema(description = "批次号列表")
     @Hidden
-    private Set<String> batchNos;
+    private Set<Long> roleIds;
  
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
  
-    @Schema(description = "系统时间")
-    @Hidden
-    private LocalDate localDate;
 }
@@ -26,7 +26,7 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam {
     @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效;4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于4")
     private Integer finishState;
  
  
@@ -273,11 +273,5 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
         });
     }
  
-//    private List<InspectionPlanCommitRespVO> imgProcess(List<InspectionPlanCommitRespVO> list) {
-//        list.forEach(e -> {
-//            e.setImgList(StrUtils.imgProcess(e.getImg(), ""));
-//        });
-//        return list;
-//    }
  
 }
@@ -52,7 +52,6 @@ import java.util.stream.Collectors;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
 import static com.zteits.urbanops.module.garden.enums.PlanConstants.CYCLE_ID_TYPE;
-import static javax.management.Query.eq;
  
 /**
  * 巡检计划汇总 Service 实现类
@@ -365,13 +364,12 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         }
  
         /*1.查询登录用户角色*/
-        Set<String> batchNos = this.getBatchNosByLoginUserId();
-        if(CollectionUtils.isEmpty(batchNos)){
-           return PageResult.empty();
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            return new PageResult<>(null, 0L);
         }
  
-        pageReqVO.setBatchNos(batchNos);
-        pageReqVO.setLocalDate(LocalDate.now());
+        pageReqVO.setRoleIds(new HashSet<>(roleIds));
         /*2.分页*/
         IPage<AppInspectionPlanRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppInspectionPlanRespVO> page = inspectionPlanMapper.getInspectionPlanAppPage(mpPage, pageReqVO);
@@ -400,29 +398,6 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         });
     }
  
-    /**
-     * 获取登录用户批次号List
-     */
-    private Set<String> getBatchNosByLoginUserId() {
-        Long companyId = SecurityFrameworkUtils.getCompanyId();
-        Long deptId = SecurityFrameworkUtils.getDeptId();
-        /*1.查询登录用户角色*/
-        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-        if (CollectionUtils.isEmpty(roleIds)) {
-            return Collections.emptySet();
-        }
-        QueryWrapper<InspectionPlanRoleDO> roleSql = new QueryWrapper<>();
-        roleSql.select("batch_no");
-        roleSql.lambda().in(InspectionPlanRoleDO::getRoleId, roleIds).
-                eq(InspectionPlanRoleDO::getCompanyId, companyId)
-                .eq(InspectionPlanRoleDO::getDeptId, deptId);
-        List<InspectionPlanRoleDO> roleList = inspectionPlanRoleMapper.selectList(roleSql);
-        if (CollectionUtils.isEmpty(roleList)) {
-            return Collections.emptySet();
-        }
-        return roleList.stream().map(InspectionPlanRoleDO::getBatchNo).collect(Collectors.toSet());
-    }
-
     @Override
     public void updateExpiredInspectionPlans() {
         // 更新过期的计划状态为过期(3)
@@ -391,29 +391,6 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         return new PageResult<>(page.getRecords(), page.getTotal());
     }
  
-    /**
-     * 获取登录用户批次号List
-     */
-    private Set<String> getBatchNosByLoginUserId() {
-        Long companyId = SecurityFrameworkUtils.getCompanyId();
-        Long deptId = SecurityFrameworkUtils.getDeptId();
-        /*1.查询登录用户角色*/
-        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-        if (CollectionUtils.isEmpty(roleIds)) {
-            return Collections.emptySet();
-        }
-        QueryWrapper<MaintainPlanRoleDO> roleSql = new QueryWrapper<>();
-        roleSql.select("batch_no");
-        roleSql.lambda().in(MaintainPlanRoleDO::getRoleId, roleIds).
-                eq(MaintainPlanRoleDO::getCompanyId, companyId)
-                .eq(MaintainPlanRoleDO::getDeptId, deptId);
-        List<MaintainPlanRoleDO> roleList = maintainPlanRoleMapper.selectList(roleSql);
-        if (CollectionUtils.isEmpty(roleList)) {
-            return Collections.emptySet();
-        }
-        return roleList.stream().map(MaintainPlanRoleDO::getBatchNo).collect(Collectors.toSet());
-    }
-
     @Override
     public PageResult<AppMaintainPlanPagePlanTypeRespVO> appMaintainPlanPlanTypePage(AppMaintainPlanPagePlanTypeReqVO pageReqVO) {
         String busiLine = SecurityFrameworkUtils.getBusiLine();
@@ -15,27 +15,30 @@
  
     <select id="getInspectionPlanAppPage" resultType="com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO">
         SELECT
-           a.batch_no,
-            a.road_id,
-            a.road_name,
-            a.busi_line,
-            a.plan_type_id,
-            a.level_id,
-            a.finish_state,
-            a.begin_time,
-            a.end_time
-        FROM garden_inspection_plan a JOIN -- 建议用显式JOIN代替隐式连接，可读性更高
-            garden_inspection_plan_detail b ON
-            a.batch_no = b.batch_no
-            AND a.deleted = b.deleted
-        WHERE a.deleted = 0
-          <if test="req.roadName != null and req.roadName !=''">
+        a.batch_no,
+        a.road_id,
+        a.road_name,
+        a.busi_line,
+        a.plan_type_id,
+        a.level_id,
+        a.finish_state,
+        a.begin_time,
+        a.end_time
+        FROM garden_inspection_plan a,
+        garden_inspection_plan_detail b,
+        garden_maintain_plan_role c
+        WHERE a.batch_no = b.batch_no
+        AND a.batch_no = c.batch_no
+        AND a.dept_id = c.dept_id
+        AND a.deleted = b.deleted
+        AND a.deleted = 0
+        <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
-          </if>
-        <if test="req.batchNos != null and req.batchNos.size() > 0">
-            AND a.batch_no IN
-            <foreach collection="req.batchNos" item="batchNo" open="(" separator="," close=")">
-                #{batchNo}
+        </if>
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND c.role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
             </foreach>
         </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
@@ -44,18 +47,9 @@
                 #{busiLine}
             </foreach>
         </if>
-        <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[and a.end_time < #{req.localDate}]]>
-        </if>
-        <if test="req.finishState == 2">
-            and b.finish_state = #{req.finishState}
-        </if>
-        <if test="req.finishState == 1">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[and b.end_time >= #{req.localDate}]]>
-            <![CDATA[and b.begin_time <= #{req.localDate}]]>
-        </if>
+        <!--状态 1:未完成;2:已完成;3:已失效 4:终止-->
+        and b.finish_state = a.finish_state
+        and b.finish_state = #{req.finishState}
+
     </select>
 </mapper>