异物侵限接口开发

business-service/src/main/java/com/ozs/service/entity/vo/ReqMsgAlarmMatterVo.java

@@ -55,7 +55,7 @@ public class ReqMsgAlarmMatterVo {
     /**
      * 报警病害属性（可以给出泥石流的框定范围）
      */
-    private String alarmAttr;
+    private String[] alarmAttr;
 
     /**
      * 报警附件集合

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -156,6 +156,10 @@ public class GeoHazardMonitorTokenController {
                 AjaxResults1 = new AjaxResults(0, "报警时间不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
             }
+            if (ObjectUtils.isEmpty(reqMsgAlarmMatterVo.getAlarmAttr())) {
+                AjaxResults1 = new AjaxResults(0, "报警病害属性不能为空");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
+            }
             if (reqMsgAlarmMatterVo.getAlarmType() < 1 || reqMsgAlarmMatterVo.getAlarmType() > 4) {
                 AjaxResults1 = new AjaxResults(0, "报警病害类型填写错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
@@ -180,6 +184,14 @@ public class GeoHazardMonitorTokenController {
             if (ObjectUtils.isEmpty(alarm)) {
                 List<String> stringList = new ArrayList<>();
                 MsgAlarmMatter msgAlarmMatter = new MsgAlarmMatter();
+                String[] alarmAttr = reqMsgAlarmMatterVo.getAlarmAttr();
+                if (alarmAttr.length > 0) {
+                    StringBuilder builder = new StringBuilder();
+                    for (int i = 0; i < alarmAttr.length; i++) {
+                        builder.append(alarmAttr[i]).append(":");
+                    }
+                    msgAlarmMatter.setAlarmAttr(builder.toString());
+                }
                 BeanUtils.copyProperties(reqMsgAlarmMatterVo, msgAlarmMatter);
                 BeanUtils.copyProperties(reqMsgAlarmMatterVo, msgAlarmFrequencyMatter);
                 msgAlarmMatter.setCreateBy(admin.getUserId());