From 5ede6d1ba71a47fa33034d6e815681f218d61ff9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 11 八月 2023 15:42:28 +0800
Subject: [PATCH] 日志
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 41 +++++++++++++
/dev/null | 53 -----------------
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 4 +
src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java | 4 +
src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java | 13 ++++
src/main/java/com/zy/asrs/service/TaskWrkService.java | 6 ++
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 11 +++
src/main/resources/mapper/TaskWrkMapper.xml | 11 +++
src/main/java/com/zy/asrs/service/CommandInfoService.java | 4 +
src/main/resources/mapper/CommandInfoMapper.xml | 9 +++
10 files changed, 103 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java b/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
index 4705017..931edd5 100644
--- a/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java
@@ -14,4 +14,8 @@
List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo);
List<CommandInfo> selectByWrkNo(Integer wrkNo);
+
+ List<CommandInfo> selectByTaskNo(String taskNo);
+
+ int saveToHistory(String taskNo);//灏嗘寚浠よ浆鏃ュ織
}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index f407922..87a02af 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -23,4 +23,8 @@
WrkMast selectCrnWorking(@Param("crnNo") Integer crnNo);
+ List<TaskWrk> selectToBeHistoryData();
+
+ int saveToHistory(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
+
}
diff --git a/src/main/java/com/zy/asrs/service/CommandInfoService.java b/src/main/java/com/zy/asrs/service/CommandInfoService.java
index e022238..181ca55 100644
--- a/src/main/java/com/zy/asrs/service/CommandInfoService.java
+++ b/src/main/java/com/zy/asrs/service/CommandInfoService.java
@@ -11,4 +11,8 @@
List<CommandInfo> selectByWrkNo(Integer wrkNo);
+ List<CommandInfo> selectByTaskNo(String taskNo);
+
+ int saveToHistory(String taskNo);//灏嗘寚浠よ浆鏃ュ織
+
}
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
index ec8debb..696d11d 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -3,6 +3,8 @@
import com.zy.asrs.entity.TaskWrk;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
public interface TaskWrkService extends IService<TaskWrk> {
TaskWrk selectByTaskNo(String taskNo);
@@ -21,4 +23,8 @@
//搴撲綅绉昏浆
void locMove(TaskWrk taskWrk, Long userId);
+ List<TaskWrk> selectToBeHistoryData();
+
+ int saveToHistory(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
index 44dd2aa..13a7c0e 100644
--- a/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java
@@ -20,4 +20,17 @@
public List<CommandInfo> selectByWrkNo(Integer wrkNo) {
return this.baseMapper.selectByWrkNo(wrkNo);
}
+
+ @Override
+ public List<CommandInfo> selectByTaskNo(String taskNo) {
+ return this.baseMapper.selectByTaskNo(taskNo);
+ }
+
+ @Override
+ public int saveToHistory(String taskNo) {
+ if (this.selectByTaskNo(taskNo).isEmpty()) {
+ return 0;
+ }
+ return this.baseMapper.saveToHistory(taskNo);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 2374090..56c6a4e 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.List;
@Service("taskWrkService")
public class TaskWrkServiceImpl extends ServiceImpl<TaskWrkMapper, TaskWrk> implements TaskWrkService {
@@ -93,4 +94,14 @@
taskWrk.setModiUser(userId);
updateById(taskWrk);
}
+
+ @Override
+ public List<TaskWrk> selectToBeHistoryData() {
+ return this.baseMapper.selectToBeHistoryData();
+ }
+
+ @Override
+ public int saveToHistory(String taskNo) {
+ return this.baseMapper.saveToHistory(taskNo);
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
new file mode 100644
index 0000000..27bac8f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -0,0 +1,41 @@
+package com.zy.asrs.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.CommandInfo;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.service.CommandInfoService;
+import com.zy.asrs.service.TaskWrkService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
+ */
+@Slf4j
+@Component
+public class TaskLogScheduler {
+
+ @Autowired
+ private TaskWrkService taskWrkService;
+ @Autowired
+ private CommandInfoService commandInfoService;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void execute() {
+ for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
+ if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
+ //浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
+ commandInfoService.saveToHistory(taskWrk.getTaskNo());
+
+ //鍒犻櫎浠诲姟
+ taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
+ //鍒犻櫎鎸囦护
+ commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/WmsWrkLogScheduler.java b/src/main/java/com/zy/asrs/task/WmsWrkLogScheduler.java
deleted file mode 100644
index 14cd36e..0000000
--- a/src/main/java/com/zy/asrs/task/WmsWrkLogScheduler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.zy.asrs.task;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.zy.common.utils.HttpHandler;
-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;
-
-/**
- * 瀹氭椂灏哤MS浠诲姟(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
- */
-@Slf4j
-@Component
-public class WmsWrkLogScheduler {
-
- @Value("${wms.url}")
- private String wmsUrl;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- public void execute() {
-// for (WmsWrk wmsWrk : wmsWrkService.selectToBeHistoryData()) {
-// boolean save = wmsWrkLogService.save(wmsWrk.getWmsWrkNo());
-// boolean delete = wmsWrkService.deleteById(wmsWrk.getWmsWrkNo());
-// if (!save || !delete) {
-// log.error("浠诲姟[wmsWrkNo={}]鍘嗗彶澶勭悊澶辫触", wmsWrk.getWmsWrkNo());
-// }
-//
-// try {
-// //浠诲姟涓婃姤
-// String response = new HttpHandler.Builder()
-// .setUri(wmsUrl)
-// .setPath("/wmsWrk/test")
-// .setJson(JSON.toJSONString(wmsWrk))
-// .build()
-// .doPost();
-// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("code").equals(200)) {
-// //todo
-//// StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-//
-// } else {
-// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/wmsWrk/test", JSON.toJSONString(wmsWrk), response);
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
- }
-
-}
diff --git a/src/main/resources/mapper/CommandInfoMapper.xml b/src/main/resources/mapper/CommandInfoMapper.xml
index ef5f79b..31878fb 100644
--- a/src/main/resources/mapper/CommandInfoMapper.xml
+++ b/src/main/resources/mapper/CommandInfoMapper.xml
@@ -29,4 +29,13 @@
where wrk_no = #{wrkNo}
</select>
+ <select id="selectByTaskNo" resultMap="BaseResultMap">
+ select * from wcs_command_info
+ where task_no = #{taskNo}
+ </select>
+
+ <insert id="saveToHistory">
+ insert into wcs_command_info_log select * from wcs_command_info where task_no = #{taskNo}
+ </insert>
+
</mapper>
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 19690dd..c64e62a 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -65,4 +65,15 @@
order by io_pri desc,create_time,wrk_no ASC
</select>
+ <select id="selectToBeHistoryData" resultMap="BaseResultMap">
+ select * from dbo.wcs_task_wrk
+ where 1=1
+ and (status=3 or status=4)
+ order by io_pri desc,create_time,wrk_no ASC
+ </select>
+
+ <insert id="saveToHistory">
+ insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=3 or status=4)
+ </insert>
+
</mapper>
--
Gitblit v1.9.1