From f8f6cb5b57f635c8c13b51532a427d87954140b3 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 8 Mar 2022 09:45:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/admin/aspect/AuthorizeAspect.java | 55 +++++++++++------- .../controller/auth/CustomerController.java | 7 ++- .../controller/auth/LoginController.java | 36 +++++++----- .../controller/auth/RegisterController.java | 7 ++- .../basic/BussinessChangeTypeController.java | 3 +- .../basic/BussinessOriginTypeController.java | 3 +- .../basic/BussinessTypeController.java | 3 +- .../basic/CorpImportLogController.java | 5 +- .../controller/basic/UdiInfoController.java | 2 + .../basic/UdiInfoExportLogController.java | 4 +- .../inout/IOOrderStatusController.java | 4 +- .../inout/OrderDetailController.java | 14 +++-- .../controller/inout/WareHouseController.java | 34 +++++++++++ .../sale/admin/entity/auth/AuthLicense.java | 4 +- .../req/inout/PostUdimsOrderRequest.java | 58 +++++++++++++++++++ .../basic/UdiRelevanceExportJsonResponse.java | 4 ++ .../basic/UdiInfoImportDetailService.java | 2 + .../admin/thread/BasicGenExcelService.java | 8 +++ .../admin/thread/IoTransInoutService.java | 10 +++- .../mybatis/mapper/auth/AuthLicenseDao.xml | 11 ++-- 20 files changed, 212 insertions(+), 62 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/aspect/AuthorizeAspect.java b/api-admin/src/main/java/com/glxp/sale/admin/aspect/AuthorizeAspect.java index c4b70f7..2f4c616 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/aspect/AuthorizeAspect.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/aspect/AuthorizeAspect.java @@ -1,6 +1,8 @@ package com.glxp.sale.admin.aspect; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.dao.auth.AuthLicenseDao; +import com.glxp.sale.admin.entity.auth.AuthLicense; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.service.auth.AuthLoginService; import com.glxp.sale.admin.util.JwtUtils; @@ -31,6 +33,8 @@ public class AuthorizeAspect { @Resource private AuthLoginService authLoginService; + @Resource + private AuthLicenseDao authLicenseDao; @Pointcut("@annotation(com.glxp.sale.admin.annotation.AuthRuleAnnotation)") public void adminLoginVerify() { @@ -49,31 +53,42 @@ public class AuthorizeAspect { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - - String id = request.getHeader("ADMIN_ID"); - String query = request.getQueryString(); Long adminId = null; - try { - adminId = Long.valueOf(id); - }catch (Exception e) { - throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); - } + String id = request.getHeader("ADMIN_ID"); + if (id == null) { + String apiKey = request.getHeader("api_key"); + String secretKey = request.getHeader("secret_key"); + AuthLicense authLicense = authLicenseDao.get(apiKey); + if (authLicense != null && authLicense.getSecretKey().equals(secretKey)) { + + } else { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } + } else { + String query = request.getQueryString(); + try { + adminId = Long.valueOf(id); + } catch (Exception e) { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } - String token = request.getHeader("ADMIN_TOKEN"); - if (token == null) { - throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); - } + String token = request.getHeader("ADMIN_TOKEN"); + if (token == null) { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } - // 验证 token - Claims claims = JwtUtils.parse(token); - if (claims == null) { - throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); - } - Long jwtAdminId = Long.valueOf(claims.get("admin_id").toString()); - if (adminId.compareTo(jwtAdminId) != 0) { - throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + // 验证 token + Claims claims = JwtUtils.parse(token); + if (claims == null) { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } + Long jwtAdminId = Long.valueOf(claims.get("admin_id").toString()); + if (adminId.compareTo(jwtAdminId) != 0) { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } } + // 判断是否进行权限验证 MethodSignature signature = (MethodSignature) joinPoint.getSignature(); //从切面中获取当前方法 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java index db24571..4d2e0ea 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.auth; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.*; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; @@ -54,7 +55,7 @@ public class CustomerController { private SystemPDFTemplateService systemPDFTemplateService; @Resource private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService; - + @AuthRuleAnnotation("") @GetMapping("/spms/customer/list") public BaseResponse filterCustomers(CustomerInfoFilterRequest customerFilterRequest) { @@ -67,7 +68,7 @@ public class CustomerController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("salewarehouse/customer/list") public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) { @@ -87,7 +88,7 @@ public class CustomerController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("salewarehouse/customer/detail") public BaseResponse customerDetail(CustomerInfoFilterRequest customerFilterRequest) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index e408583..5c692bf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java @@ -54,6 +54,7 @@ public class LoginController { @Resource private AuthLicenseDao authLicenseDao; + /** * 用户登录 * @@ -174,7 +175,7 @@ public class LoginController { return ResultVOUtils.error(ResultEnum.DATA_CHANGE); } - /** + /** * 平台验证 * * @return @@ -182,30 +183,33 @@ public class LoginController { @ResponseBody @PostMapping(value = "/verify") public BaseResponse verify(@RequestBody Map params, - HttpServletRequest request) { - AuthAdmin authAdmin; + HttpServletRequest request) { + AuthAdmin authAdmin; authAdmin = authAdminService.findByUserName(params.get("username").toString()); if (authAdmin == null) { - throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); + throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) { - throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); + throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } AuthLicense authLicense = new AuthLicense(); - if(params.get("appid")!=null) { - authLicense = authLicenseDao.get(params.get("appid").toString()); + if (params.get("appid") != null) { + authLicense = authLicenseDao.get(params.get("appid").toString()); } else { - String appid = AppUtils.getAppid(); - authLicense.setId(appid); - authLicense.setAppid(appid); - authLicense.setApiKey(appid); - if(params.get("name")!=null) - authLicense.setName(params.get("name").toString()); - authLicense.setSecretKey(AppUtils.getSecretKey(appid)); - authLicense.setCreateDate(new Date()); - authLicenseDao.save(authLicense); + String appid = AppUtils.getAppid(); + authLicense.setId(appid); + authLicense.setAppid(appid); + authLicense.setApiKey(appid); + if (params.get("name") != null) + authLicense.setName(params.get("name").toString()); + authLicense.setSecretKey(AppUtils.getSecretKey(appid)); + authLicense.setCustomerId(authAdmin.getCustomerId() + ""); + CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId()); + authLicense.setCompanyName(companyEntity.getCompanyName()); + authLicense.setCreateDate(new Date()); + authLicenseDao.save(authLicense); } return ResultVOUtils.success(authLicense); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index bb90cff..0a5292f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.auth; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.CustomerContactEntity; import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; @@ -83,7 +84,7 @@ public class RegisterController { @Resource private SystemParamConfigService systemParamConfigService; - + @AuthRuleAnnotation("") @GetMapping("salewarehouse/register/list") public BaseResponse filterList(UserResisterFilterRequest userResisterFilterRequest) { @@ -137,7 +138,7 @@ public class RegisterController { return ResultVOUtils.error(500, "验证码发送失败"); } - + @AuthRuleAnnotation("") @GetMapping("salewarehouse/register/checkCompany") public BaseResponse checkCompany(@RequestParam("companyName") String companyName) { if (StringUtils.isBlank(companyName)) return ResultVOUtils.error(ResultEnum.DATA_ERROR, "企业名称不能为空"); @@ -149,7 +150,7 @@ public class RegisterController { } } - + @AuthRuleAnnotation("") @GetMapping("salewarehouse/register/getRegisterConfig") public BaseResponse getRegisterConfig() { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java index bba8343..9f49961 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.dao.basic.BussinessChangeTypeDao; @@ -35,7 +36,7 @@ public class BussinessChangeTypeController { private BussinessTypeService bussinessTypeService; @Resource private BussinessLocalTypeService bussinessLocalTypeService; - + @AuthRuleAnnotation("") @GetMapping("/spms/bussinessChangeType/filter") public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java index f951774..6ebc81b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity; import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest; @@ -25,7 +26,7 @@ public class BussinessOriginTypeController { @Resource private BussinessOriginTypeService bussinessOriginTypeService; - + @AuthRuleAnnotation("") @GetMapping("/udiwms/originBusType/filter") public BaseResponse filterJoin(BussinessOriginTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index 988ea83..040f17f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; @@ -50,7 +51,7 @@ public class BussinessTypeController { private AuthAdminService authAdminService; @Resource private OrderService orderService; - + @AuthRuleAnnotation("") @GetMapping("/udiwms/bussinessType/filter") public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java index 7cd3aa8..76f035e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.io.IoUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.basic.CorpImportDetailEntity; @@ -42,7 +43,7 @@ public class CorpImportLogController { BasicThirdSysService basicThirdSysService; @Resource BasicCorpImportService basicCorpImportService; - + @AuthRuleAnnotation("") @GetMapping("/udiwms/corps/importLog/filter") public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -59,7 +60,7 @@ public class CorpImportLogController { pageSimpleResponse.setList(udiInfoImportLogEntities); return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/corps/importLog/filterDetail") public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java index 72f0581..c058413 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.basic; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; @@ -52,6 +53,7 @@ public class UdiInfoController { private String udiUrl; //获取同步库UDI信息 + @AuthRuleAnnotation("") @GetMapping("udiwms/udiinfo/filterUdi") public BaseResponse filterUdi(FilterUdiInfoRequest productInfoFilterRequest) { Map paramMap = new HashMap<>(16); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java index 6de0df7..0960827 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.basic.UdiInfoExportLogEntity; import com.glxp.sale.admin.req.basic.FilterUdiEpLogRequest; @@ -43,7 +44,7 @@ public class UdiInfoExportLogController { @Resource BasicGenExcelService basicGenExcelService; - + @AuthRuleAnnotation("") @GetMapping("/udiwms/products/exportLog/filter") public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, BindingResult bindingResult) { @@ -73,6 +74,7 @@ public class UdiInfoExportLogController { } //产品信息excel文件下载 + @AuthRuleAnnotation("") @GetMapping("/udiwms/products/exportLog/download") public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java index 9ef8345..6fae798 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.udid.UdiEntity; @@ -37,6 +38,7 @@ public class IOOrderStatusController { @Resource private IOOrderStatusService ioOrderStatusService; + @AuthRuleAnnotation("") @GetMapping("spms/inout/order/status") public BaseResponse listOrderStatus(OrderStatusFilterRequest orderStatusFilterRequest) { List orderStatusEntities = ioOrderStatusService.filterOrderStatus(orderStatusFilterRequest); @@ -70,7 +72,7 @@ public class IOOrderStatusController { //更新订单 @PostMapping("/spms/inout/order/deleteStatus") public BaseResponse deleteStatus(@RequestBody OrderStatusFilterRequest orderStatusFilterRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index 687dfe1..a86b4b2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils; @@ -105,7 +106,7 @@ public class OrderDetailController { IoTransInoutService ioTransInoutService; @Resource BussinessOriginTypeService bussinessOriginTypeService; - + @AuthRuleAnnotation("") @GetMapping("/spms/erpOrder/filter") public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest, BindingResult bindingResult) { @@ -158,6 +159,7 @@ public class OrderDetailController { } //手持终端下载业务单据 + @AuthRuleAnnotation("") @GetMapping("/udiwms/erpOrder/filter") public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest, BindingResult bindingResult) { @@ -207,7 +209,7 @@ public class OrderDetailController { return ResultVOUtils.success(pageSimpleResponse); // } } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/erpOrder/addStockOrder") public BaseResponse addStockOrder(FilterOrderRequest filterErpOrderRequest, BindingResult bindingResult) { @@ -305,7 +307,7 @@ public class OrderDetailController { } } - + @AuthRuleAnnotation("") @GetMapping("/warehouse/getMyErpOrders") public BaseResponse getMyErpOrders(FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { @@ -339,7 +341,7 @@ public class OrderDetailController { return ResultVOUtils.error(500, "删除失败"); } } - + @AuthRuleAnnotation("") @GetMapping(value = "/warehouse/inout/order/detail")//TODO 订单详情 public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { @@ -354,7 +356,7 @@ public class OrderDetailController { List erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest); return ResultVOUtils.success(erpOrderEntities); } - + @AuthRuleAnnotation("") @GetMapping(value = "/warehouse/inout/order/uploadOrder") public BaseResponse uploadOrder(FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { @@ -405,7 +407,7 @@ public class OrderDetailController { } } - + @AuthRuleAnnotation("") @GetMapping("/warehouse/dlErpStock1") public BaseResponse dlErpStock() { dlErpStockService.dlErpStock(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 087ee86..1f4f702 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -2,10 +2,13 @@ package com.glxp.sale.admin.controller.inout; import cn.hutool.db.sql.Order; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.InoutUtils; +import com.glxp.sale.admin.dao.auth.AuthLicenseDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.AuthLicense; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; @@ -76,6 +79,8 @@ public class WareHouseController { AuthAdminService authAdminService; @Resource BasicUnitMaintainService basicUnitMaintainService; + @Resource + private AuthLicenseDao authLicenseDao; @GetMapping("admin/warehouse/inout/list") public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) { @@ -381,6 +386,24 @@ public class WareHouseController { return ResultVOUtils.success("导入成功"); } + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/postOrdersUdims") + public BaseResponse postOrdersUdims(@RequestBody PostUdimsOrderRequest postOrderRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + try { + String customerId = getCustomerIdBykey(); + postOrderRequest.setCustomerId(customerId); + ioTransInoutService.createOrderUdims(postOrderRequest); + } catch (Exception e) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success("导入成功"); + } + public void updateErpOrderId(List erpOrderEntities, String oldId, String newId) { if (erpOrderEntities != null) { @@ -425,4 +448,15 @@ public class WareHouseController { AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); return authAdmin.getCustomerId() + ""; } + + public String getCustomerIdBykey() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("api_key"); + AuthLicense authAdmin = authLicenseDao.get(userId); + return authAdmin.getCustomerId(); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthLicense.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthLicense.java index 7ff2cdd..45af377 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthLicense.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthLicense.java @@ -15,7 +15,9 @@ public class AuthLicense { // apikey private String apiKey; // 密钥 - private String secretKey ; + private String secretKey; // 创建时间 private Date createDate; + private String customerId; + private String companyName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java new file mode 100644 index 0000000..5ac171f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java @@ -0,0 +1,58 @@ +package com.glxp.sale.admin.req.inout; + +import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostUdimsOrderRequest { + + List orderBeans; + private String customerId; + + public static class OrderBean { + private String id; + private String corpOrderId; + private String action; + private String actDate; + private String actor; + private String mainAction; + private String fromCorpId; + private String fromCorp; + private String remark; + + private List codes; + + public static class CodeBean { + private String action; + private String mainAction; + private String code; + private String corpOrderId; + private String actor; + private String actDate; + private String fromCorpId; + private String fromCorp; + private String orderId; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private Integer count; + private String packageLevel; + private String warehouseCode; + + private String customerId; + private String nameCode; + private String supId;//供应商ID + private String invStorageCode; + private String invWarehouseCode; + private String relId; + private Integer status; + private String locStorageCode; + } + } + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceExportJsonResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceExportJsonResponse.java index 929844e..71cee04 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceExportJsonResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceExportJsonResponse.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.res.basic; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import lombok.Data; import java.util.ArrayList; @@ -20,5 +21,8 @@ public class UdiRelevanceExportJsonResponse { public UdiRelevanceExportJsonResponse() { this.udiInfoEntities = new ArrayList<>(); this.udiRelevanceEntities = new ArrayList<>(); + this.companyProductRelevanceEntities = new ArrayList<>(); } + + private List companyProductRelevanceEntities; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoImportDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoImportDetailService.java index e696a9f..a463e71 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoImportDetailService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiInfoImportDetailService.java @@ -4,6 +4,7 @@ package com.glxp.sale.admin.service.basic; import com.glxp.sale.admin.entity.basic.UdiInfoImportDetailEntity; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse; +import org.springframework.scheduling.annotation.Async; import java.util.List; @@ -28,5 +29,6 @@ public interface UdiInfoImportDetailService { * * @param udiRelevanceResponse */ + @Async void importJsonData(UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java index 79745b1..15d4192 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java @@ -10,11 +10,14 @@ import com.glxp.sale.admin.constant.UdiInfoImportStatus; import com.glxp.sale.admin.dao.basic.UdiInfoDao; import com.glxp.sale.admin.dao.basic.UdiRelevanceDao; import com.glxp.sale.admin.entity.basic.*; +import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.req.basic.*; +import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest; import com.glxp.sale.admin.res.basic.UdiExportJsonResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.basic.*; +import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.util.ExcelUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -47,6 +50,8 @@ public class BasicGenExcelService { UdiRelevanceDao udiRelevanceDao; @Resource UdiInfoDao udiInfoDao; + @Resource + private CompanyProductRelevanceService companyProductRelevanceService; //往来单位 @Async @@ -230,6 +235,9 @@ public class BasicGenExcelService { } } + List companyProductRelevanceEntities = companyProductRelevanceService.filterCompanyProductRelevance(new FilterCompanyProductRelevanceRequest()); + exportData.setCompanyProductRelevanceEntities(companyProductRelevanceEntities); + File file = new File(udiInfoExportLogEntity.getFilePath()); if (!file.exists()) { try { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 4e5e6ff..3741e30 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -154,7 +154,7 @@ public class IoTransInoutService { } } - //生成订单，插入零时表 + //手持终端生成订单，插入零时表 @Async public void creatOrder(PostOrderRequest postOrderRequest) { List postOrders = postOrderRequest.getPostOrder(); @@ -171,7 +171,8 @@ public class IoTransInoutService { } WarehouseEntity warehouseEntity = warehouseEntityList.get(0); - String orderId = System.currentTimeMillis() + i + ""; + String orderId = "SM"+ + System.currentTimeMillis() + i + ""; OrderEntity orderSaveRequest = new OrderEntity(); orderSaveRequest.setId(orderId); if (warehouseEntity.getActDate() != null) { @@ -216,6 +217,11 @@ public class IoTransInoutService { } } + @Async + public void createOrderUdims(PostUdimsOrderRequest postUdimsOrderRequest) { + + } + //查找等待处理单据，转入正式表 @Async public void transInout() { diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml index fa9595e..bc12f85 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml @@ -4,12 +4,13 @@ - INSERT INTO auth_license(id,appid,name,api_key,secret_key,create_date) - values - (#{id},#{appid},#{name,jdbcType=VARCHAR},#{apiKey,jdbcType=VARCHAR},#{secretKey,jdbcType=VARCHAR},#{createDate,jdbcType=TIMESTAMP}) + INSERT INTO auth_license(id, appid, name, api_key, secret_key, create_date, customerId, companyName) + values (#{id}, #{appid}, #{name,jdbcType=VARCHAR}, #{apiKey,jdbcType=VARCHAR}, + #{secretKey,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{customerId}, #{companyName}) @@ -20,6 +21,8 @@ api_Key=#{apiKey}, secret_Key=#{secretKey}, create_Date=#{createDate} + customerId=#{customerId} + companyName=#{companyName} WHERE id=#{id}