Merge branch 'develop_station' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/datasync/entity/FireEquipment.java

@@ -179,7 +179,7 @@ public class FireEquipment implements Serializable {
 
     @ApiModelProperty(value = "资产生命周期日期")
     @TableField("lifecycledate")
-    private String lifecycledate = "";
+    private Date lifecycledate;
 
     @ApiModelProperty(value = "资产生命周期状态")
     @TableField("lifecyclestate")

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

@@ -105,6 +105,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         CommonPageInfoParam param = new CommonPageInfoParam();
         if (AlarmTypeEnum.GZGJ.getCode().equals(alarmType)) {
             param.setIsFireAlarm("false");
+        } else if (AlarmTypeEnum.HZGJ.getCode().equals(alarmType)) {
+            param.setAlarmType(alarmType);
         }
         List<HashMap<String, Object>> list = this.baseMapper.getAlarmList(param);
         List<EquipmentAlarmDownloadVO> equipmentDownloads = handleExportData(ids, list);

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

@@ -416,6 +416,17 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         this.update(new LambdaUpdateWrapper<EquipmentSpecific>().set(EquipmentSpecific::getAgencyId, equipmentSpecific.getAgencyId()).set(EquipmentSpecific::getTeamId, equipmentSpecific.getTeamId()).eq(EquipmentSpecific::getId, equipmentSpecific.getId()));
         if (equipmentSpecific.getStockDetail() != null && equipmentSpecific.getStockDetail().getWarehouseStructureId() != null) {
             equipmentSpecific.setWarehouseStructureId(equipmentSpecific.getStockDetail().getWarehouseStructureId());
+
+            // 更新alarm表没有复位的装备位置信息
+            LambdaQueryWrapper<EquipmentSpecificAlarm> queryWrapper = new LambdaQueryWrapper();
+            queryWrapper.eq(EquipmentSpecificAlarm::getEquipmentSpecificId, equipmentSpecific.getId());
+            queryWrapper.ne(EquipmentSpecificAlarm::getStatus, AlarmStatusEnum.HF.getCode());
+            List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
+            if (0 < alarms.size()) {
+                alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
+                        +  null == equipmentSpecific.getStockDetail().getDescription() ? "" : equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
+                equipmentSpecificAlarmService.updateBatchById(alarms);
+            }
         }
         boolean updateById = this.updateById(equipmentSpecific);
         if (updateById) {
@@ -474,17 +485,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                 equipmentSpecific.getStockDetail().setDescription(detail.getArea());
                 stockDetailService.save(equipmentSpecific.getStockDetail());
 
-                // 更新alarm表没有复位的装备位置信息
-                LambdaQueryWrapper<EquipmentSpecificAlarm> queryWrapper = new LambdaQueryWrapper();
-                queryWrapper.eq(EquipmentSpecificAlarm::getEquipmentSpecificId, equipmentSpecific.getId());
-                queryWrapper.ne(EquipmentSpecificAlarm::getStatus, AlarmStatusEnum.HF.getCode());
-                List<EquipmentSpecificAlarm> alarms = equipmentSpecificAlarmService.getBaseMapper().selectList(queryWrapper);
-                if (0 < alarms.size()) {
-                    alarms.stream().map(x -> x.setLocation(equipmentSpecific.getPosition() + " "
-                            + equipmentSpecific.getStockDetail().getDescription())).collect(Collectors.toList());
-                    equipmentSpecificAlarmService.updateBatchById(alarms);
-                }
-
                 //生成入库单
                 StockBill stockBill = buildStockBills(equipmentSpecific, reginParams, agencyUserModel);
                 stockBillService.save(stockBill);

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

@@ -282,7 +282,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
   }
 
   
-    static void upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
+    public static List<EquipmentSpecificAlarmLog> upAlarmLogStatus(String iotCode, String equipmentSpecificIndexKey, IEquipmentSpecificAlarmLogService equipmentSpecificAlarmLogService) {
         LambdaQueryWrapper<EquipmentSpecificAlarmLog> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(EquipmentSpecificAlarmLog::getIotCode, iotCode);
         queryWrapper.eq(EquipmentSpecificAlarmLog::getEquipmentSpecificIndexKey, equipmentSpecificIndexKey);
@@ -295,6 +295,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         if (!logs.isEmpty()) {
             equipmentSpecificAlarmLogService.updateBatchById(logs);
         }
+        return logs;
     }
 
     public void publishDataToCanvas(List<EquipmentSpecificIndex> indexList) {
@@ -321,10 +322,19 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             }
             Map<String, Object> map = JSON.parseObject(JSON.toJSONString(equipmentStateVo));
             map.put(canvasTopic, topicObject);
+
+            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+                @Override
+                public void afterCompletion(int status) {
+                    if (TransactionSynchronization.STATUS_COMMITTED == status) {
                         // 发送数据至画布
                         mqttSendGateway.sendToMqtt(canvasTopic, JSON.toJSONString(map));
                     }
                 }
+            });
+
+        }
+    }
 
     void syncSystemctlMsg(EquipmentSpecificAlarmLog equipmentSpecificAlarmLog) {
         try {
@@ -679,8 +689,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
   			  }
   		 }
 	  });
-	  //向画布推送
-	  publishDataToCanvas(equipmentSpecificIndexList);
 
 	  // 首页性能指标数据订阅
       mqttSendGateway.sendToMqtt(indexTopic, JSON.toJSONString(indexStateList));
@@ -697,6 +705,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
       //则更新拓扑节点数据及告警状态
       updateNodeDateByEquipId(equipmentSpecificIndexList);
 
+      //向画布推送
+      publishDataToCanvas(equipmentSpecificIndexList);
   }
   
   
@@ -714,23 +724,20 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
               }
               mqttSendGateway.sendToMqtt(TopicEnum.EQDQR.getTopic(), JSONArray.toJSON(action).toString());
           } else {
-              upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService);
+        	  equipmentAlarmLogs.addAll(upAlarmLogStatus(action.getIotCode(), action.getEquipmentSpecificIndexKey(), equipmentSpecificAlarmLogService));
               mqttSendGateway.sendToMqtt(TopicEnum.EQYQR.getTopic(), JSONArray.toJSON(action).toString());
               bool = Boolean.TRUE;
           }
 		  
 	  });
 	 
-	  if(ObjectUtils.isEmpty(equipmentAlarmLogs)){
-		  return;
-	  }
 	  TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
           @Override
           public void afterCommit() {
         	  JSONObject jsonObject = new JSONObject();
               jsonObject.put("seqNo", UUID.randomUUID().toString().replace("-", "").toLowerCase());
               mqttSendGateway.sendToMqtt(TopicEnum.ALARM_LOG_INSERT.getTopic(), jsonObject.toString());
-        	  
+              mqttSendGateway.sendToMqtt(TopicEnum.EQZXDT.getTopic(), "");
         	  //   数字换流站数据处理（高斯库同步及南瑞告警推送）
         	  if (syncSwitch) {
                   List<FireEquipmentFireAlarm> alarmList = createFireEquipmentFireAlarmVo(equipmentAlarmLogs);
@@ -761,9 +768,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                   }
                   
                   // 向南瑞平台推送报警消息
+                  if(!bool){
                       syncDataService.syncCreatedSendAlarm(equipmentAlarmLogs);
                   }
               }
+          }
       });
 	 
   }
@@ -913,7 +922,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
       TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
           @Override
           public void afterCommit() {
-        	  mqttSendGateway.sendToMqtt(TopicEnum.EQZXDT.getTopic(), "");
         	  mqttSendGateway.sendToMqtt(TopicEnum.EQXXTJ.getTopic(), "");
               iEquipmentSpecificSerivce.integrationPageSysDataRefresh(topicEntity.getCode());
               iEquipmentSpecificSerivce.updateEquipmentSpecIndexRealtimeData(equipmentSpecificIndexList);
@@ -960,7 +968,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
               }
           }
       } catch (Exception e) {
-
+            e.printStackTrace();
       }
   	return "";
   }

amos-boot-system-equip/src/main/resources/changelog/init/view_all.sql

@@ -5100,99 +5100,251 @@ FROM
 DROP VIEW IF EXISTS `v_fire_equip_ffs_num`;
 CREATE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `v_fire_equip_ffs_num` AS
 SELECT
-	d.jygdgwdl,
-	d.jygdgwdlpb,
-	d.jygdgwdlgz,
-	d.jygdgwdlhj,
-	ABS (d.jygdgwdl - d.jygdgwdlyc) AS jygdgwdlzc,
-	d.jygddcf,
-	d.jygddcfqd,
-	d.jygddcfgz,
-	d.jygddcfpb,
-	ABS (d.jygddcf - d.jygddcfqd) AS jygddcfzc,
-	d.jygdqdp,
-	d.jygdqdpqd,
-	d.jygdqdpgz,
-	d.jygdqdppb,
-	ABS (d.jygdqdp - d.jygdqdpqd) AS jygdqdpzc,
-	d.jygddlq,
-	d.jygddlqdl,
-	d.jygddlqgz,
-	d.jygddlqpb,
-	ABS (d.jygddlq - d.jygddlqdl) AS jygddlqzc,
-	d.jyddgwdl,
-	d.jyddgwdlpb,
-	d.jyddgwdlgz,
-	d.jyddgwdlhj,
-	ABS (d.jyddgwdl - d.jyddgwdlyc) AS jyddgwdlzc,
-	d.jydddcf,
-	d.jydddcfqd,
-	d.jydddcfgz,
-	d.jydddcfpb,
-	ABS (d.jydddcf - d.jydddcfqd) AS jydddcfzc,
-	d.jyddqdp,
-	d.jyddqdpqd,
-	d.jyddqdpgz,
-	d.jyddqdppb,
-	ABS (d.jyddqdp - d.jyddqdpqd) AS jyddqdpzc,
-	d.jydddlq,
-	d.jydddlqdl,
-	d.jydddlqgz,
-	d.jydddlqpb,
-	ABS (d.jydddlq - d.jydddlqdl) AS jydddlqzc,
-	d.jegdgwdl,
-	d.jegdgwdlpb,
-	d.jegdgwdlgz,
-	d.jegdgwdlhj,
-	ABS (d.jegdgwdl - d.jegdgwdlyc) AS jegdgwdlzc,
-	d.jegddcf,
-	d.jegddcfqd,
-	d.jegddcfgz,
-	d.jegddcfpb,
-	ABS (d.jegddcf - d.jegddcfqd) AS jegddcfzc,
-	d.jegdqdp,
-	d.jegdqdpqd,
-	d.jegdqdpgz,
-	d.jegdqdppb,
-	ABS (d.jegdqdp - d.jegdqdpqd) AS jegdqdpzc,
-	d.jegddlq,
-	d.jegddlqdl,
-	d.jegddlqgz,
-	d.jegddlqpb,
-	ABS (d.jegddlq - d.jegddlqdl) AS jegddlqzc,
-	d.jeddgwdl,
-	d.jeddgwdlpb,
-	d.jeddgwdlgz,
-	d.jeddgwdlhj,
-	ABS (d.jeddgwdl - d.jeddgwdlyc) AS jeddgwdlzc,
-	d.jedddcf,
-	d.jedddcfqd,
-	d.jedddcfgz,
-	d.jedddcfpb,
-	ABS (d.jedddcf - d.jedddcfqd) AS jedddcfzc,
-	d.jeddqdp,
-	d.jeddqdpqd,
-	d.jeddqdpgz,
-	d.jeddqdppb,
-	ABS (d.jeddqdp - d.jeddqdpqd) AS jeddqdpzc,
-	d.jedddlq,
-	d.jedddlqdl,
-	d.jedddlqgz,
-	d.jedddlqpb,
-	ABS (d.jedddlq - d.jedddlqdl) AS jedddlqzc,
-	(d.jygddcf + d.jydddcf + d.jegddcf + d.jedddcf) AS dcfzs,
-	(d.jygddcfqd + d.jydddcfqd + d.jegddcfqd + d.jedddcfqd) AS dcfqd,
-	(d.jygddcfgz + d.jydddcfgz + d.jegddcfgz + d.jedddcfgz) AS dcfgz,
-	(d.jygddcfpb + d.jydddcfpb + d.jegddcfpb + d.jedddcfpb) AS dcfpb,
-	(d.jygdqdp + d.jyddqdp + d.jegdqdp + d.jeddqdp) AS qdpzs,
-	(d.jygdqdpqd + d.jyddqdpqd + d.jegdqdpqd + d.jeddqdpqd) AS qdpqd,
-	(d.jygdqdpgz + d.jyddqdpgz + d.jegdqdpgz + d.jeddqdpgz) AS qdpgz,
-	(d.jygdqdppb + d.jyddqdppb + d.jegdqdppb + d.jeddqdppb) AS qdppb,
-	(d.jygddlq + d.jydddlq + d.jegddlq + d.jedddlq) AS dlqzs,
-	(d.jygddlqdl + d.jydddlqdl + d.jegddlqdl + d.jedddlqdl) AS dlqqd,
-	(d.jygddlqgz + d.jydddlqgz + d.jegddlqgz + d.jedddlqgz) AS dlqgz,
-	(d.jygddlqpb + d.jydddlqpb + d.jegddlqpb + d.jedddlqpb) AS dlqpb,
-	ABS	(d.jygddlq - d.jygddlqdl + d.jydddlq - d.jydddlqdl + d.jegddlq - d.jegddlqdl + d.jedddlq - d.jedddlqdl) AS dlqjt
+	`d`.`jygdgwdl` AS `jygdgwdl`,
+	`d`.`jygdgwdlpb` AS `jygdgwdlpb`,
+	`d`.`jygdgwdlgz` AS `jygdgwdlgz`,
+	`d`.`jygdgwdlhj` AS `jygdgwdlhj`,
+	abs(
+		(
+			`d`.`jygdgwdl` - `d`.`jygdgwdlyc`
+		)
+	) AS `jygdgwdlzc`,
+	`d`.`jygddcf` AS `jygddcf`,
+	`d`.`jygddcfqd` AS `jygddcfqd`,
+	`d`.`jygddcfgz` AS `jygddcfgz`,
+	`d`.`jygddcfpb` AS `jygddcfpb`,
+	abs(
+		(
+			`d`.`jygddcf` - `d`.`jygddcfqd`
+		)
+	) AS `jygddcfzc`,
+	`d`.`jygdqdp` AS `jygdqdp`,
+	`d`.`jygdqdpqd` AS `jygdqdpqd`,
+	`d`.`jygdqdpgz` AS `jygdqdpgz`,
+	`d`.`jygdqdppb` AS `jygdqdppb`,
+	abs(
+		(
+			`d`.`jygdqdp` - `d`.`jygdqdpqd`
+		)
+	) AS `jygdqdpzc`,
+	`d`.`jygddlq` AS `jygddlq`,
+	`d`.`jygddlqdl` AS `jygddlqdl`,
+	`d`.`jygddlqgz` AS `jygddlqgz`,
+	`d`.`jygddlqpb` AS `jygddlqpb`,
+	abs(
+		(
+			`d`.`jygddlq` - `d`.`jygddlqdl`
+		)
+	) AS `jygddlqzc`,
+	`d`.`jyddgwdl` AS `jyddgwdl`,
+	`d`.`jyddgwdlpb` AS `jyddgwdlpb`,
+	`d`.`jyddgwdlgz` AS `jyddgwdlgz`,
+	`d`.`jyddgwdlhj` AS `jyddgwdlhj`,
+	abs(
+		(
+			`d`.`jyddgwdl` - `d`.`jyddgwdlyc`
+		)
+	) AS `jyddgwdlzc`,
+	`d`.`jydddcf` AS `jydddcf`,
+	`d`.`jydddcfqd` AS `jydddcfqd`,
+	`d`.`jydddcfgz` AS `jydddcfgz`,
+	`d`.`jydddcfpb` AS `jydddcfpb`,
+	abs(
+		(
+			`d`.`jydddcf` - `d`.`jydddcfqd`
+		)
+	) AS `jydddcfzc`,
+	`d`.`jyddqdp` AS `jyddqdp`,
+	`d`.`jyddqdpqd` AS `jyddqdpqd`,
+	`d`.`jyddqdpgz` AS `jyddqdpgz`,
+	`d`.`jyddqdppb` AS `jyddqdppb`,
+	abs(
+		(
+			`d`.`jyddqdp` - `d`.`jyddqdpqd`
+		)
+	) AS `jyddqdpzc`,
+	`d`.`jydddlq` AS `jydddlq`,
+	`d`.`jydddlqdl` AS `jydddlqdl`,
+	`d`.`jydddlqgz` AS `jydddlqgz`,
+	`d`.`jydddlqpb` AS `jydddlqpb`,
+	abs(
+		(
+			`d`.`jydddlq` - `d`.`jydddlqdl`
+		)
+	) AS `jydddlqzc`,
+	`d`.`jegdgwdl` AS `jegdgwdl`,
+	`d`.`jegdgwdlpb` AS `jegdgwdlpb`,
+	`d`.`jegdgwdlgz` AS `jegdgwdlgz`,
+	`d`.`jegdgwdlhj` AS `jegdgwdlhj`,
+	abs(
+		(
+			`d`.`jegdgwdl` - `d`.`jegdgwdlyc`
+		)
+	) AS `jegdgwdlzc`,
+	`d`.`jegddcf` AS `jegddcf`,
+	`d`.`jegddcfqd` AS `jegddcfqd`,
+	`d`.`jegddcfgz` AS `jegddcfgz`,
+	`d`.`jegddcfpb` AS `jegddcfpb`,
+	abs(
+		(
+			`d`.`jegddcf` - `d`.`jegddcfqd`
+		)
+	) AS `jegddcfzc`,
+	`d`.`jegdqdp` AS `jegdqdp`,
+	`d`.`jegdqdpqd` AS `jegdqdpqd`,
+	`d`.`jegdqdpgz` AS `jegdqdpgz`,
+	`d`.`jegdqdppb` AS `jegdqdppb`,
+	abs(
+		(
+			`d`.`jegdqdp` - `d`.`jegdqdpqd`
+		)
+	) AS `jegdqdpzc`,
+	`d`.`jegddlq` AS `jegddlq`,
+	`d`.`jegddlqdl` AS `jegddlqdl`,
+	`d`.`jegddlqgz` AS `jegddlqgz`,
+	`d`.`jegddlqpb` AS `jegddlqpb`,
+	abs(
+		(
+			`d`.`jegddlq` - `d`.`jegddlqdl`
+		)
+	) AS `jegddlqzc`,
+	`d`.`jeddgwdl` AS `jeddgwdl`,
+	`d`.`jeddgwdlpb` AS `jeddgwdlpb`,
+	`d`.`jeddgwdlgz` AS `jeddgwdlgz`,
+	`d`.`jeddgwdlhj` AS `jeddgwdlhj`,
+	abs(
+		(
+			`d`.`jeddgwdl` - `d`.`jeddgwdlyc`
+		)
+	) AS `jeddgwdlzc`,
+	`d`.`jedddcf` AS `jedddcf`,
+	`d`.`jedddcfqd` AS `jedddcfqd`,
+	`d`.`jedddcfgz` AS `jedddcfgz`,
+	`d`.`jedddcfpb` AS `jedddcfpb`,
+	abs(
+		(
+			`d`.`jedddcf` - `d`.`jedddcfqd`
+		)
+	) AS `jedddcfzc`,
+	`d`.`jeddqdp` AS `jeddqdp`,
+	`d`.`jeddqdpqd` AS `jeddqdpqd`,
+	`d`.`jeddqdpgz` AS `jeddqdpgz`,
+	`d`.`jeddqdppb` AS `jeddqdppb`,
+	abs(
+		(
+			`d`.`jeddqdp` - `d`.`jeddqdpqd`
+		)
+	) AS `jeddqdpzc`,
+	`d`.`jedddlq` AS `jedddlq`,
+	`d`.`jedddlqdl` AS `jedddlqdl`,
+	`d`.`jedddlqgz` AS `jedddlqgz`,
+	`d`.`jedddlqpb` AS `jedddlqpb`,
+	abs(
+		(
+			`d`.`jedddlq` - `d`.`jedddlqdl`
+		)
+	) AS `jedddlqzc`,
+	(
+		(
+			(
+				`d`.`jygddcf` + `d`.`jydddcf`
+			) + `d`.`jegddcf`
+		) + `d`.`jedddcf`
+	) AS `dcfzs`,
+	(
+		(
+			(
+				`d`.`jygddcfqd` + `d`.`jydddcfqd`
+			) + `d`.`jegddcfqd`
+		) + `d`.`jedddcfqd`
+	) AS `dcfqd`,
+	(
+		(
+			(
+				`d`.`jygddcfgz` + `d`.`jydddcfgz`
+			) + `d`.`jegddcfgz`
+		) + `d`.`jedddcfgz`
+	) AS `dcfgz`,
+	(
+		(
+			(
+				`d`.`jygddcfpb` + `d`.`jydddcfpb`
+			) + `d`.`jegddcfpb`
+		) + `d`.`jedddcfpb`
+	) AS `dcfpb`,
+	(
+		(
+			(
+				`d`.`jygdqdp` + `d`.`jyddqdp`
+			) + `d`.`jegdqdp`
+		) + `d`.`jeddqdp`
+	) AS `qdpzs`,
+	(
+		(
+			(
+				`d`.`jygdqdpqd` + `d`.`jyddqdpqd`
+			) + `d`.`jegdqdpqd`
+		) + `d`.`jeddqdpqd`
+	) AS `qdpqd`,
+	(
+		(
+			(
+				`d`.`jygdqdpgz` + `d`.`jyddqdpgz`
+			) + `d`.`jegdqdpgz`
+		) + `d`.`jeddqdpgz`
+	) AS `qdpgz`,
+	(
+		(
+			(
+				`d`.`jygdqdppb` + `d`.`jyddqdppb`
+			) + `d`.`jegdqdppb`
+		) + `d`.`jeddqdppb`
+	) AS `qdppb`,
+	(
+		(
+			(
+				`d`.`jygddlq` + `d`.`jydddlq`
+			) + `d`.`jegddlq`
+		) + `d`.`jedddlq`
+	) AS `dlqzs`,
+	(
+		(
+			(
+				`d`.`jygddlqdl` + `d`.`jydddlqdl`
+			) + `d`.`jegddlqdl`
+		) + `d`.`jedddlqdl`
+	) AS `dlqqd`,
+	(
+		(
+			(
+				`d`.`jygddlqgz` + `d`.`jydddlqgz`
+			) + `d`.`jegddlqgz`
+		) + `d`.`jedddlqgz`
+	) AS `dlqgz`,
+	(
+		(
+			(
+				`d`.`jygddlqpb` + `d`.`jydddlqpb`
+			) + `d`.`jegddlqpb`
+		) + `d`.`jedddlqpb`
+	) AS `dlqpb`,
+	abs(
+		(
+			(
+				(
+					(
+						(
+							(
+								(
+									`d`.`jygddlq` - `d`.`jygddlqdl`
+								) + `d`.`jydddlq`
+							) - `d`.`jydddlqdl`
+						) + `d`.`jegddlq`
+					) - `d`.`jegddlqdl`
+				) + `d`.`jedddlq`
+			) - `d`.`jedddlqdl`
+		)
+	) AS `dlqjt`
 FROM
 	(
 		SELECT
@@ -5200,735 +5352,1495 @@ FROM
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅰ高端%'
-				AND es.equipment_code =  '92110100QY544'
-			) AS jygdgwdl,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110100QY544'
+						)
+					)
+			) AS `jygdgwdl`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_Shield'
-				AND wesi.`value`= 'true'
-			) AS jygdgwdlpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygdgwdlpb`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_Fault'
-				AND wesi.`value`= 'true'
-			) AS jygdgwdlgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygdgwdlgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm'
-				AND wesi.`value`= 'true'
-			) AS jygdgwdlhj,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygdgwdlhj`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
 						AND (
-						wesi.equipment_index_key = 'FFS_TemperatureCable_Shield'
-						OR wesi.equipment_index_key = 'FFS_TemperatureCable_Fault'
-						OR wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm'
+							(
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
 							)
-				AND wesi.`value`= 'true'
-			) AS jygdgwdlyc,
+							OR (
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
+							)
+							OR (
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
+							)
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygdgwdlyc`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅰ高端%'
-				AND es.equipment_code =  '92110200UIU44'
-			) AS jygddcf,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110200UIU44'
+						)
+					)
+			) AS `jygddcf`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Start'
-				AND wesi.`value`= 'true'
-			) AS jygddcfqd,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Start'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygddcfqd`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Fault'
-				AND wesi.`value`= 'true'
-			) AS jygddcfgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Fault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceFault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleFault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleFault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygddcfgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Shield'
-				AND wesi.`value`= 'true'
-			) AS jygddcfpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Shield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleShield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygddcfpb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅰ高端%'
-				AND es.equipment_code =  '92110300SS744'
-			) AS jygdqdp,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110300SS744'
+						)
+					)
+			) AS `jygdqdp`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_Start'
-				AND wesi.`value`= 'true'
-			) AS jygdqdpqd,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_Start'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygdqdpqd`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleFault'
-				AND wesi.`value`= 'true'
-			) AS jygdqdpgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleFault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygdqdpgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleShield'
-				AND wesi.`value`= 'true'
-			) AS jygdqdppb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleShield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygdqdppb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅰ高端%'
-				AND es.equipment_code =  '92110400CRQ44'
-			) AS jygddlq,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110400CRQ44'
+						)
+					)
+			) AS `jygddlq`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_State'
-				AND wesi.`value`= 'true'
-			) AS jygddlqdl,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_State'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygddlqdl`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_Fault'
-				AND wesi.`value`= 'true'
-			) AS jygddlqgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_Fault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygddlqgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ高端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_Shield'
-				AND wesi.`value`= 'true'
-			) AS jygddlqpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_Shield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jygddlqpb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅰ低端%'
-				AND es.equipment_code =  '92110100QY544'
-			) AS jyddgwdl,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110100QY544'
+						)
+					)
+			) AS `jyddgwdl`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_Shield'
-				AND wesi.`value`= 'true'
-			) AS jyddgwdlpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jyddgwdlpb`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_Fault'
-				AND wesi.`value`= 'true'
-			) AS jyddgwdlgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jyddgwdlgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm'
-				AND wesi.`value`= 'true'
-			) AS jyddgwdlhj,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jyddgwdlhj`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
 						AND (
-						wesi.equipment_index_key = 'FFS_TemperatureCable_Shield'
-						OR wesi.equipment_index_key = 'FFS_TemperatureCable_Fault'
-						OR wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm'
+							(
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
 							)
-				AND wesi.`value`= 'true'
-			) AS jyddgwdlyc,
+							OR (
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
+							)
+							OR (
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
+							)
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jyddgwdlyc`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅰ低端%'
-				AND es.equipment_code =  '92110200UIU44'
-			) AS jydddcf,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110200UIU44'
+						)
+					)
+			) AS `jydddcf`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Start'
-				AND wesi.`value`= 'true'
-			) AS jydddcfqd,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Start'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jydddcfqd`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Fault'
-				AND wesi.`value`= 'true'
-			) AS jydddcfgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Fault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceFault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleFault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleFault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jydddcfgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Shield'
-				AND wesi.`value`= 'true'
-			) AS jydddcfpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Shield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleShield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jydddcfpb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅰ低端%'
-				AND es.equipment_code =  '92110300SS744'
-			) AS jyddqdp,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110300SS744'
+						)
+					)
+			) AS `jyddqdp`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_Start'
-				AND wesi.`value`= 'true'
-			) AS jyddqdpqd,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_Start'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jyddqdpqd`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleFault'
-				AND wesi.`value`= 'true'
-			) AS jyddqdpgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleFault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jyddqdpgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleShield'
-				AND wesi.`value`= 'true'
-			) AS jyddqdppb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleShield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jyddqdppb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
+				WHERE
+					(
+						(
+							`es`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110400CRQ44'
+						)
+					)
+			) AS `jydddlq`,
+			(
+				SELECT
+					count(DISTINCT `wes`.`id`)
+				FROM
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					es.position LIKE '%极Ⅰ低端%'
-				AND es.equipment_code =  '92110400CRQ44'
-			) AS jydddlq,
 					(
-				SELECT
-					COUNT(DISTINCT(wes.id))
-				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
-				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_State'
-				AND wesi.`value`= 'true'
-			) AS jydddlqdl,
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_State'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jydddlqdl`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_Fault'
-				AND wesi.`value`= 'true'
-			) AS jydddlqgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_Fault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jydddlqgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅰ低端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_Shield'
-				AND wesi.`value`= 'true'
-			) AS jydddlqpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅰ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_Shield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jydddlqpb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅱ高端%'
-				AND es.equipment_code =  '92110100QY544'
-			) AS jegdgwdl,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110100QY544'
+						)
+					)
+			) AS `jegdgwdl`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_Shield'
-				AND wesi.`value`= 'true'
-			) AS jegdgwdlpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegdgwdlpb`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_Fault'
-				AND wesi.`value`= 'true'
-			) AS jegdgwdlgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegdgwdlgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm'
-				AND wesi.`value`= 'true'
-			) AS jegdgwdlhj,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegdgwdlhj`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
 						AND (
-						wesi.equipment_index_key = 'FFS_TemperatureCable_Shield'
-						OR wesi.equipment_index_key = 'FFS_TemperatureCable_Fault'
-						OR wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm'
+							(
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
 							)
-				AND wesi.`value`= 'true'
-			) AS jegdgwdlyc,
+							OR (
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
+							)
+							OR (
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
+							)
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegdgwdlyc`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅱ高端%'
-				AND es.equipment_code =  '92110200UIU44'
-			) AS jegddcf,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110200UIU44'
+						)
+					)
+			) AS `jegddcf`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Start'
-				AND wesi.`value`= 'true'
-			) AS jegddcfqd,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Start'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegddcfqd`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Fault'
-				AND wesi.`value`= 'true'
-			) AS jegddcfgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Fault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceFault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleFault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleFault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegddcfgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Shield'
-				AND wesi.`value`= 'true'
-			) AS jegddcfpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Shield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleShield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegddcfpb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅱ高端%'
-				AND es.equipment_code =  '92110300SS744'
-			) AS jegdqdp,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110300SS744'
+						)
+					)
+			) AS `jegdqdp`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_Start'
-				AND wesi.`value`= 'true'
-			) AS jegdqdpqd,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_Start'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegdqdpqd`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleFault'
-				AND wesi.`value`= 'true'
-			) AS jegdqdpgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleFault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegdqdpgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleShield'
-				AND wesi.`value`= 'true'
-			) AS jegdqdppb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleShield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegdqdppb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅱ高端%'
-				AND es.equipment_code =  '92110400CRQ44'
-			) AS jegddlq,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110400CRQ44'
+						)
+					)
+			) AS `jegddlq`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_State'
-				AND wesi.`value`= 'true'
-			) AS jegddlqdl,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_State'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegddlqdl`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_Fault'
-				AND wesi.`value`= 'true'
-			) AS jegddlqgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_Fault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegddlqgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ高端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_Shield'
-				AND wesi.`value`= 'true'
-			) AS jegddlqpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ高端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_Shield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jegddlqpb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅱ低端%'
-				AND es.equipment_code =  '92110100QY544'
-			) AS jeddgwdl,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110100QY544'
+						)
+					)
+			) AS `jeddgwdl`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_Shield'
-				AND wesi.`value`= 'true'
-			) AS jeddgwdlpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jeddgwdlpb`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_Fault'
-				AND wesi.`value`= 'true'
-			) AS jeddgwdlgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jeddgwdlgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm'
-				AND wesi.`value`= 'true'
-			) AS jeddgwdlhj,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jeddgwdlhj`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
 						AND (
-						wesi.equipment_index_key = 'FFS_TemperatureCable_Shield'
-						OR wesi.equipment_index_key = 'FFS_TemperatureCable_Fault'
-						OR wesi.equipment_index_key = 'FFS_TemperatureCable_FireAlarm'
+							(
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Shield'
 							)
-				AND wesi.`value`= 'true'
-			) AS jeddgwdlyc,
+							OR (
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_Fault'
+							)
+							OR (
+								`wesi`.`equipment_index_key` = 'FFS_TemperatureCable_FireAlarm'
+							)
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jeddgwdlyc`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅱ低端%'
-				AND es.equipment_code =  '92110200UIU44'
-			) AS jedddcf,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110200UIU44'
+						)
+					)
+			) AS `jedddcf`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Start'
-				AND wesi.`value`= 'true'
-			) AS jedddcfqd,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Start'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jedddcfqd`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Fault'
-				AND wesi.`value`= 'true'
-			) AS jedddcfgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Fault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceFault'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleFault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jedddcfgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_SolenoidValve_Shield'
-				AND wesi.`value`= 'true'
-			) AS jedddcfpb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_SolenoidValve_Shield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartSourceShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_FeedbackModuleShield'
+							OR `wesi`.`equipment_index_key` = 'FFS_SolenoidValve_StartupModuleShield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jedddcfpb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅱ低端%'
-				AND es.equipment_code =  '92110300SS744'
-			) AS jeddqdp,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110300SS744'
+						)
+					)
+			) AS `jeddqdp`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_Start'
-				AND wesi.`value`= 'true'
-			) AS jeddqdpqd,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_Start'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jeddqdpqd`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleFault'
-				AND wesi.`value`= 'true'
-			) AS jeddqdpgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleFault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jeddqdpgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_Startbottle_StartupModuleShield'
-				AND wesi.`value`= 'true'
-			) AS jeddqdppb,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Startbottle_StartupModuleShield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jeddqdppb`,
 			(
 				SELECT
 					count(1)
 				FROM
-				 wl_equipment_specific es
+					`wl_equipment_specific` `es`
 				WHERE
-					es.position LIKE '%极Ⅱ低端%'
-				AND es.equipment_code =  '92110400CRQ44'
-			) AS jedddlq,
+					(
+						(
+							`es`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`es`.`equipment_code` = '92110400CRQ44'
+						)
+					)
+			) AS `jedddlq`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_State'
-				AND wesi.`value`= 'true'
-			) AS jedddlqdl,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_State'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jedddlqdl`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_Fault'
-				AND wesi.`value`= 'true'
-			) AS jedddlqgz,
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_Fault'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jedddlqgz`,
 			(
 				SELECT
-					COUNT(DISTINCT(wes.id))
+					count(DISTINCT `wes`.`id`)
 				FROM
-					wl_equipment_specific_index wesi
-				LEFT JOIN wl_equipment_specific wes ON wes.id = wesi.equipment_specific_id
+					(
+						`wl_equipment_specific_index` `wesi`
+						LEFT JOIN `wl_equipment_specific` `wes` ON (
+							(
+								`wes`.`id` = `wesi`.`equipment_specific_id`
+							)
+						)
+					)
 				WHERE
-					wes.position LIKE '%极Ⅱ低端%'
-				AND wesi.equipment_index_key = 'FFS_Breaker_Shield'
-				AND wesi.`value`= 'true'
-			) AS jedddlqpb
-	) d;
+					(
+						(
+							`wes`.`position` LIKE '%极Ⅱ低端%'
+						)
+						AND (
+							`wesi`.`equipment_index_key` = 'FFS_Breaker_Shield'
+						)
+						AND (`wesi`.`value` = 'true')
+					)
+			) AS `jedddlqpb`
+	) `d`;
 -- 今日告警统计，概览4小shiy
 DROP VIEW IF EXISTS `v_equip_alarm_today_statistics`;
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_equip_alarm_today_statistics` AS select count(`wl_equipment_specific_alarm_log`.`confirm_type`) AS `confirmed`,(count(1) - count(`wl_equipment_specific_alarm_log`.`confirm_type`)) AS `pending` from `wl_equipment_specific_alarm_log` where ((to_days(now()) - to_days(`wl_equipment_specific_alarm_log`.`create_date`)) = 0);
@@ -6153,3 +7065,61 @@ WHERE
 	DATEDIFF(begin_time,CURRENT_DATE) <= 0 AND DATEDIFF(end_time,CURRENT_DATE) >= 0
 GROUP BY
 		au.USER_ID;
+		
+-- 今日巡查统计日常管理组态屏查询脚本
+DROP VIEW IF EXISTS `v_check_point_num`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `v_check_point_num` AS
+SELECT
+	(
+		SELECT
+			ifnull(
+				sum(`p_plan_task`.`point_num`),
+				0
+			)
+		FROM
+			`p_plan_task`
+		WHERE
+			(
+				to_days(`p_plan_task`.`begin_time`) - to_days(curdate())
+			) <= 0
+		AND (
+			to_days(`p_plan_task`.`end_time`) - to_days(curdate())
+		) >= 0
+	) AS `pointNum`,
+	(
+		SELECT
+			ifnull(
+				sum(`p_plan_task`.`point_num`),
+				0
+			)
+		FROM
+			`p_plan_task`
+		WHERE
+			`p_plan_task`.`finish_status` = 2
+		AND (
+			to_days(`p_plan_task`.`begin_time`) - to_days(curdate())
+		) <= 0
+		AND (
+			to_days(`p_plan_task`.`end_time`) - to_days(curdate())
+		) >= 0
+	) AS `finishNum`,
+	(
+		SELECT
+			ifnull(
+				sum(`p_plan_task`.`point_num`),
+				0
+			)
+		FROM
+			`p_plan_task`
+		WHERE
+			(
+				`p_plan_task`.`finish_status` = 0
+				OR `p_plan_task`.`finish_status` = 1
+			)
+		AND (
+			to_days(`p_plan_task`.`begin_time`) - to_days(curdate())
+		) <= 0
+		AND (
+			to_days(`p_plan_task`.`end_time`) - to_days(curdate())
+		) >= 0
+	) AS `unFinishNum`;
\ No newline at end of file

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

@@ -1299,58 +1299,114 @@
 			xhsanhj,
 			xhsangz,
 			xhsanpb,
-        ABS(xhsan - xhsanhj- xhsangz-xhsanpb) as xhszc,
+			(xhszc - noZcTotal) AS xhszc,
 			xhsan
-        from
-        (select
-        (SELECT
+		FROM
+			(
+				SELECT
+					(
+						SELECT
 							count(1)
-        FROM `wl_equipment_specific_index` s
-        where s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
-        and s.`value` = 'true') as xhsanhj,
-        (SELECT
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
+						AND s.`value` = 'true'
+					) AS xhsanhj,
+					(
+						SELECT
 							count(1)
-        FROM `wl_equipment_specific_index` s
-        where s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
-        and s.`value` = 'true') as xhsangz,
-        (SELECT
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
+						AND s.`value` = 'true'
+					) AS xhsangz,
+					(
+						SELECT
 							count(1)
-        FROM `wl_equipment_specific_index` s
-        where s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
-        and s.`value` = 'true') as xhsanpb,
-        (SELECT
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
+						AND s.`value` = 'true'
+					) AS xhsanpb,
+					(
+						SELECT
 							count(1)
-        from
+						FROM
 							`wl_equipment_specific_index` si
-        where
-        si.equipment_index_key  = 'FAS_FireHydrantButton_FireAlarm') as xhsan
-        ) as hydrant
+						WHERE
+							si.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
+					) AS xhsan,
+					(
+						SELECT
+							count(
+								DISTINCT equipment_specific_id
+							)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							(
+								s.`value` = 'false'
+								OR s.`value` IS NULL
+							)
+						AND (
+							s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
+							OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
+							OR s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
+						)
+					) AS xhszc,
+					(
+						SELECT
+							count(
+								DISTINCT equipment_specific_id
+							)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							(
+								s.`value` = 'true'
+							)
+						AND (
+							s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
+							OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
+							OR s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
+						)
+					) AS noZcTotal
+			) AS hydrant
     </select>
     <select id="fireWaterSysCollectingDevice" resultType="java.util.Map">
         SELECT
             sbfcjzzyc,
             sbfcjzzbs,
-            (sbfcjzz-sbfcjzzyc-sbfcjzzbs) as sbfcjzzzc,
+            ( sbfcjzzzc - noZcTotal ) AS sbfcjzzzc,
             sbfcjzz
-            from
-            (select
-            (SELECT
-            count(1)
-            FROM `wl_equipment_specific_index` s
-            where s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
-            and s.`value` = 'true') as sbfcjzzyc,
-            (SELECT
-            count(1)
-            FROM `wl_equipment_specific_index` s
-            where s.equipment_index_key = 'FHS_CollectingDevice_DeviceLock'
-            and s.`value` = 'true') as sbfcjzzbs,
-            (SELECT
-                count(1)
-            from
-            `wl_equipment_specific_index` si
-            where
-            si.equipment_index_key  = 'FHS_CollectingDevice_DeviceAbnormal') as sbfcjzz
-    ) as collectingDevice
+        FROM
+            (
+            SELECT
+                ( SELECT count( 1 ) FROM `wl_equipment_specific_index` s WHERE s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' AND s.`value` = 'true' ) AS sbfcjzzyc,
+                ( SELECT count( 1 ) FROM `wl_equipment_specific_index` s WHERE s.equipment_index_key = 'FHS_CollectingDevice_DeviceLock' AND s.`value` = 'true' ) AS sbfcjzzbs,
+                (
+                SELECT
+                    count( DISTINCT equipment_specific_id )
+                FROM
+                    `wl_equipment_specific_index` s
+                WHERE
+                    ( s.`value` = 'false' OR s.`value` IS NULL )
+                    AND ( s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' )
+                ) AS sbfcjzz,
+                (
+                SELECT
+                    count( DISTINCT equipment_specific_id )
+                FROM
+                    `wl_equipment_specific_index` s
+                WHERE
+                    ( s.`value` = 'false' OR s.`value` IS NULL )
+                    AND s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
+                ) AS sbfcjzzzc,
+            ( SELECT count( DISTINCT equipment_specific_id ) FROM `wl_equipment_specific_index` s WHERE ( s.`value` = 'true' ) AND s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal' ) AS noZcTotal
+            ) AS collectingDevice
     </select>
     <select id="fireWaterSysWaterPump" resultType="java.util.Map">
          select