From d298bf5b74c9938aac16e5df23384d8f0428f244 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sat, 11 Jun 2022 19:51:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A7=94=E6=89=98=E9=AA=8C?= =?UTF-8?q?=E6=94=B6=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/auth/ConnectTestController.java | 7 ++++++- .../glxp/sale/admin/entity/auth/AuthConnectEntity.java | 9 +++++++++ .../sale/admin/req/basic/BasicEntrustRecRequest.java | 2 +- .../com/glxp/sale/admin/res/inout/OrderNoResult.java | 1 + .../src/main/resources/mybatis/mapper/inout/OrderDao.xml | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthConnectEntity.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/ConnectTestController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/ConnectTestController.java index c3d7436..3238be3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/ConnectTestController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/ConnectTestController.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.controller.auth; +import com.glxp.sale.admin.entity.auth.AuthConnectEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.req.auth.ConnectRequest; import com.glxp.sale.admin.service.info.CompanyService; @@ -18,8 +19,12 @@ public class ConnectTestController { CompanyService companyService; @GetMapping("/udiwms/auth/device/connect") - public BaseResponse index(ConnectRequest connequest) { + public BaseResponse index(ConnectRequest connectRequest) { CompanyEntity companyEntity = companyService.findCompany(110L); + + AuthConnectEntity authConnectEntity = new AuthConnectEntity(); + authConnectEntity.setCompanyName(companyEntity.getCompanyName()); + authConnectEntity.setSysName("UDI自助平台"); return ResultVOUtils.success(companyEntity.getCompanyName()); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthConnectEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthConnectEntity.java new file mode 100644 index 0000000..d9ba366 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthConnectEntity.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.entity.auth; + +import lombok.Data; + +@Data +public class AuthConnectEntity { + private String companyName; + private String sysName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java index c03d06b..c5f8403 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicEntrustRecRequest.java @@ -15,6 +15,6 @@ public class BasicEntrustRecRequest extends ListPageRequest { private String userId; private Date updateTime; private String curInv; - + private String lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java index dd706a1..f0a230b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java @@ -8,6 +8,7 @@ import lombok.Data; @Data public class OrderNoResult { + private String id; //补单单号 private String supplementNo; diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index b355499..6d2ab4b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -569,7 +569,7 @@