From 7c4fa0b57d45926a5328e1650605f30c46b63341 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期二, 11 十月 2022 18:56:58 +0800
Subject: [PATCH] #lsh
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 f122ed7..d6d7569 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -625,6 +625,7 @@
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", testMast.getLocNo())
+ .eq("loc_sts","F")
);
if (Cools.isEmpty(locMast)) {
throw new CoolException(BaseRes.PARAM);
@@ -688,7 +689,7 @@
public ReturnT<String> suspendTestPACK1(String channel){
try {
Review review=new Review();
- review.setPause(true);
+ review.setPause("true");
review.setChannel(channel);
review.setRequestTime(DateUtils.convert(new Date()));
return postMesData(renUrl,suspendTestPACK,review);
@@ -701,6 +702,12 @@
}
private ReturnT<String> postMesData(String URL,String Path,Object combParam){
+ String name="";
+ if (URL.equals(mesUrl)){
+ name="mes绯荤粺";
+ }else if (URL.equals(renUrl)){
+ name="娴嬭瘯绯荤粺";
+ }
if(combParam != null){
String response = "";
boolean success = false;
@@ -716,16 +723,16 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
- if (jsonObject.getDate("isComplete").equals(true)){
+// 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 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);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+Path, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
} catch (Exception e) {
@@ -736,8 +743,8 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- URL + Path,
+ "涓婃姤"+name,
+ URL +"/"+ Path,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
--
Gitblit v1.9.1