From e244322ad626d19125041595f6da787d67d5f913 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 03 十二月 2024 10:59:55 +0800
Subject: [PATCH] 添加条件查询、优化Order处理及配置调整
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 2 +-
src/main/resources/application-loc.yml | 9 +++++----
src/main/webapp/views/operateLog/operateLog.html | 5 +++++
src/main/resources/application-dev.yml | 1 +
src/main/resources/application-prod.yml | 1 +
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 18 +++++++++++++-----
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 6 ++++++
src/main/resources/application.yml | 2 +-
src/main/java/com/zy/system/controller/OperateLogController.java | 3 +++
9 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 230cf7c..af24386 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -29,6 +29,9 @@
@Slf4j
public class AgvWrkMastServiceImp extends ServiceImpl<AgvWrkMastMapper, AgvWrkMast> implements AgvWrkMastService {
+ @Value("${agv.flag}")
+ private boolean flag;
+
@Value("${agv.url}")
private String url;
@@ -271,6 +274,9 @@
}
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
+ if (!flag) {
+ return 1;
+ }
String response = "";
boolean success = false;
int code = 0;
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 2f2b286..2e37524 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -135,7 +135,7 @@
if (pltType != null && pltType > 0) {
order.setPltType(pltType);
}
- order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+ //order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
super.updateById(order);
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index e9992ab..7de6ce3 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,7 +1,6 @@
package com.zy.asrs.task.handler;
import cn.hutool.core.util.NumberUtil;
-import com.alibaba.excel.util.NumberUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
@@ -29,6 +28,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2020/7/7
@@ -86,8 +86,8 @@
}
@Transactional
- public void timelyStart(Order order) {
- if (!report){
+ public synchronized void timelyStart(Order order) {
+ if (!report) {
return;
}
@@ -105,6 +105,9 @@
if (Cools.isEmpty(order.getPltType())) {
return;
}
+ if (Cools.isEmpty(order.getInTime())) {
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
+ }
if (!Cools.isEmpty(report)) {
ReportErpParam param = new ReportErpParam();
mappingParam(order, param);
@@ -112,9 +115,13 @@
log.info(JSON.toJSONString(param));
int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
if (code == 0) {
+ Date date = new Date();
+ order.setInTime(DateUtils.convert(date, DateUtils.yyyyMMddHHmmsssss_F));
+ orderService.updateById(order);
for (OrderDetl orderDetl : report) {
log.info("{}鍗曟嵁瀹℃牳涓婃姤浜嗭細{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
orderDetl.setReportQty(orderDetl.getQty());
+ orderDetl.setUpdateTime(date);
orderDetlService.updateById(orderDetl);
}
}
@@ -139,7 +146,8 @@
param.setCOrderCode(order.getOrderNo());
param.setCMaker("");
param.setCHandler("");
- param.setCDefine14(order.getOrderNo() + "_" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss + "_" + order.getPltType()));
+ param.setCDefine14(order.getOrderNo() + "_" + order.getInTime());
+ //param.setCDefine14(order.getOrderNo() + "_" + order.getInTime() + "_" + order.getPltType()));
}
public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {
@@ -192,7 +200,7 @@
boolean success = false;
try {
- response = new HttpHandler.Builder().setUri(url).setPath(path).setJson(JSONObject.toJSONString(requestParam)).build().doPost();
+ response = new HttpHandler.Builder().setUri(url).setTimeout(30, TimeUnit.SECONDS).setPath(path).setJson(JSONObject.toJSONString(requestParam)).build().doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (Cools.isEmpty(jsonObject.get("succeed"))) {
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index 8399ad4..5eaedef 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvWrkMast;
import com.zy.common.web.BaseController;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;
@@ -33,10 +34,12 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(OperateLog.class, param.keySet(), wrapper, condition);
wrapper.orderBy("id", false);
return R.ok(operateLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b544fef..ff652b0 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -72,6 +72,7 @@
password: Wlzh44338
agv:
+ flag: false
# url: localhost:8080
# taskCreatePath: /agv/task/create
# containerMoveInPath: /agv/container/moveIn
diff --git a/src/main/resources/application-loc.yml b/src/main/resources/application-loc.yml
index 3d2e3f0..c568312 100644
--- a/src/main/resources/application-loc.yml
+++ b/src/main/resources/application-loc.yml
@@ -16,10 +16,10 @@
password: sa@123
mvc:
static-path-pattern: /**
- redis:
- host: 127.0.0.1
- port: 6379
- database: 0
+# redis:
+# host: 127.0.0.1
+# port: 6379
+# database: 0
# password: xltys1995
servlet:
multipart:
@@ -72,6 +72,7 @@
password: Wlzh44338
agv:
+ flag: false
url: localhost:8080
taskCreatePath: /agv/task/create
taskCancelPath: /rcms/services/rest/hikRpcService/cancelTask
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 084d433..dc7a7d4 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -72,6 +72,7 @@
password: Wlzh44338
agv:
+ flag: true
# url: localhost:8080
# taskCreatePath: /agv/task/create
# containerMoveInPath: /agv/container/moveIn
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f2026f2..22524fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: prod
\ No newline at end of file
+ active: loc
\ No newline at end of file
diff --git a/src/main/webapp/views/operateLog/operateLog.html b/src/main/webapp/views/operateLog/operateLog.html
index 827ece5..9a76b8b 100644
--- a/src/main/webapp/views/operateLog/operateLog.html
+++ b/src/main/webapp/views/operateLog/operateLog.html
@@ -20,6 +20,11 @@
</div>
</div>
<div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-inline cool-auto-complete">
<input id="userId" class="layui-input" name="user_id" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
<input id="userUsername" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐢ㄦ埛" onfocus=this.blur()>
--
Gitblit v1.9.1