修改告警历史记录

AmosBankService/src/main/java/com/yeejoin/amos/bank/config/SelfSupportListener.java

@@ -240,15 +240,14 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
             
             //增建告警记录表            
       	     //告警记录          
-            List<Alarm> curAlarmList = alarmService.findByQueryColumn(eqpId+metricKey);
+            List<Alarm> curAlarmList = alarmService.findByQueryColumn(eqpId+"");
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (curAlarmList != null && curAlarmList.size() > 0) {
-            	if("异常".equals(curAlarmList.get(0).getCurrentState())){
+//            	if("异常".equals(curAlarmList.get(0).getCurrentState())){
             		 Alarm alarm = curAlarmList.get(0);
                      alarm.setUpdateDate(df.format(new Date()));
-                     alarm.setAlarmSourceType(metricKey);                  
                      iAlarmDao.save(alarm);            		
-            	}               
+//            	}               
             } else {
                 Alarm alarm = new Alarm();
                 alarm.setSourceId(eqpId+"");
@@ -270,7 +269,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
                 alarm.setEnsurePerson("");
                 alarm.setOrgCode(orgCode1);
                 alarm.setUpdateDate(df.format(new Date()));
-                alarm.setQueryColumn(eqpId+metricKey);          
+                alarm.setQueryColumn(eqpId+"");          
                 iAlarmDao.save(alarm);                
             }                              
         } catch (Exception e) {