diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java index 08486665b..036665548 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java +++ b/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 data = new HashMap<>(16); String online = "online"; diff --git a/src/main/java/com/zhgd/xmgl/modules/mulei/controller/MlHoistController.java b/src/main/java/com/zhgd/xmgl/modules/mulei/controller/MlHoistController.java index 7001a9e9c..f8d9add18 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mulei/controller/MlHoistController.java +++ b/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(() -> { - //木垒转发 - map.put("serialNumber", finalItem.getSerialNumber()); - String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/mlHoist/flow/add/transpond") - .body(JSON.toJSONString(map)) - .timeout(2000)//超时,毫秒 - .execute().body(); - log.info("工作流添加吊装作业信息转发结果:{}", result2); - }); +// CompletableFuture.runAsync(() -> { +// //木垒转发 +// map.put("serialNumber", finalItem.getSerialNumber()); +// String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/mlHoist/flow/add/transpond") +// .body(JSON.toJSONString(map)) +// .timeout(2000)//超时,毫秒 +// .execute().body(); +// log.info("工作流添加吊装作业信息转发结果:{}", result2); +// }); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 911c03369..a40346bcc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -218,7 +218,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl { //木垒转发 String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/api/saveHardWareAlarm") @@ -227,7 +227,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl { //木垒转发 String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/photo") @@ -1207,7 +1207,7 @@ status 状态码 String 1表示成功;其余表示失败 .execute().body(); log.info("木垒转发考勤结果:{}", result2); }); - } + }*/ } HashMap map = new HashMap<>(16); FileInfo fileInfo = null; diff --git a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java index f221c4761..6be12eded 100644 --- a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java +++ b/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 devList = safetyHatDevMapper.selectList(new LambdaQueryWrapper() .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; diff --git a/src/main/java/com/zhgd/xmgl/util/PathUtil.java b/src/main/java/com/zhgd/xmgl/util/PathUtil.java index bac311f2e..30ad04b87 100644 --- a/src/main/java/com/zhgd/xmgl/util/PathUtil.java +++ b/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() { - return StrUtil.removeSuffix(mlTranspondUrl, "/"); - } - - @Value("${ml.transpond.url:}") - public void setMlTranspondUrl(String mlTranspondUrl) { - PathUtil.mlTranspondUrl = mlTranspondUrl; - } +// public static String getMlTranspondUrl() { +// return StrUtil.removeSuffix(mlTranspondUrl, "/"); +// } +// +// @Value("${ml.transpond.url:}") +// public void setMlTranspondUrl(String mlTranspondUrl) { +// PathUtil.mlTranspondUrl = mlTranspondUrl; +// } public static void main(String[] args) {