renzheng

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

@@ -100,12 +100,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "线路编码")
     private String railwayCode;
 
-    /**
-     * 线路名称
-     */
-    @Excel(name = "线路名称")
-    private String railwayName;
-
     /**
      * 物联网卡号
      */

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

@@ -45,7 +45,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 相机编码
      */
-    private String alarmCamera;
+    private String cameraCode;
 
     /**
      * 报警时间

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

@@ -50,7 +50,7 @@ public class UploadController {
             if (StringUtils.isNotBlank(imageName)) {
                 LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
                 if (!ObjectUtils.isEmpty(cameraCode)) {
-                    lw.eq(MsgAlarm::getAlarmCamera, cameraCode);
+                    lw.eq(MsgAlarm::getCameraCode, cameraCode);
                     lw.orderByDesc(MsgAlarm::getAlarmTime);
                 }
                 List<MsgAlarm> list = msgAlarmService.list(lw);

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

@@ -139,8 +139,17 @@ public class GeoHazardMonitorTokenController {
             if (ObjectUtils.isEmpty(alarm)) {
                 MsgAlarm msgAlarm = new MsgAlarm();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
+                msgAlarm.setCameraCode(String.valueOf(reqMsgAlarmVo.getAlarmCamera()));
+                String[] imageUrl = reqMsgAlarmVo.getImageUrls();
+                StringBuffer buffer = new StringBuffer();
+                for (String ss : imageUrl) {
+                    buffer.append(ss);
+                    buffer.append(";");
+                }
+                msgAlarm.setImageUrl(buffer.toString());
 //                msgAlarm.setCreateBy(getUsername());
-                msgAlarm.setAlarmLine(baseCameraManagement.getRailwayName());
+                // 根据线路编码找线路名称 字典表 -- 卜占一
+                // msgAlarm.setAlarmLine(baseCameraManagement.getRailwayName());
                 msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 msgAlarmService.save(msgAlarm);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());

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

@@ -1,9 +1,11 @@
 package com.ozs.controller.upload;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.MinioUtils;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.stateSecrets.SM4Utils;
 import com.ozs.common.utils.uuid.IdUtils;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.MsgAlarm;
@@ -66,13 +68,33 @@ public class UploadController {
                 } else {
                     line = baseCameraManagement.getLineDir();
                 }
-                String imgName = baseCameraManagement.getRemark() + "/" + line + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
+                String imgName = baseCameraManagement.getRailwayCode() + "/" + line + "/" + baseCameraManagement.getInstallMile() + "/" + format1 + "/" + filename;
                 minioUtils.minIoClientUpload(stream.getInputStream(), imgName);
-                uploadFile = "/" + baseCameraManagement.getRemark() + "/" + line + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
+                uploadFile = "/" + baseCameraManagement.getRailwayCode() + "/" + line + "/" + baseCameraManagement.getInstallMile() + "/" + format1 + "/" + filename;
             }
         } else {
             return AjaxResult.error("上传功能出错");
         }
         return AjaxResult.success(uploadFile);
     }
+
+    public static void main(String[] args) {
+        String[] sre = new String[3];
+        sre[0] = "123";
+        sre[1] = "1234";
+        sre[2] = "12345";
+        JSONObject res = new JSONObject();
+        res.put("alarmCamera", "123");
+        res.put("alarmId", "6588");
+        res.put("alarmTime", 68822222222L);
+        res.put("alarmMile", "1,2,6,8,6,7");
+        res.put("content", "报警内容");
+        res.put("alarmConfidence", 88);
+        res.put("lineDir", 1);
+        res.put("alarmAttr", "aaa");
+        res.put("alarmType", 1);
+        res.put("imageUrls", sre);
+        String s = SM4Utils.encryptData_ECB(JSONObject.toJSONString(res), "4370780c9a8c43e5");
+        System.out.println(s);
+    }
 }

hazard-sdk/src/main/java/com/ozs/vo/ReqMsgAlarmVo.java

@@ -17,7 +17,7 @@ public class ReqMsgAlarmVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 报警的唯一标识 */
-    private Long alarmId;
+    private String alarmId;
 
     /** 报警时间 */
     private Long alarmTime;
@@ -44,5 +44,5 @@ public class ReqMsgAlarmVo implements Serializable {
     private String alarmAttr;
     
     /** 报警图片地址 */
-    private String imageUrl;
+    private String[] imageUrls;
 }

hazard-sdk/src/main/java/com/ozs/vo/RespMsgAlarmVo.java

@@ -14,7 +14,7 @@ public class RespMsgAlarmVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
-    private Long alarmId;
+    private String alarmId;
 
     /** 报警解除时间 */
     private Long cancelTime;