From a8d50dc00026ce066403632cb96b4ee3ce6de783 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 07 一月 2025 13:40:01 +0800
Subject: [PATCH] 任务开始上报放在定时器中
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 31 ----------
src/main/java/com/zy/asrs/task/autoReportStartHandler.java | 127 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 127 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3911ecc..5b8eaa2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -863,36 +863,6 @@
command.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
command.setCommand((short) 1);
- if(Cools.isEmpty(taskWrk.getMarkStart())||taskWrk.getMarkStart()==0){
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo",taskWrk.getTaskNo());
- String response = "";
- try {
- //寮�濮嬩笂鎶�,鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
- response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(hashMap))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Boolean bool = false;
- if(jsonObject.get("ReturnStatus").equals(0)){
- bool = true;
- taskWrk.setMarkStart(1);
- }
- apiLogService.save("wcs寮�濮嬩换鍔′笂鎶ms"
- , wmsUrl + TaskExecCallback
- , null
- , "127.0.0.1"
- , JSON.toJSONString(hashMap)
- , response
- , bool
- );
- } catch (Exception e) {
- }
- }
-
if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command), false)) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(command));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
@@ -901,7 +871,6 @@
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
taskWrk.setWrkSts(12);
- taskWrk.setStatus(2);
taskWrk.setModiTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/task/autoReportStartHandler.java b/src/main/java/com/zy/asrs/task/autoReportStartHandler.java
new file mode 100644
index 0000000..aebe864
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/autoReportStartHandler.java
@@ -0,0 +1,127 @@
+package com.zy.asrs.task;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.controller.CrnController;
+import com.zy.asrs.controller.SiteController;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.mapper.TaskWrkMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OpenServiceImpl;
+import com.zy.common.service.CommonService;
+import com.zy.common.utils.HttpHandler;
+import com.zy.core.properties.SlaveProperties;
+import com.zy.system.service.ConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Component
+public class autoReportStartHandler {
+
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasErrLogService basErrLogService;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private TaskWrkMapper taskWrkMapper;
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private StaDescMapper staDescMapper;
+ @Autowired
+ private CommandInfoService commandInfoService;
+
+ @Autowired
+ private OpenServiceImpl openServiceImpl;
+ @Autowired
+ private StaDescService staDescService;
+
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private CommonService commonService;
+
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Value("${wms.inboundTaskApplyPath}")
+ private String inboundTaskApplyPath;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
+ @Value("${wms.taskStatusFeedbackPath}")
+ private String taskStatusFeedbackPath;
+ @Autowired
+ private CrnController crnController;
+ @Autowired
+ private SiteController siteController;
+
+ /**
+ * 鑷姩涓婃姤寮�濮�
+ * @throws IOException
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute() throws IOException {
+ List<TaskWrk> taskWrks=taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("status",1).in("wrk_sts",12,3));
+ if(taskWrks.size()>0){
+ for(TaskWrk taskWrk:taskWrks){
+ if(Cools.isEmpty(taskWrk.getMarkStart())||taskWrk.getMarkStart()==0){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("TaskNo",taskWrk.getTaskNo());
+ String response = "";
+ try {
+ //寮�濮嬩笂鎶�,鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(hashMap))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Boolean bool = false;
+ if(jsonObject.get("ReturnStatus").equals(0)){
+ bool = true;
+ taskWrk.setMarkStart(1);
+ taskWrk.setStatus(2);
+ taskWrkMapper.updateById(taskWrk);
+ }
+ apiLogService.save("wcs寮�濮嬩换鍔′笂鎶ms"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(hashMap)
+ , response
+ , bool
+ );
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
+ }
+
+}
--
Gitblit v1.9.1