去除正则表达式

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -366,6 +366,9 @@ public class BaseCameraManagementController extends BaseController {
         baseCameraManagement.setEndMiles(end);
         String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
         baseCameraManagement.setBeginMiles(begin);
+        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile()/1000);
+        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile()/1000);
+        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile()/1000);
         return AjaxResult.success(baseCameraManagement);
     }
 

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

@@ -73,7 +73,7 @@ public class GeoHazardMonitorTokenController {
         if (!ObjectUtils.isEmpty(svcAddress.getClientId())) {
             lw.eq(SvcAddress::getClientId, svcAddress.getClientId());
         }else {
-            jsonObject.put("resultCode", 2);
+            jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "客户端编号不能为空");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -94,19 +94,19 @@ public class GeoHazardMonitorTokenController {
                     jsonObject.put("data", respGeoHazardMonitorVo);
                     return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
                 } else {
-                    jsonObject.put("resultCode", 2);
+                    jsonObject.put("resultCode", 0);
                     jsonObject.put("message", "失败");
                     jsonObject.put("data", "生成token失败");
                     return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
                 }
             }else {
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "客户端密钥错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
         } else {
-            jsonObject.put("resultCode", 2);
+            jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "参数验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -129,7 +129,7 @@ public class GeoHazardMonitorTokenController {
             String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
             ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
             if (!reqMsgAlarmVo.getAlarmAttr().matches(PATTERN)) {
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "你填写的报警病害属性不符合规则!!!");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -147,7 +147,7 @@ public class GeoHazardMonitorTokenController {
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
             log.info("baseCameraManagement:{}", baseCameraManagement);
             if (ObjectUtils.isEmpty(baseCameraManagement)) {
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "你填写的相机编码不存在!!!");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -222,7 +222,7 @@ public class GeoHazardMonitorTokenController {
             } catch (Exception e) {
                 log.info(e.getMessage());
                 e.printStackTrace();
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "消息推送失败");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -232,7 +232,7 @@ public class GeoHazardMonitorTokenController {
             jsonObject.put("data", respMsgAlarmVo);
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
-            jsonObject.put("resultCode", 2);
+            jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "token验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -261,7 +261,7 @@ public class GeoHazardMonitorTokenController {
             log.info("reqDeviceVo:{}", reqDeviceVo);
             LambdaQueryWrapper<BaseDeviceDynamicManagement> lw = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
             if (ObjectUtils.isEmpty(reqDeviceVo.getCameraCode())) {
-                jsonObject.put("resultCode", 2);
+                jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "信息编码为空！");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
@@ -269,6 +269,9 @@ public class GeoHazardMonitorTokenController {
             lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
             BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
             baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
+            if (reqDeviceVo.getTime().toString().length() == 10) {
+                reqDeviceVo.setTime(reqDeviceVo.getTime() * 1000);
+            }
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
             baseDynamicManagement.setUpdateBy(admin.getUserId());
             log.info("reqDeviceVo:{}", baseDynamicManagement);
@@ -277,11 +280,11 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("message", "成功");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            jsonObject.put("resultCode", 2);
+            jsonObject.put("resultCode", 0);
             jsonObject.put("message", "设备状态数据传输失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
-            jsonObject.put("resultCode", 2);
+            jsonObject.put("resultCode", 0);
             jsonObject.put("message", "token验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }