From d95eac3f8d10cd5b46bf6f39afa64f64646274f3 Mon Sep 17 00:00:00 2001 From: 18516761980 <tqsxp@163.com> Date: 星期六, 08 十月 2022 19:17:59 +0800 Subject: [PATCH] #lsh --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 54 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 24 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 a2849a6..9d3cea4 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -86,11 +86,13 @@ @Value("${mes.url}") private String mesUrl; + @Value("${ren.url}") + private String renUrl; - @Value("${mes.startUpTestPACK}") + @Value("${ren.startUpTestPACK}") private String startUpTestPACK; - @Value("${mes.startUpTestPACK}") + @Value("${ren.startUpTestPACK}") private String suspendTestPACK; @Value("${mes.inPath}") @@ -621,21 +623,25 @@ @Transactional public void startUpTestPACK(TestMast testMast) { - //鍚姩娴嬭瘯璇锋眰 -// ReturnT<String> result=startUpTestPACK1(testMast); -// if (!result.isSuccess()) { -// log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode()); -// throw new CoolException("娴嬭瘯鐢宠澶辫触"); -// } - LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo())); + LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>() + .eq("loc_no", testMast.getLocNo()) + ); if (Cools.isEmpty(locMast)) { throw new CoolException(BaseRes.PARAM); } - Date now = new Date(); testMast.setStatus(1); + testMast.setChannel(locMast.getChannel()); testMast.setModiTime(now); testMast.setAppeTime(now); + +// 鍚姩娴嬭瘯璇锋眰 + ReturnT<String> result=startUpTestPACK1(testMast); + if (!result.isSuccess()) { + log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode()); + throw new CoolException("娴嬭瘯鐢宠澶辫触"); + } + if (!testMastService.insert(testMast)){ throw new CoolException("娣诲姞testMast澶辫触"); } @@ -647,7 +653,7 @@ combParam.setLocNo(locMast.getLocNo()); combParam.setPackSts(1); combParam.setRequestTime(DateUtils.convert(new Date())); - postMesData(inpath,combParam); + postMesData(mesUrl,inpath,combParam); if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){ throw new CoolException("鐢宠娴嬭瘯澶辫触"); @@ -664,12 +670,12 @@ @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); + Review review=new Review(); + review.setLocNo(testMast.getLocNo()); + review.setUserId(testMast.getUserId()); + review.setBarcode(testMast.getBarcode()); + review.setRequestTime(DateUtils.convert(new Date())); + return postMesData(renUrl,startUpTestPACK,review); }catch (Exception e) { log.error("fail", e); e.printStackTrace(); @@ -683,7 +689,7 @@ Review review=new Review(); review.setPause(true); review.setRequestTime(DateUtils.convert(new Date())); - return postMesData(suspendTestPACK,review); + return postMesData(renUrl,suspendTestPACK,review); }catch (Exception e) { log.error("fail", e); e.printStackTrace(); @@ -692,7 +698,7 @@ } } - private ReturnT<String> postMesData(String mesPath,Object combParam){ + private ReturnT<String> postMesData(String URL,String Path,Object combParam){ if(combParam != null){ String response = ""; boolean success = false; @@ -701,8 +707,8 @@ // map.put("appkey","ea1f0459efc02a79f046f982767939ae"); response = new HttpHandler.Builder() // .setHeaders(map) - .setUri(mesUrl) - .setPath(mesPath) + .setUri(URL) + .setPath(Path) .setJson(JSON.toJSONString(combParam)) .build() .doPost(); @@ -713,11 +719,11 @@ }else if (jsonObject.getDate("isComplete").equals(false)){ success = false; }else { - log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response); + log.error("杩斿洖鍊煎嚭閿�!!!url锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+Path, JSON.toJSONString(combParam), response); throw new CoolException("杩斿洖鍊煎嚭閿�"); } } else { - log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(combParam), response); + log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+Path, JSON.toJSONString(combParam), response); throw new CoolException("涓婃姤mes绯荤粺澶辫触"); } } catch (Exception e) { @@ -729,7 +735,7 @@ // 淇濆瓨鎺ュ彛鏃ュ織 apiLogService.save( "鎴愬搧搴撳叆搴撲笂鎶�", - MesConstant.URL + MesConstant.PAKIN_URL, + URL + Path, null, "127.0.0.1", JSON.toJSONString(combParam), -- Gitblit v1.9.1