修改消防水源接口及预案添加参数

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/ContingencyRo.java

@@ -21,6 +21,9 @@ public class ContingencyRo implements Serializable {
 	private String fireEquipmentName;//消防设备名称
 	@Label("消防设备id")
     private String fireEquipmentId;//消防设备id
+	
+	@Label("消防设备code")
+    private String fireEquipmentCode;//消防设备code
 
 
     private Integer  layer=0;//显示图层

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

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
+import com.yeejoin.amos.fas.business.vo.FormInstanceVo;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
@@ -93,7 +94,7 @@ public interface RiskSourceMapper extends BaseMapper {
 
     List<RiskSourceTreeResponse> getCheckPointRiskSource();
 
-    List<Map> queryContingencyWater();
+    List<FormInstanceVo> queryContingencyWater();
 
     List<Map> queryFmeaByPointId(@Param("pointId") Long pointId);
 

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

@@ -550,6 +550,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         contingencyRo.setEquipmentName(equipment.getName());
         contingencyRo.setFireEquipmentId(String.valueOf(fireEquipment.getId()));
         contingencyRo.setFireEquipmentName(fireEquipment.getName());
+        contingencyRo.setFireEquipmentCode(fireEquipment.getCode());
         contingencyRo.setStep("0");
         contingencyRo.setConfirm("NONE");
         contingencyRo.setFireTruckRoute(equipment.getFireTruckRoute());
@@ -1392,29 +1393,29 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 //    }
 
     @Override
-    public List<Map> queryContingencyWater() {
-        List<Map> list = riskSourceMapper.queryContingencyWater();
-        for (Map map : list) {
+    public List<FormInstanceVo> queryContingencyWater() {
+        List<FormInstanceVo> list = riskSourceMapper.queryContingencyWater();
+        for (FormInstanceVo map : list) {
             String iotCode = "";
             String maxlevel = "";
             String volume = "";
             double area = 0;
-            if (!ObjectUtils.isEmpty(map.get("area"))) {
-                area = Double.valueOf(map.get("area").toString());
+            if (!ObjectUtils.isEmpty(map.getArea())) {
+                area = Double.valueOf(map.getArea());
             }
-            if (!ObjectUtils.isEmpty(map.get("iot_code"))) {
-                iotCode = map.get("iot_code").toString();
+            if (!ObjectUtils.isEmpty(map.getIotCode())) {
+                iotCode = map.getIotCode();
             }
             Object value = redisTemplate.opsForValue().get("WaterLevel:Value:" + iotCode);
             if (StringUtil.isNotEmpty(value)) {
-                maxlevel = map.get("max_level") != null ? map.get("max_level").toString() : value.toString();
-                volume = map.get("volume") != null && StringUtil.isNumeric(map.get("volume").toString()) ? String.format("%.2f", (Double.valueOf(map.get("volume").toString()))) : String.format("%.2f", Double.valueOf(value.toString()) * area);
+                maxlevel = map.getMaxLevel() != null ? map.getMaxLevel() : value.toString();
+                volume = map.getVolume() != null && StringUtil.isNumeric(map.getVolume()) ? String.format("%.2f", (Double.valueOf(map.getVolume()))) : String.format("%.2f", Double.valueOf(value.toString()) * area);
             } else {
-                maxlevel = map.get("max_level") != null ? map.get("max_level").toString() : "0.0";
-                volume = map.get("volume") != null && StringUtil.isNumeric(map.get("volume").toString()) ? String.format("%.2f", (Double.valueOf(map.get("volume").toString()))) : String.format("%.2f", Double.valueOf(maxlevel) * area);
+                maxlevel = map.getMaxLevel() != null ? map.getMaxLevel() : "0.0";
+                volume = map.getVolume() != null && StringUtil.isNumeric(map.getVolume()) ? String.format("%.2f", (Double.valueOf(map.getVolume()))) : String.format("%.2f", Double.valueOf(maxlevel) * area);
             }
-            map.put("level", maxlevel);
-            map.put("volume", volume);
+            map.setLevel(maxlevel);
+            map.setVolume(volume);
         }
         return list;
     }

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

@@ -11,6 +11,7 @@ import com.yeejoin.amos.fas.business.param.AlarmParam;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.param.FmeaBindParam;
 import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
+import com.yeejoin.amos.fas.business.vo.FormInstanceVo;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
@@ -150,7 +151,7 @@ public interface IRiskSourceService {
 
     void queryContingencyDeviceStatus(ContingencyDeviceStatus contingencyDeviceStatus);
 
-    List<Map> queryContingencyWater();
+    List<FormInstanceVo> queryContingencyWater();
 
     List<Map> queryFmeaByPointId(Long pointId);
 

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -52,3 +52,6 @@ emqx.password=public
 #文件服务器地址
 file.downLoad.url=http://39.98.246.31:8888/
 
+#规则ip配置，用于多网卡及docker镜像启动时添加
+rule.definition.local-ip=172.16.11.201
+

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

@@ -6,8 +6,8 @@
 		SELECT
 		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 = 'height' THEN a.field_value END ) AS maxLevel,
+		MAX( CASE WHEN a.field_name = 'lowWaterHeight' THEN a.field_value END ) AS alarmLevel,
 		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

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

@@ -641,7 +641,7 @@
 					rf.id = ${factorId}
 			)
 	</select>
-	<select id="queryContingencyWater"  resultType="java.util.HashMap">
+	<select id="queryContingencyWater"  resultType="com.yeejoin.amos.fas.business.vo.FormInstanceVo">
 		SELECT
 			*
 		FROM
@@ -649,8 +649,8 @@
 			SELECT
 				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 = 'height' THEN a.field_value END ) AS maxLevel,
+				MAX( CASE WHEN a.field_name = 'lowWaterHeight' THEN a.field_value END ) AS alarmLevel,
 				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
@@ -663,8 +663,8 @@
 				a.instance_id
 			) s
 		GROUP BY
-			s.alarm_level,
-			s.max_level,
+			s.alarmLevel,
+			s.maxLevel,
 			s.area,
 			s.`name`
 	</select>