木垒去除设备转发

src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java

@@ -196,7 +196,7 @@ public class CarPassRecordController {
         map.put("closeup_pic", closeupPic);
         map.put("type", type);
         log.info("saveCarPassRecord：{}", JSON.toJSONString(map));
-        if (EnvironmentUtil.getActiveEnvironment().equals("baise") && Objects.equals(parkId, "F20D19C31C5140C585185BAB10E8D9A2")) {
+       /* if (EnvironmentUtil.getActiveEnvironment().equals("baise") && Objects.equals(parkId, "F20D19C31C5140C585185BAB10E8D9A2")) {
             CompletableFuture.runAsync(() -> {
                 //木垒转发
                 String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/carPassRecord/saveCarPassRecord")
@@ -205,7 +205,7 @@ public class CarPassRecordController {
                         .execute().body();
                 log.info("木垒转发车牌识别结果：{}", result2);
             });
-        }
+        }*/
 
         Map<String, Object> data = new HashMap<>(16);
         String online = "online";

src/main/java/com/zhgd/xmgl/modules/mulei/controller/MlHoistController.java

@@ -127,15 +127,15 @@ public class MlHoistController {
         videoItemService.updateById(item);
         item = videoItemService.getById(item.getItemId());
         VideoItem finalItem = item;
-        CompletableFuture.runAsync(() -> {
+//        CompletableFuture.runAsync(() -> {
-            //木垒转发
+//            //木垒转发
-            map.put("serialNumber", finalItem.getSerialNumber());
+//            map.put("serialNumber", finalItem.getSerialNumber());
-            String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/mlHoist/flow/add/transpond")
+//            String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/mlHoist/flow/add/transpond")
-                    .body(JSON.toJSONString(map))
+//                    .body(JSON.toJSONString(map))
-                    .timeout(2000)//超时，毫秒
+//                    .timeout(2000)//超时，毫秒
-                    .execute().body();
+//                    .execute().body();
-            log.info("工作流添加吊装作业信息转发结果：{}", result2);
+//            log.info("工作流添加吊装作业信息转发结果：{}", result2);
-        });
+//        });
         return Result.ok();
     }
 

src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java

@@ -218,7 +218,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
         //将数据通过MQTT转发到前台
         asyncAiAnalyse.sendAiAnalyse(aiAnalyseHardWareAlarmRecord, Cts.PROJECT_LEVEL);
         // 木垒转发到县平台
-        if (EnvironmentUtil.getActiveEnvironment().equals("baise") && aiAnalyseHardWareRecord.getProjectSn().equals("F20D19C31C5140C585185BAB10E8D9A2")) {
+       /* if (EnvironmentUtil.getActiveEnvironment().equals("baise") && aiAnalyseHardWareRecord.getProjectSn().equals("F20D19C31C5140C585185BAB10E8D9A2")) {
             CompletableFuture.runAsync(() -> {
                 //木垒转发
                 String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/api/saveHardWareAlarm")
@@ -227,7 +227,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
                         .execute().body();
                 log.info("木垒AI预警转发结果：{}", result2);
             });
-        }
+        }*/
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java

@@ -1198,7 +1198,7 @@ status	状态码	String	1表示成功；其余表示失败
         if (!Objects.equals(dto.getIsTranspond(), true)) {
             dto.setWorkerId(null);
             dto.setIsTranspond(true);
-            if (EnvironmentUtil.getActiveEnvironment().equals("baise") && Objects.equals(dev.getProjectSn(), "F20D19C31C5140C585185BAB10E8D9A2")) {
+           /* if (EnvironmentUtil.getActiveEnvironment().equals("baise") && Objects.equals(dev.getProjectSn(), "F20D19C31C5140C585185BAB10E8D9A2")) {
                 CompletableFuture.runAsync(() -> {
                     //木垒转发
                     String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/photo")
@@ -1207,7 +1207,7 @@ status	状态码	String	1表示成功；其余表示失败
                             .execute().body();
                     log.info("木垒转发考勤结果：{}", result2);
                 });
-            }
+            }*/
         }
         HashMap<String, Object> map = new HashMap<>(16);
         FileInfo fileInfo = null;

src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java

@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.util.concurrent.RateLimiter;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.xmgl.config.SafetyHatWSClient;
@@ -108,6 +109,11 @@ public class SafetyHatTask {
         }
     }
 
+    // 设置每秒最大请求数
+    private static final double MAX_REQUESTS_PER_SECOND = 15.0;
+    // 创建一个RateLimiter实例
+    private static final RateLimiter rateLimiter = RateLimiter.create(MAX_REQUESTS_PER_SECOND);
+
     /**
      * 定时2分钟获取安全帽数据
      */
@@ -122,6 +128,8 @@ public class SafetyHatTask {
                 List<SafetyHatDev> devList = safetyHatDevMapper.selectList(new LambdaQueryWrapper<SafetyHatDev>()
                         .eq(SafetyHatDev::getProjectSn, project.getProjectSn()));
                 for (SafetyHatDev dev : devList) {
+                    // 等待从RateLimiter获取权限
+                    rateLimiter.acquire();
                     if (StrUtil.isBlank(dev.getExtUserId())) {
                         log.info("定时2分钟获取安全帽数据任务，安全帽外部user_id没有设置,devSn:{}", dev.getDevSn());
                         continue;

src/main/java/com/zhgd/xmgl/util/PathUtil.java

@@ -9,7 +9,7 @@ public class PathUtil {
 
     private static String basePath;
     private static String serverUrl;
-    private static String mlTranspondUrl;
+//    private static String mlTranspondUrl;
 
     /**
      * 删除多余的斜杠
@@ -30,14 +30,14 @@ public class PathUtil {
         PathUtil.serverUrl = serverUrl;
     }
 
-    public static String getMlTranspondUrl() {
+//    public static String getMlTranspondUrl() {
-        return StrUtil.removeSuffix(mlTranspondUrl, "/");
+//        return StrUtil.removeSuffix(mlTranspondUrl, "/");
-    }
+//    }
-
+//
-    @Value("${ml.transpond.url:}")
+//    @Value("${ml.transpond.url:}")
-    public void setMlTranspondUrl(String mlTranspondUrl) {
+//    public void setMlTranspondUrl(String mlTranspondUrl) {
-        PathUtil.mlTranspondUrl = mlTranspondUrl;
+//        PathUtil.mlTranspondUrl = mlTranspondUrl;
-    }
+//    }
 
 
     public static void main(String[] args) {