Browse Source

添加返回信息

gao.qiang 1 year ago
parent
commit
a4e64a822e

+ 10 - 0
business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -126,4 +126,14 @@ public class MsgAlarmResp implements Serializable {
      * 解除人真实姓名
      * 解除人真实姓名
      */
      */
     private String releasedByName;
     private String releasedByName;
+
+    /**
+     * 解除报警类型名称   1真实报警2误报警
+     */
+    private String releasedTypeName;
+
+    /**
+     * 报警置信度(百分比)
+     */
+    private Integer alarmConfidence;
 }
 }

+ 3 - 0
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -799,6 +799,9 @@ public class BaseCameraManagementController extends BaseController {
                 msgAlarmResp.setContent(msgAlarm.getContent());
                 msgAlarmResp.setContent(msgAlarm.getContent());
                 msgAlarmResp.setReleasedByName(msgAlarm.getReleasedByName());
                 msgAlarmResp.setReleasedByName(msgAlarm.getReleasedByName());
                 msgAlarmResp.setReleasedReason(msgAlarm.getReleasedReason());
                 msgAlarmResp.setReleasedReason(msgAlarm.getReleasedReason());
+                if (!ObjectUtils.isEmpty(msgAlarmResp.getReleasedType())) {
+                    msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "真实报警" : "误报警");
+                }
                 if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
                 if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
                     String[] split = msgAlarm.getImageUrl().split(";");
                     String[] split = msgAlarm.getImageUrl().split(";");
                     ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
                     ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));

+ 3 - 0
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -348,6 +348,9 @@ public class MsgAlarmController extends BaseController {
                 BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
                 BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
                 msgAlarm.setReleasedByName(user.getNickName());
                 msgAlarm.setReleasedByName(user.getNickName());
             }
             }
+            if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
+                msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "真实报警" : "误报警");
+            }
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());