fix bug

AmosBankService/src/main/java/com/yeejoin/amos/bank/webSocket/ShiduAlarmWebSocketClient.java

@@ -198,6 +198,10 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
                         String sourceId = msgJson.getString("sourceId");
                         String orgCode = msgJson.getString("orgCode");
                         String authOrg = msgJson.getString("authOrg");
+                        String authOrgTemp = JsonUtil.arraysToString(JsonUtil.toStringArray(authOrg));
+                        if (!ObjectUtils.isEmpty(authOrgTemp)) {
+                            orgCode = authOrgTemp;
+                        }
                         //添加告警记录
                         addRecordAlarm(alarmType, res, sourceId, orgCode, authOrg);
                     }
@@ -230,14 +234,14 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
      * @param authOrg
      */
     private void addRecordAlarm(String alarmType, String alarmStatus,String sourceId,String orgCode,String authOrg) {
-    	SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     	//告警记录
         String queryColumn = sourceId + "_" + alarmType;
         //查出当前记录中的告警记录
         List<Alarm> curAlarmList = alarmService.findByQueryColumn(queryColumn);
         if (curAlarmList != null && curAlarmList.size() > 0) {
             Alarm alarm = curAlarmList.get(0);
-            alarm.setUpdateDate(df.format(new Date()));
+            alarm.setOrgCode(orgCode);
+            alarm.setUpdateDate(DateTimeKit.now());
             if (!ObjectUtils.isEmpty(alarm.getHappenDate())) {
                 String subtract = DateTimeKit.getSubtract(alarm.getHappenDate());
                 alarm.setContinueDate(subtract);