From fcc407a26c3565d3ff5feae683dbc04e71b6e3ca Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 15:14:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 75 ++-----------------------------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 +++--
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 22 +++--------
3 files changed, 16 insertions(+), 91 deletions(-)
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 0d4f9e4..fd11836 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -17,6 +17,7 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -689,7 +690,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(1);
combParam.setRequestTime(DateUtils.convert(new Date()));
- postMesData(mesUrl,inpath,combParam);
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
throw new CoolException("鐢宠娴嬭瘯澶辫触");
@@ -730,7 +731,7 @@
}else if (testMast.getChannel()<=48){
renUrl=renUrl6;
}
- return postMesData(renUrl,startUpTestPACK,review);
+ return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,startUpTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -810,81 +811,13 @@
default:
log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
}
- return postMesData(renUrl,suspendTestPACK,review);
+ return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,suspendTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
}
- }
-
- private ReturnT<String> postMesData(String URL,String Path,Object combParam){
- String name="";
- if (URL.equals(mesUrl)){
- name="mes绯荤粺";
- }else if (URL.equals(renUrl1)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl2)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl3)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl4)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl5)){
- name="娴嬭瘯绯荤粺";
- }else if (URL.equals(renUrl6)){
- name="娴嬭瘯绯荤粺";
- }else {
- log.error("鏌ヨ杩炴帴澶辫触锛岃鏌ョ湅锛�");
- }
- 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(URL)
- .setPath(Path)
- .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锛歿}", URL+Path, JSON.toJSONString(combParam), response);
-// throw new CoolException("杩斿洖鍊煎嚭閿�");
-// }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+Path, 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(
- "涓婃姤"+name,
- URL +"/"+ Path,
- 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/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c584f44..0506530 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -67,6 +67,8 @@
@Value("${mes.inPath}")
private String inpath;
+ @Value("${mes.url}")
+ private String mesUrl;
@Override
@Transactional
@@ -713,7 +715,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(7);
combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData(inpath,combParam);
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.updateById(locMast)) {
throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
@@ -764,7 +766,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(2);
combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData(inpath,combParam);
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存柊浜у搧鐘舵�佸け璐�");
@@ -806,7 +808,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(3);
combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData(inpath,combParam);
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
@@ -847,7 +849,7 @@
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(4);
combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData(inpath,combParam);
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index 2dba856..23d28ad 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -16,10 +16,7 @@
@Autowired
private ApiLogService apiLogService;
- @Value("${mes.url}")
- private String mesUrl;
-
- public ReturnT<String> postMesData(String mesPath, Object combParam){
+ public ReturnT<String> postMesData(String name,String URL,String mesPath, Object combParam){
if (true){
return SUCCESS;
}
@@ -31,24 +28,17 @@
// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
response = new HttpHandler.Builder()
// .setHeaders(map)
- .setUri(mesUrl)
+ .setUri(URL)
.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锛歿}", mesUrl+"/"+mesPath, JSON.toJSONString(combParam), response);
-// throw new CoolException("杩斿洖鍊煎嚭閿�");
-// }
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+"/"+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤"+name);
}
} catch (Exception e) {
log.error("fail", e);
@@ -58,8 +48,8 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "涓婃姤mes绯荤粺",
- mesUrl +"/"+ mesPath,
+ "涓婃姤"+name,
+ URL +"/"+ mesPath,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
--
Gitblit v1.9.1