From 9733e8dd79506fa1bbda8c161684f310af56f06d Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 6 Nov 2024 17:02:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=A8=E5=9E=92=E8=BD=AC=E5=8F=91bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mulei/controller/MlHoistController.java | 13 ++-------- ...AnalyseHardWareAlarmRecordServiceImpl.java | 22 ++++++++--------- .../impl/WorkerAttendanceServiceImpl.java | 24 ++++++++----------- 3 files changed, 23 insertions(+), 36 deletions(-) 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..2fca792e7 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 @@ -14,6 +14,7 @@ import com.zhgd.xmgl.modules.mulei.entity.MlHoist; import com.zhgd.xmgl.modules.mulei.service.IMlHoistService; import com.zhgd.xmgl.modules.video.entity.VideoItem; import com.zhgd.xmgl.modules.video.service.IVideoItemService; +import com.zhgd.xmgl.util.EnvironmentUtil; import com.zhgd.xmgl.util.FlowUtil; import com.zhgd.xmgl.util.PathUtil; import io.swagger.annotations.Api; @@ -32,6 +33,7 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.CompletableFuture; @@ -125,17 +127,6 @@ public class MlHoistController { item.setItemId(videoItemId); item.setIsFlowPass(1); 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); - }); 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 611fd358f..b8812119e 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 @@ -186,6 +186,17 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl { + //木垒转发 + String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/api/saveHardWareAlarm") + .body(JSON.toJSONString(body)) + .timeout(2000)//超时，毫秒 + .execute().body(); + log.info("木垒AI预警转发结果：{}", result2); + }); + } QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(AiAnalyseHardWareRecord::getHardwareId, body.getString("hardwareId")); AiAnalyseHardWareRecord aiAnalyseHardWareRecord = aiAnalyseHardWareRecordMapper.selectOne(queryWrapper); @@ -215,17 +226,6 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl { - //木垒转发 - String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/api/saveHardWareAlarm") - .body(JSON.toJSONString(body)) - .timeout(2000)//超时，毫秒 - .execute().body(); - log.info("木垒AI预警转发结果：{}", result2); - }); - } } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java index c9b678cf8..37fc6310b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -1180,6 +1180,16 @@ status 状态码 String 1表示成功；其余表示失败 @Override public String uploadAttendanceByDev(UploadAttendanceByDevDto dto) { + if (EnvironmentUtil.getActiveEnvironment().equals("baise")) { + CompletableFuture.runAsync(() -> { + //木垒转发 + String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/photo") + .body(JSON.toJSONString(dto)) + .timeout(5000)//超时，毫秒 + .execute().body(); + log.info("木垒转发考勤结果：{}", result2); + }); + } UfaceDev dev = ufaceDevMapper.selectOne(new LambdaQueryWrapper() .eq(UfaceDev::getDevSn, dto.getDeviceId())); if (dev == null) { @@ -1195,20 +1205,6 @@ status 状态码 String 1表示成功；其余表示失败 throw new OpenAlertException("workerId不存在"); } dto.setIdCard(workerInfo.getIdCard()); - if (!Objects.equals(dto.getIsTranspond(), true)) { - dto.setWorkerId(null); - dto.setIsTranspond(true); - if (EnvironmentUtil.getActiveEnvironment().equals("baise") && Objects.equals(dev.getProjectSn(), "F20D19C31C5140C585185BAB10E8D9A2")) { - CompletableFuture.runAsync(() -> { - //木垒转发 - String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/photo") - .body(JSON.toJSONString(dto)) - .timeout(2000)//超时，毫秒 - .execute().body(); - log.info("木垒转发考勤结果：{}", result2); - }); - } - } HashMap map = new HashMap<>(16); FileInfo fileInfo = null; if (StringUtils.isNotBlank(dto.getBase64())) {