异物侵限接口开发

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

@@ -0,0 +1,23 @@
+package com.ozs.service.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ * 报警附件
+ */
+@Data
+public class Files implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 文件名称
+     */
+    public String fileName;
+    /**
+     * 文件类型
+     */
+    public Integer fileType;
+}

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

@@ -2,6 +2,8 @@ package com.ozs.service.entity.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ReqMsgAlarmMatterVo {
     private static final long serialVersionUID = 1L;
@@ -56,10 +58,6 @@ public class ReqMsgAlarmMatterVo {
      * 报警病害属性（可以给出泥石流的框定范围）
      */
     private String[] alarmAttr;
-    /**
-     * 文件名
-     */
-    private String fileName;
     /**
      * 测点编码
      */
@@ -67,5 +65,5 @@ public class ReqMsgAlarmMatterVo {
     /**
      * 文件类型
      */
-    private Integer fileType;
+    private List<Files> files;
 }

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

@@ -10,6 +10,7 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
 import com.ozs.config.AjaxResults;
 import com.ozs.service.entity.*;
+import com.ozs.service.entity.vo.Files;
 import com.ozs.service.entity.vo.ParameterVo;
 import com.ozs.service.entity.vo.ReleaseAlarmVo;
 import com.ozs.service.entity.vo.ReqMsgAlarmMatterVo;
@@ -170,16 +171,12 @@ public class GeoHazardMonitorTokenController {
                 AjaxResults1 = new AjaxResults(0, "报警级别填写错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
             }
-            if (ObjectUtils.isEmpty(reqMsgAlarmMatterVo.getFileName())) {
-                AjaxResults1 = new AjaxResults(0, "文件名不能为空");
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
-            }
             if (ObjectUtils.isEmpty(reqMsgAlarmMatterVo.getPointCode())) {
                 AjaxResults1 = new AjaxResults(0, "测点编码不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
             }
-            if (ObjectUtils.isEmpty(reqMsgAlarmMatterVo.getFileType())) {
-                AjaxResults1 = new AjaxResults(0, "文件类型不能为空");
+            if (ObjectUtils.isEmpty(reqMsgAlarmMatterVo.getFiles())) {
+                AjaxResults1 = new AjaxResults(0, "报警文件集合不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
             }
             BaseMeasurePoint one = baseMeasurePointService.getOne(new LambdaQueryWrapper<BaseMeasurePoint>()
@@ -226,15 +223,28 @@ public class GeoHazardMonitorTokenController {
                 msgAlarmMatter.setRailwayCode(reqMsgAlarmMatterVo.getAlarmRailway());
                 String source = split[split.length - 2];
                 msgAlarmMatter.setSource(source);
-                MsgAlarmExt msgAlarmExt = new MsgAlarmExt();
-                msgAlarmExt.setAlarmId(msgAlarmMatter.getAlarmId());
-                SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMdd");
-                String format1 = dateFormat1.format(new Date());
-                String fileName = imgUrl + "/yiwuqinxian/" + reqMsgAlarmMatterVo.getAlarmRailway() + "/" + reqMsgAlarmMatterVo.getPointCode() + "/" + format1 + "/" + reqMsgAlarmMatterVo.getFileName();
-                msgAlarmExt.setAlarmAttPath(fileName);
-                msgAlarmExt.setAlarmAttType(reqMsgAlarmMatterVo.getFileType());
-                msgAlarmExt.setCreateTime(new Date());
-                msgAlarmExtService.save(msgAlarmExt);
+
+                for (Files file : reqMsgAlarmMatterVo.getFiles()) {
+                    if (ObjectUtils.isEmpty(file.getFileType())) {
+                        AjaxResults1 = new AjaxResults(0, "文件类型不能为空");
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
+                    }
+                    if (ObjectUtils.isEmpty(file.getFileName())) {
+                        AjaxResults1 = new AjaxResults(0, "文件名称不能为空");
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
+                    }
+                    MsgAlarmExt msgAlarmExt = new MsgAlarmExt();
+                    msgAlarmExt.setAlarmId(msgAlarmMatter.getAlarmId());
+                    SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMdd");
+                    String format1 = dateFormat1.format(new Date());
+                    String fileName = imgUrl + "/yiwuqinxian/" + reqMsgAlarmMatterVo.getAlarmRailway() + "/" + reqMsgAlarmMatterVo.getPointCode() + "/" + format1 + "/" + file.getFileName();
+                    msgAlarmExt.setAlarmAttPath(fileName);
+                    msgAlarmExt.setAlarmAttType(file.getFileType());
+                    msgAlarmExt.setCreateTime(new Date());
+                    msgAlarmExtService.save(msgAlarmExt);
+                }
+
+
                 msgAlarmMatterService.save(msgAlarmMatter);
                 msgAlarmFrequencyMatter.setCreateBy(admin.getUserId());
                 msgAlarmFrequencyMatter.setUpdateBy(admin.getUserId());