修改协议为ws

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

@@ -114,6 +114,62 @@ public class GeoHazardMonitorTokenController {
         }
     }
 
+    public static void main(String[] args) {
+//        String parameter = "rjW9XcaNdY1M2rtUj4rYsW+3nqcJUDBuE6Orqvd4vyMhOh3fQGPNava0aOcUA7h0wuxoQtHE3bUP5imxqbRd/iBT7QDkrqtdPP5QLEhQodT8v0l8YMMtb7yohAJfEThLJOJ8Odl0kuTJXEJBMD8pE//K9KpRGDY4eEKPdS26YywnIl6HwK9EweYxVGtfJOP3/N7lwum2ROv7iqYgefXd/IxGEG8eVqEUutGKpeCcM0dds/N3Uq5ri/k/BrpaKcV96GnlR4pWkBjWOW08eGJ78shuUJkC682294W4RUp3NPPR7OTErtVAh65or8pB+RGDZuZQlUJ/QVpWp2ZdCrN5Wjqsi1TIa00oGQbYmMixOF0=";
+//        String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+//        ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
+//        System.out.println(reqMsgAlarmVo.toString());
+        System.out.println(new Date().getTime());
+    }
+
+    @PostMapping("/encryptionAlarm")
+    public String encryptionAlarm(@RequestBody ReqMsgAlarmVo vo) {
+        String s1 = JSONObject.toJSONString(vo);
+        return SM4Utils.encryptData_ECB(s1, "4370780c9a8c43e5");
+    }
+
+    /**
+     * 设备状态数据传输
+     *
+     * @return
+     */
+    @PostMapping("/device/state")
+    public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws ParseException {
+        JSONObject jsonObject = new JSONObject();
+        String token = apiTokenUtils.getGeoHazardMonitorToken(request);
+        log.info("token:{}", token);
+        log.info("parameter:{}", parameter);
+        if (StringUtils.isNotEmpty(token)) {
+            ReqDeviceVo reqDeviceVo = JSON.parseObject(SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5"), ReqDeviceVo.class);
+            log.info("reqDeviceVo:{}", reqDeviceVo);
+            LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+            if (ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
+                jsonObject.put("resultCode", 2);
+                jsonObject.put("message", "信息编码为空！");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
+            BaseUser admin = baseUserService.getUserName("admin");
+            lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
+            BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
+            baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
+            baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
+            baseDynamicManagement.setUpdateBy(admin.getUserId());
+            log.info("reqDeviceVo:{}", baseDynamicManagement);
+            if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
+                jsonObject.put("resultCode", 1);
+                jsonObject.put("message", "成功");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "设备状态数据传输失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        } else {
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "token验证失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        }
+    }
+
     /**
      * 报警信息数据传输
      *
@@ -239,64 +295,4 @@ public class GeoHazardMonitorTokenController {
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
-
-    @PostMapping("/encryptionAlarm")
-    public String encryptionAlarm(@RequestBody ReqMsgAlarmVo vo) {
-        String s1 = JSONObject.toJSONString(vo);
-        return SM4Utils.encryptData_ECB(s1, "4370780c9a8c43e5");
-    }
-
-    /**
-     * 设备状态数据传输
-     *
-     * @return
-     */
-    @PostMapping("/device/state")
-    public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws ParseException {
-        JSONObject jsonObject = new JSONObject();
-        String token = apiTokenUtils.getGeoHazardMonitorToken(request);
-        log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
-        if (StringUtils.isNotEmpty(token)) {
-            ReqDeviceVo reqDeviceVo = JSON.parseObject(SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5"), ReqDeviceVo.class);
-            log.info("reqDeviceVo:{}", reqDeviceVo);
-            LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-            if (ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
-                jsonObject.put("resultCode", 2);
-                jsonObject.put("message", "信息编码为空！");
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-            }
-            BaseUser admin = baseUserService.getUserName("admin");
-            lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
-            BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
-            baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
-            baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
-            baseDynamicManagement.setUpdateBy(admin.getUserId());
-            log.info("reqDeviceVo:{}", baseDynamicManagement);
-            if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
-                jsonObject.put("resultCode", 1);
-                jsonObject.put("message", "成功");
-                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-            }
-            jsonObject.put("resultCode", 2);
-            jsonObject.put("message", "设备状态数据传输失败");
-            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-        } else {
-            jsonObject.put("resultCode", 2);
-            jsonObject.put("message", "token验证失败");
-            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
-        }
-    }
-
-    public static void main(String[] args) {
-//        String parameter = "rjW9XcaNdY1M2rtUj4rYsW+3nqcJUDBuE6Orqvd4vyMhOh3fQGPNava0aOcUA7h0wuxoQtHE3bUP5imxqbRd/iBT7QDkrqtdPP5QLEhQodT8v0l8YMMtb7yohAJfEThLJOJ8Odl0kuTJXEJBMD8pE//K9KpRGDY4eEKPdS26YywnIl6HwK9EweYxVGtfJOP3/N7lwum2ROv7iqYgefXd/IxGEG8eVqEUutGKpeCcM0dds/N3Uq5ri/k/BrpaKcV96GnlR4pWkBjWOW08eGJ78shuUJkC682294W4RUp3NPPR7OTErtVAh65or8pB+RGDZuZQlUJ/QVpWp2ZdCrN5Wjqsi1TIa00oGQbYmMixOF0=";
-//        String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
-//        ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
-//        System.out.println(reqMsgAlarmVo.toString());
-//        System.out.println(new Date().getTime());
-
-        String s = "0e525fd60be888f54f2ae226329859a5";
-        System.out.println(new String());
-        System.out.println(SM4Utils.decryptData_ECB(s, "4370780c9a8c43e5"));
-    }
 }