item:消防水池液位推送（/AMOS-AUTOSYS/yinan/analogue）

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FormInstanceController.java

+package com.yeejoin.amos.fas.business.controller;
+
+import com.yeejoin.amos.fas.business.util.ScheduledUtil;
+import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/formInstance")
+@Api(tags = "建筑API")
+public class FormInstanceController extends BaseController {
+
+    @Autowired
+    private ScheduledUtil scheduledUtil;
+
+    @ApiOperation(httpMethod = "GET", value = "消防水池与设备编码关系存入Redis", notes = "消防水池与设备编码关系存入Redis")
+    @RequestMapping(value = "/saveWaterLevelToRedis", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse saveWaterLevelToRedis() {
+        return CommonResponseUtil.success(scheduledUtil.saveWaterLevelToRedis());
+    }
+
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/FormInstanceMapper.java

 package com.yeejoin.amos.fas.business.dao.mapper;
 
+import com.yeejoin.amos.fas.business.vo.FormInstanceVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ProjectName: YeeAmosFireAutoSysRoot
@@ -14,6 +14,6 @@ import java.util.Map;
  * @Date: 2021/12/10 17:53
  * @Version: 1.0
  */
-public interface FormInstanceMapper extends BaseMapper{
-    List<Map<String, String>> queryFirePool(@Param("firePoolIndexKey") String firePoolIndexKey);
+public interface FormInstanceMapper extends BaseMapper {
+    List<FormInstanceVo> queryFirePool(@Param("firePoolIndexKey") String firePoolIndexKey);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FormInstanceServiceImpl.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import com.yeejoin.amos.fas.business.dao.mapper.FormInstanceMapper;
 import com.yeejoin.amos.fas.business.service.intfc.IFormInstanceService;
+import com.yeejoin.amos.fas.business.vo.FormInstanceVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ProjectName: YeeAmosFireAutoSysRoot
@@ -24,7 +24,7 @@ public class FormInstanceServiceImpl implements IFormInstanceService {
     private FormInstanceMapper formInstanceMapper;
 
     @Override
-    public List<Map<String, String>> queryFirePool(String firePoolIndexKey) {
+    public List<FormInstanceVo> queryFirePool(String firePoolIndexKey) {
         return formInstanceMapper.queryFirePool(firePoolIndexKey);
     }
 }
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

@@ -153,8 +153,18 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         String nameKey = equipmentSpecificIndex.getNameKey();
         String iotCode = equipmentSpecificIndex.getIotCode();
         String value = equipmentSpecificIndex.getValue();
-        if (nameKey != null && nameKey.equalsIgnoreCase(firePoolIndexKey)) {
+        if (nameKey != null && StringUtil.isNotEmpty(value) && nameKey.equalsIgnoreCase(firePoolIndexKey)) {
             redisTemplate.opsForValue().set("WaterLevel:Value:" + iotCode, value);
+            Object obj = redisTemplate.opsForValue().get("WaterLevel:Code:" + iotCode);
+            if (!ObjectUtils.isEmpty(obj)) {
+                FormInstanceVo formInstanceVo = JSONObject.parseObject(obj.toString(), FormInstanceVo.class);
+                String area = formInstanceVo.getArea();
+                formInstanceVo.setLevel(value);
+                if (StringUtil.isNotEmpty(area)) {
+                    formInstanceVo.setVolume(String.format("%.2f", (Double.valueOf(Double.parseDouble(value) * Double.parseDouble(area)))));
+                }
+                sendWaterLevel(formInstanceVo);
+            }
         }
         if(topicEntity.getSimulationDate().equals("false") && nameKeys.contains(typeCode) && indexStateIsChange(equipmentSpecificIndex)){
             log.info("指标值没有发生变化： " + equipmentSpecificIndex.getIotCode()+"-"+equipmentSpecificIndex.getNameKey()+":"+equipmentSpecificIndex.getValue());
@@ -239,6 +249,17 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         }
     }
 
+    @Async
+    public void sendWaterLevel(FormInstanceVo formInstanceVo) {
+        try {
+            String topic = String.format("/%s/%s/%s", serviceName, stationName, "analogue");
+            webMqttComponent.publish(topic, JSON.toJSONString(formInstanceVo));
+            log.info("消防水池液位数据发送成功！");
+        } catch (Exception e) {
+            log.error("消防水池液位数据发送失败！");
+        }
+    }
+
     /**
      * 三维故障火警模块推送最新5条数据
      * @param orgCode

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -27,10 +27,7 @@ import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.util.JexlUtil;
 import com.yeejoin.amos.fas.business.util.RpnUtils;
-import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
-import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
-import com.yeejoin.amos.fas.business.vo.Toke;
-import com.yeejoin.amos.fas.business.vo.TopicEntityVo;
+import com.yeejoin.amos.fas.business.vo.*;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.common.enums.CheckStatusEnum;
 import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IFormInstanceService.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
+import com.yeejoin.amos.fas.business.vo.FormInstanceVo;
+
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ProjectName: YeeAmosFireAutoSysRoot
@@ -16,8 +17,9 @@ public interface IFormInstanceService {
 
     /**
      * 获取消防水池
-     * @return
+     *
      * @param firePoolIndexKey
+     * @return
      */
-    List<Map<String, String>> queryFirePool(String firePoolIndexKey);
+    List<FormInstanceVo> queryFirePool(String firePoolIndexKey);
 }
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/ScheduledUtil.java

 package com.yeejoin.amos.fas.business.util;
 
+import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.fas.business.service.intfc.IFormInstanceService;
+import com.yeejoin.amos.fas.business.vo.FormInstanceVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +12,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ProjectName: YeeAmosFireAutoSysRoot
@@ -34,14 +35,30 @@ public class ScheduledUtil {
     @Value("${autoSys.fire.pool.index_key}")
     private String firePoolIndexKey;
 
-    @Scheduled(cron = "0 * * * * ? ")
-    synchronized private void syncByRedis() {
-        List<Map<String, String>> list = formInstanceService.queryFirePool(firePoolIndexKey);
+    /**
+     * 每日凌晨六点执行
+     */
+    @Scheduled(cron = "0 0 0 6 * ? ")
+    synchronized private void saveWaterLevelByRedis() {
+        List<FormInstanceVo> list = formInstanceService.queryFirePool(firePoolIndexKey);
         if (CollectionUtils.isNotEmpty(list)) {
-            for (Map<String, String> map : list) {
-                Object[] toArray = map.values().toArray();
-                redisTemplate.opsForValue().set("WaterLevel:Code:" + toArray[0], toArray[1]);
+            for (FormInstanceVo formInstanceVo : list) {
+                redisTemplate.opsForValue().set("WaterLevel:Code:" + formInstanceVo.getIotCode(), JSON.toJSONString(formInstanceVo));
             }
         }
     }
+
+    /**
+     * 手动调用接口执行
+     */
+    public Boolean saveWaterLevelToRedis() {
+        List<FormInstanceVo> list = formInstanceService.queryFirePool(firePoolIndexKey);
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (FormInstanceVo formInstanceVo : list) {
+                redisTemplate.opsForValue().set("WaterLevel:Code:" + formInstanceVo.getIotCode(), JSON.toJSONString(formInstanceVo));
+            }
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
 }
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/FormInstanceVo.java

+package com.yeejoin.amos.fas.business.vo;
+
+import lombok.Data;
+
+/**
+ * @ProjectName: YeeAmosFireAutoSysRoot
+ * @Package: com.yeejoin.amos.fas.business.vo
+ * @ClassName: FormInstanceVo
+ * @Author: Jianqiang Gao
+ * @Description: FormInstanceVo
+ * @Date: 2021/12/10 21:07
+ * @Version: 1.0
+ */
+@Data
+public class FormInstanceVo {
+
+    private String name;
+    private String code;
+    private String level;
+    private String maxLevel;
+    private String alarmLevel;
+    private String area;
+    private String volume;
+    private String iotCode;
+}
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_form_instance.xml

@@ -2,10 +2,15 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.fas.business.dao.mapper.FormInstanceMapper">
-	<select id="queryFirePool"  resultType="java.util.HashMap">
+	<select id="queryFirePool"  resultType="com.yeejoin.amos.fas.business.vo.FormInstanceVo">
 		SELECT
-		es.iot_code AS iotCode,
-		MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS `code`
+		MAX( CASE WHEN a.field_name = 'name' THEN a.field_value END ) AS `name`,
+		MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS `code`,
+		MAX( CASE WHEN a.field_name = 'height' THEN a.field_value END ) AS max_level,
+		MAX( CASE WHEN a.field_name = 'lowWaterHeight' THEN a.field_value END ) AS alarm_level,
+		MAX( CASE WHEN a.field_name = 'bottomArea' THEN a.field_value END ) AS area,
+		MAX( CASE WHEN a.field_name = 'volume' THEN a.field_value END ) AS volume,
+		es.iot_code
 		FROM
 		`wl_form_instance` a
 		LEFT JOIN wl_equipment_specific es ON a.instance_id = es.warehouse_structure_id