异物侵限接口开发

business-service/src/main/java/com/ozs/service/entity/BaseMeasurePoint.java

@@ -0,0 +1,48 @@
+package com.ozs.service.entity;
+
+
+import com.ozs.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 测点信息表
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-17
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class BaseMeasurePoint extends BaseEntity implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 测点编码
+     */
+    private String pointCode;
+
+
+    /**
+     * 线路编码
+     */
+    private String railwayCode;
+
+    /**
+     * 行别(1上行2下行3上下行）
+     */
+    private Integer lineDir;
+
+    /**
+     * 监控相机安装里程位置
+     */
+    private Integer installMile;
+
+}

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

@@ -1,23 +0,0 @@
-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 fileUrl;
-    /**
-     * 1图片；2声音；3视频
-     */
-    public Integer fileType;
-}

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

@@ -56,9 +56,16 @@ public class ReqMsgAlarmMatterVo {
      * 报警病害属性（可以给出泥石流的框定范围）
      */
     private String[] alarmAttr;
-
     /**
-     * 报警附件集合
+     * 文件名
+     */
+    private String fileName;
+    /**
+     * 测点编码
+     */
+    private String pointCode;
+    /**
+     * 文件类型
      */
-    private Files[] files;
+    private Integer fileType;
 }

business-service/src/main/java/com/ozs/service/mapper/BaseMeasurePointMapper.java

@@ -0,0 +1,19 @@
+package com.ozs.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.service.entity.BaseMeasurePoint;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * <p>
+ * 测点信息表 Mapper 接口
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-22
+ */
+@Mapper
+public interface BaseMeasurePointMapper extends BaseMapper<BaseMeasurePoint> {
+
+}

business-service/src/main/java/com/ozs/service/service/BaseMeasurePointService.java

@@ -0,0 +1,17 @@
+package com.ozs.service.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.service.entity.BaseMeasurePoint;
+
+/**
+ * <p>
+ * 测点信息表 服务类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-22
+ */
+public interface BaseMeasurePointService extends IService<BaseMeasurePoint> {
+
+}

business-service/src/main/java/com/ozs/service/service/impl/BaseMeasurePointServiceImpl.java

@@ -0,0 +1,15 @@
+package com.ozs.service.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.service.entity.BaseMeasurePoint;
+import com.ozs.service.mapper.BaseMeasurePointMapper;
+import com.ozs.service.service.BaseMeasurePointService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ * 测点信息表服务实现类
+ */
+@Service
+public class BaseMeasurePointServiceImpl extends ServiceImpl<BaseMeasurePointMapper, BaseMeasurePoint> implements BaseMeasurePointService {
+}

business-service/src/main/resources/mapper/service/BaseMeasurePonitMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.service.mapper.BaseMeasurePointMapper">
+
+
+</mapper>

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

@@ -10,7 +10,6 @@ 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;
@@ -55,6 +54,8 @@ public class GeoHazardMonitorTokenController {
     private BaseRailwayManagementService baseRailwayManagementService;
     @Autowired
     private BaseUserService baseUserService;
+    @Value("${base.imgUrl}")
+    private String imgUrl;
 
 
     /**
@@ -168,6 +169,18 @@ 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, "文件类型不能为空");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
+            }
             if (reqMsgAlarmMatterVo.getAlarmTime().toString().length() == 10) {
                 reqMsgAlarmMatterVo.setAlarmTime(reqMsgAlarmMatterVo.getAlarmTime() * 1000);
             }
@@ -182,7 +195,6 @@ public class GeoHazardMonitorTokenController {
             BaseUser admin = baseUserService.getUserName("admin");
             MsgAlarmFrequencyMatter msgAlarmFrequencyMatter = new MsgAlarmFrequencyMatter();
             if (ObjectUtils.isEmpty(alarm)) {
-                List<String> stringList = new ArrayList<>();
                 MsgAlarmMatter msgAlarmMatter = new MsgAlarmMatter();
                 String[] alarmAttr = reqMsgAlarmMatterVo.getAlarmAttr();
                 if (alarmAttr.length > 0) {
@@ -207,29 +219,15 @@ public class GeoHazardMonitorTokenController {
                 msgAlarmMatter.setRailwayCode(reqMsgAlarmMatterVo.getAlarmRailway());
                 String source = split[split.length - 2];
                 msgAlarmMatter.setSource(source);
-                if (!ObjectUtils.isEmpty(reqMsgAlarmMatterVo.getFiles())) {
-                    Files[] files1 = reqMsgAlarmMatterVo.getFiles();
-                    if (files1.length > 0) {
-                        for (int i = 0; i < files1.length; i++) {
-                            if (ObjectUtils.isEmpty(files1[i].fileUrl)) {
-                                AjaxResults1 = new AjaxResults(0, "上传文件地址不能为空!!!");
-                                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
-                            }
-                            if (files1[i].fileType < 1 || files1[i].fileType > 3) {
-                                AjaxResults1 = new AjaxResults(0, "文件类型填写错误!!!");
-                                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), "f5408458becc8c68");
-                            }
-                            MsgAlarmExt msgAlarmExt = new MsgAlarmExt();
-                            msgAlarmExt.setAlarmId(msgAlarmMatter.getAlarmId());
-                            msgAlarmExt.setAlarmAttPath(files1[i].fileUrl);
-                            msgAlarmExt.setAlarmAttType(files1[i].fileType);
-                            msgAlarmExt.setCreateTime(new Date());
-                            stringList.add(files1[i].fileUrl);
-                            msgAlarmExtService.save(msgAlarmExt);
-                        }
-                    }
-                }
-                msgAlarmMatter.setImageUrls(stringList);
+                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);
                 msgAlarmMatterService.save(msgAlarmMatter);
                 msgAlarmFrequencyMatter.setCreateBy(admin.getUserId());
                 msgAlarmFrequencyMatter.setUpdateBy(admin.getUserId());
@@ -335,6 +333,4 @@ public class GeoHazardMonitorTokenController {
     }
 
 
-
-
 }

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

@@ -35,8 +35,6 @@ public class UploadController {
     MinioUtils minioUtils;
     @Autowired
     BaseCameraManagementService baseCameraManagementService;
-    @Value("${base.imgUrl}")
-    private String imgUrl;
     @Autowired
     private BaseRailwayManagementService baseRailwayManagementService;
 
@@ -48,6 +46,8 @@ public class UploadController {
                                   @RequestParam(value = "alarmMile", required = false) Integer alarmMile,
                                   @RequestParam(value = "alarmRailway", required = false) String alarmRailway,
                                   @RequestParam(value = "fileType", required = false) Integer fileType,
+                                  @RequestParam(value = "fileName", required = false) String fileName,
+                                  @RequestParam(value = "pointCode", required = false) String pointCode,
                                   @RequestParam(value = "lineDir", required = false) Integer lineDir) throws Exception {
 
         JSONObject jsonObject = new JSONObject();
@@ -57,7 +57,7 @@ public class UploadController {
             jsonObject.put("data", "不能上传空文件哦");
             return jsonObject;
         }
-        if (lineDir!=1&&lineDir!=2){
+        if (lineDir != 1 && lineDir != 2) {
             jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "行别填写错误");
@@ -75,36 +75,42 @@ public class UploadController {
             jsonObject.put("data", "要上传的stream的填写格式不正确");
             return jsonObject;
         }
-        if (ObjectUtils.isEmpty(contentType)){
+        if (ObjectUtils.isEmpty(contentType)) {
             jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "Content Type不能为空");
             return jsonObject;
         }
+        if (ObjectUtils.isEmpty(pointCode)) {
+            jsonObject.put("resultCode", 0);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "测点编码不能为空");
+            return jsonObject;
+        }
+        if (ObjectUtils.isEmpty(fileName)) {
+            jsonObject.put("resultCode", 0);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "文件名不能为空");
+            return jsonObject;
+        }
         LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
         if (!ObjectUtils.isEmpty(alarmRailway)) {
             queryWrapper.eq(BaseRailwayManagement::getRailwayCode, alarmRailway);
         }
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-        if (ObjectUtils.isEmpty(baseRailwayManagement)){
+        if (ObjectUtils.isEmpty(baseRailwayManagement)) {
             jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "填写的报警线路编码不存在");
             return jsonObject;
         }
-        //图片保存路径
-        //String fileUploadPath ="/"+userId+"/image";
-        String uploadFile = null;
         if (!stream.isEmpty()) {
-
             String imageName = stream.getOriginalFilename();
             if (StringUtils.isNotBlank(imageName)) {
-//                String filename = IdUtils.fastSimpleUUID() + stream.getOriginalFilename().substring(stream.getOriginalFilename().lastIndexOf("."));
-                SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
+                SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMdd");
                 String format1 = dateFormat1.format(new Date());
-                String imgName = alarmRailway + "/" + lineDir + "/" + alarmMile + "/" + format1 + "/" + imageName;
+                String imgName = "yiwuqinxian/"+alarmRailway + "/" + pointCode + "/" + format1 + "/" + imageName;
                 minioUtils.minIoClientUpload(stream.getInputStream(), imgName);
-                uploadFile = imgUrl+"/" + alarmRailway + "/" + lineDir + "/" + alarmMile + "/" + format1 + "/" + imageName;
             }
         } else {
             jsonObject.put("resultCode", 0);
@@ -112,11 +118,9 @@ public class UploadController {
             jsonObject.put("data", "图片为null");
             return jsonObject;
         }
-        Map<String, Object> map = new HashMap<>();
-        map.put("url", uploadFile);
         jsonObject.put("resultCode", 1);
         jsonObject.put("message", "成功");
-        jsonObject.put("data", map);
+        jsonObject.put("data", null);
         return jsonObject;
     }
 }