Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

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

@@ -155,4 +155,17 @@ public class EmergencyController extends AbstractBaseController {
 		return iEmergencyService.selectAlarmAnalysis(bizOrgCode, startDate, endDate);
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation("火灾自动报警系统告警分析-饼图")
+	@GetMapping(value = "/selectAlarmAnalysisCount")
+	public List<Map<String, Object>> selectAlarmAnalysisCount(@RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+															  @RequestParam(value = "startDate") String startDate,
+															  @RequestParam(value = "endDate") String endDate) {
+		if (ObjectUtils.isEmpty(bizOrgCode)) {
+			ReginParams reginParams = getSelectedOrgInfo();
+			bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+		}
+		return iEmergencyService.selectAlarmAnalysisCount(bizOrgCode, startDate, endDate);
+	}
+
 }

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

@@ -63,4 +63,6 @@ public interface EmergencyMapper extends BaseMapper{
 
     List<Map<String, Object>> selectAlarmAnalysis(@Param("bizOrgCode") String bizOrgCode, @Param("startDate")String startDate, @Param("endDate")String endDate);
 
+    List<Map<String, Object>> selectAlarmAnalysisCount(@Param("bizOrgCode") String bizOrgCode, @Param("startDate")String startDate, @Param("endDate")String endDate);
+
 }

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

@@ -35,4 +35,6 @@ public interface IEmergencyService {
     Page<Map<String, Object>> selectPressureFlow(Page<Map<String, Object>> page, String bizOrgCode);
 
     List<Map<String, Object>> selectAlarmAnalysis(String bizOrgCode, String startDate, String endDate);
+
+    List<Map<String, Object>> selectAlarmAnalysisCount(String bizOrgCode, String startDate, String endDate);
 }

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

@@ -92,4 +92,9 @@ public class EmergencyServiceImpl implements IEmergencyService {
     public List<Map<String, Object>> selectAlarmAnalysis(String bizOrgCode, String startDate, String endDate) {
         return emergencyMapper.selectAlarmAnalysis(bizOrgCode, startDate, endDate);
     }
+
+    @Override
+    public List<Map<String, Object>> selectAlarmAnalysisCount(String bizOrgCode, String startDate, String endDate) {
+        return emergencyMapper.selectAlarmAnalysisCount(bizOrgCode, startDate, endDate);
+    }
 }

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

@@ -465,5 +465,57 @@
         ORDER BY
             temp.date
     </select>
+    <select id="selectAlarmAnalysisCount" resultType="java.util.Map">
+        SELECT
+            (
+                SELECT
+                    COUNT(
+                            DISTINCT (
+                        wespa.equipment_specific_id
+                        )
+                        )
+                FROM
+                    wl_equipment_specific_alarm_log wespa
+                WHERE
+                    wespa.equipment_specific_index_key LIKE concat('%', 'Fault')
+                  AND wespa.equipment_specific_index_value = 'true'
+                  AND wespa.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+                  AND wespa.create_date BETWEEN #{startDate}
+                    AND #{endDate}
+            ) AS faultNum,
+            (
+                SELECT
+                    COUNT(
+                            DISTINCT (
+                        wespa.equipment_specific_id
+                        )
+                        )
+                FROM
+                    wl_equipment_specific_alarm_log wespa
+                WHERE
+                    wespa.equipment_specific_index_key LIKE concat('%', 'FireAlarm')
+                  AND wespa.equipment_specific_index_value = 'true'
+                  AND wespa.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+                  AND wespa.create_date BETWEEN #{startDate}
+                    AND #{endDate}
+            ) AS fireAlarmNum,
+            (
+                SELECT
+                    COUNT(
+                            DISTINCT (
+                        wespa.equipment_specific_id
+                        )
+                        )
+                FROM
+                    wl_equipment_specific_alarm_log wespa
+                WHERE
+                    wespa.equipment_specific_index_key LIKE concat('%', 'Shield')
+                  AND wespa.equipment_specific_index_value = 'true'
+                  AND wespa.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+                  AND wespa.create_date BETWEEN #{startDate}
+                    AND #{endDate}
+            ) AS shieldNum
+
+    </select>
 
 </mapper>