Browse Source

去除正则表达式

gao.qiang 2 years ago
parent
commit
0396cbd445

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

@@ -207,6 +207,9 @@ public class BaseCameraManagementController extends BaseController {
                 o.setEndMiles(end);
                 String begin = AppendUtils.stringAppend(o.getBeginMile());
                 o.setBeginMiles(begin);
+                o.setInstallMile(o.getInstallMile()/1000);
+                o.setEndMile(o.getEndMile()/1000);
+                o.setBeginMile(o.getBeginMile()/1000);
                 if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
                     o.setIsStartRecording(1);
                     for (String s : roleKey) {

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

@@ -232,7 +232,7 @@ public class GeoHazardMonitorTokenController {
             jsonObject.put("data", respMsgAlarmVo);
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
-            jsonObject.put("resultCode", 0);
+            jsonObject.put("resultCode", 2);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "token验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -284,7 +284,7 @@ public class GeoHazardMonitorTokenController {
             jsonObject.put("message", "设备状态数据传输失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
-            jsonObject.put("resultCode", 0);
+            jsonObject.put("resultCode", 2);
             jsonObject.put("message", "token验证失败");
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }