Merge remote-tracking branch 'origin/develop_dl_4.0' into develop_dl_4.0

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Equipment.java

@@ -147,6 +147,12 @@ public class Equipment extends BasicEntity  {
 	@Column(name="reserve_source")
 	private Integer reserveSource;
 
+	/**
+	 * 排空时长（分钟）
+	 */
+	@Column(name="drain_duration")
+	private Double drainDuration;
+
 	public Equipment() {
 	}
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java

@@ -91,14 +91,15 @@ public class ContingencyPlanController extends BaseController {
                                     @RequestParam(value = "editOrgName", required = false) String editOrgName,
                                     @RequestParam(value = "implementationTimeLeft", required = false) Long implementationTimeLeftStamp,
                                     @RequestParam(value = "implementationTimeRight", required = false) Long implementationTimeRightStamp,
-                                    @RequestParam(value = "size") int size) {
+                                    @RequestParam(value = "size") int size,
+                                    @RequestParam(value = "equipmentId", required = false) String equipmentId) {
         if (current < 1 || size < 1) {
             throw new YeeException("分页参数有误");
         }
         Date implementationTimeLeft = implementationTimeLeftStamp == null ? null : new Date(implementationTimeLeftStamp);
         Date implementationTimeRight = implementationTimeRightStamp == null ? null : new Date(implementationTimeRightStamp);
         Page page = new Page(current, size);
-        return CommonResponseUtil2.success(contingencyPlanService.pageFilter(page, planName, classifyId, planRange, editOrgName, implementationTimeLeft, implementationTimeRight));
+        return CommonResponseUtil2.success(contingencyPlanService.pageFilter(page, planName, classifyId, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, equipmentId));
     }
 
     /**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PlanDetailMapper.java

@@ -38,13 +38,13 @@ public interface PlanDetailMapper {
      * 筛选预案获得总数
      * @return
      */
-    Integer filterCount(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight);
+    Integer filterCount(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("equipmentId") String equipmentId);
 
     /**
      * 筛选预案获得分页记录
      * @return
      */
-    List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size);
+    List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size, @Param("equipmentId") String equipmentId);
 
     List<String> getRuleIdByEquipment(@Param("id")  Long id);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -644,7 +644,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Override
     public Page<PlanDetailVo> pageFilter(Page page, String planName, Long
             classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date
-                                                 implementationTimeRight) {
+                                                 implementationTimeRight, String equipmentId) {
         List<Long> classifyIdList = new ArrayList<>();
         if (classifyId != null) {
             Collection<PlanClassifyTreeVo> classifyTreeList = planClassifyTreeService.getAllChildIncludeMe(classifyId);
@@ -653,7 +653,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 allChildren.forEach(e -> classifyIdList.add(e.getId()));
             }
         }
-        int total = planDetailMapper.filterCount(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight);
+        int total = planDetailMapper.filterCount(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, equipmentId);
         page.setTotal(total);
         long start = (page.getCurrent() - 1) * page.getSize();
         if (total == 0) {
@@ -663,7 +663,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 page.setCurrent(1);
                 start = 0;
             }
-            List<PlanDetailVo> planList = planDetailMapper.filterList(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, (int) start, (int) page.getSize());
+            List<PlanDetailVo> planList = planDetailMapper.filterList(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, (int) start, (int) page.getSize(), equipmentId);
             // 查询并插入绑定数据的信息
             fillBindingInfo(planList);
             page.setRecords(planList);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java

@@ -96,7 +96,7 @@ public interface IContingencyPlanService {
      * @param implementationTimeRight 实施时间右界限
      * @return Page
      */
-    Page<PlanDetailVo> pageFilter(Page page, String planName, Long classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date implementationTimeRight);
+    Page<PlanDetailVo> pageFilter(Page page, String planName, Long classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date implementationTimeRight, String equipmentId);
 
     /**
      * 查询预案使用的文档ID

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanDetailMapper.xml

@@ -21,32 +21,36 @@
       count(1)
     FROM
       c_plan_detail cpd
+    left join c_plan_equipment as cpe on cpd.id = cpe.plan_id and cpe.is_delete = 0
     <where>
       <if test="planName != null and planName.length > 0">
-        AND plan_name LIKE concat('%', #{planName}, '%')
+        AND cpd.plan_name LIKE concat('%', #{planName}, '%')
       </if>
       <if test="classifyId != null and classifyId.size > 0">
-        AND classify_id IN
+        AND cpd.classify_id IN
         <foreach collection="classifyId" separator="," item="cid" open="(" close=")">
           #{cid}
         </foreach>
       </if>
       <if test="planRange != null and planRange.size > 0">
-        AND plan_range IN
+        AND cpd.plan_range IN
         <foreach collection="planRange" separator="," item="pr" open="(" close=")">
           #{pr}
         </foreach>
       </if>
       <if test="editOrgName != null and editOrgName.length > 0">
-        AND edit_org_name LIKE concat('%', #{editOrgName}, '%')
+        AND cpd.edit_org_name LIKE concat('%', #{editOrgName}, '%')
       </if>
       <if test="implementationTimeLeft != null">
-        AND implementation_time <![CDATA[ >= ]]> #{implementationTimeLeft}
+        AND cpd.implementation_time <![CDATA[ >= ]]> #{implementationTimeLeft}
       </if>
       <if test="implementationTimeRight != null">
-        AND implementation_time <![CDATA[ < ]]> #{implementationTimeRight}
+        AND cpd.implementation_time <![CDATA[ < ]]> #{implementationTimeRight}
+      </if>
+      <if test="equipmentId != null and equipmentId != ''">
+        AND cpe.fire_equipment_id = #{equipmentId}
       </if>
-      AND is_delete = 0
+      AND cpd.is_delete = 0
     </where>
   </select>
 
@@ -102,6 +106,9 @@
       <if test="implementationTimeRight != null">
         AND cpd.implementation_time <![CDATA[ < ]]> #{implementationTimeRight}
       </if>
+      <if test="equipmentId != null and equipmentId != ''">
+        AND cpe.fire_equipment_id = #{equipmentId}
+      </if>
       AND cpd.is_delete = 0
     </where>
     ORDER BY cpd.create_date DESC