告警分类统计、漏检统计错误处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/AlarmStatisticController.java

@@ -59,6 +59,7 @@ public class AlarmStatisticController extends AbstractBaseController {
                                    @RequestParam(required = false) Integer handleStatus,
                                    @RequestParam(required = false) String bizOrgCode,
                                    @RequestParam(required = false) String systemCode,
+                                   @RequestParam(required = false) String systemType,
                                    @RequestParam(required = false) String createDate,
                                    @RequestParam(required = false) String startDate,
                                    @RequestParam(required = false) String endDate
@@ -74,7 +75,7 @@ public class AlarmStatisticController extends AbstractBaseController {
                 }
             }
         }
-        return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels,
+        return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, systemType, types, emergencyLevels,
                 name, cleanStatus, handleStatus, createDate, startDate, endDate, "", ""));
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java

@@ -707,6 +707,7 @@ public class EmergencyController extends AbstractBaseController {
 								   @RequestParam(required = false) Integer handleStatus,
 								   @RequestParam(required = false) String bizOrgCode,
 								   @RequestParam(required = false) String systemCode,
+								   @RequestParam(required = false) String systemType,
 								   @RequestParam(required = false) String createDate,
 								   @RequestParam(required = false) String startDate,
 								   @RequestParam(required = false) String endDate,
@@ -728,7 +729,7 @@ public class EmergencyController extends AbstractBaseController {
 			sortField = sorter.split("@")[0].equalsIgnoreCase("cleanStatus") ? "clean_time" : sorter.split("@")[0];
 			sortOrder = sorter.split("@")[1];
 		}
-		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus, handleStatus, createDate, startDate, endDate, sortField, sortOrder));
+		return CommonResponseUtil.success(iEmergencyService.alarmList(page, bizOrgCode, systemCode, systemType, types, emergencyLevels, name, cleanStatus, handleStatus, createDate, startDate, endDate, sortField, sortOrder));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java

@@ -108,7 +108,7 @@ public interface EmergencyMapper extends BaseMapper{
      * @return
      */
     Page<Map<String, Object>> alarmList(@Param("page") Page<Map<String, Object>> page, @Param("bizOrgCode") String bizOrgCode,
-                                        @Param("systemCode") String systemCode, @Param("types") List<String> types,
+                                        @Param("systemCode") String systemCode, @Param("systemType") String systemType, @Param("types") List<String> types,
                                         @Param("emergencyLevels") List<String> emergencyLevels, @Param("name") String name,
                                         @Param("cleanStatus") Integer cleanStatus, @Param("handleStatus") Integer handleStatus,
                                         @Param("createDate") String createDate , @Param("startDate") String startDate ,

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java

@@ -69,7 +69,7 @@ public interface IEmergencyService {
 
     List<Map<String, Object>> getPressurePumpDiagnosticAnalysis(String bizOrgCode);
 
-    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, String systemCode, List<String> types,
+    Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page,String bizOrgCode, String systemCode, String systemType, List<String> types,
                                         List<String> emergencyLevels, String name, Integer cleanStatus, Integer handleStatus,
                                         String createDate,String startDate,String endDate,String sortField,String sortOrder);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -643,11 +643,11 @@ public class EmergencyServiceImpl implements IEmergencyService {
 
 
     @Override
-    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page, String bizOrgCode, String systemCode,
+    public Page<Map<String, Object>> alarmList(Page<Map<String, Object>> page, String bizOrgCode, String systemCode, String systemType,
                                                List<String> types, List<String> emergencyLevels, String name, Integer cleanStatus,
                                                Integer handleStatus,String createDate,String startDate,String endDate,
                                                String sortField,String sortOrder) {
-        return emergencyMapper.alarmList(page, bizOrgCode, systemCode, types, emergencyLevels, name, cleanStatus,
+        return emergencyMapper.alarmList(page, bizOrgCode, systemCode, systemType, types, emergencyLevels, name, cleanStatus,
                 handleStatus, createDate, startDate, endDate, sortField, sortOrder);
     }
 

amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml

@@ -1466,6 +1466,9 @@
             <if test="systemCode != null and systemCode != ''">
                 and fs.code = #{systemCode}
             </if>
+            <if test="systemType != null and systemType != ''">
+                and fs.system_type = #{systemType}
+            </if>
             <if test="name != null and name != ''">
                 and wlesal.equipment_specific_name like concat('%', #{name},'%')
             </if>

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -7371,7 +7371,7 @@
                 AND wlesal.create_date <= #{endDate}
             </if>
         </where>
-        GROUP BY fs.system_type_code
+        GROUP BY fs.system_type
     </select>
 
     <select id="getSystemTypes" resultType="Map">

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1521,7 +1521,7 @@
 					AND org_code LIKE CONCAT(#{bizOrgCode}, '%')
 				</if>
 		  	)
-		  	AND ptd.is_finish != 1
+		  	AND ptd.is_finish = 2
 		</where>
 
 		UNION ALL
@@ -1586,7 +1586,7 @@
 					AND org_code LIKE CONCAT(#{bizOrgCode}, '%')
 				</if>
 		  	)
-		  	AND ptd.is_finish != 1
+		  	AND ptd.is_finish = 2
 		</where>
 	</select>
 
@@ -1793,7 +1793,7 @@
 				DATE_FORMAT( t.begin_time, '%Y-%m-%d %H:%i' ) AS beginTime,
 				DATE_FORMAT( t.end_time, '%Y-%m-%d %H:%i' ) AS endTime,
 				IFNULL( SUM( t.point_num ), 0 ) AS allCount,
-				( SELECT COUNT(1) FROM p_plan_task_detail d WHERE d.is_finish != 1 AND d.task_no = t.id ) AS missPointCount,
+				( SELECT COUNT(1) FROM p_plan_task_detail d WHERE d.is_finish = 2 AND d.task_no = t.id ) AS missPointCount,
 				( SELECT COUNT(1) FROM p_plan_task_detail d WHERE d.is_finish = 1 AND d.task_no = t.id )  AS finishPointCount,
 				( SELECT DATE_FORMAT(MIN( c.check_time ), '%Y-%m-%d %H:%i:%s' ) FROM p_plan_task_detail d LEFT JOIN p_check c on d.id = c.plan_task_detail_id WHERE d.is_finish = 1 AND d.task_no = t.id ) AS realStartTime,
 				( SELECT DATE_FORMAT(MAX( c.check_time ), '%Y-%m-%d %H:%i:%s' ) FROM p_plan_task_detail d LEFT JOIN p_check c on d.id = c.plan_task_detail_id WHERE d.is_finish = 1 AND d.task_no = t.id ) AS realEndTime
@@ -1851,7 +1851,7 @@
 	<select id="selectPatrolActivityStats" resultType="Map">
 		SELECT
 			LEFT(t.org_code, 18) AS bizOrgCode,
-			( SELECT IF(COUNT(1)> 0, '有漏检', '无漏检') FROM p_plan_task_detail d WHERE d.is_finish != 1 AND FIND_IN_SET(d.task_no,GROUP_CONCAT(t.id)) > 0 ) AS missStatus
+			( SELECT IF(COUNT(1)> 0, '有漏检', '无漏检') FROM p_plan_task_detail d WHERE d.is_finish = 2 AND FIND_IN_SET(d.task_no,GROUP_CONCAT(t.id)) > 0 ) AS missStatus
 		FROM
 			p_plan_task t
 			<where>