From 43bf799fc85e18923480b5877e01b46dab28606f Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期六, 13 八月 2022 16:19:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 17 ++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 104 ++++++++++++++++++++++++--
src/main/java/com/zy/asrs/controller/MobileController.java | 8 -
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 75 ++----------------
src/main/resources/application.yml | 10 +-
5 files changed, 131 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7508ecd..6588483 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -327,20 +327,18 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@PostMapping("/test/startUp/auth")
-// @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
+ @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
if (Cools.isEmpty(testMast)) {
return R.parse(BaseRes.PARAM);
}
- //鎻愪氦娴嬭瘯绯荤粺
- mobileService.startUpTestPACK(testMast);
-
+ mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
return R.ok();
}
@PostMapping("/test/suspend/auth")
@ManagerAuth(memo = "鏆傚仠娴嬭瘯")
public synchronized R suspendTestPACK() {
- mobileService.suspendTestPACK();
+ mobileService.suspendTestPACK(); //璇锋眰鏆傚仠娴嬭瘯
return R.ok();
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index be9b3b4..78ded4b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -253,6 +253,23 @@
return R.ok();
}
+ @PostMapping("/rpv/test/open/auth")
+ @AppAuth(memo = "妯℃嫙娴嬭瘯鎺ュ彛")
+ public synchronized R test1(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Object param,
+ HttpServletRequest request){
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ System.out.println(param);
+
+ Map<String,Boolean> map=new HashMap<>();
+ map.put("isComplete",true);
+ return R.ok(map);
+ }
+
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 1801b6f..dae07fb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -11,7 +11,9 @@
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.Review;
import com.zy.asrs.service.*;
+import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.MatUtils;
@@ -24,15 +26,14 @@
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -40,7 +41,7 @@
*/
@Slf4j
@Service
-public class MobileServiceImpl implements MobileService {
+public class MobileServiceImpl extends AbstractHandler<String> implements MobileService{
@Autowired
private MatService matService;
@@ -82,6 +83,15 @@
private TestMastService testMastService;
@Autowired
private WorkLogHandler workLogHandler;
+
+ @Value("${mes.url}")
+ private String mesUrl;
+
+ @Value("${mes.startUpTestPACK}")
+ private String startUpTestPACK;
+
+ @Value("${mes.startUpTestPACK}")
+ private String suspendTestPACK;
@Override
@@ -608,7 +618,7 @@
public void startUpTestPACK(TestMast testMast) {
//鍚姩娴嬭瘯璇锋眰
- ReturnT<String> result=workLogHandler.startUpTestPACK(testMast);
+ ReturnT<String> result=startUpTestPACK1(testMast);
if (!result.isSuccess()) {
log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
// throw new CoolException("娴嬭瘯鐢宠澶辫触");
@@ -619,7 +629,6 @@
}
Date now = new Date();
- testMast.setChannel(1);
testMast.setStatus(1);
testMast.setModiTime(now);
testMast.setAppeTime(now);
@@ -635,10 +644,89 @@
@Override
@Transactional
public void suspendTestPACK() {
- ReturnT<String> result=workLogHandler.suspendTestPACK();
+ ReturnT<String> result=suspendTestPACK1();
if (!result.isSuccess()) {
log.error("娴嬭瘯鐢宠澶辫触");
}
}
+ @Transactional
+ public ReturnT<String> startUpTestPACK1(TestMast testMast){
+ try {
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(testMast.getLocNo());
+ combParam.setPackName(testMast.getUserId());
+ combParam.setLocno(testMast.getBarcode());
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(startUpTestPACK,combParam);
+ }catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ }
+ @Transactional
+ public ReturnT<String> suspendTestPACK1(){
+ try {
+ Review review=new Review();
+ review.setPause(true);
+ review.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(suspendTestPACK,review);
+ }catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ }
+
+ private ReturnT<String> postMesData(String mesPath,Object combParam){
+ if(combParam != null){
+ String response = "";
+ boolean success = false;
+ try {
+ Map<String, Object> map = new HashMap<>();
+ map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder().setHeaders(map)
+ .setUri(mesUrl)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(combParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ if (jsonObject.getDate("isComplete").equals(true)){
+ success = true;
+ }else if (jsonObject.getDate("isComplete").equals(false)){
+ success = false;
+ }else {
+ log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+ throw new CoolException("杩斿洖鍊煎嚭閿�");
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎴愬搧搴撳叆搴撲笂鎶�",
+ MesConstant.URL + MesConstant.PAKIN_URL,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(combParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
+ }
+ return SUCCESS;
+ }
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index eeaf75d..a9d19e0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -3,30 +3,24 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.Review;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MobileServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.constant.MesConstant;
-import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.parser.JJTCCJSqlParserState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2020/7/6
@@ -44,17 +38,9 @@
@Autowired
private WrkDetlLogService wrkDetlLogService;
@Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private WaitPakinLogService waitPakinLogService;
- @Autowired
- private OrderService orderService;
- @Autowired
private ApiLogService apiLogService;
@Autowired
private LocMastService locMastService;
-
- private MobileServiceImpl mobileService;
@Value("${mes.url}")
private String mesUrl;
@@ -64,9 +50,6 @@
@Value("${mes.outPath}")
private String outPath;
-
- @Value("${mes.startUpTestPACK}")
- private String startUpTestPACK;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -88,7 +71,7 @@
combParam.setLocno(wrkMast.getLocNo());
combParam.setPackSts(1);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(inpath,1,combParam);
+ result = postMesData(inpath,combParam);
}
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
@@ -103,9 +86,9 @@
combParam.setPackNo(wrkDetl.getZpallet());
combParam.setPackName(wrkDetl.getMatnr());
combParam.setLocno(wrkMast.getLocNo());
- combParam.setPackSts(1);
+ combParam.setPackSts(null);
combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(outPath,2,combParam);
+ result = postMesData(outPath,combParam);
}
}
if(null != result && !result.isSuccess()){
@@ -142,12 +125,14 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
- private ReturnT<String> postMesData(String mesPath,int a,Object combParam){
+ private ReturnT<String> postMesData(String mesPath,Object combParam){
if(combParam != null){
String response = "";
boolean success = false;
try {
- response = new HttpHandler.Builder()
+ Map<String, Object> map = new HashMap<>();
+ map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder().setHeaders(map)
.setUri(mesUrl)
.setPath(mesPath)
.setJson(JSON.toJSONString(combParam))
@@ -155,18 +140,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- if (a==4 && a==3){
- if (jsonObject.getDate("isComplete").equals(true)){
- success = true;
- }else if (jsonObject.getDate("isComplete").equals(false)){
- success = false;
- }else {
- log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
- throw new CoolException("杩斿洖鍊煎嚭閿�");
- }
- }else {
- success = true;
- }
+ success = true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -191,37 +165,6 @@
}
}
return SUCCESS;
- }
-
- @Transactional
- public ReturnT<String> startUpTestPACK(TestMast testMast){
- try {
- CombParam combParam = new CombParam();
- combParam.setPackNo(testMast.getLocNo());
- combParam.setPackName(testMast.getUserId());
- combParam.setLocno(testMast.getBarcode());
- combParam.setRequestTime(DateUtils.convert(new Date()));
- return postMesData(outPath,3,combParam);
- }catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- }
- @Transactional
- public ReturnT<String> suspendTestPACK(){
- try {
- Review review=new Review();
- review.setPause(true);
- review.setRequestTime(DateUtils.convert(new Date()));
- return postMesData(outPath,4,review);
- }catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7140c5e..8164306 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,6 +2,8 @@
port: 8080
servlet:
context-path: /@pom.build.finalName@
+# tomcat:
+# uri-encoding: UTF-8
spring:
application:
@@ -53,10 +55,10 @@
mes:
url: 127.0.0.1:8080/test
# 鍏ュ簱涓婃姤
- inPath: mesin/v1
+ inPath: localhost:8080/ynwms/open/asrs/rpv/test/open/auth
# 鍑哄簱涓婃姤
- outPath: mesin/v1
+ outPath: localhost:8080/ynwms/open/asrs/rpv/test/open/auth
# 鍚姩娴嬭瘯璇锋眰
- startUpTestPACK: mesin/v1
+ startUpTestPACK: localhost:8080/ynwms/open/asrs/rpv/test/open/auth
#鏆傚仠娴嬭瘯
- suspendTestPACK: mesin/v1
\ No newline at end of file
+ suspendTestPACK: localhost:8080/ynwms/open/asrs/rpv/test/open/auth
\ No newline at end of file
--
Gitblit v1.9.1