Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpCheckEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+public enum PressurePumpCheckEnum {
+
+    LE("le", "小于等于"),
+    GE("ge", "大于等于"),
+    BE("be", "在两者之间");
+
+    private String code;
+    private String describe;
+
+    private PressurePumpCheckEnum(String code, String describe) {
+        this.code = code;
+        this.describe = describe;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public static PressurePumpCheckEnum getByCode(String code) {
+        for (PressurePumpCheckEnum l : PressurePumpCheckEnum.values()) {
+            if (code.equals(l.getCode())) {
+                return l;
+            }
+        }
+        return null;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public enum PressurePumpEnum {
+
+//    ALONE_START_YXSC("FHS_PressurePump_Start_ALONE_START_YXSC", "ge", "5", "", "aaa", "bbb", "last"),
+    ALONE_START_QT("FHS_PressurePump_Start_ALONE_START_QT", PressurePumpCheckEnum.LE.getCode(), "", "5",
+        PressurePumpValueEnum.LAST_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode()),
+    ALONE_STOP_QT("FHS_PressurePump_Stop_ALONE_STOP_QT", PressurePumpCheckEnum.GE.getCode(), "5", "",
+             PressurePumpValueEnum.LAST_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ_YXSC.getCode()),
+    ALL_START_QT_WJ("FHS_PressurePump_Start_ALL_START_QT_WJ", PressurePumpCheckEnum.LE.getCode(), "", "30",
+            PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode()),
+    ALL_START_QT_YZ("FHS_PressurePump_Start_ALL_START_QT_YZ", PressurePumpCheckEnum.BE.getCode(), "30", "60",
+             PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YZ.getCode()),
+    ALL_START_QT_YB("FHS_PressurePump_Start_ALL_START_QT_YB", PressurePumpCheckEnum.BE.getCode(), "60", "240",
+            PressurePumpValueEnum.LATELY_STOP.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YB.getCode()),
+    ALL_STOP_QT_WJ("FHS_PressurePump_Stop_ALL_STOP_QT_WJ", PressurePumpCheckEnum.LE.getCode(), "", "30",
+            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_QT_WJ.getCode()),
+    ALL_STOP_QT_YZ("FHS_PressurePump_Stop_ALL_STOP_QT_YZ", PressurePumpCheckEnum.BE.getCode(), "30", "60",
+            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YZ.getCode()),
+    ALL_STOP_QT_YB("FHS_PressurePump_Stop_ALL_STOP_QT_YB", PressurePumpCheckEnum.BE.getCode(), "60", "240",
+            PressurePumpValueEnum.LATELY_START.getCode(), PressurePumpMessageEnum.MESSAGE_LEVEL_YB.getCode());
+
+    private String code;
+    private String operator;
+    private String leftValue;
+    private String rightValue;
+    private String compareValue;
+    private String level;
+
+    private PressurePumpEnum(String code, String operator, String leftValue, String rightValue, String compareValue, String level) {
+        this.code = code;
+        this.operator = operator;
+        this.leftValue = leftValue;
+        this.rightValue = rightValue;
+        this.compareValue = compareValue;
+        this.level = level;
+    }
+
+    public static List<PressurePumpEnum> getEnumListByCode(String code) {
+        List<PressurePumpEnum> list = new ArrayList<>();
+        for(PressurePumpEnum e : PressurePumpEnum.values()) {
+            if (e.getCode().startsWith(code)) {
+                list.add(e);
+            }
+        }
+        return list;
+    }
+
+    public String getCode() {
+        return code;
+    }
+    public String getOperator() {
+        return operator;
+    }
+    public String getLeftValue() {
+        return leftValue;
+    }
+    public String getRightValue() {
+        return rightValue;
+    }
+    public String getCompareValue() { return compareValue; }
+    public String getLevel() { return level; }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpMessageEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+public enum PressurePumpMessageEnum {
+
+    MESSAGE_LEVEL_YB("YB", "【%s】分钟内，启停间隔较小",  "","名称：稳压泵启停异常提醒；时间：%s；内容：【%s】- 【%s】 -  【%s】分钟内，设备启停频繁，请及时查看处理"),
+    MESSAGE_LEVEL_YZ("YZ", "【%s】分钟内，启停间隔较小", "", "名称：稳压泵启停异常提醒；时间：%s；内容：【%s】- 【%s】 -  【%s】分钟内，设备启停频繁，请及时查看处理"),
+    MESSAGE_LEVEL_QT_WJ("QT_WJ", "【%s】分钟内，设备启停频繁", "", "名称：漏水提醒； 时间：%s；内容：【%s】- 【%s】 - 【%s】分钟内，设备启停频繁，可能存在漏水，请及时查看处理"),
+    MESSAGE_LEVEL_QT_WJ_YXSC("WJ_YXSC", "运行时长超过【%s】分钟，存在漏水可能", "", "名称：漏水提醒； 时间：%s；内容：【%s】- 【%s】 - 运行时长超过【%s】分钟，存在漏水可能，请及时查看处理");
+    private String code;
+    private String allMessage;
+    private String marqueeMessage;
+    private String recordMessage;
+
+    private PressurePumpMessageEnum(String code, String allMessage, String marqueeMessage,String recordMessage) {
+        this.code = code;
+        this.allMessage = allMessage;
+        this.marqueeMessage = marqueeMessage;
+        this.recordMessage = recordMessage;
+    }
+
+    public String getCode() {
+        return code;
+    }
+    public String getAllMessage() {
+        return allMessage;
+    }
+    public String getMarqueeMessage() {
+        return marqueeMessage;
+    }
+    public String getRecordMessage() {
+        return recordMessage;
+    }
+
+
+    public static PressurePumpMessageEnum getByCode(String code) {
+        for (PressurePumpMessageEnum l : PressurePumpMessageEnum.values()) {
+            if (code.equals(l.getCode())) {
+                return l;
+            }
+        }
+        return null;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpValueEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+public enum PressurePumpValueEnum {
+
+    LAST_STOP("lastStop", "上次停泵时间"),
+    LAST_START("lastStart", "上次启泵时间"),
+    LATELY_STOP("latelyStop", "所有泵最近一次停泵时间"),
+    LATELY_START("latelyStart", "所有泵最近一次启泵时间");
+
+    private String code;
+    private String describe;
+
+    private PressurePumpValueEnum(String code, String describe) {
+        this.code = code;
+        this.describe = describe;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDescribe() {
+        return describe;
+    }
+
+    public static PressurePumpValueEnum getByCode(String code) {
+        for (PressurePumpValueEnum l : PressurePumpValueEnum.values()) {
+            if (code.equals(l.getCode())) {
+                return l;
+            }
+        }
+        return null;
+    }
+}

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

@@ -111,4 +111,6 @@ public interface EquipmentSpecificIndexMapper extends BaseMapper<EquipmentSpecif
     List<EquipmentSpecificIndex> getEquipmentSpeIndexByIotCodeTrend(String iotCode, Integer isTrend, String fieldKey);
 
     List<Map<String, Object>> getEquipSpecificScrap();
+
+    List<EquipmentSpecificIndex> getEquipIndexInIndex(@Param("list") List<String> listIndex);
 }

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

@@ -27,4 +27,11 @@ public interface IEquipmentSpecificIndexService extends IService<EquipmentSpecif
      * @Date 2020/11/3 17:58
      */
     List<EquipmentSpecificIndex> getEquipmentSpeIndexBySpeIotCode(String iotCode);
+
+    /**
+     * 根据指标key查询列表
+     * @param listIndex keys
+     * @return 列表
+     */
+    List<EquipmentSpecificIndex> getEquipmentSpeIndexByIndex(List<String> listIndex);
 }

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

 package com.yeejoin.equipmanage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
@@ -23,4 +24,9 @@ public class EquipmentSpecificIndexServiceImpl extends ServiceImpl<EquipmentSpec
     public List<EquipmentSpecificIndex> getEquipmentSpeIndexBySpeIotCode(String iotCode) {
         return this.baseMapper.getEquipmentSpeIndexBySpeIotCode(iotCode);
     }
+
+    @Override
+    public List<EquipmentSpecificIndex> getEquipmentSpeIndexByIndex(List<String> listIndex) {
+        return this.baseMapper.getEquipIndexInIndex(listIndex);
+    }
 }

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

@@ -27,6 +27,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -35,8 +36,11 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -179,6 +183,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         MqttReceiveServiceImpl.jcsSwitch = jcsSwitch;
     }
 
+
+    @Value("${equipment.pressurepump.start}")
+    private String pressurePumpStart;
+
+    @Value("${equipment.pressurepump.stop}")
+    private String pressurePumpStop;
+
     private static Boolean bool = Boolean.FALSE;
 
     @Override
@@ -281,6 +292,11 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         // 存储温度数据至内存中（火眼）
         iotDataListToCacheMap(iotDatalist);
         iotDatalist.forEach(iotDataVO -> {
+            String indexKey = iotDataVO.getKey();
+            // 稳压泵启停信号处理
+            if (indexKey.equals(pressurePumpStart) || indexKey.equals(pressurePumpStop)) {
+                pressurePump(indexKey, iotDatalist, topicEntity);
+            }
             for (EquipmentSpecificIndex equipmentSpecificIndex : indexList) {
                 if (!ObjectUtils.isEmpty(equipmentSpecificIndex.getNameKey())
                         && equipmentSpecificIndex.getNameKey().toLowerCase().equals(iotDataVO.getKey().toLowerCase())) {
@@ -1143,4 +1159,167 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         }
     }
 
+    private void pressurePump(String indexKey, List<IotDataVO> iotDatalist, TopicEntityVo topicEntity) {
+        List<String> listIndex = new ArrayList<>();
+        listIndex.add(pressurePumpStart);
+        listIndex.add(pressurePumpStop);
+        // 获取全部启停泵信号
+        List<EquipmentSpecificIndex> equipmentSpeIndexList = equipmentSpecificIndexService.getEquipmentSpeIndexByIndex(listIndex);
+        List<PressurePumpEnum> enumListByCode = PressurePumpEnum.getEnumListByCode(indexKey);
+
+        if (!CollectionUtils.isEmpty(enumListByCode)) {
+            enumListByCode.forEach(pressurePumpEnum -> {
+                // 1. 获取需要校验的值
+                PressurePumpValueEnum valueEnum = PressurePumpValueEnum.getByCode(pressurePumpEnum.getCompareValue());
+                assert valueEnum != null;
+                EquipmentSpecificIndex data = getPressurePumpDateByType(valueEnum, topicEntity, equipmentSpeIndexList);
+                Date newDate = new Date();
+                // 2. 校验
+                if (!ObjectUtils.isEmpty(data)) {
+                    checkValueByDate(data, newDate, pressurePumpEnum);
+                }
+            });
+        }
+
+    }
+
+    private EquipmentSpecificIndex getPressurePumpDateByType(PressurePumpValueEnum valueEnum, TopicEntityVo topicEntity, List<EquipmentSpecificIndex> equipmentSpeIndexList) {
+        String iotCode = topicEntity.getIotCode();
+        EquipmentSpecificIndex equipmentSpecificIndex = null;
+        switch (valueEnum) {
+            case LAST_STOP:
+                List<EquipmentSpecificIndex> lastStop = equipmentSpeIndexList.stream().filter(e ->
+                        StringUtil.isNotEmpty(e.getValue()) && e.getIotCode().equals(iotCode) && pressurePumpStop.equals(e.getEquipmentIndexKey())).sorted(Comparator.comparing(EquipmentSpecificIndex::getUpdateDate).reversed())
+                        .collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(lastStop)) {
+                    equipmentSpecificIndex = lastStop.get(0);
+                }
+                break;
+            case LAST_START:
+                List<EquipmentSpecificIndex> lastStart = equipmentSpeIndexList.stream().filter(e ->
+                        StringUtil.isNotEmpty(e.getValue()) && e.getIotCode().equals(iotCode) && pressurePumpStart.equals(e.getEquipmentIndexKey())).sorted(Comparator.comparing(EquipmentSpecificIndex::getUpdateDate).reversed())
+                        .collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(lastStart)) {
+                    equipmentSpecificIndex = lastStart.get(0);
+                }
+                break;
+            case LATELY_STOP:
+                List<EquipmentSpecificIndex> latelyStop = equipmentSpeIndexList.stream().filter(e ->
+                        StringUtil.isNotEmpty(e.getValue()) && pressurePumpStop.equals(e.getEquipmentIndexKey())).sorted(Comparator.comparing(EquipmentSpecificIndex::getUpdateDate).reversed())
+                        .collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(latelyStop)) {
+                    equipmentSpecificIndex = latelyStop.get(0);
+                }
+                break;
+            case LATELY_START:
+                List<EquipmentSpecificIndex> latelyStart = equipmentSpeIndexList.stream().filter(e ->
+                        StringUtil.isNotEmpty(e.getValue()) && pressurePumpStart.equals(e.getEquipmentIndexKey())).sorted(Comparator.comparing(EquipmentSpecificIndex::getUpdateDate).reversed())
+                        .collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(latelyStart)) {
+                    equipmentSpecificIndex = latelyStart.get(0);
+                }
+                break;
+            default:
+                break;
+        }
+        return equipmentSpecificIndex;
+    }
+
+    private void checkValueByDate(EquipmentSpecificIndex data, Date newDate, PressurePumpEnum pressurePumpEnum) {
+        String operator = pressurePumpEnum.getOperator();
+        PressurePumpCheckEnum pumpCheckEnum = PressurePumpCheckEnum.getByCode(operator);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long diff = 0;
+        try {
+            long d1 = df.parse(df.format(data.getUpdateDate())).getTime();
+            long d2 = df.parse(df.format(newDate)).getTime();
+            diff = (d2-d1)/1000/60;
+        } catch (Exception e) {
+            log.error("时间转换失败" + e.getMessage());
+            return;
+        }
+        assert pumpCheckEnum != null;
+        String leftValue = pressurePumpEnum.getLeftValue();
+        String rightValue = pressurePumpEnum.getRightValue();
+        switch (pumpCheckEnum) {
+            case LE:
+                if (StringUtil.isNotEmpty(rightValue)) {
+                    long value = Long.parseLong(rightValue);
+                    if (diff <= value) {
+                        sendMessagePressure(pressurePumpEnum, data);
+                    }
+                }
+                break;
+            case GE:
+                if (StringUtil.isNotEmpty(leftValue)) {
+                    long value = Long.parseLong(leftValue);
+                    if (diff >= value) {
+                        sendMessagePressure(pressurePumpEnum, data);
+                    }
+                }
+                break;
+            case BE:
+                if (StringUtil.isNotEmpty(leftValue) && StringUtil.isNotEmpty(rightValue)) {
+                    long lvalue = Long.parseLong(leftValue);
+                    long rvalue = Long.parseLong(rightValue);
+                    if (diff >= lvalue && diff <= rvalue) {
+                        sendMessagePressure(pressurePumpEnum, data);
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void sendMessagePressure(PressurePumpEnum pressurePumpEnum, EquipmentSpecificIndex data) {
+        String level = pressurePumpEnum.getLevel();
+        PressurePumpMessageEnum pumpMessageEnum = PressurePumpMessageEnum.getByCode(level);
+        assert pumpMessageEnum != null;
+        String time = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN).format(new Date());
+        MessageModel model = new MessageModel();
+        String allMessage = pumpMessageEnum.getAllMessage();
+        String body = "";
+        Map<String, String> map = new HashMap<>(4);
+        if (StringUtil.isNotEmpty(allMessage)) {
+            String value = StringUtil.isNotEmpty(pressurePumpEnum.getLeftValue()) ? pressurePumpEnum.getLeftValue() : pressurePumpEnum.getRightValue();
+            String content = String.format(allMessage, value);
+            map.put("content", content);
+            map.put("name", data.getEquipmentSpecificName());
+            map.put("time", time);
+        }
+        String recordMessage = pumpMessageEnum.getRecordMessage();
+        if (StringUtil.isNotEmpty(recordMessage)) {
+            String value = StringUtil.isNotEmpty(pressurePumpEnum.getLeftValue()) ? pressurePumpEnum.getLeftValue() : pressurePumpEnum.getRightValue();
+            body = String.format(recordMessage,time, data.getEquipmentSpecificName(), data.getLocation(), value);
+        }
+        String marqueeMessage = pumpMessageEnum.getMarqueeMessage();
+        if (StringUtil.isNotEmpty(marqueeMessage)) {
+//            body = String.format(marqueeMessage);
+        }
+
+        switch (pumpMessageEnum) {
+            case MESSAGE_LEVEL_YB:
+            case MESSAGE_LEVEL_YZ:
+                map.put("type", "稳压泵启停异常提醒");
+                break;
+            case MESSAGE_LEVEL_QT_WJ:
+            case MESSAGE_LEVEL_QT_WJ_YXSC:
+                map.put("type", "漏水提醒");
+                break;
+            default:
+                break;
+        }
+
+        model.setBody(body);
+        model.setExtras(map);
+        model.setMsgType("pressurePump");
+        model.setSendTime(new Date());
+        model.setIsSendApp(false);
+        model.setTerminal("WEB");
+        model.setIsSendWeb(true);
+        model.setCategory(1);
+        Token token = remoteSecurityService.getServerToken();
+        systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
+    }
 }

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

@@ -482,4 +482,27 @@
         where wed.production_date is not null
           and wlsd.status != 7
     </select>
+    <select id="getEquipIndexInIndex" resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
+        SELECT
+        si.equipment_specific_id AS equipmentId,
+        si.id,
+        si.`value`,
+        si.create_date,
+        si.update_date,
+        si.equipment_index_key,
+        si.equipment_specific_name,
+        es.position location,
+        es.`iot_code` AS iotCode
+        FROM
+        wl_equipment_specific_index si
+        LEFT JOIN wl_equipment_specific es ON si.equipment_specific_id = es.id
+        <where>
+            <if test="list != null and list.size > 0 and type = 'id'">
+                si.equipment_index_key  IN
+                <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file