bug修改

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

@@ -454,7 +454,7 @@ public class ConfigureController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-获取某站下装备数量、摄像头数量")
     @GetMapping("/statisticsByStation")
-    public ResponseModel getEquipmentState(@RequestParam(required = false) String bizOrgCode) {
+    public ResponseModel statisticsByStation(@RequestParam(required = false) String bizOrgCode) {
 
         if (ObjectUtils.isEmpty(bizOrgCode)) {
             ReginParams reginParams = getSelectedOrgInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -1179,7 +1179,7 @@ public class ExcelServiceImpl {
 
 		excelDtoList.forEach(item -> {
 			if (StringUtils.isEmpty(item.getCompanyName()) || StringUtils.isEmpty(item.getName()) ||
-					StringUtils.isEmpty(item.getTypeCode()) || StringUtils.isEmpty(item.getAddress())) {
+					StringUtils.isEmpty(item.getType()) || StringUtils.isEmpty(item.getAddress())) {
 				throw new BadRequest("请检查必填项是否为空");
 			}
 			FireTeam fireTeam = new FireTeam();

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

@@ -2225,6 +2225,9 @@
             <if test="bizOrgCode!=null and bizOrgCode!=''">
                 and es.biz_org_code like concat(#{bizOrgCode}, '%')
             </if>
+            <if test="systemCode!=null and systemCode!=''">
+                and FIND_IN_SET( #{systemCode,jdbcType=VARCHAR}, log.system_codes )
+            </if>
         </where>
             ) AS unConfirmInfoNum
     </select>
@@ -2507,37 +2510,69 @@
     </select>
 
     <select id="equipmentState" resultType="java.util.Map">
+<!--        SELECT-->
+<!--            b.equipName,-->
+<!--            (CASE WHEN-->
+<!--                      b.totalNum > 0 THEN-->
+<!--                      '异常' ELSE '正常' END) `status`,-->
+<!--            b.totalNum AS totalNum,-->
+<!--            b.`code` AS equipDetailCode-->
+<!--        FROM-->
+<!--            (-->
+<!--                SELECT-->
+<!--                    a.equipName,-->
+<!--                    count( wesl.id ) AS totalNum,-->
+<!--                    a.`code`-->
+<!--                FROM-->
+<!--                    (-->
+<!--                        SELECT-->
+<!--                            wes.`name` AS equipName,-->
+<!--                            wed.equipment_id AS equipmentId,-->
+<!--                            wed.`code` AS code-->
+<!--                        FROM-->
+<!--                            wl_equipment_specific wes-->
+<!--                                LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id-->
+<!--                        WHERE-->
+<!--                            FIND_IN_SET( #{id}, wes.system_id ) > 0-->
+<!--                        GROUP BY-->
+<!--                            wed.equipment_id-->
+<!--                    ) a-->
+<!--                        LEFT JOIN wl_equipment_specific_alarm_log wesl ON wesl.equipment_id = a.equipmentId-->
+<!--                GROUP BY-->
+<!--                    a.equipmentId-->
+<!--            ) b-->
+
         SELECT
         b.equipName,
-            (CASE WHEN
-                      b.totalNum > 0 THEN
-                      '异常' ELSE '正常' END) `status`,
+        ( CASE WHEN b.totalNum > 0 THEN '异常' ELSE '正常' END ) `status`,
         b.totalNum AS totalNum,
         b.`code` AS equipDetailCode
         FROM
         (
         SELECT
         a.equipName,
-                    count( wesl.id ) AS totalNum,
+        count( DISTINCT wesa.equipment_specific_id ) AS totalNum,
         a.`code`
         FROM
         (
         SELECT
-                            wes.`name` AS equipName,
+        wed.`name` AS equipName,
         wed.equipment_id AS equipmentId,
-                            wed.`code` AS code
+        wed.`code` AS `code`
         FROM
-                            wl_equipment_specific wes
-                                LEFT JOIN wl_equipment_detail wed ON wed.id = wes.equipment_detail_id
+        wl_equipment_detail wed
+        LEFT JOIN wl_equipment_specific wes ON wed.id = wes.equipment_detail_id
         WHERE
         FIND_IN_SET( #{id}, wes.system_id ) > 0
         GROUP BY
         wed.equipment_id
         ) a
-                        LEFT JOIN wl_equipment_specific_alarm_log wesl ON wesl.equipment_id = a.equipmentId
+        LEFT JOIN wl_equipment_specific_alarm wesa ON wesa.equipment_id = a.equipmentId
+        AND wesa.`status` = 1
         GROUP BY
         a.equipmentId
         ) b
+
     </select>
 
     <select id="getPressurePumpInfo" resultType="java.util.Map">