Browse Source

报警信息临时表增加模拟状态字段

gao.qiang 1 year atrás
parent
commit
551b52105b

+ 8 - 0
business-service/src/main/java/com/ozs/entity/vo/MsgAlarmTemporary.java

@@ -97,6 +97,14 @@ public class MsgAlarmTemporary  implements Serializable {
     private String alarmAttr;
 
     private String fileUrl;
+    /**
+     * 模拟状态 1未使用2已使用
+     */
+    private Integer stare;
+    /**
+     * 模拟状态 1未使用2已使用
+     */
+    private String stareName;
     
     /**
      * 线路名称

+ 10 - 1
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmTemporaryController.java

@@ -118,6 +118,7 @@ public class MsgAlarmTemporaryController extends BaseController {
                 String mils = AppendUtils.stringAppend(o.getAlarmMile());
                 o.setAlarmMiles(mils);
                 o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
+                o.setStareName(o.getLineDir() == 1 ? "未使用" : "已使用");
                 o.setAlarmTypeStr(o.getAlarmType() == 1 ? "泥石流" : (o.getAlarmType() == 2 ? "异物侵线" : (o.getAlarmType() == 3 ? "断轨监测" : "未知")));
                 List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
                 data.stream().forEach(sysDictData -> {
@@ -163,7 +164,14 @@ public class MsgAlarmTemporaryController extends BaseController {
     @GetMapping("/alarm/{id}")
     @ApiOperation("报警推送假数据")
     public String alarm(@PathVariable Long id) {
+        JSONObject jsonObject = new JSONObject();
         MsgAlarmTemporary msgAlarmTemporary = msgAlarmTemporaryService.getById(id);
+        if (msgAlarmTemporary.getStare()==2){
+            jsonObject.put("resultCode", 0);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "数据已模拟,不能再次使用");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        }
         ReqMsgAlarmVo reqMsgAlarmVo = new ReqMsgAlarmVo();
         com.ozs.common.utils.bean.BeanUtils.copyProperties(msgAlarmTemporary, reqMsgAlarmVo);
         reqMsgAlarmVo.setAlarmTime(msgAlarmTemporary.getAlarmTime().getTime());
@@ -173,7 +181,6 @@ public class MsgAlarmTemporaryController extends BaseController {
         Files[] files2=new Files[1];
         files2[0]=files;
         reqMsgAlarmVo.setFiles(files2);
-        JSONObject jsonObject = new JSONObject();
         if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmAttr())) {
             if (!reqMsgAlarmVo.getAlarmAttr().matches(PATTERN)) {
                 jsonObject.put("resultCode", 0);
@@ -330,6 +337,8 @@ public class MsgAlarmTemporaryController extends BaseController {
         jsonObject.put("resultCode", 1);
         jsonObject.put("message", "ok");
         jsonObject.put("data", null);
+        msgAlarmTemporary.setStare(2);
+        msgAlarmTemporaryService.updateById(msgAlarmTemporary);
         return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
     }
 }