修改bug

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

@@ -2,12 +2,15 @@ package com.yeejoin.equipmanage.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.dto.EquiplistSpecificBySystemESVO;
+import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.dto.EquipmentAlarmLogDto;
 import com.yeejoin.equipmanage.common.exception.BaseException;
 import com.yeejoin.equipmanage.dao.ESequiplistSpecificBySystemRepository;
+import com.yeejoin.equipmanage.mapper.EquipmentIndexMapper;
 import com.yeejoin.equipmanage.service.IESeqService;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -46,7 +49,8 @@ public class ESeqServiceImpl implements IESeqService {
     @Autowired
     private ESequiplistSpecificBySystemRepository esequiplistSpecificBySystemRepository;
 
-
+    @Autowired
+    private EquipmentIndexMapper equipmentIndexMapper;
 
     @Value("${es.ESEquiplistSpecific.flag}")
     private Boolean flag;
@@ -101,9 +105,14 @@ public class ESeqServiceImpl implements IESeqService {
                     Date daf =new Date(equiplistSpecificBySystemESVO.getTime());
                     String time=ft.format(daf);
                     da.setTime(time);
-                    String value=equiplistSpecificBySystemESVO.getValue();
-                    value= getReadableStatus(value );
-                    da.setContent(equiplistSpecificBySystemESVO.getEquipmentIndexName()+":"+value);
+//                    String value=equiplistSpecificBySystemESVO.getValue();
+//                    value= getReadableStatus(value );
+//                    da.setContent(equiplistSpecificBySystemESVO.getEquipmentIndexName()+":"+value);
+                    QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
+                    wrapper.eq("name_key", equiplistSpecificBySystemESVO.getEquipmentIndexKey());
+                    wrapper.last("limit 1");
+                    EquipmentIndex index = equipmentIndexMapper.selectOne(wrapper);
+                    da.setContent(index.getTypeName());
                     list.add(da);
             }
             pageBean.setRecords(list);

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

@@ -198,6 +198,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Value("classpath:/json/equipmentCode.json")
     private Resource equipmentCode;
 
+    @Value("${equipment.pressurepump.start}")
+    private String pressurePumpStart;
+
 
     private final String injection = "{\n" +
             "\n" +
@@ -1921,17 +1924,18 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                         if (!ObjectUtils.isEmpty(equipmentSpecificIndex)) {
                             IotIndexInfoVo iotIndexInfoVo = new IotIndexInfoVo();
 
-
                             iotIndexInfoVo.setType(equipmentSpecificIndex.getTypeName()!=null?equipmentSpecificIndex.getTypeName(): equipmentSpecificIndex.getIndexName());
 
-
                             iotIndexInfoVo.setNumber(deviceName);
                             if (equipmentSpecificIndex.getIsTrend() == 1) {
                                 iotIndexInfoVo.setContent(equipmentSpecificIndex.getIndexName() + entry.getValue() + equipmentSpecificIndex.getIndexUnitName());
                             } else {
-                                iotIndexInfoVo.setContent(equipmentSpecificIndex.getEquipmentIndexName());
+                                if (pressurePumpStart.equals(equipmentSpecificIndex.getNameKey())) {
+                                    iotIndexInfoVo.setContent(TrueOrFalseEnum.real.value.equals(entry.getValue()) ? equipmentSpecificIndex.getEquipmentIndexName() : PressurePumpRelateEnum.STOP.getDesc());
+                                } else {
+                                    iotIndexInfoVo.setContent(equipmentSpecificIndex.getEquipmentIndexName());
+                                }
                             }
-
                             iotIndexInfoVo.setSendTime(dateStr);
                             infoVoList.add(iotIndexInfoVo);
                         }

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

@@ -727,7 +727,15 @@
             (SELECT name from wl_equipment_specific where id = wlesal.equipment_specific_id) AS fireEquipmentName,
             wlesal.equipment_index_id AS fireEquipmentIndexId,
             wlesal.equipment_specific_index_key AS fireEquipmentSpecificIndexKey,
-            wlesal.equipment_specific_index_name AS fireEquipmentSpecificIndexName,
+            (
+            SELECT
+            type_name
+            FROM
+            wl_signal_classify sc
+            WHERE
+            sc.type_code = wlesal.type
+            LIMIT 1
+            ) AS fireEquipmentSpecificIndexName,
             if(wlesal.confirm_type IS NULL, 0, 1) AS confirmType,
             if(wlesal.clean_time IS NULL, 0, 1) AS cleanStatus,
             CASE