修改告警问题

amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/AlarmEventServiceImpl.java

@@ -70,8 +70,8 @@ public class AlarmEventServiceImpl extends BaseService<AlarmEventDto, AlarmEvent
 					for(Object o:arr) 
 					{
                        JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(o));
-						if (json.containsKey(value)) {
-							String warn = json.getString(value);
+						if (json.containsKey("key")&&value.equals(json.get("key"))) {
+							String warn = json.getString("label");
 							if (warn.indexOf("备留") == -1) {
 								equipAlarmEvent.setEquipName(objName);
 								equipAlarmEvent.setEventDesc(indexName);
@@ -81,7 +81,6 @@ public class AlarmEventServiceImpl extends BaseService<AlarmEventDto, AlarmEvent
 							}
 						}
 					}
-					
 				} else {
 					// equipAlarmEvent.setEquipIndex(value);
 					equipAlarmEvent.setEquipName(objName);

amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/resources/mapper/tdengine/EquipAlarmEventMapper.xml

@@ -25,7 +25,7 @@
         equip_alarm_event(created_time,staion_name,staion_id,gateway_id,equip_index,event_desc,equip_name,front_module,value)
         VALUES
 		<foreach collection="list" item="item" separator=",">
-         (NOW(),#{item.stationName},#{item.stationId},#{item.gatewayId},#{item.equipIndex},'#{item.eventDesc}','#{item.equipName}',#{item.frontModule},#{item.value})
+         (NOW(),#{item.stationName},#{item.stationId},#{item.gatewayId},#{item.equipIndex},'#{item.eventDesc}','#{item.equipName}',#{item.frontModule},'#{item.value}')
 		</foreach>
 	</insert>
 </mapper>