fix bug

AmosBankService/src/main/java/com/yeejoin/amos/bank/constants/AlarmConstant.java

@@ -13,4 +13,5 @@ public class AlarmConstant {
     public static String ALARM_TYPE = "IP设备告警";
     public static String ALARM_NORMAL_STATUS = "清除";
     public static String ALARM_ABNORMAL_STATUS = "告警";
+    public static String ALARM_DEVICE = "警告告警";
 }

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

@@ -6,6 +6,8 @@ import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_LEVEL;
 import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_NORMAL_STATUS;
 import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_TYPE;
 import static com.yeejoin.amos.bank.constants.AlarmConstant.CLEAR_PERSON;
+import static com.yeejoin.amos.bank.constants.AlarmConstant.ALARM_DEVICE;
+
 
 import java.io.IOException;
 import java.net.URI;
@@ -198,12 +200,14 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
                         String sourceId = msgJson.getString("sourceId");
                         String orgCode = msgJson.getString("orgCode");
                         String authOrg = msgJson.getString("authOrg");
+                        String eqpName = msgJson.getString("eqpName");
+                        String cpblName = msgJson.getString("cpblName");
                         String authOrgTemp = JsonUtil.arraysToString(JsonUtil.toStringArray(authOrg));
                         if (!ObjectUtils.isEmpty(authOrgTemp)) {
                             orgCode = authOrgTemp;
                         }
                         //添加告警记录
-                        addRecordAlarm(alarmType, res, sourceId, orgCode, authOrg);
+                        addRecordAlarm(alarmType, res, sourceId, orgCode, authOrg, eqpName,cpblName);
                     }
                 }
             }else {
@@ -232,8 +236,10 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
      * @param sourceId 
      * @param orgCode
      * @param authOrg
+     * @param eqpName 设备名称
+     * @param cpblName 报警类型
      */
-    private void addRecordAlarm(String alarmType, String alarmStatus,String sourceId,String orgCode,String authOrg) {
+    private void addRecordAlarm(String alarmType, String alarmStatus,String sourceId,String orgCode,String authOrg,String eqpName,String cpblName) {
     	//告警记录
         String queryColumn = sourceId + "_" + alarmType;
         //查出当前记录中的告警记录
@@ -258,7 +264,9 @@ public class ShiduAlarmWebSocketClient extends WebSocketClient {
         } else {//记录无告警则新增
         	 Alarm alarm = new Alarm();
              alarm.setSourceId(sourceId);
-             alarm.setAlarmLevel("警告告警");
+             alarm.setAlarmReason(cpblName);
+             alarm.setAlarmSourceName(eqpName);
+             alarm.setAlarmLevel(ALARM_DEVICE);
              alarm.setAlarmSourceIp(sourceId);
              alarm.setAlarmSourceType(ALARM_TYPE);
              alarm.setClearDate("");

AmosBankService/src/main/java/com/yeejoin/amos/spc/business/controller/AlarmController.java

@@ -62,7 +62,7 @@ public class AlarmController extends BaseController {
 
         List<DaoCriteria> criterias = buildDaoCriterias(queryRequests);
         criterias.add(criteria);
-        Sort sort = new Sort(Sort.Direction.DESC, "updateDate");
+        Sort sort = new Sort(Sort.Direction.DESC, "happenDate");
         commonPageable.setSort(sort);
         Page<Alarm> list = iAlarmService.list(criterias, commonPageable);
         return CommonResponseUtil.success(list);