木垒转发bug修复

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();
     }
 

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

@@ -186,6 +186,17 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
     @Override
     public void saveAiAnalyseHardWareAlarmRecord(JSONObject body) {
         log.info("调用AiAnalyseHardWareAlarmRecordServiceImpl#saveAiAnalyseHardWareAlarmRecord方法，参数为：{}", body);
+        // 木垒转发到县平台
+        if (EnvironmentUtil.getActiveEnvironment().equals("baise")) {
+            CompletableFuture.runAsync(() -> {
+                //木垒转发
+                String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/api/saveHardWareAlarm")
+                        .body(JSON.toJSONString(body))
+                        .timeout(2000)//超时，毫秒
+                        .execute().body();
+                log.info("木垒AI预警转发结果：{}", result2);
+            });
+        }
         QueryWrapper<AiAnalyseHardWareRecord> 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<AiAnaly
         aiAnalyseHardWareAlarmRecordMapper.insert(aiAnalyseHardWareAlarmRecord);
         //将数据通过MQTT转发到前台
         asyncAiAnalyse.sendAiAnalyse(aiAnalyseHardWareAlarmRecord, Cts.PROJECT_LEVEL);
-        // 木垒转发到县平台
-        if (EnvironmentUtil.getActiveEnvironment().equals("baise") && aiAnalyseHardWareRecord.getProjectSn().equals("F20D19C31C5140C585185BAB10E8D9A2")) {
-            CompletableFuture.runAsync(() -> {
-                //木垒转发
-                String result2 = HttpRequest.post(PathUtil.getMlTranspondUrl() + "/xmgl/api/saveHardWareAlarm")
-                        .body(JSON.toJSONString(body))
-                        .timeout(2000)//超时，毫秒
-                        .execute().body();
-                log.info("木垒AI预警转发结果：{}", result2);
-            });
-        }
     }
 
     @Override

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<UfaceDev>()
                 .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<String, Object> map = new HashMap<>(16);
         FileInfo fileInfo = null;
         if (StringUtils.isNotBlank(dto.getBase64())) {