From 5000a7f971fd5632c1e729e80e3b8a0441eb20b0 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 07 二月 2025 07:57:09 +0800
Subject: [PATCH] 关闭订单
---
src/main/java/com/zy/asrs/controller/OrderLogController.java | 51 +++++++++-------
src/main/java/com/zy/asrs/excel/ExcelOrder.java | 14 ++++
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 3
src/main/java/com/zy/asrs/excel/CloseOrderReadListener.java | 84 ++++++++++++++++++++++++++++
4 files changed, 128 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
index 08f5a62..63c9e80 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
@@ -123,7 +123,8 @@
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.get("loc_no")));
String orderNo = null;
if (agvWrkMast != null) {
- List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo());
+ //List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectByWrkNo(agvWrkMast.getWrkNo());
+ List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
if (!agvWrkDetls.isEmpty()) {
orderNo = agvWrkDetls.get(0).getOrderNo();
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderLogController.java b/src/main/java/com/zy/asrs/controller/OrderLogController.java
index d256d77..26f1991 100644
--- a/src/main/java/com/zy/asrs/controller/OrderLogController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderLogController.java
@@ -9,6 +9,8 @@
import com.core.common.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.excel.CloseOrderReadListener;
+import com.zy.asrs.excel.ExcelOrder;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -42,10 +44,12 @@
private LocDetlService locDetlService;
@Autowired
private MatService matService;
+ @Autowired
+ private OrderService orderService;
@RequestMapping(value = "/orderLog/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<OrderLog> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -73,15 +77,17 @@
@RequestMapping(value = "/orderLog/head/page/auth")
@ManagerAuth
- public R head(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R head(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -90,12 +96,9 @@
@RequestMapping(value = "/orderLog/detl/all/auth")
@ManagerAuth
- public R head(@RequestParam Long orderId){
+ public R head(@RequestParam Long orderId) {
return R.ok().add(orderDetlLogService.selectList(new EntityWrapper<OrderDetlLog>().eq("order_id", orderId)));
}
-
-
-
@PostMapping(value = "/orderLog/wrk/trace/auth")
@@ -177,22 +180,24 @@
@RequestMapping(value = "/orderLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -205,7 +210,7 @@
@RequestMapping(value = "/orderLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
@@ -221,7 +226,7 @@
wrapper.like("id", condition);
Page<OrderLog> page = orderLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderLog order : page.getRecords()){
+ for (OrderLog order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -234,7 +239,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderLog> wrapper = new EntityWrapper<OrderLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderLogService.selectOne(wrapper)){
+ if (null != orderLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/excel/CloseOrderReadListener.java b/src/main/java/com/zy/asrs/excel/CloseOrderReadListener.java
new file mode 100644
index 0000000..cad2151
--- /dev/null
+++ b/src/main/java/com/zy/asrs/excel/CloseOrderReadListener.java
@@ -0,0 +1,84 @@
+package com.zy.asrs.excel;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.fastjson.JSON;
+import com.zy.asrs.controller.AgvMobileController;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.OrderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class CloseOrderReadListener implements ReadListener<ExcelOrder> {
+
+ private static final Logger log = LoggerFactory.getLogger(CloseOrderReadListener.class);
+
+
+ /**
+ * 姣忛殧5鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互100鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
+ */
+ private static final int BATCH_COUNT = 300;
+ /**
+ * 缂撳瓨鐨勬暟鎹�
+ */
+ private List<ExcelOrder> cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
+
+ private OrderService orderService;
+
+
+ /**
+ * 濡傛灉浣跨敤浜唖pring,璇蜂娇鐢ㄨ繖涓瀯閫犳柟娉曘�傛瘡娆″垱寤篖istener鐨勬椂鍊欓渶瑕佹妸spring绠＄悊鐨勭被浼犺繘鏉�
+ *
+ * @param orderService
+ */
+ public CloseOrderReadListener(OrderService orderService) {
+ this.orderService = orderService;
+ }
+
+ /**
+ * 杩欎釜姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
+ *
+ * @param data one row value. Is is same as
+ * @param context
+ */
+ @Override
+ public void invoke(ExcelOrder data, AnalysisContext context) {
+ log.info("瑙ｆ瀽鍒颁竴鏉℃暟鎹�:{}", JSON.toJSONString(data));
+ cachedDataList.add(data);
+ // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
+ if (cachedDataList.size() >= BATCH_COUNT) {
+ saveData();
+ // 瀛樺偍瀹屾垚娓呯悊 list
+ cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
+ }
+ }
+
+ /**
+ * 鎵�鏈夋暟鎹В鏋愬畬鎴愪簡 閮戒細鏉ヨ皟鐢�
+ *
+ * @param context
+ */
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ // 杩欓噷涔熻淇濆瓨鏁版嵁锛岀‘淇濇渶鍚庨仐鐣欑殑鏁版嵁涔熷瓨鍌ㄥ埌鏁版嵁搴�
+ saveData();
+ log.info("鎵�鏈夋暟鎹В鏋愬畬鎴愶紒");
+ }
+
+ /**
+ * 鍔犱笂瀛樺偍鏁版嵁搴�
+ */
+ private void saveData() {
+ log.info("{}鏉℃暟鎹紝寮�濮嬫搷浣滄暟鎹簱锛�", cachedDataList.size());
+ for (ExcelOrder excelOrder : cachedDataList) {
+ Order order = orderService.selectByNo(excelOrder.getOrderNo());
+ if (order != null) {
+ orderService.updateSettle(order.getId(), 6L, 9529L);
+ }
+ }
+ log.info("瀛樺偍鏁版嵁搴撴垚鍔燂紒");
+ }
+}
diff --git a/src/main/java/com/zy/asrs/excel/ExcelOrder.java b/src/main/java/com/zy/asrs/excel/ExcelOrder.java
new file mode 100644
index 0000000..46bbe51
--- /dev/null
+++ b/src/main/java/com/zy/asrs/excel/ExcelOrder.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ExcelOrder implements Serializable {
+
+ @ExcelProperty("鍗曟嵁缂栧彿")
+ private String orderNo;
+
+}
--
Gitblit v1.9.1