Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -127,7 +127,7 @@ public class GeoHazardMonitorTokenController {
             if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmCamera())) {
                 wrapper.eq(BaseCameraManagement::getCameraCode, reqMsgAlarmVo.getAlarmCamera());
             }
-            BaseCameraManagement  baseCameraManagement = baseCameraManagementService.getOne(wrapper);
+            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
             if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())) {
                 reqMsgAlarmVo.setLineDir(baseCameraManagement.getLineDir());
             }
@@ -159,6 +159,13 @@ public class GeoHazardMonitorTokenController {
             } else {
                 MsgAlarmFrequency msgAlarmVice = new MsgAlarmFrequency();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarmVice);
+                String[] imageUrl = reqMsgAlarmVo.getImageUrls();
+                StringBuffer buffer = new StringBuffer();
+                for (String ss : imageUrl) {
+                    buffer.append(ss);
+                    buffer.append(";");
+                }
+                msgAlarmVice.setImageUrl(buffer.toString());
 //                msgAlarmVice.setCreateBy(getUsername());
                 msgAlarmFrequencyService.save(msgAlarmVice);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
@@ -188,16 +195,18 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @PostMapping("/device/state")
-    public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws
-            ParseException {
+    public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws ParseException {
         JSONObject jsonObject = new JSONObject();
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         if (StringUtils.isNotEmpty(token)) {
             ReqDeviceVo reqDeviceVo = JSON.parseObject(SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5"), ReqDeviceVo.class);
             LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-            if (!ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
-                lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
+            if (ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
+                jsonObject.put("resultCode", 2);
+                jsonObject.put("message", "信息编码为空！");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
+            lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
             BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));

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

@@ -78,23 +78,32 @@ public class UploadController {
         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);
-    }
+//    public static void main(String[] args) {
+//        String[] sre = new String[3];
+//        sre[0] = "/1244/1/25/2023-03-03/63a1fe3084f24928915dafcf8a47a925.png";
+//        sre[1] = "/1244/1/25/2023-03-03/63a1fe3084f24928915dafcf8a47a925.png";
+//        sre[2] = "/1244/1/25/2023-03-03/63a1fe3084f24928915dafcf8a47a925.png";
+//        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);
+//    }
+public static void main(String[] args) {
+    JSONObject res = new JSONObject();
+    res.put("cameraCode", "654321");
+    res.put("time", "1232456789");
+    res.put("electricity", 88);
+    res.put("cameraState", 1);
+    String s = SM4Utils.encryptData_ECB(JSONObject.toJSONString(res), "4370780c9a8c43e5");
+    System.out.println(s);
+}
 }