相机树开发

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

@@ -325,21 +325,32 @@ public class GeoHazardMonitorTokenController {
             BaseUser admin = baseUserService.getUserName("admin");
             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);
-            if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date targetDate = dateFormat.parse("2024-10-25 00:00:00");
+            log.info("修改时间----" + baseDynamicManagement.getUpdateTime());
+            log.info("自己定义的时间----" + targetDate);
+            if (!baseDynamicManagement.getUpdateTime().equals(targetDate)) {
+                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);
+                if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
+                    jsonObject.put("resultCode", 1);
+                    jsonObject.put("message", "成功");
+                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+                } else {
+                    jsonObject.put("resultCode", 0);
+                    jsonObject.put("message", "设备状态数据传输失败");
+                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+                }
+            } else {
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "成功");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            jsonObject.put("resultCode", 0);
-            jsonObject.put("message", "设备状态数据传输失败");
-            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         } else {
             jsonObject.put("resultCode", 2);
             jsonObject.put("message", "token验证失败");