From b757d25d6c2c122df79074fa47607f20367003b4 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 29 Aug 2022 09:54:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/ext/lk/rest/WmsToLkController.java | 7 +++ .../org/nl/ext/lk/service/WmsToLkService.java | 8 ++++ .../lk/service/impl/WmsToLkServiceImpl.java | 43 +++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/rest/WmsToLkController.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/rest/WmsToLkController.java index 2b20aa48..7d3f5202 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/rest/WmsToLkController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/rest/WmsToLkController.java @@ -65,6 +65,13 @@ public class WmsToLkController { return new ResponseEntity<>(wmsToLkService.queryIvt(map), HttpStatus.OK); } + @GetMapping("/login") + @Log("获取登陆信息") + @ApiOperation("获取登陆信息") + public ResponseEntity login(JSONObject json) { + return new ResponseEntity<>(wmsToLkService.login(json), HttpStatus.OK); + } + @PostMapping("/test") @Log("测试") @ApiOperation("测试") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/WmsToLkService.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/WmsToLkService.java index e335598f..e276d48d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/WmsToLkService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/WmsToLkService.java @@ -121,4 +121,12 @@ public interface WmsToLkService { * @return JSONArray */ JSONArray queryIvt(HashMap map); + + /** + * WMS客户端--->LK服务端 + * 登陆 + * + * @return JSONObject + */ + JSONObject login(JSONObject json); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java index 0e8acc98..c0135f96 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java @@ -27,6 +27,8 @@ import java.util.Map; public class WmsToLkServiceImpl implements WmsToLkService { @Override public JSONObject storageApply(Map whereJson) { + // 登陆 + JSONObject login = this.login(null); // 打印日志 log.info("入库申请输入参数："+whereJson.toString()); @@ -46,6 +48,7 @@ public class WmsToLkServiceImpl implements WmsToLkService { // 建立与立库的通讯连接 String resultMsg = HttpRequest.post(url) + .header("Authorization",login.getString("token")) .body(String.valueOf(json)) .execute().body(); result = JSONObject.parseObject(resultMsg); @@ -57,6 +60,8 @@ public class WmsToLkServiceImpl implements WmsToLkService { @Override public JSONObject storageNotice(JSONObject json) { + // 登陆 + JSONObject login = this.login(null); // 打印日志 log.info("入库通知单输入参数："+json.toString()); @@ -105,6 +110,7 @@ public class WmsToLkServiceImpl implements WmsToLkService { // 建立与立库的通讯连接 String resultMsg = HttpRequest.post(url) + .header("Authorization",login.getString("token")) .body(String.valueOf(jsonParam)) .execute().body(); result = JSONObject.parseObject(resultMsg); @@ -116,6 +122,8 @@ public class WmsToLkServiceImpl implements WmsToLkService { @Override public JSONObject qualityResult(JSONObject json) { + // 登陆 + JSONObject login = this.login(null); // 打印日志 log.info("质检结果输入参数："+json.toString()); @@ -137,6 +145,7 @@ public class WmsToLkServiceImpl implements WmsToLkService { // 建立与立库的通讯连接 String resultMsg = HttpRequest.post(url) + .header("Authorization",login.getString("token")) .body(String.valueOf(jsonParam)) .execute().body(); result = JSONObject.parseObject(resultMsg); @@ -148,6 +157,8 @@ public class WmsToLkServiceImpl implements WmsToLkService { @Override public JSONObject stockStockOut(JSONObject json) { + // 登陆 + JSONObject login = this.login(null); // 打印日志 log.info("出库通知单输入参数："+json.toString()); @@ -198,6 +209,7 @@ public class WmsToLkServiceImpl implements WmsToLkService { // 建立与立库的通讯连接 String resultMsg = HttpRequest.post(url) + .header("Authorization",login.getString("token")) .body(String.valueOf(jsonParam)) .execute().body(); result = JSONObject.parseObject(resultMsg); @@ -210,6 +222,8 @@ public class WmsToLkServiceImpl implements WmsToLkService { @Override public JSONObject empInAndOut(JSONObject json) { + // 登陆 + JSONObject login = this.login(null); // 打印日志 log.info("空托盘出入库输入参数："+json.toString()); @@ -228,6 +242,7 @@ public class WmsToLkServiceImpl implements WmsToLkService { // 建立与立库的通讯连接 String resultMsg = HttpRequest.post(url) + .header("Authorization",login.getString("token")) .body(String.valueOf(jsonParam)) .execute().body(); result = JSONObject.parseObject(resultMsg); @@ -243,4 +258,32 @@ public class WmsToLkServiceImpl implements WmsToLkService { JSONArray resultJSONArray = WQL.getWO("QLK01").addParamMap(map).setDbname("dataSource2").process().getResultJSONArray(0); return resultJSONArray; } + + @Override + public JSONObject login(JSONObject json) { + // 打印日志 + log.info("登陆输入参数："+json.toString()); + + JSONObject result = new JSONObject(); + + JSONObject jsonParam = new JSONObject(); + String lkUserName = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("LK_USERNAME").getValue(); + String lkPassWord = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("LK_PASSWORD").getValue(); + jsonParam.put("username", lkUserName); + jsonParam.put("password", lkPassWord); + + // 获取立库url + String lkUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("LK_URL").getValue(); + String url = lkUrl + "login"; + + // 建立与立库的通讯连接 + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(jsonParam)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + + // 打印日志 + log.info("登陆输出参数："+json.toString()); + return result; + } }