From da9c9ee1181a28db10fecebce9cc5f1bada3e17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 4 Apr 2023 14:16:48 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=BB=B4=E6=8A=A4bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/thrsys/ThrProductsAddDiController.java | 1 + src/main/resources/mybatis/mapper/basic/UdiProductDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 33e51b16..8bb14777 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -219,6 +219,7 @@ public class ThrProductsAddDiController { udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); + udiProductEntity.setNameCode(null); udiProductService.updateUdiInfoByUuid(udiProductEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceEntity1); diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 9c104d56..24572939 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -518,7 +518,7 @@ ggxh=#{ggxh}, - qxlb !==#{qxlb !=}, + qxlb =#{qxlb}, tyshxydm=#{tyshxydm}, @@ -675,7 +675,7 @@ ggxh=#{ggxh}, - qxlb !==#{qxlb !=}, + qxlb =#{qxlb}, tyshxydm=#{tyshxydm}, From 0aca31a1fe5e19840dceaba94859bcad7b64593c Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 4 Apr 2023 14:31:40 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/AuthCheckController.java | 3 +++ .../api/controller/auth/AuthUserController.java | 1 + .../glxp/api/controller/auth/DeptController.java | 5 +++++ .../api/controller/auth/DeptUserController.java | 3 +++ .../api/controller/auth/InvBusUserController.java | 7 +++++++ .../api/controller/auth/InvSpaceController.java | 5 +++++ .../api/controller/auth/InvWarehouseController.java | 10 ++++++++++ .../glxp/api/controller/auth/LoginController.java | 3 +++ .../api/controller/auth/RegisterController.java | 5 +++++ .../api/controller/auth/SysDictDataController.java | 5 +++++ .../api/controller/auth/SysDictTypeController.java | 5 +++++ .../glxp/api/controller/auth/SysMenuController.java | 5 +++++ .../glxp/api/controller/auth/SysRoleController.java | 9 +++++++++ .../glxp/api/controller/auth/SysUserController.java | 1 + .../basic/BasicBusTypeChangeController.java | 5 +++++ .../controller/basic/BasicBusTypePreController.java | 6 ++++++ .../basic/BasicBussinessTypeController.java | 5 +++++ .../api/controller/basic/BasicCorpController.java | 8 ++++++++ .../basic/BasicCorpExportLogController.java | 6 ++++++ .../basic/BasicCorpImportLogController.java | 4 ++++ .../api/controller/basic/BasicGenExcelService.java | 5 +++++ .../controller/basic/BasicHospTypeController.java | 5 +++++ .../api/controller/basic/BasicInCodeController.java | 3 +++ .../controller/basic/BasicProductSetController.java | 3 +++ .../basic/BasicProductsExportLogController.java | 6 ++++++ .../basic/BasicProductsImportLogController.java | 8 ++++++++ .../api/controller/basic/EntrustReceController.java | 5 +++++ .../api/controller/basic/UdiContrastController.java | 7 +++++++ .../controller/basic/UdiRelevanceController.java | 11 +++++++++++ .../api/controller/basic/UdiRlSupController.java | 6 ++++++ .../api/controller/inout/IoCodeLostController.java | 3 +++ .../api/controller/inout/IoCodeTempController.java | 7 +++++++ .../api/controller/inout/IoOrderController.java | 13 +++++++++++++ .../inout/IoOrderDetailBizController.java | 11 +++++++++++ .../controller/inout/IoOrderReviewController.java | 5 +++++ .../api/controller/inout/ioCodeRelController.java | 4 ++++ .../api/controller/inv/DeviceMAOrderController.java | 6 ++++++ .../inv/DeviceMAOrderDetailCotroller.java | 7 ++++++- .../inv/DeviceReceiveDetailController.java | 5 +++++ .../inv/DeviceReceiveOrderController.java | 7 +++++++ .../api/controller/inv/InnerOrderController.java | 9 +++++++++ .../api/controller/inv/InvCountCodesController.java | 4 ++++ .../api/controller/inv/InvCountOrderController.java | 7 +++++++ .../inv/InvCountOrderDetailController.java | 4 ++++ .../inv/InvInnerOrderPrintController.java | 3 +++ .../api/controller/inv/InvMAOrderController.java | 6 ++++++ .../controller/inv/InvMAOrderDetailController.java | 4 ++++ .../api/controller/inv/InvPreProductController.java | 3 +++ .../api/controller/inv/InvPreinOrderController.java | 3 +++ .../api/controller/inv/InvProductController.java | 3 +++ .../api/controller/inv/InvRemindMsgController.java | 4 ++++ .../api/controller/inv/InvRemindSetController.java | 6 ++++++ .../controller/monitor/SysLogininforController.java | 2 +- .../api/controller/purchase/PurApplyController.java | 13 +++++++++++++ .../controller/purchase/PurArrivalController.java | 10 ++++++++++ .../controller/purchase/PurDeliveryController.java | 11 +++++++++++ .../api/controller/purchase/PurOrderController.java | 11 +++++++++++ .../purchase/PurOrderReceiveController.java | 9 +++++++++ .../api/controller/purchase/PurPlanController.java | 10 ++++++++++ .../controller/purchase/PurReturnedController.java | 9 +++++++++ .../api/controller/purchase/SupCertController.java | 7 +++++++ .../purchase/SupCertRemindMsgController.java | 4 ++++ .../controller/purchase/SupCertSetController.java | 5 +++++ .../controller/purchase/SupCompanyController.java | 6 ++++++ .../purchase/SupManufacturerController.java | 6 ++++++ .../controller/purchase/SupProductController.java | 5 +++++ .../glxp/api/controller/sup/CustomerController.java | 5 +++++ .../sync/SpsSyncDownloadStatusController.java | 4 ++++ .../sync/SpsSyncExportStatusController.java | 5 +++++ .../api/controller/system/CompanyController.java | 3 +++ .../api/controller/system/DeviceKeyController.java | 4 ++++ .../controller/system/SysMenuHelpController.java | 5 +++++ .../controller/system/SysParamConfigController.java | 3 +++ .../controller/system/SysPdfModuleController.java | 6 ++++++ .../controller/system/SysPdfTemplateController.java | 5 +++++ .../controller/thrsys/ThirdSysApiController.java | 3 +++ .../controller/thrsys/ThirdUploadSetController.java | 3 +++ .../thrsys/ThrBusTypeOriginController.java | 6 ++++++ .../thrsys/ThrCorpExportLogController.java | 6 ++++++ .../thrsys/ThrCorpImportLogController.java | 3 +++ .../api/controller/thrsys/ThrCorpsController.java | 7 +++++++ .../api/controller/thrsys/ThrDeptController.java | 4 ++++ .../controller/thrsys/ThrInvProductsController.java | 7 +++++++ .../thrsys/ThrInvProductsExportLogController.java | 3 +++ .../thrsys/ThrInvProductsImportLogController.java | 3 +++ .../thrsys/ThrInvWarehouseController.java | 5 +++++ .../api/controller/thrsys/ThrOrderController.java | 5 +++++ .../thrsys/ThrOrderExportLogController.java | 5 +++++ .../thrsys/ThrOrderImportLogController.java | 4 ++++ .../thrsys/ThrOrderUploadLogController.java | 3 +++ .../controller/thrsys/ThrProductsAddController.java | 3 +++ .../thrsys/ThrProductsAddDiController.java | 6 ++++++ .../controller/thrsys/ThrProductsController.java | 5 ++++- .../thrsys/ThrProductsExportLogController.java | 3 +++ .../thrsys/ThrProductsImportLogController.java | 3 +++ .../api/controller/thrsys/ThrSystemController.java | 8 ++++++++ 96 files changed, 524 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java index cb760528..a8023c18 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java @@ -1,6 +1,8 @@ package com.glxp.api.controller.auth; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.AuthCheckEntity; import com.glxp.api.req.auth.FilterAuthCheckRequest; import com.glxp.api.res.PageSimpleResponse; @@ -43,6 +45,7 @@ public class AuthCheckController { } @PostMapping("/udiwms/auth/device/save") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse save(@RequestBody @Valid AuthCheckEntity authCheckEntity, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index b160cbd3..f015ee61 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -38,6 +38,7 @@ public class AuthUserController extends BaseController { @AuthRuleAnnotation("admin/auth/admin/updateInv") @PostMapping("/admin/auth/admin/updateInv") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse updateInv(@RequestBody @Valid AuthUserSaveRequest authUserSaveRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 51891a3a..2e900805 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptEntity; @@ -168,6 +170,7 @@ public class DeptController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/save") + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid DeptEntity deptEntity, BindingResult bindingResult) { @@ -228,6 +231,7 @@ public class DeptController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse edit(@RequestBody @Valid DeptEntity deptEntity, BindingResult bindingResult) { @@ -258,6 +262,7 @@ public class DeptController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/delete") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { if (deleteRequest.getId() == null) { diff --git a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java index 82f8c3a0..74a63577 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java @@ -2,6 +2,8 @@ package com.glxp.api.controller.auth; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; @@ -52,6 +54,7 @@ public class DeptUserController { @AuthRuleAnnotation("") @PostMapping("udi/auth/dept/user/delete") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) { boolean b = deptUserService.delete(deptUserEntity.getDeptId(), deptUserEntity.getUserId()); if (b) diff --git a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java index 880df60b..53c6c52f 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.auth; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.InvWarehouseEntity; @@ -106,6 +108,7 @@ public class InvBusUserController { @AuthRuleAnnotation("") @PostMapping("/spms/bus/user/warehouse/update") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse updateRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); if (CollUtil.isNotEmpty(relBusRequset.getInvBusUserEntities())) { @@ -126,6 +129,7 @@ public class InvBusUserController { @AuthRuleAnnotation("") @PostMapping("/spms/bus/user/warehouse/post") + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { @@ -155,6 +159,7 @@ public class InvBusUserController { @AuthRuleAnnotation("") @PostMapping("/spms/bus/user/warehouse/save") + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid InvBusUserEntity invBusUserEntity, BindingResult bindingResult) { @@ -173,6 +178,7 @@ public class InvBusUserController { @AuthRuleAnnotation("") @PostMapping("/spms/bus/user/warehouse/edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse edit(@RequestBody @Valid InvBusUserEntity invBusUserEntity, BindingResult bindingResult) { @@ -192,6 +198,7 @@ public class InvBusUserController { @AuthRuleAnnotation("") @PostMapping("/spms/bus/user/warehouse/delete") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { if (deleteRequest.getId() == null) { diff --git a/src/main/java/com/glxp/api/controller/auth/InvSpaceController.java b/src/main/java/com/glxp/api/controller/auth/InvSpaceController.java index 4bb28ac8..e65a013e 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvSpaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvSpaceController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.auth; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.req.auth.FilterInvSpaceRequest; import com.glxp.api.req.system.DeleteRequest; @@ -48,6 +50,7 @@ public class InvSpaceController { * @return */ @PostMapping("/spms/inv/space/add") + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse addSpace(@RequestBody InvSpace invSpace, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -65,6 +68,7 @@ public class InvSpaceController { * @return */ @PostMapping("/spms/inv/space/delete") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse deleteSpace(@RequestBody DeleteRequest deleteRequest) { if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空"); @@ -80,6 +84,7 @@ public class InvSpaceController { * @return */ @PostMapping("/spms/inv/space/update") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse updateSpace(@RequestBody InvSpace invSpace, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index c99b58ab..8d260fc7 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -6,9 +6,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; @@ -182,6 +184,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/sub/inv/warehouse/save") + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, BindingResult bindingResult) { @@ -220,6 +223,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/sub/inv/warehouse/edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, BindingResult bindingResult, FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) { @@ -260,6 +264,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/sub/inv/warehouse/delete") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { if (deleteRequest.getId() == null) { @@ -324,6 +329,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/sub/inv/warehouse/bindThrWarehouse") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse bindThrWarehouse(String id, String thridWarehouseId, String sysId) { if (null == id || null == thridWarehouseId || StrUtil.isBlank(sysId)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -340,6 +346,7 @@ public class InvWarehouseController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/spms/sub/inv/warehouse/unbindThrWarehouse") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse unbindThrWarehouse(String id, String sysId) { if (null == id || StrUtil.isBlank(sysId)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -435,6 +442,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/invRelBusType/warehouse/post") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse postRes(@RequestBody UpdateInvRelBusRequest relBusRequset) { if (StrUtil.isEmpty(relBusRequset.getInvCode())) return ResultVOUtils.error(500, "仓库编码不能为空！"); @@ -541,6 +549,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/delWarehouseUser") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse deleteWarehouseUser(Integer id) { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -561,6 +570,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/addWarehouseUser") + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse addWarehouseUser(@RequestBody Map params) { String code = String.valueOf(params.get("code")); String userListJson = String.valueOf(params.get("userList")); diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 1030c194..a552267f 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -2,6 +2,8 @@ package com.glxp.api.controller.auth; import cn.hutool.core.util.StrUtil; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; import com.glxp.api.dao.auth.AuthLicenseDao; @@ -268,6 +270,7 @@ public class LoginController extends BaseController { */ @AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串 @PostMapping("/admin/auth/login/password") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse password(@RequestBody @Valid UpdatePasswordRequest updatePasswordRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/auth/RegisterController.java b/src/main/java/com/glxp/api/controller/auth/RegisterController.java index 27d05604..a97d972c 100644 --- a/src/main/java/com/glxp/api/controller/auth/RegisterController.java +++ b/src/main/java/com/glxp/api/controller/auth/RegisterController.java @@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.CustomerInfoEntity; import com.glxp.api.entity.auth.UserRegisterEntity; @@ -178,6 +180,7 @@ public class RegisterController { @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/deleteResiter") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse deleteResiter(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -190,6 +193,7 @@ public class RegisterController { } @PostMapping("salewarehouse/register/update") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse updateRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, BindingResult bindingResult) { @@ -325,6 +329,7 @@ public class RegisterController { @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/check") + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse checkRegister(@RequestBody @Valid RegisterCheckRequest registerCheckRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java index f3181d6f..5ec69838 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java @@ -2,6 +2,8 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.req.auth.SysDictDataRequest; @@ -66,6 +68,7 @@ public class SysDictDataController extends BaseController { * 新增字典类型 */ @PostMapping + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse add(@Validated @RequestBody SysDictData dict) { dictDataService.insertDictData(dict); return ResultVOUtils.success("添加成功！"); @@ -76,6 +79,7 @@ public class SysDictDataController extends BaseController { */ @SaCheckPermission("system:dict:edit") @PutMapping + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse edit(@Validated @RequestBody SysDictData dict) { dictDataService.updateDictData(dict); return ResultVOUtils.success("修改成功！"); @@ -88,6 +92,7 @@ public class SysDictDataController extends BaseController { */ @SaCheckPermission("system:dict:remove") @DeleteMapping("/{dictCodes}") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse remove(@PathVariable Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return ResultVOUtils.success("移除成功！"); diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java index dc4d54bf..874e3745 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java @@ -3,6 +3,8 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.SysDictType; @@ -54,6 +56,7 @@ public class SysDictTypeController extends BaseController { * 新增字典类型 */ @PostMapping + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse add(@Validated @RequestBody SysDictType dict) { if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { return ResultVOUtils.error(500, "新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); @@ -66,6 +69,7 @@ public class SysDictTypeController extends BaseController { * 修改字典类型 */ @PutMapping + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse edit(@Validated @RequestBody SysDictType dict) { // if (Constant.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { // return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); @@ -81,6 +85,7 @@ public class SysDictTypeController extends BaseController { */ @SaCheckPermission("system:dict:remove") @DeleteMapping("/{dictIds}") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse remove(@PathVariable Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return ResultVOUtils.success("删除成功！"); diff --git a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java index 6fbe78db..912e793c 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java @@ -2,6 +2,8 @@ package com.glxp.api.controller.auth; import cn.hutool.core.lang.tree.Tree; import cn.hutool.http.HttpUtil; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; @@ -85,6 +87,7 @@ public class SysMenuController extends BaseController { * 新增菜单 */ @PostMapping + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse add(@Validated @RequestBody SysMenu menu) { if (Constant.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { return ResultVOUtils.error(500, "新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); @@ -101,6 +104,7 @@ public class SysMenuController extends BaseController { * 修改菜单 */ @PutMapping + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse edit(@Validated @RequestBody SysMenu menu) { menu.setNeMenuId(menu.getMenuId()); if (Constant.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { @@ -120,6 +124,7 @@ public class SysMenuController extends BaseController { * @param menuId 菜单ID */ @DeleteMapping("/{menuId}") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse remove(@PathVariable("menuId") Long menuId) { if (menuService.hasChildByMenuId(menuId)) { return ResultVOUtils.error(500, "存在子菜单,不允许删除"); diff --git a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java index 208bf80f..5081f90e 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java @@ -2,6 +2,8 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; @@ -64,6 +66,7 @@ public class SysRoleController extends BaseController { * 新增角色 */ @PostMapping + @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse add(@Validated @RequestBody SysRole role) { role.setRoleKey(UUID.randomUUID() + ""); if (Constant.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { @@ -83,6 +86,7 @@ public class SysRoleController extends BaseController { * 修改保存角色 */ @PutMapping + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse edit(@Validated @RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); @@ -105,6 +109,7 @@ public class SysRoleController extends BaseController { * 修改保存数据权限 */ @PutMapping("/dataScope") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse dataScope(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); @@ -118,6 +123,7 @@ public class SysRoleController extends BaseController { * 状态修改 */ @PutMapping("/changeStatus") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) public BaseResponse changeStatus(@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); @@ -131,6 +137,7 @@ public class SysRoleController extends BaseController { * @param roleIds 角色ID串 */ @DeleteMapping("/{roleIds}") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse remove(@PathVariable Long[] roleIds) { int i = roleService.deleteRoleByIds(roleIds); if(i>0){ @@ -184,6 +191,7 @@ public class SysRoleController extends BaseController { * 取消授权用户 */ @PutMapping("/authUser/cancel") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse cancelAuthUser(@RequestBody SysUserRole userRole) { int i = roleService.deleteAuthUser(userRole); return ResultVOUtils.success("取消成功！"); @@ -197,6 +205,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:edit") @PutMapping("/authUser/cancelAll") + @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse cancelAuthUserAll(Long roleId, Long[] userIds) { int i = roleService.deleteAuthUsers(roleId, userIds); diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 92840db0..4cb545f5 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -135,6 +135,7 @@ public class SysUserController extends BaseController { * @param userId 用户Id * @param roleIds 角色ID串 */ + @Log(title = "用户管理", businessType = BusinessType.GRANT) @SaCheckPermission("system:user:edit") @PutMapping("/authRole") public BaseResponse inseinsertUserAuthrtAuthRole(Long userId, Long[] roleIds) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java index bbca6a45..dcdd1952 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.basic; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.system.DeleteRequest; @@ -58,6 +60,7 @@ public class BasicBusTypeChangeController { * @return */ @PostMapping("/basic/bustype/change/insert") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -79,6 +82,7 @@ public class BasicBusTypeChangeController { * @return */ @PostMapping("/basic/bustype/change/update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -100,6 +104,7 @@ public class BasicBusTypeChangeController { * @return */ @PostMapping("/basic/bustype/change/delete") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse delBussinessType(@RequestBody @Valid DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index df305059..b9165de9 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.auth.InvWarehouseEntity; @@ -119,6 +121,7 @@ public class BasicBusTypePreController { * @return */ @PostMapping("/spms/busTypePre/remove") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse removeBuTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -140,6 +143,7 @@ public class BasicBusTypePreController { * @return */ @PostMapping("/spms/busTypePre/delete") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteBusTypePre(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -157,6 +161,7 @@ public class BasicBusTypePreController { * @return */ @PostMapping("/spms/busTypePre/update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateBusTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -183,6 +188,7 @@ public class BasicBusTypePreController { * @return */ @PostMapping("/spms/busTypePre/insert") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertBusTypePre(@RequestBody BasicBusTypePreEntity basicBusTypePreEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index e2724b63..699544b1 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -6,9 +6,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; @@ -124,6 +126,7 @@ public class BasicBussinessTypeController extends BaseController { * @return */ @PostMapping(value = "/udiwms/bussinessType/insert") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertBussinessType(@RequestBody @Valid BussinessTypeSaveRequest bussinessTypeSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -152,6 +155,7 @@ public class BasicBussinessTypeController extends BaseController { * @return */ @PostMapping("/udiwms/bussinessType/update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateBussinessType(@RequestBody BussinessTypeSaveRequest bussinessTypeSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -225,6 +229,7 @@ public class BasicBussinessTypeController extends BaseController { * @return */ @PostMapping("/udiwms/bussinessType/delete") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index e97ca765..07cf6656 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; @@ -106,6 +108,7 @@ public class BasicCorpController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/save") + @Log(title = "往来单位信息", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest, BindingResult bindingResult) { @@ -133,6 +136,7 @@ public class BasicCorpController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/update") + @Log(title = "往来单位信息", businessType = BusinessType.UPDATE) public BaseResponse update(@RequestBody @Valid BasicCorpEntity basicUnitMaintainSaveRequest,BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -203,6 +207,7 @@ public class BasicCorpController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/combine") + @Log(title = "往来单位信息", businessType = BusinessType.INSERT) public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -268,6 +273,7 @@ public class BasicCorpController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/combineSingle") + @Log(title = "往来单位信息", businessType = BusinessType.UPDATE) public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -302,6 +308,7 @@ public class BasicCorpController { //解除绑定 @AuthRuleAnnotation("") @GetMapping("/udiwms/unit/thirdSys/removeRl") + @Log(title = "往来单位信息", businessType = BusinessType.UPDATE) public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) { BasicCorpEntity basicCorpEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId()); if (removeRelRequest.getThirdSys().equals("thirdId")) { @@ -327,6 +334,7 @@ public class BasicCorpController { @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/delete") + @Log(title = "往来单位信息", businessType = BusinessType.DELETE) public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java index 1601761f..ab5febfc 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java @@ -1,10 +1,12 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.req.basic.BasicCorpsExportRequest; @@ -59,6 +61,7 @@ public class BasicCorpExportLogController { } @PostMapping("/udiwms/corps/exportLog/deleteLog") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -71,6 +74,7 @@ public class BasicCorpExportLogController { //往来单位excel文件下载 @GetMapping("/udiwms/corps/exportLog/download") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public void download(FilterCorpExportLogRequest filterCorpExportLogRequest, HttpServletResponse res) { List corpExportLogEntities = basicCorpExportLogService.filterCorpExportLog(filterCorpExportLogRequest); @@ -107,6 +111,7 @@ public class BasicCorpExportLogController { //往来单位导出生成Excel，并创建生成记录 @PostMapping("/udiwms/corps/importLog/export") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse excelDownload(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) { String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".UpperIn"; BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity(); @@ -127,6 +132,7 @@ public class BasicCorpExportLogController { //往来单位上传SMP，并创建生成记录 @PostMapping("/udiwms/corps/importLog/uploadSmp") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse uploadSmp(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) { BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity(); corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java index a110c3fc..45cd14f0 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java @@ -3,10 +3,12 @@ package com.glxp.api.controller.basic; import cn.hutool.core.io.IoUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; import com.glxp.api.req.basic.FilterCorpImportLogRequest; @@ -56,6 +58,7 @@ public class BasicCorpImportLogController { } @PostMapping("/udiwms/corps/importLog/deleteLog") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -75,6 +78,7 @@ public class BasicCorpImportLogController { //往来单位信息文件导入 @PostMapping("/udiwms/corps/importLog/upload") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse uploadCorp(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { String filePath = "D:\\udiwms\\filePath\\"; File createFile = new File(filePath); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java index 818f7fd4..7b31b1de 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java @@ -2,8 +2,10 @@ package com.glxp.api.controller.basic; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.entity.basic.BasicProductsExportLogEntity; @@ -54,6 +56,7 @@ public class BasicGenExcelService { // //往来单位导出excel文件 @Async + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public void exportCorp(String genKey, BasicCorpsExportRequest basicCorpsExportRequest) { BasicCorpsExportLogEntity corpExportLogEntity = basicCorpExportLogService.selectByGenKey(genKey); @@ -179,6 +182,7 @@ public class BasicGenExcelService { // // @Async + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public void uploadCorpSmpJson(String genKey, BasicCorpExportLogResponse exportData) { BasicCorpsExportLogEntity corpExportLogEntity = basicCorpExportLogService.selectByGenKey(genKey); @@ -248,6 +252,7 @@ public class BasicGenExcelService { // } // @Async + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) { BasicProductsExportLogEntity basicProductsExportLogEntity = basicProductsExportLogService.selectByGenKey(genKey); // String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", exportData); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java index a3867833..93c7f837 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicHospTypeEntity; import com.glxp.api.req.basic.BasicHospTypeFilterRequest; import com.glxp.api.req.basic.BasicHospTypeRequest; @@ -74,6 +76,7 @@ public class BasicHospTypeController { @PostMapping("/udiwms/basic/hosp/type/update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -88,6 +91,7 @@ public class BasicHospTypeController { } @GetMapping("/udiwms/basic/hosp/type/delect") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse delect(BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -132,6 +136,7 @@ public class BasicHospTypeController { @PostMapping("/udiwms/basic/hosp/type/unbindRel") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java b/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java index 228049c2..754e5d7e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -69,6 +71,7 @@ public class BasicInCodeController { } @PostMapping("/udiwms/stock/order/addOrderPrint") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) { if (invInnerOrderprintReques.getOrderIdFk() != null) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java index c04811ab..ca3e9f6c 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java @@ -2,8 +2,10 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicProductSetEntity; import com.glxp.api.req.basic.FilterBasicProductSetrequest; import com.glxp.api.res.PageSimpleResponse; @@ -37,6 +39,7 @@ public class BasicProductSetController { @AuthRuleAnnotation("") @PostMapping("/spms/basicProduct/setup/modify") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse modifySetup(@RequestBody BasicProductSetEntity basicProductSetEntity) { basicProductSetService.updateSetup(basicProductSetEntity); return ResultVOUtils.success("修改成功"); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java index d4a913eb..599482e1 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java @@ -1,10 +1,12 @@ package com.glxp.api.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicProductsExportLogEntity; import com.glxp.api.req.basic.FilterUdiEpLogRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; @@ -67,6 +69,7 @@ public class BasicProductsExportLogController { } @PostMapping("/udiwms/products/exportLog/deleteLog") + @Log(title = "医疗器械信息", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -79,6 +82,7 @@ public class BasicProductsExportLogController { //产品信息excel文件下载 @GetMapping("/udiwms/products/exportLog/download") + @Log(title = "医疗器械信息", businessType = BusinessType.UPDATE) public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { List udiInfoExportLogEntities = basicProductsExportLogService.filterUdiInfoExportLog(filterUdiEpLogRequest); @@ -115,6 +119,7 @@ public class BasicProductsExportLogController { //产品信息导出生成Excel，并创建生成记录 @PostMapping("/udiwms/products/importLog/export") + @Log(title = "医疗器械信息", businessType = BusinessType.INSERT) public BaseResponse excelDownload(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { BasicProductsExportLogEntity basicProductsExportLogEntity = new BasicProductsExportLogEntity(); basicProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); @@ -134,6 +139,7 @@ public class BasicProductsExportLogController { //产品信息上传SMP，并创建生成记录 @PostMapping("/udiwms/products/importLog/uploadSmp") + @Log(title = "医疗器械信息", businessType = BusinessType.INSERT) public BaseResponse uploadSmp(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { BasicProductsExportLogEntity basicProductsExportLogEntity = new BasicProductsExportLogEntity(); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java index fb7f589f..d8e1de6e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java @@ -3,10 +3,12 @@ package com.glxp.api.controller.basic; import cn.hutool.core.io.IoUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicProductsImportDetailEntity; import com.glxp.api.entity.basic.BasicProductsImportLogEntity; import com.glxp.api.req.basic.FilterUdiIpLogRequest; @@ -83,6 +85,7 @@ public class BasicProductsImportLogController { @PostMapping("/udiwms/products/importLog/deleteLog") + @Log(title = "医疗器械信息", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -102,6 +105,7 @@ public class BasicProductsImportLogController { } @PostMapping("/udiwms/products/importLog/delete") + @Log(title = "医疗器械信息", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -116,6 +120,7 @@ public class BasicProductsImportLogController { //产品信息文件导入 @PostMapping("/udiwms/products/importLog/upload") + @Log(title = "医疗器械信息", businessType = BusinessType.INSERT) public BaseResponse uploadProducts(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { String filePath = "D:\\udiwms\\filePath\\"; File createFile = new File(filePath); @@ -201,6 +206,7 @@ public class BasicProductsImportLogController { //产品信息接口上传 @PostMapping("/udiwms/basic/products/upload") + @Log(title = "医疗器械信息", businessType = BusinessType.INSERT) public BaseResponse postUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -238,6 +244,7 @@ public class BasicProductsImportLogController { //扫码精灵产品信息接口上传 @PostMapping("/udiwms/basic/products/srUpload") + @Log(title = "医疗器械信息", businessType = BusinessType.INSERT) public BaseResponse postSrUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -274,6 +281,7 @@ public class BasicProductsImportLogController { //供应商平台产品信息下载 @GetMapping("/udiwms/products/smp/download") + @Log(title = "医疗器械信息", businessType = BusinessType.INSERT) public BaseResponse downloadSmpUdi(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java b/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java index b91b5b6c..b23c8f96 100644 --- a/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java +++ b/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java @@ -2,8 +2,10 @@ package com.glxp.api.controller.basic; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; @@ -74,6 +76,7 @@ public class EntrustReceController extends BaseController { InvWarehouseService invWarehouseService; @PostMapping("/spms/entrust/rece/add") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse aadEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) { entrustReceEntity.setUserId(getUserId()); entrustReceEntity.setUpdateTime(new Date()); @@ -106,6 +109,7 @@ public class EntrustReceController extends BaseController { @PostMapping("/spms/entrust/rece/update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateEntrustRece(@RequestBody EntrustReceEntity entrustReceEntity) { if (StrUtil.isEmpty(entrustReceEntity.getCurInv())) { return ResultVOUtils.error(500, "当前仓库不能为空！"); @@ -130,6 +134,7 @@ public class EntrustReceController extends BaseController { } @PostMapping("/spms/entrust/rece/delete") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { boolean b = entrustReceService.deleteById(deleteRequest.getId()); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 67a93964..89b81b63 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.ProductInfoEntity; @@ -72,6 +74,7 @@ public class UdiContrastController { */ @AuthRuleAnnotation("") @PostMapping("/udi/udirel/revleance") + @Log(title = "耗材字典", businessType = BusinessType.INSERT) public BaseResponse revleanceUdi(@RequestBody UdiCombineRequest udiCombineRequest) { udiCombineRequest.setCustomerId(Long.valueOf(customerService.getCustomerId())); List keys = udiCombineRequest.getKeys(); @@ -141,6 +144,7 @@ public class UdiContrastController { */ @AuthRuleAnnotation("") @PostMapping("/udi/udirel/changeVersion") + @Log(title = "耗材字典", businessType = BusinessType.UPDATE) public BaseResponse changeVersion(@RequestBody UdiCombineRequest udiCombineRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId()); if (udiContrastService.isExit(udiCombineRequest.getKeys().get(0), udiRelevanceEntity.getMainId(), null)) { @@ -165,6 +169,7 @@ public class UdiContrastController { //更改关联第三方产品产品信息 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/modifyRel") + @Log(title = "耗材字典", businessType = BusinessType.UPDATE) public BaseResponse modifyRel(@RequestBody UdiCombineRequest udiCombineRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiCombineRequest.getRelId()); udiRelevanceEntity = setThird(udiCombineRequest, udiRelevanceEntity); @@ -199,6 +204,7 @@ public class UdiContrastController { //解除绑定第三方产品信息 @AuthRuleAnnotation("") @GetMapping("/udiwms/udirl/thirdSys/remove") + @Log(title = "耗材字典", businessType = BusinessType.UPDATE) public BaseResponse removeThirdId(RemoveUdiRelRequest removeUdiRelRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeUdiRelRequest.getRelId()); List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid()); @@ -241,6 +247,7 @@ public class UdiContrastController { //解除绑定DI器械信息 @AuthRuleAnnotation("") @GetMapping("/udiwms/udirl/di/remove") + @Log(title = "耗材字典", businessType = BusinessType.UPDATE) public BaseResponse removeDI(RemoveUdiRelRequest removeRelRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) { diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index d341451f..964c717b 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.*; @@ -232,6 +234,7 @@ public class UdiRelevanceController extends BaseController { //多选删除 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/deleteAll") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -244,6 +247,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/deleteById") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -300,6 +304,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceSaveRequest udiRelevanceSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -358,6 +363,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/update/di") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateSingel(@RequestBody UdiRelevanceSaveRequest udiRelevanceSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -388,6 +394,7 @@ public class UdiRelevanceController extends BaseController { //新增或修改关联 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/check/udi") + public BaseResponse checkUdi(@RequestBody UdiCombineRequest udiCombineRequest) { List keys = udiCombineRequest.getKeys(); @@ -448,6 +455,7 @@ public class UdiRelevanceController extends BaseController { //单独选入ERP产品 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/addErp") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addErp(@RequestBody UdiCombineRequest udiCombineRequest) { String errMsg = null; @@ -465,6 +473,7 @@ public class UdiRelevanceController extends BaseController { //一键选入ERP产品 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/addAllErp") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addAllErp(@RequestBody UdiCombineRequest udiCombineRequest) { if (udiCombineRequest.getIsRlInv() != null && udiCombineRequest.getIsRlInv()) { @@ -644,6 +653,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/udirl/lock/status") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse uploadThirdServcie(@RequestBody LockUdiRequest lockUdiRequest) { if (lockUdiRequest.getLockStatus() != null && lockUdiRequest.getIds().size() > 0) { for (Long id : lockUdiRequest.getIds()) { @@ -661,6 +671,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/updateById") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateById(@RequestBody UdiProductEntity udiProductEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 5a2e04a3..31009915 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.*; @@ -192,6 +194,7 @@ public class UdiRlSupController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/sale/info/insertCompanyProductRelevance") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) { if (udiRlSupService.findCompanyProductRelevanceByProductUuid(udiRlSupEntity) != null) { return ResultVOUtils.error(ResultEnum.DATA_REPEAT); @@ -206,6 +209,7 @@ public class UdiRlSupController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/sale/info/insertFilter") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId() + ""); if (companyEntity.getUnitIdFk().equals("110")) { @@ -244,6 +248,7 @@ public class UdiRlSupController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/sale/info/updateCompanyProductRelevance") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) { udiRlSupEntity.setUpdateTime(new Date()); int b = udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity); @@ -251,6 +256,7 @@ public class UdiRlSupController extends BaseController { } @PostMapping("/sale/info/deleteCompanyProductRelevance") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteCompanyProductRelevance(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = udiRlSupService.deleteById(deleteCompanyFileRequest.getId()); return ResultVOUtils.success("成功"); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java index ca78ec55..e2f1879f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.inout; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; @@ -47,6 +49,7 @@ public class IoCodeLostController extends BaseController { @AuthRuleAnnotation("") @PostMapping("warehouse/inout/updateCodeLost") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 0ad39b48..5ab4b3c2 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; @@ -93,6 +95,7 @@ public class IoCodeTempController extends BaseController { //手持端扫码单据上传调用接口 @AuthRuleAnnotation("") @PostMapping("warehouse/inout/postOrders") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -328,6 +331,7 @@ public class IoCodeTempController extends BaseController { //前端扫码提交 @AuthRuleAnnotation("") @PostMapping("warehouse/inout/addOrderWeb") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addOrderWeb(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -872,6 +876,7 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/addCode/updateBindSup") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity codeSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -927,6 +932,7 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @GetMapping("warehouse/inout/deleteCodesTempById") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteCodesTempById(@RequestParam("id") Integer id) { IoCodeTempEntity codeTempEntity = codeTempService.selectById(id); @@ -963,6 +969,7 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @PostMapping("warehouse/inout/saveTempCode") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) { if (codeTempEntity.getCount() == null) codeTempEntity.setCount(1); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index f7558614..60e22d9e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.InvBusUserEntity; @@ -106,6 +108,7 @@ public class IoOrderController extends BaseController { //新增业务-立即提交 @AuthRuleAnnotation("") @PostMapping("warehouse/inout/submitBiz") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse submitBiz(@RequestBody AddOrderRequest addOrderRequest) { //校验单据是否已完成 @@ -140,6 +143,7 @@ public class IoOrderController extends BaseController { //新增扫码单据-立即提交 @AuthRuleAnnotation("") @PostMapping("warehouse/inout/submitCodes") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse submitCodes(@RequestBody AddOrderRequest addOrderRequest) { //校验单据是否已完成 @@ -162,6 +166,7 @@ public class IoOrderController extends BaseController { //新增业务单据，新增扫码单据，等待校验-草稿保存 @AuthRuleAnnotation("") @PostMapping("warehouse/inout/saveOrderWeb") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { IoOrderEntity orderEntity = new IoOrderEntity(); if (StrUtil.isEmpty(addOrderRequest.getAction())) @@ -191,6 +196,7 @@ public class IoOrderController extends BaseController { //等待校验-立即提交 @AuthRuleAnnotation("") @PostMapping("warehouse/inout/submitOrderWeb") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { //校验单据是否已完成 @@ -239,6 +245,7 @@ public class IoOrderController extends BaseController { //未校验单据删除 @AuthRuleAnnotation("") @PostMapping("udiwms/inout/order/delete") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { orderService.deleteByBillNo(deleteRequest.getBillNo()); orderDetailBizService.deleteByOrderId(deleteRequest.getBillNo()); @@ -252,6 +259,7 @@ public class IoOrderController extends BaseController { //已验收单据删除、单据编辑删除等 @AuthRuleAnnotation("") @PostMapping("udiwms/inout/order/finish/delete") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest) { List delBillNos = new ArrayList<>(); if (CollUtil.isNotEmpty(deleteRequest.getBillNos())) { @@ -274,6 +282,7 @@ public class IoOrderController extends BaseController { //单据编辑，条码减一 @AuthRuleAnnotation("") @PostMapping("udiwms/inout/code/finish/delete") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse deleteCodeById(@RequestBody IoCodeEntity codeEntity) { orderService.deleteInvCode(codeEntity.getOrderId(), codeEntity.getCode()); return ResultVOUtils.success("删除成功！"); @@ -282,6 +291,7 @@ public class IoOrderController extends BaseController { //已验收单据撤回 @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/received/rollback") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse rollbackOrder(String billNo) { if (StrUtil.isBlank(billNo)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -305,6 +315,7 @@ public class IoOrderController extends BaseController { //已校验单据撤回到等待处理 @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/unReceive/rollback") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse rollUnReceivebackOrder(String billNo) { if (StrUtil.isBlank(billNo)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -435,6 +446,7 @@ public class IoOrderController extends BaseController { * @return */ @PostMapping("/udiwms/inout/order/updateOrderInfo") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateOrderInfo(@RequestBody OrderEditRequest orderEditRequest) { if (null == orderEditRequest || CollUtil.isEmpty(orderEditRequest.getOrderIds())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -471,6 +483,7 @@ public class IoOrderController extends BaseController { } @PostMapping("/udiwms/inout/order/updateOrderDetailBiz") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateOrderDetailBiz(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) { if (null == ioOrderDetailBizEntity) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 952be59d..1ced767f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; @@ -105,6 +107,7 @@ public class IoOrderDetailBizController extends BaseController { //录入业务单据详情 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addBizProduct") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert"); boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false; @@ -189,6 +192,7 @@ public class IoOrderDetailBizController extends BaseController { //修改业务单据详情 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateBizProduct") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateBizProduct(@RequestBody IoOrderDetailBizEntity orderDetailBizEntity) { boolean isExit = orderDetailBizService.isExit(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getId(), orderDetailBizEntity.getOrderIdFk()); if (isExit) { @@ -208,6 +212,7 @@ public class IoOrderDetailBizController extends BaseController { //选入第三方单据至业务单据 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addThrOrder") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addThrOrder(@RequestBody ThrOrderEntity thrOrderRequest) { ThrOrderEntity thrOrderEntity = thrOrderService.findById(thrOrderRequest.getId()); @@ -333,6 +338,7 @@ public class IoOrderDetailBizController extends BaseController { //选入领用单据至业务单据 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addReceiveOrder") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addReceiveOrder(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { @@ -395,6 +401,7 @@ public class IoOrderDetailBizController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/delBizProduct") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) { return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("删除成功！") : ResultVOUtils.error(500, "删除失败"); } @@ -425,6 +432,7 @@ public class IoOrderDetailBizController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/biz/updateBind") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateBindSup(@RequestBody BizBindUpdateRequest bizBindUpdateRequest) { @@ -448,6 +456,7 @@ public class IoOrderDetailBizController extends BaseController { * @return */ @GetMapping("/udiwms/inout/biz/deleteById") + @Log(title = "发票管理", businessType = BusinessType.DELETE) public BaseResponse deleteById(Integer id) { return ResultVOUtils.success(ioOrderInvoiceService.deleteByInvId(id)); @@ -462,6 +471,7 @@ public class IoOrderDetailBizController extends BaseController { */ @PostMapping("/udiwms/inout/biz/updateById") + @Log(title = "发票管理", businessType = BusinessType.UPDATE) public BaseResponse deleteById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) { return ResultVOUtils.success(ioOrderInvoiceService.updateByInvId(ioOrderInvoiceRequest)); @@ -470,6 +480,7 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/biz/insertInvoice") + @Log(title = "发票管理", businessType = BusinessType.INSERT) public BaseResponse insertInvoice(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) { IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity(); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 423670a8..f2b06c58 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.controller.BaseController; @@ -109,6 +111,7 @@ public class IoOrderReviewController extends BaseController { //前端二次审核 @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/web/updateStatus") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse webUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, BindingResult bindingResult) { @@ -133,6 +136,7 @@ public class IoOrderReviewController extends BaseController { //前端第三次验收 @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/third/updateStatus") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse thirdUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, BindingResult bindingResult) { @@ -221,6 +225,7 @@ public class IoOrderReviewController extends BaseController { //手持终端验收完成后，更新订单状态 @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/check/updateStatus") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, BindingResult bindingResult) { AuthAdmin authAdmin = null; diff --git a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java index 60b59803..7f8f5614 100644 --- a/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java +++ b/src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java @@ -3,8 +3,10 @@ package com.glxp.api.controller.inout; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoCodeRelEntity; @@ -65,6 +67,7 @@ public class ioCodeRelController { } @GetMapping("/udi/ioCode/Rel/checkLowProduct") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse checkLowProduct(String upCode,String lowCode) { UdiProductEntity udiProductEntity=new UdiProductEntity(); @@ -127,6 +130,7 @@ public class ioCodeRelController { @GetMapping("/udi/ioCode/Rel/del") + @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse del(String code,String parentCode) { int count=ioCodeRelServicec.delIoCodeRel(code,parentCode); diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java b/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java index a7001415..f0d8ca2f 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.inv; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.DeviceMAOrderEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; @@ -73,6 +75,7 @@ public class DeviceMAOrderController { * @return */ @PostMapping("/device/MA/order/addMAOrder") + @Log(title = "设备养护", businessType = BusinessType.INSERT) public BaseResponse addMAOrder(@RequestBody DeviceMAOrderEntity deviceMAOrderEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -88,6 +91,7 @@ public class DeviceMAOrderController { * @return */ @PostMapping("/device/MA/order/updateMAOrder") + @Log(title = "设备养护", businessType = BusinessType.UPDATE) public BaseResponse updateMAOrder(@RequestBody DeviceMAOrderEntity deviceMAOrderEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -103,6 +107,7 @@ public class DeviceMAOrderController { * @return */ @PostMapping("/device/MA/order/deleteMAOrder") + @Log(title = "设备养护", businessType = BusinessType.DELETE) public BaseResponse deleteMAOrder(@RequestBody FilterDeviceMAOrderRequest filterDeviceMAOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -121,6 +126,7 @@ public class DeviceMAOrderController { * @return */ @PostMapping("/device/MA/order/addDeviceMAOrder") + @Log(title = "设备养护", businessType = BusinessType.INSERT) public BaseResponse addDeviceMAOrder(@RequestBody AddDeviceMAOrderRequest addDeviceMAOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderDetailCotroller.java b/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderDetailCotroller.java index bc6b280e..f43be063 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderDetailCotroller.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderDetailCotroller.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.inv; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity; import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest; import com.glxp.api.res.PageSimpleResponse; @@ -23,7 +25,7 @@ import java.util.List; * 设备养护记录详情接口 */ @RestController -public class DeviceMAOrderDetailCotroller { +public class DeviceMAOrderDetailCotroller { @Resource private DeviceMAOrderDetailService deviceMAOrderDetailService; @@ -52,6 +54,7 @@ public class DeviceMAOrderDetailCotroller { * @return */ @PostMapping("/device/MA/order/detail/addOrderDetail") + @Log(title = "设备养护", businessType = BusinessType.INSERT) public BaseResponse addOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -67,6 +70,7 @@ public class DeviceMAOrderDetailCotroller { * @return */ @PostMapping("/device/MA/order/detail/updateOrderDetail") + @Log(title = "设备养护", businessType = BusinessType.UPDATE) public BaseResponse updateOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -82,6 +86,7 @@ public class DeviceMAOrderDetailCotroller { * @return */ @PostMapping("/device/MA/order/detail/deleteOrderDetail") + @Log(title = "设备养护", businessType = BusinessType.DELETE) public BaseResponse deleteOrderDetail(@RequestBody DeviceMAOrderDetailEntity detailEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java index 54d9799b..150d5eee 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.inv; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest; import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; @@ -65,6 +67,7 @@ public class DeviceReceiveDetailController { * @return */ @PostMapping("/device/receive/order/detail/addOrderDetail") + @Log(title = "设备领用", businessType = BusinessType.INSERT) public BaseResponse addOrderDetail(@RequestBody AddDeviceReceiveOrderDetailRequest addDetailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -83,6 +86,7 @@ public class DeviceReceiveDetailController { * @return */ @PostMapping("/device/receive/order/detail/updateOrderDetail") + @Log(title = "设备领用", businessType = BusinessType.UPDATE) public BaseResponse updateOrderDetail(@RequestBody DeviceReceiveOrderDetailEntity detailEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -101,6 +105,7 @@ public class DeviceReceiveDetailController { * @return */ @PostMapping("/device/receive/order/detail/deleteOrderDetail") + @Log(title = "设备领用", businessType = BusinessType.DELETE) public BaseResponse deleteOrderDetail(@RequestBody FilterDeviceReceiveOrderDetailRequest detailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java index 0a20348d..f6aaef94 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java @@ -1,9 +1,11 @@ package com.glxp.api.controller.inv; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest; import com.glxp.api.res.inv.DeviceReceiveOrderResponse; @@ -47,6 +49,7 @@ public class DeviceReceiveOrderController { * @param deviceReceiveOrderEntity */ @PostMapping("/device/receive/order/addOrder") + @Log(title = "设备领用", businessType = BusinessType.INSERT) public BaseResponse addOrder(@RequestBody DeviceReceiveOrderEntity deviceReceiveOrderEntity, BindingResult bindingResult) { if (bindingResult.hasErrors() || null == deviceReceiveOrderEntity) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -62,6 +65,7 @@ public class DeviceReceiveOrderController { * @return */ @PostMapping("/device/receive/order/update") + @Log(title = "设备领用", businessType = BusinessType.UPDATE) public BaseResponse update(@RequestBody DeviceReceiveOrderEntity deviceReceiveOrderEntity, BindingResult bindingResult) { Integer integer = deviceReceiveOrderService.selectOrderIdByOrderId(deviceReceiveOrderEntity.getOrderId()); deviceReceiveOrderEntity.setId(integer); @@ -83,6 +87,7 @@ public class DeviceReceiveOrderController { * @return */ @PostMapping("/device/receive/order/submitAudit") + @Log(title = "设备领用", businessType = BusinessType.UPDATE) public BaseResponse submitAudit(@RequestBody FilterDeviceReceiveOrderRequest deviceReceiveOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -101,6 +106,7 @@ public class DeviceReceiveOrderController { * @return */ @PostMapping("/device/receive/order/updateStatus") + @Log(title = "设备领用", businessType = BusinessType.UPDATE) public BaseResponse updateStatus(@RequestBody FilterDeviceReceiveOrderRequest filterDeviceReceiveOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -119,6 +125,7 @@ public class DeviceReceiveOrderController { * @return */ @PostMapping("/device/receive/order/delete") + @Log(title = "设备领用", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody FilterDeviceReceiveOrderRequest filterDeviceReceiveOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java index d059d991..95191d6a 100644 --- a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.inv; import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.entity.inv.InnerOrderDetailEntity; import com.glxp.api.entity.inv.InnerOrderEntity; @@ -57,6 +59,7 @@ public class InnerOrderController { @RepeatSubmit() @AuthRuleAnnotation("") @PostMapping("/postOrder") + @Log(title = "内部码", businessType = BusinessType.INSERT) public BaseResponse postOrder(@RequestBody PostInnerOrderRequest postInnerOrderRequest) { long userId = customerService.getUserId(); @@ -100,6 +103,7 @@ public class InnerOrderController { */ @RepeatSubmit() @PostMapping() + @Log(title = "内部码", businessType = BusinessType.INSERT) public BaseResponse add(@RequestBody InnerOrderEntity innerOrderEntity) { innerOrderService.insert(innerOrderEntity); @@ -111,6 +115,7 @@ public class InnerOrderController { */ @RepeatSubmit() @PutMapping() + @Log(title = "内部码", businessType = BusinessType.UPDATE) public BaseResponse edit(@RequestBody InnerOrderEntity innerOrderEntity) { innerOrderService.update(innerOrderEntity); return ResultVOUtils.success("删除成功"); @@ -122,6 +127,7 @@ public class InnerOrderController { * @param ids 主键串 */ @DeleteMapping("/{ids}") + @Log(title = "内部码", businessType = BusinessType.DELETE) public BaseResponse remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) { List idArray = Arrays.asList(ids); @@ -158,6 +164,7 @@ public class InnerOrderController { */ @RepeatSubmit() @PostMapping("/insertDetail") + @Log(title = "内部码", businessType = BusinessType.INSERT) public BaseResponse detailAdd(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) { innerOrderDetailService.insert(innerOrderDetailEntity); @@ -169,6 +176,7 @@ public class InnerOrderController { */ @RepeatSubmit() @PostMapping("/updateDetail") + @Log(title = "内部码", businessType = BusinessType.UPDATE) public BaseResponse detailEdit(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) { innerOrderDetailService.update(innerOrderDetailEntity); return ResultVOUtils.success("更新成功"); @@ -180,6 +188,7 @@ public class InnerOrderController { * @param ids 主键串 */ @DeleteMapping("/detail/{ids}") + @Log(title = "内部码", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java b/src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java index a5714534..76696e2e 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountCodesController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.inv; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvCountCodesEntity; import com.glxp.api.req.inv.FilterInvCountCodesRequest; import com.glxp.api.res.PageSimpleResponse; @@ -49,6 +51,7 @@ public class InvCountCodesController { * @return */ @PostMapping("/inv/count/codes/deleteCode") + @Log(title = "盘点单据", businessType = BusinessType.DELETE) public BaseResponse deleteCode(@RequestBody FilterInvCountCodesRequest codesRequest) { if (null == codesRequest || StrUtil.isBlank(codesRequest.getOrderIdFk()) || StrUtil.isBlank(codesRequest.getRelId()) || StrUtil.isBlank(codesRequest.getCode())) { return ResultVOUtils.success(ResultEnum.PARAM_VERIFY_FALL); @@ -63,6 +66,7 @@ public class InvCountCodesController { * @return */ @PostMapping("/inv/count/codes/addCode") + @Log(title = "盘点单据", businessType = BusinessType.INSERT) public BaseResponse addCode(@RequestBody InvCountCodesEntity invCountCodes) { if (null == invCountCodes || StrUtil.isBlank(invCountCodes.getCode())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java index be949b06..5b4141cf 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java @@ -4,9 +4,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvCountOrderEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; @@ -75,6 +77,7 @@ public class InvCountOrderController { */ @AuthRuleAnnotation("") @PostMapping("/inv/count/order/delete") + @Log(title = "盘点单据", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { invCountOrderService.deleteOrder(deleteRequest.getId()); return ResultVOUtils.success(); @@ -87,6 +90,7 @@ public class InvCountOrderController { */ @AuthRuleAnnotation("") @PostMapping("/inv/count/order/saveCountOrder") + @Log(title = "盘点单据", businessType = BusinessType.INSERT) public BaseResponse saveCountOrder(@RequestBody InvCountOrderEntity invCountOrder, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -106,6 +110,7 @@ public class InvCountOrderController { */ @AuthRuleAnnotation("") @GetMapping("/inv/count/order/submitAudit") + @Log(title = "盘点单据", businessType = BusinessType.UPDATE) public BaseResponse submitAudit(String id) { if (StrUtil.isBlank(id)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -121,6 +126,7 @@ public class InvCountOrderController { */ @AuthRuleAnnotation("") @PostMapping("/inv/count/order/updateCountOrderStatus") + @Log(title = "盘点单据", businessType = BusinessType.UPDATE) public BaseResponse updateCountOrderStatus(@RequestBody FilterInvCountOrderRequest filterInvCountOrderRequest) { if (null == filterInvCountOrderRequest || StrUtil.isBlank(filterInvCountOrderRequest.getId()) || null == filterInvCountOrderRequest.getStatus()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -184,6 +190,7 @@ public class InvCountOrderController { */ @AuthRuleAnnotation("") @PostMapping("/invCount/order/saveCountOrderForPDA") + @Log(title = "盘点单据", businessType = BusinessType.INSERT) public BaseResponse saveCountOrderForPDA(@RequestBody @Valid AddInvCountOrderSaveRequest addInvCountOrderSaveRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/InvCountOrderDetailController.java index 08da1ded..016f1910 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountOrderDetailController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.inv; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvCountOrderDetailEntity; import com.glxp.api.req.inv.FilterInvCountOrderDetailRequest; import com.glxp.api.res.PageSimpleResponse; @@ -51,6 +53,7 @@ public class InvCountOrderDetailController { * @return */ @PostMapping("/inv/count/order/detail/deleteOrderDetail") + @Log(title = "盘点单据", businessType = BusinessType.DELETE) public BaseResponse deleteOrderDetail(@RequestBody FilterInvCountOrderDetailRequest detailRequest) { if (null == detailRequest || null == detailRequest.getId()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -65,6 +68,7 @@ public class InvCountOrderDetailController { * @return */ @PostMapping("/inv/count/order/detail/addCountOrderDetail") + @Log(title = "产品详情", businessType = BusinessType.INSERT) public BaseResponse addCountOrderDetail(@RequestBody InvCountOrderDetailEntity invCountOrderDetail) { if (null == invCountOrderDetail || StrUtil.isBlank(invCountOrderDetail.getOrderIdFk()) || null == invCountOrderDetail.getRelId()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index b067b26b..62fba612 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.inv; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; @@ -68,6 +70,7 @@ public class InvInnerOrderPrintController { } @PostMapping("/udiwms/innerOrderPrint/addOrderPrint") + @Log(title = "内部码", businessType = BusinessType.INSERT) public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) { if (invInnerOrderprintReques.getOrderIdFk() != null) { diff --git a/src/main/java/com/glxp/api/controller/inv/InvMAOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvMAOrderController.java index 18e4dd9c..5f096ae2 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvMAOrderController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.inv; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvMAOrderEntity; import com.glxp.api.req.inv.FilterInvMAOrderRequest; import com.glxp.api.res.inv.InvMAOrderResponse; @@ -50,6 +52,7 @@ public class InvMAOrderController { * @return */ @PostMapping("/inv/MA/order/addOrder") + @Log(title = "库存养护记录", businessType = BusinessType.INSERT) public BaseResponse addOrder(@RequestBody InvMAOrderEntity invMAOrderEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -65,6 +68,7 @@ public class InvMAOrderController { * @return */ @PostMapping("/inv/MA/order/update") + @Log(title = "库存养护记录", businessType = BusinessType.UPDATE) public BaseResponse update(@RequestBody InvMAOrderEntity invMAOrderEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -99,6 +103,7 @@ public class InvMAOrderController { * @return */ @PostMapping("/inv/MA/order/updateStatus") + @Log(title = "库存养护记录", businessType = BusinessType.UPDATE) public BaseResponse updateStatus(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -117,6 +122,7 @@ public class InvMAOrderController { * @return */ @PostMapping("/inv/MA/order/delete") + @Log(title = "库存养护记录", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody FilterInvMAOrderRequest filterInvMAOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java index fecbc3fe..ae6a2409 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.inv; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvMAOrderDetailEntity; import com.glxp.api.req.inv.AddInvMAOrderDetailRequest; import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; @@ -86,6 +88,7 @@ public class InvMAOrderDetailController { * @return */ @PostMapping("/inv/MA/order/detail/delete") + @Log(title = "库存养护记录", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody FilterInvMAOrderDetailRequest filterInvMAOrderDetailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -103,6 +106,7 @@ public class InvMAOrderDetailController { * @return */ @PostMapping("/inv/MA/order/detail/update") + @Log(title = "库存养护记录", businessType = BusinessType.UPDATE) public BaseResponse update(@RequestBody InvMAOrderDetailEntity invMAOrderDetailEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java index c4112312..25e449e4 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreProductController.java @@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.entity.inv.InvPreProductEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; @@ -113,6 +115,7 @@ public class InvPreProductController { * @return */ @PostMapping("/spms/inv/pre/product/delete") + @Log(title = "寄售库存", businessType = BusinessType.DELETE) public BaseResponse deleteInvPreProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java index 9214c9a9..77e0e270 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java @@ -3,8 +3,10 @@ package com.glxp.api.controller.inv; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; @@ -63,6 +65,7 @@ public class InvPreinOrderController extends BaseController { @AuthRuleAnnotation("") @PostMapping("udiwms/inv/prein/delete") + @Log(title = "预验收单据", businessType = BusinessType.DELETE) public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { if (StrUtil.isEmpty(deleteRequest.getBillNo())) diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index 87f8bf47..6a71ee6f 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.entity.inv.InvProductEntity; @@ -167,6 +169,7 @@ public class InvProductController extends BaseController { * @return */ @PostMapping("/spms/inv/product/delete") + @Log(title = "库存查询", businessType = BusinessType.DELETE) public BaseResponse deleteInvProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java index 61896fd7..c61a1dc9 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java @@ -1,8 +1,10 @@ package com.glxp.api.controller.inv; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.req.inv.FilterInvRemindMsgRequest; import com.glxp.api.res.inv.InvRemindMsgResponse; @@ -50,6 +52,7 @@ public class InvRemindMsgController extends BaseController { * @return */ @GetMapping("/udiwms/inv/remind/msg/confirmMsg") + @Log(title = "库存预警", businessType = BusinessType.UPDATE) public BaseResponse confirmMsg(Integer id, String handleMsg) { return invRemindMsgService.confirmMsg(id, handleMsg); } @@ -62,6 +65,7 @@ public class InvRemindMsgController extends BaseController { * @return */ @GetMapping("/udiwms/inv/remind/msg/ignoreMsg") + @Log(title = "库存预警", businessType = BusinessType.UPDATE) public BaseResponse ignoreMsg(Integer id, Integer ignoreStatus) { return invRemindMsgService.ignoreMsg(id, ignoreStatus); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java index f7d7fde3..4e7f9c0b 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.inv; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvRemindSetEntity; import com.glxp.api.req.inv.AddInvRemindSetRequest; import com.glxp.api.req.inv.FilterInvRemindSetRequest; @@ -48,6 +50,7 @@ public class InvRemindSetController { * @return */ @PostMapping("/udiwms/inv/remind/set/add") + @Log(title = "库存预警", businessType = BusinessType.INSERT) public BaseResponse addInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) { return invRemindSetService.addInvRemindSet(addInvRemindSetRequest); } @@ -59,6 +62,7 @@ public class InvRemindSetController { * @return */ @PostMapping("/udiwms/inv/remind/set/batchAddInvRemindSet") + @Log(title = "库存预警", businessType = BusinessType.INSERT) public BaseResponse batchAddInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) { if (null == addInvRemindSetRequest || CollUtil.isEmpty(addInvRemindSetRequest.getRelIdList())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -73,6 +77,7 @@ public class InvRemindSetController { * @return */ @PostMapping("/udiwms/inv/remind/set/update") + @Log(title = "库存预警", businessType = BusinessType.UPDATE) public BaseResponse updateInvRemindSet(@RequestBody InvRemindSetEntity invRemindSetEntity) { return invRemindSetService.updateInvRemindSet(invRemindSetEntity); } @@ -84,6 +89,7 @@ public class InvRemindSetController { * @return */ @PostMapping("/udiwms/inv/remind/set/delete") + @Log(title = "库存预警", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java b/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java index d5945812..f9a298e5 100644 --- a/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java +++ b/src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java @@ -25,7 +25,7 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/monitor/logininfor") -public class SysLogininforController extends BaseController { +public class SysLogininforController extends BaseController { private final ISysLogininforService logininforService; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 4a2a839e..77c7b486 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.purchase.PurApplyDetailEntity; @@ -78,6 +80,7 @@ public class PurApplyController { @RepeatSubmit() @AuthRuleAnnotation("") @PostMapping("/purchase/apply/postOrder") + @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse postOrder(@RequestBody PostPurApplyRequest postPurApplyRequest) { Long userId = customerService.getUserId(); @@ -147,6 +150,7 @@ public class PurApplyController { */ @RepeatSubmit() @PostMapping("/purchase/apply/auditOrder") + @Log(title = "审核申购单", businessType = BusinessType.INSERT) public BaseResponse auditOrder(@RequestBody PurApplyResponse purApplyRequest) { @@ -201,6 +205,7 @@ public class PurApplyController { */ @RepeatSubmit() @PostMapping("/purchase/apply") + @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse add(@RequestBody PurApplyEntity purApplyRequest) { purApplyService.insert(purApplyRequest); @@ -212,6 +217,7 @@ public class PurApplyController { */ @RepeatSubmit() @PutMapping("/purchase/apply") + @Log(title = "申购单", businessType = BusinessType.UPDATE) public BaseResponse edit(@RequestBody PurApplyEntity purApplyRequest) { purApplyService.update(purApplyRequest); return ResultVOUtils.success("删除成功"); @@ -223,6 +229,7 @@ public class PurApplyController { * @param ids 主键串 */ @DeleteMapping("/purchase/apply/{ids}") + @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { List idArray = Arrays.asList(ids); @@ -259,6 +266,7 @@ public class PurApplyController { */ @RepeatSubmit() @PostMapping("/purchase/apply/detail") + @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse detailAdd(@RequestBody PurApplyDetailEntity purApplyDetailEntity) { purApplyDetailService.insert(purApplyDetailEntity); @@ -270,6 +278,7 @@ public class PurApplyController { */ @RepeatSubmit() @PostMapping("/purchase/apply/updateDetail") + @Log(title = "申购单", businessType = BusinessType.UPDATE) public BaseResponse detailEdit(@RequestBody PurApplyDetailEntity purApplyDetailRequest) { purApplyDetailService.update(purApplyDetailRequest); return ResultVOUtils.success("修改成功"); @@ -281,6 +290,7 @@ public class PurApplyController { * @param ids 主键串 */ @DeleteMapping("/purchase/apply/detail/{ids}") + @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { @@ -294,6 +304,7 @@ public class PurApplyController { */ @RepeatSubmit() @PostMapping("/purchase/apply/addDetail") + @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse addDetail(@RequestBody PurApplyDetailEntity purApplyDetailEntity) { purApplyDetailService.insert(purApplyDetailEntity); @@ -304,6 +315,7 @@ public class PurApplyController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/apply/add") + @Log(title = "申购单", businessType = BusinessType.INSERT) public BaseResponse add() { Long userId = customerService.getUserId(); @@ -323,6 +335,7 @@ public class PurApplyController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/apply/delApplyDetailAll") + @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { if(purApplyEntity.getId()!=null){ diff --git a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java index 6f7defe5..46acc744 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -77,6 +79,7 @@ public class PurArrivalController extends BaseController { @RepeatSubmit() @AuthRuleAnnotation("") @PostMapping("/purchase/arrival/postOrder") + @Log(title = "到货单", businessType = BusinessType.INSERT) public BaseResponse postOrder(@RequestBody PostPurArrivalRequest purArrivalRequest) { Long userId = getUserId(); @@ -150,6 +153,7 @@ public class PurArrivalController extends BaseController { */ @RepeatSubmit() @PostMapping("/purchase/arrival/auditOrder") + @Log(title = "审核采购订单", businessType = BusinessType.INSERT) public BaseResponse auditOrder(@RequestBody PostPurArrivalRequest postPurArrivalRequest) { Long userId = customerService.getUserId(); PurArrivalEntity purArrivalEntity = postPurArrivalRequest.getPurArrivalEntity(); @@ -243,6 +247,7 @@ public class PurArrivalController extends BaseController { * 添加产品到采购单里面 */ @PostMapping("/purchase/arrival/addOrderDetail") + @Log(title = "采购单", businessType = BusinessType.INSERT) public BaseResponse addOrderDetail(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) { boolean falg = purArrivalDetailService.insert(purOrderDetailEntity); @@ -260,6 +265,7 @@ public class PurArrivalController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/arrival/add") + @Log(title = "计划单", businessType = BusinessType.INSERT) public BaseResponse add() { Long userId = customerService.getUserId(); PurArrivalEntity purArrivalEntity = new PurArrivalEntity(); @@ -277,6 +283,7 @@ public class PurArrivalController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/arrival/delOrderDetailAll") + @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { if (purApplyEntity.getId() != null) { @@ -293,6 +300,7 @@ public class PurArrivalController extends BaseController { */ @RepeatSubmit() @PostMapping("/purchase/arrival/updateDetail") + @Log(title = "计划详情单", businessType = BusinessType.UPDATE) public BaseResponse detailEdit(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) { purArrivalDetailService.update(purOrderDetailEntity); return ResultVOUtils.success("修改成功"); @@ -304,6 +312,7 @@ public class PurArrivalController extends BaseController { * @param ids 主键串 */ @DeleteMapping("/purchase/arrival/detail/{ids}") + @Log(title = "采购订单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { @@ -319,6 +328,7 @@ public class PurArrivalController extends BaseController { * 添加采购订单至送货单 */ @PostMapping("/purchase/arrival/addPlanDetailAndOrder") + @Log(title = "送货单", businessType = BusinessType.INSERT) public BaseResponse addPlanDetailAndOrder(@RequestBody PurArrivalRequest purArrivalRequest) { diff --git a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java index 82f06071..77e63653 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java @@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -87,6 +89,7 @@ public class PurDeliveryController extends BaseController { @RepeatSubmit() @AuthRuleAnnotation("") @PostMapping("/purchase/delivery/postOrder") + @Log(title = "到货单", businessType = BusinessType.INSERT) public BaseResponse postOrder(@RequestBody PostPurDeliveryRequest purDeliveryRequest) { Long userId = customerService.getUserId(); @@ -160,6 +163,7 @@ public class PurDeliveryController extends BaseController { */ @RepeatSubmit() @PostMapping("/purchase/delivery/auditOrder") + @Log(title = "送货单", businessType = BusinessType.INSERT) public BaseResponse auditOrder(@RequestBody PostPurDeliveryRequest postPurDeliveryRequest) { Long userId = customerService.getUserId(); PurDeliveryEntity purDeliveryEntity = postPurDeliveryRequest.getPurDeliveryEntity(); @@ -355,6 +359,7 @@ public class PurDeliveryController extends BaseController { * @return */ @PostMapping("/purchase/delivery/list/updateStatus") + @Log(title = "到货单", businessType = BusinessType.UPDATE) public BaseResponse updateStatus(@RequestBody ReviewDeliveryOrderRequest reviewFinishRequest) { if (null == reviewFinishRequest && StrUtil.isBlank(reviewFinishRequest.getBillNo())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -371,6 +376,7 @@ public class PurDeliveryController extends BaseController { * 添加产品到采购单里面 */ @PostMapping("/purchase/delivery/addOrderDetail") + @Log(title = "采购单", businessType = BusinessType.INSERT) public BaseResponse addOrderDetail(@RequestBody PurDeliveryDetailEntity purOrderDetailEntity) { boolean falg = purDeliveryDetailService.insert(purOrderDetailEntity); @@ -388,6 +394,7 @@ public class PurDeliveryController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/delivery/add") + @Log(title = "计划单", businessType = BusinessType.INSERT) public BaseResponse add() { Long userId = customerService.getUserId(); PurDeliveryEntity purArrivalEntity = new PurDeliveryEntity(); @@ -406,6 +413,7 @@ public class PurDeliveryController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/delivery/delOrderDetailAll") + @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { if (purApplyEntity.getId() != null) { @@ -422,6 +430,7 @@ public class PurDeliveryController extends BaseController { */ @RepeatSubmit() @PostMapping("/purchase/delivery/updateDetail") + @Log(title = "计划详情单", businessType = BusinessType.UPDATE) public BaseResponse detailEdit(@RequestBody PurDeliveryDetailEntity purDeliveryDetailEntity) { purDeliveryDetailService.update(purDeliveryDetailEntity); return ResultVOUtils.success("修改成功"); @@ -433,6 +442,7 @@ public class PurDeliveryController extends BaseController { * @param ids 主键串 */ @DeleteMapping("/purchase/delivery/detail/{ids}") + @Log(title = "采购订单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { @@ -447,6 +457,7 @@ public class PurDeliveryController extends BaseController { * 添加采购订单至送货单 */ @PostMapping("/purchase/delivery/addPlanDetailAndOrder") + @Log(title = "采购订单", businessType = BusinessType.INSERT) public BaseResponse addPlanDetailAndOrder(@RequestBody PurDeliveryRequest purDeliveryRequest) { List purOrderDetailEntities = purOrderDetailService.findByOrderId(purDeliveryRequest.getPurOrderId() + ""); List purDeliveryDetailEntities = purOrderDetailEntities.stream() diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 913207a3..b602414e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -77,6 +79,7 @@ public class PurOrderController { @RepeatSubmit() @AuthRuleAnnotation("") @PostMapping("/purchase/order/postOrder") + @Log(title = "采购计划", businessType = BusinessType.INSERT) public BaseResponse postOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { Long userId = customerService.getUserId(); @@ -147,6 +150,7 @@ public class PurOrderController { @RepeatSubmit() @PostMapping("/purchase/order/dealOrder") + @Log(title = "送货单", businessType = BusinessType.INSERT) public BaseResponse dealOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); purOrderEntity.setUpdateTime(new Date()); @@ -224,6 +228,7 @@ public class PurOrderController { */ @RepeatSubmit() @PostMapping("/purchase/order/auditOrder") + @Log(title = "采购订单", businessType = BusinessType.INSERT) public BaseResponse auditOrder(@RequestBody PostPurOrderRequest postPurOrderRequest) { Long userId = customerService.getUserId(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); @@ -318,6 +323,7 @@ public class PurOrderController { * 添加申购单到采购单里面 */ @PostMapping("/purchase/order/addPlanDetailAndOrder") + @Log(title = "采购订单", businessType = BusinessType.INSERT) public BaseResponse addPlanDetailAndOrder(@RequestBody PurOrderRequest purOrderRequest) { if (purOrderRequest.getApplyId() == null || purOrderRequest.getId() == null) { @@ -376,6 +382,7 @@ public class PurOrderController { * 添加产品到采购单里面 */ @PostMapping("/purchase/order/addOrderDetail") + @Log(title = "采购订单", businessType = BusinessType.INSERT) public BaseResponse addOrderDetail(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { boolean falg = purOrderDetailService.insert(purOrderDetailEntity); @@ -393,6 +400,7 @@ public class PurOrderController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/order/add") + @Log(title = "计划单", businessType = BusinessType.INSERT) public BaseResponse add() { Long userId = customerService.getUserId(); PurOrderEntity purOrderEntity = new PurOrderEntity(); @@ -410,6 +418,7 @@ public class PurOrderController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/order/delOrderDetailAll") + @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { if (purApplyEntity.getId() != null) { @@ -426,6 +435,7 @@ public class PurOrderController { */ @RepeatSubmit() @PostMapping("/purchase/order/updateDetail") + @Log(title = "计划详情单", businessType = BusinessType.UPDATE) public BaseResponse detailEdit(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { purOrderDetailService.update(purOrderDetailEntity); return ResultVOUtils.success("修改成功"); @@ -437,6 +447,7 @@ public class PurOrderController { * @param ids 主键串 */ @DeleteMapping("/purchase/order/detail/{ids}") + @Log(title = "采购订单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index bc6f349f..b6a25f3b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -5,9 +5,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; @@ -52,6 +54,7 @@ public class PurOrderReceiveController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/order/insertWeb") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse addReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -72,6 +75,7 @@ public class PurOrderReceiveController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/receive/order/update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -117,6 +121,7 @@ public class PurOrderReceiveController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/receive/detail/add") + @Log(title = "单据管理", businessType = BusinessType.INSERT) public BaseResponse updateReceive(@RequestBody AddReceiveDetailRequest addReceiveDetailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -161,6 +166,7 @@ public class PurOrderReceiveController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/receive/detail/Update") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse updateReceiveDetail(@RequestBody UpdateReceiveDetailRequest updateReceiveDetailRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -176,6 +182,7 @@ public class PurOrderReceiveController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/udiwms/receive/order/del") + @Log(title = "领用单", businessType = BusinessType.DELETE) public BaseResponse del(String orderIdFk) { boolean falg = receiveService.delReceive(orderIdFk); if (falg) { @@ -187,6 +194,7 @@ public class PurOrderReceiveController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/udiwms/receive/detail/delReceiveDetail") + @Log(title = "领用单", businessType = BusinessType.DELETE) public BaseResponse delReceiveDetail(Integer id) { boolean falg = receivedetailService.delDetail(id + ""); @@ -199,6 +207,7 @@ public class PurOrderReceiveController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/receive/order/audit") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse audit(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index 6e427b49..fba32b1c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -87,6 +89,7 @@ public class PurPlanController { @RepeatSubmit() @AuthRuleAnnotation("") @PostMapping("/purchase/plan/postOrder") + @Log(title = "采购计划", businessType = BusinessType.INSERT) public BaseResponse postOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) { Long userId = customerService.getUserId(); @@ -180,6 +183,7 @@ public class PurPlanController { */ @RepeatSubmit() @PostMapping("/purchase/plan/auditOrder") + @Log(title = "采购计划", businessType = BusinessType.INSERT) public BaseResponse auditOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) { Long userId = customerService.getUserId(); PurPlanEntity purApplyEntity = postPurPlanRequest.getPurPlanEntity(); @@ -269,6 +273,7 @@ public class PurPlanController { * 添加申购单到采购单里面 */ @PostMapping("/purchase/plan/addPlanDetailAndApply") + @Log(title = "采购单", businessType = BusinessType.INSERT) public BaseResponse addPlanDetailAndApply(@RequestBody PurPlanRequest purPlanRequest) { if (purPlanRequest.getApplyId() == null || purPlanRequest.getId() == null) { @@ -327,6 +332,7 @@ public class PurPlanController { * 添加产品到采购单里面 */ @PostMapping("/purchase/plan/addPlanDetail") + @Log(title = "采购单", businessType = BusinessType.INSERT) public BaseResponse addPlanDetail(@RequestBody PurPlanDetailEntity purPlanDetailEntity) { boolean falg=purPlanDetailService.insert(purPlanDetailEntity); @@ -344,6 +350,7 @@ public class PurPlanController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/plan/add") + @Log(title = "计划单", businessType = BusinessType.INSERT) public BaseResponse add() { Long userId = customerService.getUserId(); PurPlanEntity purPlanEntity= new PurPlanEntity(); @@ -361,6 +368,7 @@ public class PurPlanController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/plan/delPlanDetailAll") + @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { if(purApplyEntity.getId()!=null){ @@ -377,6 +385,7 @@ public class PurPlanController { */ @RepeatSubmit() @PostMapping("/purchase/plan/updateDetail") + @Log(title = "计划详情单", businessType = BusinessType.UPDATE) public BaseResponse detailEdit(@RequestBody PurPlanDetailEntity purPlanDetailEntity) { purPlanDetailService.update(purPlanDetailEntity); return ResultVOUtils.success("修改成功"); @@ -387,6 +396,7 @@ public class PurPlanController { * @param ids 主键串 */ @DeleteMapping("/purchase/plan/detail/{ids}") + @Log(title = "采购计划", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { diff --git a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java index 94a05372..e4bb606a 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -76,6 +78,7 @@ public class PurReturnedController extends BaseController { @RepeatSubmit() @AuthRuleAnnotation("") @PostMapping("/purchase/returned/postOrder") + @Log(title = "到货单", businessType = BusinessType.INSERT) public BaseResponse postOrder(@RequestBody PostPurReturnedRequest postPurReturnedRequest) { Long userId = customerService.getUserId(); @@ -150,6 +153,7 @@ public class PurReturnedController extends BaseController { */ @RepeatSubmit() @PostMapping("/purchase/returned/auditOrder") + @Log(title = "采购订单", businessType = BusinessType.INSERT) public BaseResponse auditOrder(@RequestBody PostPurReturnedRequest postPurReturnedRequest) { Long userId = customerService.getUserId(); PurReturnedEntity purReturnedEntity = postPurReturnedRequest.getPurReturnedEntity(); @@ -240,6 +244,7 @@ public class PurReturnedController extends BaseController { * 添加产品到采购单里面 */ @PostMapping("/purchase/returned/addOrderDetail") + @Log(title = "采购订单", businessType = BusinessType.INSERT) public BaseResponse addOrderDetail(@RequestBody PurReturnedDetailEntity purOrderDetailEntity) { boolean falg = purReturnedDetailService.insert(purOrderDetailEntity); @@ -257,6 +262,7 @@ public class PurReturnedController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/returned/add") + @Log(title = "计划单", businessType = BusinessType.INSERT) public BaseResponse add() { Long userId = customerService.getUserId(); PurReturnedEntity purArrivalEntity = new PurReturnedEntity(); @@ -274,6 +280,7 @@ public class PurReturnedController extends BaseController { */ @AuthRuleAnnotation("") @PostMapping("/purchase/returned/delOrderDetailAll") + @Log(title = "申购单", businessType = BusinessType.DELETE) public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { if (purApplyEntity.getId() != null) { @@ -290,6 +297,7 @@ public class PurReturnedController extends BaseController { */ @RepeatSubmit() @PostMapping("/purchase/returned/updateDetail") + @Log(title = "计划详情单", businessType = BusinessType.UPDATE) public BaseResponse detailEdit(@RequestBody PurReturnedDetailEntity purReturnedDetailEntity) { purReturnedDetailService.update(purReturnedDetailEntity); return ResultVOUtils.success("修改成功"); @@ -301,6 +309,7 @@ public class PurReturnedController extends BaseController { * @param ids 主键串 */ @DeleteMapping("/purchase/returned/detail/{ids}") + @Log(title = "采购订单", businessType = BusinessType.DELETE) public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index ec0bc08c..abf5351b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.purchase.*; @@ -83,6 +85,7 @@ public class SupCertController { @AuthRuleAnnotation("") @PostMapping("/sup/info/selectAllCert") + @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse selectAllCert(@RequestBody PostSelCertRequest postSelCertRequest) { String customerId = null; if (StrUtil.isEmpty(postSelCertRequest.getCustomerId())) @@ -150,6 +153,7 @@ public class SupCertController { @AuthRuleAnnotation("") @PostMapping("/sup/info/insertCompanyCert") + @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse insertCompanyCert(@RequestBody SupCertEntity supCertEntity) { supCertEntity.setCreateTime(new Date()); supCertEntity.setUpdateTime(new Date()); @@ -161,6 +165,7 @@ public class SupCertController { @AuthRuleAnnotation("") @PostMapping("/sale/sup/cert/audit") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse auditSupCert(@RequestBody SupCertEntity supCertEntity) { supCertEntity.setCreateTime(new Date()); supCertEntity.setUpdateTime(new Date()); @@ -171,6 +176,7 @@ public class SupCertController { //撤回单据 @AuthRuleAnnotation("") @PostMapping("/sale/sup/cert/revoke") + @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse revokeSupCert(@RequestBody SupCertEntity supCertEntity) { supCertEntity.setCreateTime(new Date()); supCertEntity.setUpdateTime(new Date()); @@ -208,6 +214,7 @@ public class SupCertController { @AuthRuleAnnotation("") @PostMapping("/sup/info/updateCompanyCert") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) { SupCertEntity supCertEntity = new SupCertEntity(); BeanUtils.copyProperties(postSupCertRequest, supCertEntity); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java index 74c0336b..a42ef4e9 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.req.purchase.FilterCertRemindMsgRequest; import com.glxp.api.res.purchase.SupCertRemindMsgResponse; import com.glxp.api.service.purchase.SupCertRemindMsgService; @@ -46,6 +48,7 @@ public class SupCertRemindMsgController { * @return */ @GetMapping("/sup/cert/remind/msg/confirmMsg") + @Log(title = "资质预警", businessType = BusinessType.UPDATE) public BaseResponse confirmMsg(Integer id, String handleMsg) { if (null == id || StrUtil.isBlank(handleMsg)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -61,6 +64,7 @@ public class SupCertRemindMsgController { * @return */ @GetMapping("/sup/cert/remind/msg/ignoreMsg") + @Log(title = "资质预警", businessType = BusinessType.UPDATE) public BaseResponse ignoreMsg(Integer id, Integer ignoreStatus) { if (null == id || null == ignoreStatus) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index dc0d134f..d018f4ad 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.req.purchase.FilterCertSetsRequest; import com.glxp.api.req.system.DeleteRequest; @@ -51,6 +53,7 @@ public class SupCertSetController { @AuthRuleAnnotation("") @PostMapping("/sup/cert/set/add") + @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse addCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { if (supCertSetEntity == null) { supCertSetEntity = new SupCertSetEntity(); @@ -77,6 +80,7 @@ public class SupCertSetController { @AuthRuleAnnotation("") @PostMapping("/sup/cert/set/update") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { if (CollUtil.isNotEmpty(supCertSetEntity.getFlbmList())) { String flbm = supCertSetEntity.getFlbmList().stream().collect(Collectors.joining(",")); @@ -99,6 +103,7 @@ public class SupCertSetController { @AuthRuleAnnotation("") @PostMapping("/sup/cert/set/delete") + @Log(title = "资质证书", businessType = BusinessType.DELETE) public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) { boolean b = supCertSetService.deleteById(deleteRequest.getId()); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index 65fc84d4..cdbee71b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.BasicCorpEntity; @@ -88,6 +90,7 @@ public class SupCompanyController { @AuthRuleAnnotation("") @PostMapping("/api/pur/addCompany") + @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { @@ -156,6 +159,7 @@ public class SupCompanyController { @AuthRuleAnnotation("") @PostMapping("/api/pur/modifyCompany") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) { if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE) { @@ -214,6 +218,7 @@ public class SupCompanyController { @AuthRuleAnnotation("") @PostMapping("/api/pur/auditCompany") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) { @@ -337,6 +342,7 @@ public class SupCompanyController { @AuthRuleAnnotation("") @PostMapping("api/pur/supCompany/delete") + @Log(title = "资质证书", businessType = BusinessType.DELETE) public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) { boolean b = supCompanyService.deleteCompany(deleteRequest.getId()); if (b) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index f85349ec..ae9c402b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.purchase.SupCertEntity; @@ -91,6 +93,7 @@ public class SupManufacturerController { @AuthRuleAnnotation("") @PostMapping("/sup/manufacturer/addCompany") + @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { String customerId = getCustomerId(); @@ -188,6 +191,7 @@ public class SupManufacturerController { @AuthRuleAnnotation("") @PostMapping("/sup/manufacturer/modifyCompany") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse modifyCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { @@ -293,6 +297,7 @@ public class SupManufacturerController { @AuthRuleAnnotation("") @PostMapping("/udiwms/sup/manufacturer/audit") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse auditMmanufacturer(@RequestBody SupManufacturerEntity supManufacturerEntity) { if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { @@ -383,6 +388,7 @@ public class SupManufacturerController { @AuthRuleAnnotation("") @GetMapping("/sup/manufacturer/basic/delete") + @Log(title = "资质证书", businessType = BusinessType.DELETE) public BaseResponse deleteContact(DeleteRequest deleteRequest) { boolean b = supManufacturerService.deleteById(deleteRequest.getId()); if (b) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index a0296b55..05082e22 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.UdiRelevanceEntity; @@ -85,6 +87,7 @@ public class SupProductController { @AuthRuleAnnotation("") @PostMapping("/sup/product/addRegistration") + @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) { //提交审核 @@ -185,6 +188,7 @@ public class SupProductController { @AuthRuleAnnotation("") @PostMapping("/sup/product/modifyRegistration") + @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse modifyRegistration(@RequestBody SupProductEntity supProductEntity) { if (StrUtil.isEmpty(supProductEntity.getProductId()) || StrUtil.isEmpty(supProductEntity.getManufacturerIdFk()) || StrUtil.isEmpty(supProductEntity.getCustomerId())) { @@ -427,6 +431,7 @@ public class SupProductController { @AuthRuleAnnotation("") @GetMapping("/sup/product/delete") + @Log(title = "资质证书", businessType = BusinessType.DELETE) public BaseResponse delete(DeleteCompanyFileRequest deleteCompanyFileRequest) { boolean b = supProductService.deleteById(deleteCompanyFileRequest.getId()); if (b) diff --git a/src/main/java/com/glxp/api/controller/sup/CustomerController.java b/src/main/java/com/glxp/api/controller/sup/CustomerController.java index ffc34f15..6c301b06 100644 --- a/src/main/java/com/glxp/api/controller/sup/CustomerController.java +++ b/src/main/java/com/glxp/api/controller/sup/CustomerController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.sup; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.purchase.CustomerContactEntity; import com.glxp.api.entity.system.CompanyEntity; @@ -93,6 +95,7 @@ public class CustomerController { @AuthRuleAnnotation("") @PostMapping("salewarehouse/customer/update") + @Log(title = "客户信息", businessType = BusinessType.UPDATE) public BaseResponse updateCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity, BindingResult bindingResult) { @@ -140,6 +143,7 @@ public class CustomerController { @AuthRuleAnnotation("") @PostMapping("salewarehouse/customer/modify") + @Log(title = "客户信息", businessType = BusinessType.UPDATE) public BaseResponse modifyCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity, BindingResult bindingResult) { @@ -161,6 +165,7 @@ public class CustomerController { @AuthRuleAnnotation("") @PostMapping("salewarehouse/customer/delete") + @Log(title = "客户信息", businessType = BusinessType.DELETE) public BaseResponse deleteCustomers(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadStatusController.java index aede6548..af2d044c 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadStatusController.java @@ -2,8 +2,10 @@ package com.glxp.api.controller.sync; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.req.sync.BasicDownloadRequest; import com.glxp.api.req.sync.SpsSyncDataRequest; @@ -57,6 +59,7 @@ public class SpsSyncDownloadStatusController { @AuthRuleAnnotation("") @PostMapping("/spssync/download/basic/udiinfo/deleteByStatus") + @Log(title = "定时任务", businessType = BusinessType.DELETE) public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { boolean b = basicDownloadService.deleteById(deleteRequest.getId()); @@ -69,6 +72,7 @@ public class SpsSyncDownloadStatusController { @AuthRuleAnnotation("") @PostMapping("/spssync/download/basic/udiinfo/updateStatus") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) public BaseResponse updateStatus(@RequestBody BasicDownloadStatusEntity basicDownloadStatusEntity) { basicDownloadStatusEntity.setEndTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index cabaefaf..822a6327 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportStatusRequest; @@ -54,6 +56,7 @@ public class SpsSyncExportStatusController { @AuthRuleAnnotation("") @PostMapping("/spssync/basic/udiinfo/deleteByStatus") + @Log(title = "定时任务", businessType = BusinessType.DELETE) public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { boolean b = basicExportService.deleteById(deleteRequest.getId()); @@ -66,6 +69,7 @@ public class SpsSyncExportStatusController { @AuthRuleAnnotation("") @PostMapping("/spssync/basic/udiinfo/updateStatus") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) public BaseResponse updateStatus(@RequestBody BasicExportStatusEntity basicExportStatusEntity) { if (StrUtil.isEmpty(basicExportStatusEntity.getReceiveStatus())) { basicExportStatusEntity.setEndTime(new Date()); @@ -91,6 +95,7 @@ public class SpsSyncExportStatusController { @AuthRuleAnnotation("") @PostMapping("/spssync/basic/schedule/updateLastTime") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) { boolean b = basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity); diff --git a/src/main/java/com/glxp/api/controller/system/CompanyController.java b/src/main/java/com/glxp/api/controller/system/CompanyController.java index 442c4e94..9c069218 100644 --- a/src/main/java/com/glxp/api/controller/system/CompanyController.java +++ b/src/main/java/com/glxp/api/controller/system/CompanyController.java @@ -1,5 +1,7 @@ package com.glxp.api.controller.system; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.system.CompanyRequest; import com.glxp.api.service.system.CompanyService; @@ -28,6 +30,7 @@ public class CompanyController { } @PostMapping("/warehouse/info/modifyCompany") + @Log(title = "企业信息", businessType = BusinessType.UPDATE) public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) { boolean b = companyService.modifyCompany(companyEntity); diff --git a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java index 29c20778..99a237e2 100644 --- a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java +++ b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java @@ -1,6 +1,8 @@ package com.glxp.api.controller.system; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.system.SysPdaKeyEntity; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.FilterDeviceKeyRequest; @@ -47,6 +49,7 @@ public class DeviceKeyController { @PostMapping("sale/device/check") + @Log(title = "系统信息", businessType = BusinessType.UPDATE) public BaseResponse checkRegister(@RequestBody @Valid SysPdaKeyEntity sysPdaKeyEntity, BindingResult bindingResult) { @@ -76,6 +79,7 @@ public class DeviceKeyController { @PostMapping("/sale/info/deleterKey") + @Log(title = "系统信息", businessType = BusinessType.DELETE) public BaseResponse deleterKey(@RequestBody DeleteRequest deleteRequest) { sysPdaKeyService.deleteDeviceKey(deleteRequest); diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java index 66816c73..ec963c47 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.system; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.SysMenu; import com.glxp.api.entity.system.SysMenuHelpEntity; import com.glxp.api.req.system.SysMenuHelpRequest; @@ -58,6 +60,7 @@ public class SysMenuHelpController { @AuthRuleAnnotation("system/param/help/insertMenuHelp") @PostMapping("/system/param/help/insertMenuHelp") + @Log(title = "菜单帮助", businessType = BusinessType.INSERT) public BaseResponse insertMenuHelp(@RequestBody SysMenuHelpRequest sysMenuHelpRequest, BindingResult bindingResult ) { if (bindingResult.hasErrors()) { @@ -71,6 +74,7 @@ public class SysMenuHelpController { @AuthRuleAnnotation("system/param/help/updateMenuHelp") @PostMapping("/system/param/help/updateMenuHelp") + @Log(title = "菜单帮助", businessType = BusinessType.UPDATE) public BaseResponse updateMenuHelp(@RequestBody SysMenuHelpRequest sysMenuHelpRequest, BindingResult bindingResult ) { if (bindingResult.hasErrors()) { @@ -84,6 +88,7 @@ public class SysMenuHelpController { @AuthRuleAnnotation("system/param/help/deleteMenuHelp") @GetMapping("/system/param/help/deleteMenuHelp") + @Log(title = "菜单帮助", businessType = BusinessType.DELETE) public BaseResponse deleteMenuHelp( String id) { if(!StringUtils.isNotBlank(id)){ return ResultVOUtils.error(999,"参数错误"); diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index 8b298d5d..660d471a 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.system.ProductRemarkSetEntity; import com.glxp.api.entity.system.ScheduledEntity; @@ -64,6 +66,7 @@ public class SysParamConfigController { @AuthRuleAnnotation("system/param/config/save") @PostMapping("/system/param/config/save") + @Log(title = "系统参数", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid SysParamConfigSaveRequest sysParamConfigSaveRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index d73e9adf..c1d27d4d 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.system; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; @@ -113,6 +115,7 @@ public class SysPdfModuleController { @AuthRuleAnnotation("system/pdf/module/updateRl") @PostMapping("/system/pdf/module/updateRl") + @Log(title = "pdf模板", businessType = BusinessType.UPDATE) public BaseResponse updateRl(@RequestBody SystemPDFTemplateRelevanceEntity systemPDFModuleSaveRequest) { systemPDFTemplateRelevanceService.udpateRl(systemPDFModuleSaveRequest); return ResultVOUtils.success("修改成功"); @@ -142,6 +145,7 @@ public class SysPdfModuleController { @AuthRuleAnnotation("system/pdf/module/save") @PostMapping("/system/pdf/module/save") + @Log(title = "pdf模板", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid SysPdfModuleSaveRequest sysPdfModuleSaveRequest, BindingResult bindingResult) { @@ -165,6 +169,7 @@ public class SysPdfModuleController { @AuthRuleAnnotation("system/pdf/module/update") @PostMapping("/system/pdf/module/update") + @Log(title = "pdf模板", businessType = BusinessType.UPDATE) public BaseResponse update(@RequestBody SysPdfModuleSaveRequest sysPdfModuleSaveRequest) { sysPdfModuleSaveRequest.setUpdate_time(new Date()); systemPDFModuleService.updateById(sysPdfModuleSaveRequest); @@ -174,6 +179,7 @@ public class SysPdfModuleController { @AuthRuleAnnotation("system/pdf/module/delete") @GetMapping("/system/pdf/module/delete") + @Log(title = "pdf模板", businessType = BusinessType.DELETE) public BaseResponse deleteById(@RequestParam("id") Integer id) { diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index 8c00ac2d..ad76cad4 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.system; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; @@ -110,6 +112,7 @@ public class SysPdfTemplateController { @AuthRuleAnnotation("system/pdf/template/save") @PostMapping("/system/pdf/template/save") + @Log(title = "pdf模板", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest, BindingResult bindingResult) { @@ -136,6 +139,7 @@ public class SysPdfTemplateController { @AuthRuleAnnotation("system/pdf/template/update") @PostMapping("/system/pdf/template/update") + @Log(title = "pdf模板", businessType = BusinessType.UPDATE) public BaseResponse update(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) { // systemPDFTemplateSaveRequest.setId(1); if(sysPdfTemplateSaveRequest.getBussinessStatusList()!=null && sysPdfTemplateSaveRequest.getBussinessStatusList().size()>0){ @@ -150,6 +154,7 @@ public class SysPdfTemplateController { @AuthRuleAnnotation("system/pdf/template/delete") @PostMapping("/system/pdf/template/delete") + @Log(title = "pdf模板", businessType = BusinessType.DELETE) public BaseResponse deleteById(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) { if (StringUtils.isNotBlank(sysPdfTemplateSaveRequest.getPath())) {//删除文件 diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java index eaf10179..5972f665 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java @@ -1,6 +1,8 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.system.ThirdSysApiEntity; import com.glxp.api.req.system.FilterSysApiRequest; import com.glxp.api.res.PageSimpleResponse; @@ -34,6 +36,7 @@ public class ThirdSysApiController { } @PostMapping("/sys/api/modifyApi") + @Log(title = "第三方api", businessType = BusinessType.UPDATE) public BaseResponse modifyApi(@RequestBody ThirdSysApiEntity thirdSysApiEntity) { boolean b = thirdSysApiService.modifySysApi(thirdSysApiEntity); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java index b49240d3..8016e9a8 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java @@ -2,6 +2,8 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncUploadDataSetEntity; import com.glxp.api.service.system.SyncUploadDataBustypeService; @@ -35,6 +37,7 @@ public class ThirdUploadSetController { @AuthRuleAnnotation("system/third/syncData/save") @PostMapping("/system/third/syncData/save") + @Log(title = "第三方", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity ) { List busTypes = syncUploadDataSetEntity.getBusTypes(); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java index 815de039..a55f164d 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; @@ -98,6 +100,7 @@ public class ThrBusTypeOriginController { * @return */ @PostMapping("/udiwms/originBusType/update") + @Log(title = "第三方单据类型", businessType = BusinessType.UPDATE) public BaseResponse updateBussinessType(@RequestBody @Valid ThrBusTypeOriginEntity thrBusTypeOriginEntity, BindingResult bindingResult) { @@ -125,6 +128,7 @@ public class ThrBusTypeOriginController { * @return */ @PostMapping("/udiwms/originBusType/add") + @Log(title = "第三方单据类型", businessType = BusinessType.INSERT) public BaseResponse addBussinessType(@RequestBody ThrBusTypeOriginEntity thrBusTypeOriginEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -150,6 +154,7 @@ public class ThrBusTypeOriginController { * @return */ @PostMapping("/udiwms/originBusType/delete") + @Log(title = "第三方单据类型", businessType = BusinessType.DELETE) public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -170,6 +175,7 @@ public class ThrBusTypeOriginController { * @return */ @PostMapping("/udiwms/originBusType/download") + @Log(title = "第三方单据类型", businessType = BusinessType.INSERT) public BaseResponse dlBusType(@RequestBody @Valid FilterThrBusTypeOriginRequest filterThrBusTypeOriginRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index 248da8ad..0265d747 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -2,10 +2,12 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; @@ -75,6 +77,7 @@ public class ThrCorpExportLogController { } @PostMapping("/udiwms/thrCorp/exportLog/deleteLog") + @Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -87,6 +90,7 @@ public class ThrCorpExportLogController { //往来单位excel文件下载 @GetMapping("/udiwms/thrCorp/exportLog/download") + @Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.UPDATE) public void download(FilterThrCorpExportLogRequest filterThrCorpExportLogRequest, HttpServletResponse res) { List thrCorpExportLogEntities = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest); @@ -123,6 +127,7 @@ public class ThrCorpExportLogController { //往来单位导出生成Excel，并创建生成记录 @PostMapping("/udiwms/thrCorp/importLog/export") + @Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.INSERT) public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { //String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; @@ -157,6 +162,7 @@ public class ThrCorpExportLogController { //往来单位导出生成Excel，并创建生成记录 @PostMapping("/udiwms/thrCorp/importLog/upload") + @Log(title = "第三方数据往来单位导出日志", businessType = BusinessType.INSERT) public BaseResponse uploadSmp(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { //String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java index 69e0553b..58a55469 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpImportLogController.java @@ -1,9 +1,11 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.req.system.DeleteRequest; @@ -65,6 +67,7 @@ public class ThrCorpImportLogController { } @PostMapping("/udiwms/thrCorp/importLog/deleteLog") + @Log(title = "第三方数据往来单位导入日志", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java index e263cf2d..aca962a0 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpsController.java @@ -2,10 +2,12 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; @@ -66,6 +68,7 @@ public class ThrCorpsController { @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/delCorps") + @Log(title = "第三方往来单位类型", businessType = BusinessType.DELETE) public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -78,6 +81,7 @@ public class ThrCorpsController { @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/corp/delAll") + @Log(title = "第三方往来单位类型", businessType = BusinessType.DELETE) public BaseResponse delAll() { thrCorpService.deleteAll(); return ResultVOUtils.success("删除成功"); @@ -86,6 +90,7 @@ public class ThrCorpsController { //第三方服务上传（包括文件导入后上传） @PostMapping("/udiwms/thrsys/postCorps") + @Log(title = "第三方服务上传", businessType = BusinessType.INSERT) public BaseResponse postCorps(@RequestBody PostThrCorpRequest postThrCorpRequest, BindingResult bindingResult) { @@ -120,6 +125,7 @@ public class ThrCorpsController { //接口一键全部 @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/corp/downloadAll") + @Log(title = "第三方往来单位类型", businessType = BusinessType.INSERT) public BaseResponse downloadAll(FilterThrCorpRequest filterThrProductsRequest) { String data = (String) redisUtil.get(Constant.dlThrProducts); if (data != null && data.equals("true")) { @@ -145,6 +151,7 @@ public class ThrCorpsController { //选中或者下载全部 @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/corp/corpsDlAll") + @Log(title = "第三方往来单位类型", businessType = BusinessType.UPDATE) public BaseResponse corpsDlAll(@RequestBody ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { thrUnitMaintainFilterRequest.setThirdSysFk(thrUnitMaintainFilterRequest.getThirdSys()); String data = (String) redisUtil.get(Constant.dlThrProducts); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index 097c711c..f14a03b6 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -2,9 +2,11 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.system.DeleteRequest; @@ -57,6 +59,7 @@ public class ThrDeptController { } @PostMapping("/spms/thrsys/warehouse/save") + @Log(title = "第三方仓库", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid ThrDeptEntity thrDeptEntity, BindingResult bindingResult) { @@ -127,6 +130,7 @@ public class ThrDeptController { } @PostMapping("/spms/thrsys/warehouse/delete") + @Log(title = "第三方仓库", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { if (deleteRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java index 66e759c3..935df55a 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsController.java @@ -4,10 +4,12 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; @@ -70,6 +72,7 @@ public class ThrInvProductsController { //第三方服务上传（包括文件导入后上传） @PostMapping("/udiwms/thrsys/postInvProducts") + @Log(title = "第三方服务", businessType = BusinessType.INSERT) public BaseResponse postInvProducts(@RequestBody PostThrInvProductsRequest postThrInvProductsRequest, BindingResult bindingResult) { @@ -108,6 +111,7 @@ public class ThrInvProductsController { } @PostMapping("/udiwms/thrsys/delInvProducts") + @Log(title = "第三方服务", businessType = BusinessType.DELETE) public BaseResponse delInvProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -122,12 +126,14 @@ public class ThrInvProductsController { @RequestMapping("/udiwms/thrsys/invProducts/delAll") + @Log(title = "第三方服务", businessType = BusinessType.DELETE) public BaseResponse delAll() { thrInvProductsService.deleteAll(); return ResultVOUtils.success("删除成功"); } @RequestMapping("/udiwms/thrsys/invProducts/downloadAll") + @Log(title = "第三方服务", businessType = BusinessType.INSERT) public BaseResponse downloadAll(FilterThrInvProductsRequest filterThrInvProductsRequest) { String data = (String) redisUtil.get(Constant.dlThrInvProducts); if (data != null && data.equals("true")) { @@ -151,6 +157,7 @@ public class ThrInvProductsController { } @PostMapping("/udiwms/thrsys/invProducts/inpisDlAll") + @Log(title = "第三方服务", businessType = BusinessType.UPDATE) public BaseResponse inpisDlAll(@RequestBody ThrOnhandRequest erpOnhandRequest) { String data = (String) redisUtil.get(Constant.dlThrInvProducts); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index 3747f343..a18b524f 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -1,10 +1,12 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; @@ -65,6 +67,7 @@ public class ThrInvProductsExportLogController { } @PostMapping("/udiwms/invProducts/exportLog/deleteLog") + @Log(title = "第三方产品", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java index 83159b3c..d484a1b2 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java @@ -1,9 +1,11 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.req.system.DeleteRequest; @@ -66,6 +68,7 @@ public class ThrInvProductsImportLogController { } @PostMapping("/udiwms/thrInvProducts/importLog/deleteLog") + @Log(title = "第三方产品", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index eb189a47..3b189c89 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.system.DeleteRequest; @@ -59,6 +61,7 @@ public class ThrInvWarehouseController { @AuthRuleAnnotation("") @PostMapping("/thirdSys/sub/inv/warehouse/save") + @Log(title = "第三方仓库", businessType = BusinessType.INSERT) public BaseResponse save(@RequestBody @Valid ThrInvWarehouseEntity invSubWarehouseEntity, BindingResult bindingResult) { @@ -94,6 +97,7 @@ public class ThrInvWarehouseController { @AuthRuleAnnotation("") @PostMapping("/thirdSys/sub/inv/warehouse/edit") + @Log(title = "第三方仓库", businessType = BusinessType.UPDATE) public BaseResponse edit(@RequestBody @Valid ThrInvWarehouseEntity invSubWarehouseEntity, BindingResult bindingResult,FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest ) { @@ -130,6 +134,7 @@ public class ThrInvWarehouseController { @AuthRuleAnnotation("") @PostMapping("/thirdSys/sub/inv/warehouse/delete") + @Log(title = "第三方仓库", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { if (deleteRequest.getId() == null) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index 82f1bcf3..7666b833 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.*; @@ -195,6 +197,7 @@ public class ThrOrderController { @PostMapping("/udiwms/thrsys/delOrder") + @Log(title = "第三方", businessType = BusinessType.DELETE) public BaseResponse delOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -216,6 +219,7 @@ public class ThrOrderController { @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/delOrderDetail") + @Log(title = "第三方", businessType = BusinessType.DELETE) public BaseResponse delOrderDetail(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -243,6 +247,7 @@ public class ThrOrderController { @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/order/delAll") + @Log(title = "第三方", businessType = BusinessType.DELETE) public BaseResponse delAll() { thrOrderService.deleteAll(); thrOrderDetailService.deleteAll(); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index c0a7e81b..310dd229 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -1,10 +1,12 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; @@ -68,6 +70,7 @@ public class ThrOrderExportLogController { } @PostMapping("/udiwms/thrOrder/exportLog/deleteLog") + @Log(title = "第三方", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -116,6 +119,7 @@ public class ThrOrderExportLogController { //业务单据导出生成Excel，并创建生成记录 @PostMapping("/udiwms/thrOrder/importLog/export") + @Log(title = "业务单据导出", businessType = BusinessType.INSERT) public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { @@ -144,6 +148,7 @@ public class ThrOrderExportLogController { //业务单据上传SMP，并创建生成记录 @PostMapping("/udiwms/thrOrder/importLog/uploadSmp") + @Log(title = "业务单据上传SMP", businessType = BusinessType.INSERT) public BaseResponse uploadSmp(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java index 27b57751..99f38883 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderImportLogController.java @@ -2,10 +2,12 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderImportLogEntity; import com.glxp.api.req.system.DeleteRequest; @@ -74,6 +76,7 @@ public class ThrOrderImportLogController { @PostMapping("/udiwms/thrOrder/importLog/deleteLog") + @Log(title = "单据导出", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -93,6 +96,7 @@ public class ThrOrderImportLogController { } @PostMapping("/udiwms/thrOrder/importLog/delete") + @Log(title = "单据导出", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderUploadLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderUploadLogController.java index f19bb282..4de79e11 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderUploadLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderUploadLogController.java @@ -1,8 +1,10 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.req.thrsys.FilterThrOrderUploadLogRequest; import com.glxp.api.res.thrsys.ThrOrderUploadLogResponse; import com.glxp.api.service.thrsys.ThrOrderUploadLogService; @@ -41,6 +43,7 @@ public class ThrOrderUploadLogController { * @return */ @GetMapping("/udiwms/inout/order/uploadLog/delete") + @Log(title = "单据上传", businessType = BusinessType.DELETE) public BaseResponse delete(Integer id) { boolean result = thrOrderUploadLogService.delete(id); if (result) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java index 06c4499e..bc5bb64c 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java @@ -3,9 +3,11 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; @@ -83,6 +85,7 @@ public class ThrProductsAddController { } @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/delThrAddProducts") + @Log(title = "第三方", businessType = BusinessType.DELETE) public BaseResponse delThrProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 8bb14777..f6c82c0c 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -6,9 +6,11 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicNewUploadDiEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; @@ -118,6 +120,7 @@ public class ThrProductsAddDiController { */ @AuthRuleAnnotation("") @PostMapping("udiwms/thrsys/addThrAddDiProducts") + @Log(title = "DI产品信息", businessType = BusinessType.INSERT) public BaseResponse addThrAddDiProducts(@RequestBody AddThrDiProductsRequest addThrDiProductsRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -164,6 +167,7 @@ public class ThrProductsAddDiController { */ @AuthRuleAnnotation("") @PostMapping("udiwms/thrsys/updateThrAddDiProducts") + @Log(title = "DI产品信息", businessType = BusinessType.UPDATE) public BaseResponse updateDiProduct(@RequestBody ThrProductsAddDiEntity thrProductsAddDiEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -264,6 +268,7 @@ public class ThrProductsAddDiController { */ @AuthRuleAnnotation("") @PostMapping("udiwms/thrsys/delThrAddDiProducts") + @Log(title = "DI产品信息", businessType = BusinessType.DELETE) public BaseResponse delThrDiProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (null != deleteRequest && deleteRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -297,6 +302,7 @@ public class ThrProductsAddDiController { */ @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/addThrAddProducts") + @Log(title = "第三方产品信息", businessType = BusinessType.INSERT) public BaseResponse saveProduct(@RequestBody ThrProductsAddDiEntity thrProductsAdddiEntity) { if (null == thrProductsAdddiEntity) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 21a16df3..a8156c86 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -5,9 +5,11 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; @@ -166,6 +168,7 @@ public class ThrProductsController { */ @AuthRuleAnnotation("") @PostMapping("/udiwms/udiinfo/erp/products/saveProduct") + @Log(title = "第三方产品信息", businessType = BusinessType.INSERT) public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity,FilterThrProductsRequest filterThrProductsRequest) { @@ -194,4 +197,4 @@ public class ThrProductsController { } -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java index 0d7187ad..794c5780 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java @@ -1,10 +1,12 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpBasicClient; @@ -68,6 +70,7 @@ public class ThrProductsExportLogController { } @PostMapping("/udiwms/thrProducts/exportLog/deleteLog") + @Log(title = "第三方产品信息", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java index d78e8556..3611317a 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java @@ -1,9 +1,11 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; @@ -65,6 +67,7 @@ public class ThrProductsImportLogController { } @PostMapping("/udiwms/thrProducts//importLog/deleteLog") + @Log(title = "第三方产品信息", businessType = BusinessType.DELETE) public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index 74ee0ac5..b3554947 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; @@ -105,6 +107,7 @@ public class ThrSystemController { } @PostMapping("/udiwms/basic/thirdsys/update") + @Log(title = "第三方系统", businessType = BusinessType.UPDATE) public BaseResponse save(@RequestBody @Valid ThrSystemEntity thrSystemEntity, BindingResult bindingResult) { @@ -198,6 +201,7 @@ public class ThrSystemController { } @PostMapping("/udiwms/basic/thirdsys/saveDetail") + @Log(title = "第三方系统", businessType = BusinessType.UPDATE) public BaseResponse saveDetail(@RequestBody @Valid ThrSystemDetailEntity thrSystemDetailEntity, BindingResult bindingResult) { @@ -219,6 +223,7 @@ public class ThrSystemController { * @return */ @PostMapping("/udiwms/basic/thirdsys/updateInterfaceStatus") + @Log(title = "第三方系统", businessType = BusinessType.UPDATE) public BaseResponse updateInterfaceStatus(@RequestBody List list) { if (CollUtil.isEmpty(list)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -246,6 +251,7 @@ public class ThrSystemController { @PostMapping("/udiwms/basic/thirdsys/saveBusTypeDetail") + @Log(title = "第三方系统", businessType = BusinessType.UPDATE) public BaseResponse saveBusTypeDetail(@RequestBody @Valid ThrSystemBusApiEntity thrSystemBusApiEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -267,6 +273,7 @@ public class ThrSystemController { * @return */ @PostMapping("/udiwms/basic/thirdsys/saveBusTypes") + @Log(title = "第三方系统", businessType = BusinessType.INSERT) public BaseResponse saveBusTypes(@RequestBody ThrSystemBusApiEntity thrSystemBusApiEntity) { if (null == thrSystemBusApiEntity || null == thrSystemBusApiEntity.getType()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); @@ -280,6 +287,7 @@ public class ThrSystemController { } @GetMapping("/udiwms/basic/thirdsys/delete") + @Log(title = "第三方系统", businessType = BusinessType.DELETE) public BaseResponse delete(Integer id) { if (null == id) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); From 0177fffd2b73e4937741b38dfbc4197f74e8fe5d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 4 Apr 2023 15:49:16 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/ApiAdminApplication.java | 2 + .../purchase/SupCertController.java | 2 +- .../api/dao/system/SystemPDFModuleDao.java | 2 + .../api/idc/service/impl/IdcServiceImpl.java | 140 +++++++++--------- .../inout/InspectionPDFTemplateRequest.java | 1 + .../req/system/FilterPdfModuleRequest.java | 1 + .../auth/impl/AuthAdminServiceImpl.java | 2 + .../auth/impl/AuthCheckServiceImpl.java | 2 + .../auth/impl/AuthRoleAdminServiceImpl.java | 2 + .../auth/impl/AuthRoleServiceImpl.java | 2 + .../auth/impl/CustomerInfoServiceImpl.java | 2 + .../service/auth/impl/DeptServiceImpl.java | 2 + .../auth/impl/DeptUserServiceImpl.java | 2 + .../auth/impl/InvBusUserServiceImpl.java | 2 + .../auth/impl/InvWarehouseServiceImpl.java | 2 + .../auth/impl/SysDictDataServiceImpl.java | 2 + .../auth/impl/SysDictTypeServiceImpl.java | 1 + .../service/auth/impl/SysMenuServiceImpl.java | 2 + .../auth/impl/SysPdaKeyServiceImpl.java | 2 + .../service/auth/impl/SysRoleServiceImpl.java | 1 + .../auth/impl/UserRegisterServiceImpl.java | 2 + .../WarehouseBussinessTypeServiceImpl.java | 2 + .../auth/impl/WarehouseUserServiceImpl.java | 2 + .../impl/BasicCorpExportLogServiceImpl.java | 2 + .../impl/BasicCorpImportLogServiceImpl.java | 2 + .../basic/impl/BasicCorpServiceImpl.java | 2 + .../basic/impl/BasicHospTypeServiceImpl.java | 2 + .../impl/BasicNewUploadDiServiceImpl.java | 2 + .../impl/BasicProductSetServiceImpl.java | 2 + .../BasicProductsExportLogServiceImpl.java | 2 + .../BasicProductsImportDetailServiceImpl.java | 2 + .../BasicProductsImportLogServiceImpl.java | 2 + .../impl/BasicUnitMaintainServiceImpl.java | 2 + .../CompanyProductRelevanceServiceImpl.java | 2 + .../basic/impl/EntrustReceServiceImpl.java | 2 + .../basic/impl/ProductInfoServiceImpl.java | 4 +- .../basic/impl/UdiCompanyServiceImpl.java | 2 + .../basic/impl/UdiProductServiceImpl.java | 2 + .../basic/impl/UdiRelevanceServiceImpl.java | 2 + .../basic/impl/UdiRlSupServiceImpl.java | 2 + .../inout/impl/IoCodeLostServiceImpl.java | 2 + .../inout/impl/IoCodeRelServiceImpl.java | 2 + .../service/inout/impl/IoCodeServiceImpl.java | 2 + .../inout/impl/IoCodeTempServiceImpl.java | 2 + .../impl/IoOrderDetailBizServiceImpl.java | 2 + .../impl/IoOrderDetailCodeServiceImpl.java | 2 + .../impl/IoOrderDetailResultServiceImpl.java | 2 + .../inout/impl/IoOrderInvoiceServiceImpl.java | 2 + .../inout/impl/IoOrderServiceImpl.java | 2 + .../inout/impl/ReceiveDetailServiceImpl.java | 2 + .../inout/impl/ReceiveServiceImpl.java | 2 + .../inv/impl/InnerOrderDetailServiceImpl.java | 2 + .../inv/impl/InnerOrderServiceImpl.java | 2 + .../impl/SysLogininforServiceImpl.java | 2 + .../monitor/impl/SysOperLogServiceImpl.java | 2 + .../impl/CustomerContactServiceImpl.java | 2 + .../impl/PurApplyDetailImplService.java | 2 + .../purchase/impl/PurApplyServiceImpl.java | 2 + .../impl/PurArrivalDetailServiceImpl.java | 2 + .../purchase/impl/PurArrivalServiceImpl.java | 2 + .../impl/PurDeliveryDetailServiceImpl.java | 2 + .../purchase/impl/PurDeliveryServiceImpl.java | 2 + .../impl/PurOrderDetailServiceImpl.java | 2 + .../purchase/impl/PurOrderServiceImpl.java | 2 + .../impl/PurPlanDetailServiceImpl.java | 2 + .../purchase/impl/PurPlanServiceImpl.java | 2 + .../impl/PurReturnedDetailServiceImpl.java | 2 + .../purchase/impl/PurReturnedServiceImpl.java | 2 + .../purchase/impl/SupCertServiceImpl.java | 2 + .../purchase/impl/SupCertSetServiceImpl.java | 2 + .../purchase/impl/SupCompanyServiceImpl.java | 2 + .../impl/SupManufacturerServiceImpl.java | 2 + .../purchase/impl/SupProductServiceImpl.java | 2 + .../sync/impl/BasicExportTimeServiceImpl.java | 2 + .../sync/impl/SyncDataBustypeServiceImpl.java | 2 + .../sync/impl/SyncDataSetServiceImpl.java | 2 + .../system/impl/ClassifyCodeServiceImpl.java | 2 + .../system/impl/CompanyServiceImpl.java | 2 + .../SyncUploadDataBustypeServiceImpl.java | 2 + .../impl/SyncUploadDataSetServiceImpl.java | 2 + .../system/impl/SysMenuHelpServiceImpl.java | 2 + .../system/impl/SysRemindMsgServiceImpl.java | 2 + .../system/impl/SysRemindSetServiceImpl.java | 2 + .../system/impl/SysServerLogServiceImpl.java | 2 + .../impl/SystemPDFModuleServiceImpl.java | 4 +- ...SystemPDFTemplateRelevanceServiceImpl.java | 2 + .../impl/SystemPDFTemplateServiceImpl.java | 2 + .../impl/SystemParamConfigServiceImpl.java | 2 + .../system/impl/ThirdSysApiServiceImpl.java | 2 + .../impl/ThrCorpExportLogServiceImpl.java | 2 + .../impl/ThrCorpImportDetailServiceImpl.java | 2 + .../impl/ThrCorpImportLogServiceImpl.java | 2 + .../thrsys/impl/ThrCorpServiceImpl.java | 2 + .../thrsys/impl/ThrDeptServiceImpl.java | 1 + .../impl/ThrInvProductsDetailServiceImpl.java | 2 + .../ThrInvProductsExportLogServiceImpl.java | 2 + .../ThrInvProductsImportLogServiceImpl.java | 2 + .../impl/ThrInvProductsServiceImpl.java | 2 + .../impl/ThrInvWarehouseServiceImpl.java | 2 + .../impl/ThrOrderDetailServiceImpl.java | 2 + .../impl/ThrOrderExportLogServiceImpl.java | 2 + .../impl/ThrOrderImportDetailServiceImpl.java | 2 + .../impl/ThrOrderImportLogServiceImpl.java | 2 + .../thrsys/impl/ThrOrderServiceImpl.java | 2 + .../impl/ThrProductsAddDiServiceImpl.java | 2 +- .../impl/ThrProductsAddServiceImpl.java | 2 + .../impl/ThrProductsExportLogServiceImpl.java | 2 + .../ThrProductsImportDetailServiceImpl.java | 2 + .../impl/ThrProductsImportLogServiceImpl.java | 2 + .../thrsys/impl/ThrProductsServiceImpl.java | 2 + .../impl/ThrSystemBusApiServiceImpl.java | 1 + .../impl/ThrSystemDetailServiceImpl.java | 1 + .../thrsys/impl/ThrSystemServiceImpl.java | 2 + .../mapper/system/SystemPDFModuleDao.xml | 9 +- 114 files changed, 296 insertions(+), 74 deletions(-) diff --git a/src/main/java/com/glxp/api/ApiAdminApplication.java b/src/main/java/com/glxp/api/ApiAdminApplication.java index cc2c99fa..4e002d71 100644 --- a/src/main/java/com/glxp/api/ApiAdminApplication.java +++ b/src/main/java/com/glxp/api/ApiAdminApplication.java @@ -7,12 +7,14 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @ServletComponentScan @EnableScheduling @MapperScan("com.glxp.api.dao") +@EnableTransactionManagement public class ApiAdminApplication extends SpringBootServletInitializer { diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index abf5351b..8be18294 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -282,7 +282,7 @@ public class SupCertController { } //查询模板文件是否存在 FilterPdfModuleRequest filterPdfModuleRequest = new FilterPdfModuleRequest(); - filterPdfModuleRequest.setId(inspectionPDFTemplateRequest.getModuleId()); + filterPdfModuleRequest.setModelKey(inspectionPDFTemplateRequest.getModelKey()); SystemPDFModuleEntity systemPDFModule = systemPDFModuleService.findSystemPDFModule(filterPdfModuleRequest); if (null == systemPDFModule) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java index 106d2757..094b2b3e 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java @@ -16,6 +16,8 @@ public interface SystemPDFModuleDao { SystemPDFModuleEntity findSystemPDFModule(FilterPdfModuleRequest filterPDFModuleRequest); + SystemPDFModuleEntity findSystemPDFModuleByKey(FilterPdfModuleRequest filterPDFModuleRequest); + SystemPDFModuleEntity selectById(String id); boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest); diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 261696b6..935e3d62 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -27,6 +27,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.support.CronSequenceGenerator; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson.JSON; @@ -58,6 +59,7 @@ import okhttp3.Response; /*数据中继数据中心(接收)*/ @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class IdcServiceImpl implements IdcService { private static final Logger logger = LoggerFactory.getLogger(IdcServiceImpl.class); @Value("${file_path}") @@ -117,11 +119,11 @@ public class IdcServiceImpl implements IdcService { BaseResponse response = JSON.parseObject(json,BaseResponse.class); return response; } - + return ResultVOUtils.success(object); } - + /*UDI系统上传自助平台*/ @Override public void asyncUdiTask() { @@ -134,7 +136,7 @@ public class IdcServiceImpl implements IdcService { logger.info("自助平台同步任务开始--------"); asyncDataTask(false); } - + /*拉取前一级中继服务数据*/ @Async @Override @@ -147,7 +149,7 @@ public class IdcServiceImpl implements IdcService { fetchTask(true); } - + private void fetchTask(boolean isIdc) { String host = getNextHost(); if(!isIdc) { @@ -158,7 +160,7 @@ public class IdcServiceImpl implements IdcService { logger.info("fetch from ip:"+host); if(!StringUtils.isEmpty(host)) { String result = post(host+"/spssync/common/list",null); - + if(IDCUtils.isJson(result)) { JSONObject json = JSON.parseObject(result); if(json!=null&&json.getInteger("code")==20000&&json.getString("data")!=null) { @@ -174,7 +176,7 @@ public class IdcServiceImpl implements IdcService { } } } - + @Async @Override public void asyncIdcTask() { @@ -184,7 +186,7 @@ public class IdcServiceImpl implements IdcService { dbDao.save("insert into idc_var (code,content) values ('system_type','IDC')"); } } - + private void asyncDataTask(boolean isUpload) { initTable(); @@ -206,15 +208,15 @@ public class IdcServiceImpl implements IdcService { } } } - + private void syncData(String t,boolean isUpload,String syncIp) { boolean sync = true; String[] tnames = t.split("/"); - + String lastUpdateTime = getUpdateTime(tnames[3]); Date nowUpdateTime = new Date(); if(!StringUtils.isEmpty(tnames[0])) { - + List> keyList = dbDao.listKeyMysql(tnames[2]); String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; Map map = new HashMap(); @@ -227,7 +229,7 @@ public class IdcServiceImpl implements IdcService { map.put("isEnd", "1"); } map.put("sqlWhere", sqlWhere); - + map.put("tableKey", tnames[0]); map.put("tableName", tnames[2]); map.put("uniqueColumn", tnames[3]); @@ -241,7 +243,7 @@ public class IdcServiceImpl implements IdcService { scheduledRequest.setCronName("sync"+WordUtils.capitalizeFully(tnames[2], new char[]{'_'}).replace("_", "")); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); String cron = scheduledEntity!=null ? scheduledEntity.getCron() : ""; - + if(!StringUtils.isEmpty(cron)) { CronSequenceGenerator cronSequenceGenerator = new CronSequenceGenerator(cron); Date nextTimePoint = cronSequenceGenerator.next(DateUtil.parseDate(lastUpdateTime)); @@ -254,8 +256,8 @@ public class IdcServiceImpl implements IdcService { } } } - - + + private String fetchData(String host,Map params) { OkHttpClient client = new OkHttpClient().newBuilder() @@ -274,7 +276,7 @@ public class IdcServiceImpl implements IdcService { Response response = client.newCall(request).execute(); result = response.body().string(); JSONObject json = JSONObject.parseObject(result); - + if(isLastLevel()) { if(json.get("code")!=null) { success = analyToDB(host,json.getJSONObject("data"),files,false); @@ -290,12 +292,12 @@ public class IdcServiceImpl implements IdcService { syncAddTaskStatus(json,false,success); } } - + if(success) { String ret = post(host+"/spssync/common/success",params); - + } - + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -351,7 +353,7 @@ public class IdcServiceImpl implements IdcService { IDCUtils.createDirectory(filePath +filePathSlash +datePath+"/"); if(!FileUtils.makeDirectory(backFilePath +backFileSlash +datePath)) IDCUtils.createDirectory(filePath +backFileSlash +datePath+"/"); - + FileUtils.SaveFileAs(content, fileName); FileUtils.SaveFileAs(content, backFileName); String[] saveFiles= {}; @@ -391,7 +393,7 @@ public class IdcServiceImpl implements IdcService { } else { return ResultVOUtils.error(9000, "转发失败"); } - + } } return ResultVOUtils.success(); @@ -401,17 +403,17 @@ public class IdcServiceImpl implements IdcService { /*数据同步，从数据库获取数据下发或上传下级中继服务*/ @Override public BaseResponse send(Map params) { - - return send(params.get("messageType").toString(),params.get("tableName").toString(),params); - - + + return send(params.get("messageType").toString(),params.get("tableName").toString(),params); + + } @Override public BaseResponse send(String messageType,String tableName,Map params) { - + return ResultVOUtils.error(9999, ""); } - + @Override public void downloadFile(String fileName,HttpServletResponse response) { OutputStream os; @@ -438,7 +440,7 @@ public class IdcServiceImpl implements IdcService { dbDao.save(sql); } - + private void saveExportStatus(Map params) { Map map = new HashMap(); map.put("receiveStatus", "0"); @@ -478,8 +480,8 @@ public class IdcServiceImpl implements IdcService { dbDao.save(sql); } - - + + private boolean syncMasterData(Map params,boolean isUpload,String syncIp) { boolean success=false; String tableName = params.get("tableName").toString(); @@ -502,13 +504,13 @@ public class IdcServiceImpl implements IdcService { Map whereParams = new HashMap(); whereParams.put("sqlWhere", params.get("sqlWhere")); whereParams.put("dataWhere", params.get("dataWhere")); - + Map map = new HashMap(); String where = DBAUtils.convertWhere(column,whereParams,""); sql+=!StringUtils.isEmpty(where) ? " where "+where : ""; map.put("sql", sql); int total = dbDao.count(map); - + String isEnd = params.get("isEnd")!=null ? params.get("isEnd").toString() : "0"; int limit = 50; String[] files = new String[limit]; @@ -517,13 +519,13 @@ public class IdcServiceImpl implements IdcService { String messageType = params.get("messageType").toString(); saveIdcLog(messageType,"",tableName +">"+where,0,total); String filePathSlash = filePath.substring(filePath.length() -1).equals("/") ? "" : "/"; - + if(total>0) { success = true; - + whereParams.put("page", 0); whereParams.put("limit", limit); - + List> keyList = dbDao.listKeyMysql(tableName); String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; for(int i=0;i json,boolean isUpload,boolean success) { String content = JSON.toJSONString(json); @@ -610,10 +612,10 @@ public class IdcServiceImpl implements IdcService { IDCUtils.createDirectory(filePath +datePath+"/"); if(!FileUtils.makeDirectory(backFilePath +datePath)) IDCUtils.createDirectory(filePath +datePath+"/"); - + FileUtils.SaveFileAs(content, fileName); FileUtils.SaveFileAs(content, backFileName); - + //type,transportType,superiorService,subordinateService,cacheFilePath Map map = new HashMap<>(); map.put("type", json.get("messageType")); @@ -622,16 +624,16 @@ public class IdcServiceImpl implements IdcService { map.put("taskId", json.get("messageId")); map.put("cacheFilePath", fileName); map.put("status", success ? "1" : "0"); - + saveExportStatus(map); } - - + + /*解析到数据库*/ private boolean analyToDB(String host,JSONObject jsonObject,MultipartFile[] files,boolean isUpload) { - + if(jsonObject.get("data")!=null) { String tableName = ""; String uniqueColumn = ""; @@ -705,7 +707,7 @@ public class IdcServiceImpl implements IdcService { if(!StringUtils.isEmpty(filePathColumn)) { files[i] = list.get(i).get(filePathColumn) !=null ? list.get(i).get(filePathColumn).toString() : ""; } - + if("A,D,U".contains(operateMode)) { for(int z=0;z0 ? "," : ""; boolean ups = list.get(i).containsKey(attrName) ? true : false ; updateSet+=ups&&h>0 ? "," : ""; @@ -760,11 +762,11 @@ public class IdcServiceImpl implements IdcService { dbDao.update(upd + updateSet+" where "+updateWhere); h+=ups ? 1 : 0; } - + sql+=")"; n++; } - + for(int m=0;m<30;m++) { if(list.get(i).get("tableName"+m)!=null&&list.get(i).get("data"+m)!=null) { Object obj = list.get(i).get("data"+m); @@ -777,7 +779,7 @@ public class IdcServiceImpl implements IdcService { break; } } - + } if(n>0) { result = (dbDao.save(sql)>0); @@ -864,20 +866,20 @@ public class IdcServiceImpl implements IdcService { .addFormDataPart("fileName", fileName) .build(); - + Request request = new Request.Builder() .url(syncIp+"/spssync/common/downloadFile") .post(requestBody) .build(); try { Response result = client.newCall(request).execute(); - - - + + + if (MediaType.parse("application/force-download").equals(result.body().contentType())) { try (InputStream inputStream = result.body().byteStream()) { String filePathSlash = filePath.substring(filePath.length() -1).equals("/") ? "" : "/"; - + FileOutputStream outputStream =new FileOutputStream(filePath +filePathSlash+fileName); byte b[]=new byte[1024]; @@ -892,14 +894,14 @@ public class IdcServiceImpl implements IdcService { outputStream.flush(); - - + + } catch (Exception e) { - - + + } - } - + } + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -907,7 +909,7 @@ public class IdcServiceImpl implements IdcService { return true; } - + /*获取转发服务地址，当前值允许单向，只使用参数upper_server_ip*/ private String getNextHost() { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("upper_server_ip"); @@ -921,7 +923,7 @@ public class IdcServiceImpl implements IdcService { Map map = dbDao.get("select * from idc_var where code='system_type'"); return !(map!=null&&map.get("content")!=null&&map.get("content").toString().equals("IDC")) ; } - + /*是否需要转发*/ private boolean isRelay() { String relayHost = getNextHost(); @@ -932,7 +934,7 @@ public class IdcServiceImpl implements IdcService { private List> getList(String tableName,Map params) { String sql = "select "+tableName+".*,'A' as operateMode from "+tableName; Map column = getColumn(tableName); - + String where = DBAUtils.convertWhere(column,params,""); sql+=!StringUtils.isEmpty(where) ? " where "+where : ""; Map map = new HashMap(); @@ -1032,7 +1034,7 @@ public class IdcServiceImpl implements IdcService { } else { //国家库数据 if(id.equals("productinfo")) { - + } updateTime = "2000-01-01 00:00:00"; String sql = "insert into idc_status (id,statusTime) values ('"+id+"',cast('"+updateTime+"' as datetime))"; @@ -1062,7 +1064,7 @@ public class IdcServiceImpl implements IdcService { jdbcTemplate.execute("alter table basic_export_status add column cacheFilePath varchar(255)"); jdbcTemplate.execute("alter table basic_upload_status add column cacheFilePath varchar(255)"); } catch (Exception e) { - + } } private void alterTable(String tableName,String sql) { @@ -1072,6 +1074,6 @@ public class IdcServiceImpl implements IdcService { } } - + } diff --git a/src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java b/src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java index 3b044200..f5c777dc 100644 --- a/src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java +++ b/src/main/java/com/glxp/api/req/inout/InspectionPDFTemplateRequest.java @@ -13,6 +13,7 @@ public class InspectionPDFTemplateRequest { private String orderId; private Long customerId; private Integer moduleId; + private String modelKey; } diff --git a/src/main/java/com/glxp/api/req/system/FilterPdfModuleRequest.java b/src/main/java/com/glxp/api/req/system/FilterPdfModuleRequest.java index 721015c5..ac1fd1f7 100644 --- a/src/main/java/com/glxp/api/req/system/FilterPdfModuleRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterPdfModuleRequest.java @@ -19,4 +19,5 @@ public class FilterPdfModuleRequest extends ListPageRequest { private Date create_time; private Integer templateType; private Date update_time; + private String modelKey; } diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index b4ef0258..22ea3c3f 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -15,6 +15,7 @@ import com.glxp.api.req.auth.FilterUserRoleRequest; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.common.enums.ResultEnum; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -23,6 +24,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class AuthAdminServiceImpl implements AuthAdminService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java index 48613c00..30c8e366 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.auth.AuthCheckEntity; import com.glxp.api.req.auth.FilterAuthCheckRequest; import com.glxp.api.service.auth.AuthCheckService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class AuthCheckServiceImpl implements AuthCheckService { @Resource private AuthCheckDao authCheckDao; diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java index 4e562d6e..fb023998 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.auth.AuthRole; import com.glxp.api.entity.auth.AuthRoleAdmin; import com.glxp.api.service.auth.AuthRoleAdminService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -12,6 +13,7 @@ import java.util.List; import java.util.stream.Collectors; @Service +@Transactional(rollbackFor = Exception.class) public class AuthRoleAdminServiceImpl implements AuthRoleAdminService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java index 67b62758..251b0fb4 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java @@ -8,6 +8,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeRoleEntity; import com.glxp.api.req.auth.AuthRoleQueryRequest; import com.glxp.api.service.auth.AuthRoleService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -15,6 +16,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class AuthRoleServiceImpl implements AuthRoleService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java index 36a101b4..9449602a 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.entity.auth.CustomerInfoEntity; import com.glxp.api.req.auth.CustomerInfoFilterRequest; import com.glxp.api.service.auth.CustomerInfoService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class CustomerInfoServiceImpl implements CustomerInfoService { diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java index 1104f1d0..0ae77321 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java @@ -8,6 +8,7 @@ import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.req.auth.FilterInvWarehouseRequest; import com.glxp.api.service.auth.DeptService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -15,6 +16,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class DeptServiceImpl implements DeptService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index ac942e69..5e7fda2e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -8,11 +8,13 @@ import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.auth.DeptUserResponse; import com.glxp.api.service.auth.DeptUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class DeptUserServiceImpl implements DeptUserService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java index fe433be5..b4c43889 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.req.auth.FilterInvBusUserRequest; import com.glxp.api.res.auth.InvBusUserResponse; import com.glxp.api.service.auth.InvBusUserService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -16,6 +17,7 @@ import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class InvBusUserServiceImpl implements InvBusUserService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index bc3a0300..2fd487c4 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -15,6 +15,7 @@ import com.glxp.api.res.auth.InvSubWarehouseResponse; import com.glxp.api.res.auth.InvWarehouseThirdSysResponse; import com.glxp.api.service.auth.InvWarehouseService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -22,6 +23,7 @@ import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class InvWarehouseServiceImpl implements InvWarehouseService { diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java index 2ffa9e02..4ccded5b 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java @@ -8,6 +8,7 @@ import com.glxp.api.exception.ServiceException; import com.glxp.api.req.auth.SysDictDataRequest; import com.glxp.api.service.auth.ISysDictDataService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -16,6 +17,7 @@ import java.util.List; * 字典 业务层处理 */ @Service +@Transactional(rollbackFor = Exception.class) public class SysDictDataServiceImpl implements ISysDictDataService { @Resource SysDictDataMapper baseMapper; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index ad11506c..1d1c6998 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -25,6 +25,7 @@ import java.util.List; */ @RequiredArgsConstructor @Service +@Transactional(rollbackFor = Exception.class) public class SysDictTypeServiceImpl implements ISysDictTypeService { private final SysDictTypeMapper baseMapper; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java index fa240ced..cc4ff33e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysMenuServiceImpl.java @@ -15,6 +15,7 @@ import com.glxp.api.util.TreeBuildUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; @@ -23,6 +24,7 @@ import java.util.*; * 菜单 业务层处理 */ @Service +@Transactional(rollbackFor = Exception.class) public class SysMenuServiceImpl implements ISysMenuService { diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java index f585b835..f4fd660e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.FilterDeviceKeyRequest; import com.glxp.api.service.auth.SysPdaKeyService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SysPdaKeyServiceImpl implements SysPdaKeyService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java index b3e9e09e..0abb43ca 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java @@ -29,6 +29,7 @@ import java.util.*; */ @RequiredArgsConstructor @Service +@Transactional(rollbackFor = Exception.class) public class SysRoleServiceImpl implements ISysRoleService { diff --git a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java index 68869016..ef6991a4 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.auth.UserRegisterEntity; import com.glxp.api.req.auth.UserResisterFilterRequest; import com.glxp.api.service.auth.UserRegisterService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class UserRegisterServiceImpl implements UserRegisterService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java index 0554507c..2ca38493 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java @@ -10,6 +10,7 @@ import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.service.auth.WarehouseBussinessTypeService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -18,6 +19,7 @@ import java.util.List; @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessTypeService { @Resource diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index cc8d3b3c..a2b8cb4b 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -10,6 +10,7 @@ import com.glxp.api.req.auth.FilterInvUserRequest; import com.glxp.api.service.auth.WarehouseUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -18,6 +19,7 @@ import java.util.List; @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class WarehouseUserServiceImpl implements WarehouseUserService { diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java index 974bfa72..f2a71ee5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.req.basic.FilterCorpExportLogRequest; import com.glxp.api.service.basic.BasicCorpExportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class BasicCorpExportLogServiceImpl implements BasicCorpExportLogService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java index 16ee8c45..963072a3 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java @@ -20,6 +20,7 @@ import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -27,6 +28,7 @@ import java.util.List; @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class BasicCorpImportLogServiceImpl implements BasicCorpImportLogService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 1ffe0602..3ecf7a8a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.basic.BasicCorpService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -16,6 +17,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class BasicCorpServiceImpl implements BasicCorpService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 24c3884c..949098bf 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -16,6 +16,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.BasicHospTypeService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -24,6 +25,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class BasicHospTypeServiceImpl implements BasicHospTypeService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java index 79d6a1f9..b165eca7 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.basic.BasicNewUploadDiEntity; import com.glxp.api.req.basic.FilterBasicNewUploadDiRequest; import com.glxp.api.service.basic.BasicNewUploadDiService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class BasicNewUploadDiServiceImpl implements BasicNewUploadDiService { @Resource BasicNewUploadDiDao newUploadDiDao; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java index f3a3e9b5..1ff5fc51 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.api.entity.basic.BasicProductSetEntity; import com.glxp.api.req.basic.FilterBasicProductSetrequest; import com.glxp.api.service.basic.BasicProductSetService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -15,6 +16,7 @@ import java.util.List; import java.util.Map; @Service +@Transactional(rollbackFor = Exception.class) public class BasicProductSetServiceImpl implements BasicProductSetService { @Resource BasicProductSetDao basicProductSetDao; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java index 2bdfe138..1b385760 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.entity.basic.BasicProductsExportLogEntity; import com.glxp.api.req.basic.FilterUdiEpLogRequest; import com.glxp.api.service.basic.BasicProductsExportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class BasicProductsExportLogServiceImpl implements BasicProductsExportLogService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java index 7cf98263..6b79eb11 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java @@ -18,12 +18,14 @@ import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class BasicProductsImportDetailServiceImpl implements BasicProductsImportDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index c5fbf29d..9016441e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -32,11 +32,13 @@ import com.glxp.api.util.HttpClient; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; @Service +@Transactional(rollbackFor = Exception.class) public class BasicProductsImportLogServiceImpl implements BasicProductsImportLogService { @Resource BasicProductsImportLogDao udiInfoImportLogDao; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java index 9d6de910..ea308c56 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.service.basic.BasicUnitMaintainService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java index 68880816..2f42c49f 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.res.basic.CompanyProductRelevanceResponse; import com.glxp.api.service.basic.CompanyProductRelevanceService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevanceService { @Resource CompanyProductRelevanceDao companyProductRelevanceDao; diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index ca84ddc1..dfccaac6 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -10,12 +10,14 @@ import com.glxp.api.req.basic.BasicEntrustRecRequest; import com.glxp.api.res.basic.EntrustReceResponse; import com.glxp.api.service.basic.EntrustReceService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class EntrustReceServiceImpl implements EntrustReceService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java index b552136b..4fef3ba0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.service.basic.ProductInfoService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ProductInfoServiceImpl implements ProductInfoService { @Resource @@ -202,4 +204,4 @@ public class ProductInfoServiceImpl implements ProductInfoService { public boolean deleteAll(List ids) { return productInfoDao.deleteAll(ids); } -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java index 716e96be..d441399c 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java @@ -6,11 +6,13 @@ import com.glxp.api.entity.basic.UdiCompanyEntity; import com.glxp.api.req.basic.UdiCompanyRequest; import com.glxp.api.service.basic.UdiCompanyService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class UdiCompanyServiceImpl implements UdiCompanyService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 8f2253ae..636fe63c 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -11,12 +11,14 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class UdiProductServiceImpl implements UdiProductService { @Resource diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 8ceab1d7..009ca427 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -14,12 +14,14 @@ import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class UdiRelevanceServiceImpl implements UdiRelevanceService { @Resource UdiRelevanceDao udiRelevanceDao; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java index 6406befb..3a094437 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.service.basic.UdiRlSupService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class UdiRlSupServiceImpl implements UdiRlSupService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java index aeb5e9ab..74839923 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java @@ -9,10 +9,12 @@ import javax.annotation.Resource; import com.glxp.api.dao.inout.IoCodeLostMapper; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.service.inout.IoCodeLostService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class IoCodeLostServiceImpl implements IoCodeLostService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java index a7178316..014d0578 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java @@ -9,12 +9,14 @@ import com.glxp.api.req.inout.IoOrderRelRequest; import com.glxp.api.res.inout.IoCodeRelResponse; import com.glxp.api.service.inout.IoCodeRelService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class IoCodeRelServiceImpl implements IoCodeRelService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java index 1eedd9b8..36afabc7 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java @@ -17,6 +17,7 @@ import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoCodeTempResponse; import com.glxp.api.service.inout.IoCodeService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -24,6 +25,7 @@ import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class IoCodeServiceImpl implements IoCodeService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index 2812f8c4..bb1b5fee 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -12,11 +12,13 @@ import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.page.PageQuery; import com.glxp.api.util.page.TableDataInfo; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class IoCodeTempServiceImpl implements IoCodeTempService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 74676d3f..f93b0633 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -13,12 +13,14 @@ import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 1ad636e6..8b2589d0 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -15,6 +15,7 @@ import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -22,6 +23,7 @@ import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 20e61781..00f6e366 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -10,12 +10,14 @@ import com.glxp.api.req.inout.FilterOrderDetailResultRequest; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.service.inout.IoOrderDetailResultService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java index ecf137d2..38792258 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceServiceImpl.java @@ -7,10 +7,12 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.glxp.api.service.inout.IoOrderInvoiceService; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @Service +@Transactional(rollbackFor = Exception.class) public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService { @Resource IoOrderInvoiceMapper ioOrderInvoiceMapper; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 3f01e2b5..4c56139b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -43,6 +43,7 @@ import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.Field; @@ -51,6 +52,7 @@ import java.util.stream.Collectors; @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class IoOrderServiceImpl implements IoOrderService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java index 27734edf..2562bd1b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -10,12 +10,14 @@ import com.glxp.api.res.inout.ReceiveDetailResponse; import com.glxp.api.service.inout.ReceivedetailService; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ReceiveDetailServiceImpl implements ReceivedetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java index 90ab3b7b..f9e07174 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -10,12 +10,14 @@ import com.glxp.api.req.inout.FilterReceiveRequest; import com.glxp.api.res.inout.ReceiveResponse; import com.glxp.api.service.inout.ReceiveService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ReceiveServiceImpl implements ReceiveService { @Resource diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java index 3351de53..edfebd2b 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.req.inv.InnerOrderDetailRequest; import com.glxp.api.res.inv.innerOrderDetailResponse; import com.glxp.api.service.inv.InnerOrderDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class InnerOrderDetailServiceImpl implements InnerOrderDetailService { @Resource InnerOrderDetailDao innerOrderDetailDao; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java index 0e2f5793..5a0c2bf7 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.entity.inv.InnerOrderEntity; import com.glxp.api.req.inv.InnerOrderRequest; import com.glxp.api.service.inv.InnerOrderService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class InnerOrderServiceImpl implements InnerOrderService { @Resource diff --git a/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java index 0d365960..03503710 100644 --- a/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.util.Date; @@ -27,6 +28,7 @@ import java.util.List; @RequiredArgsConstructor @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class SysLogininforServiceImpl implements ISysLogininforService, LogininforService { private final SysLogininforMapper baseMapper; diff --git a/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java index 3473ff44..340db6d1 100644 --- a/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java @@ -12,6 +12,7 @@ import com.glxp.api.util.AddressUtils; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.Date; @@ -22,6 +23,7 @@ import java.util.List; */ @RequiredArgsConstructor @Service +@Transactional(rollbackFor = Exception.class) public class SysOperLogServiceImpl implements ISysOperLogService, OperLogService { private final SysOperLogMapper baseMapper; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java index 1563636c..99889edb 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.req.purchase.CustomerContactFilterRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.service.purchase.CustomerContactService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class CustomerContactServiceImpl implements CustomerContactService { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java index aa1a103e..a7ad3f45 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java @@ -8,12 +8,14 @@ import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.service.purchase.PurApplyDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurApplyDetailImplService implements PurApplyDetailService { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java index 48bfff77..e6a2717f 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.req.purchase.PurApplyRequest; import com.glxp.api.res.purchase.PurApplyResponse; import com.glxp.api.service.purchase.PurApplyService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurApplyServiceImpl implements PurApplyService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java index 6b916e92..91ee0f9f 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.req.purchase.PurOrderDetailRequest; import com.glxp.api.res.purchase.PurArrivalDetailResponse; import com.glxp.api.service.purchase.PurArrivalDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurArrivalDetailServiceImpl implements PurArrivalDetailService { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java index 6df1162d..e62ca946 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.res.purchase.PurArrivalResponse; import com.glxp.api.res.purchase.PurOrderResponse; import com.glxp.api.service.purchase.PurArrivalService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurArrivalServiceImpl implements PurArrivalService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java index 363b45b3..b8591b34 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.req.purchase.PurOrderDetailRequest; import com.glxp.api.res.purchase.PurDeliveryDetailResponse; import com.glxp.api.service.purchase.PurDeliveryDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurDeliveryDetailServiceImpl implements PurDeliveryDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java index 1448e15a..30f8155e 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java @@ -13,6 +13,7 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.purchase.PurDeliveryService; import com.glxp.api.util.RedisUtil; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -20,6 +21,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurDeliveryServiceImpl implements PurDeliveryService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java index 7378a441..b08f5407 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java @@ -10,12 +10,14 @@ import com.glxp.api.res.purchase.PurDeliveryDetailResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.service.purchase.PurOrderDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurOrderDetailServiceImpl implements PurOrderDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java index db5639a0..36429d6f 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java @@ -12,12 +12,14 @@ import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.purchase.PurOrderService; import com.glxp.api.service.purchase.PurPlanService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurOrderServiceImpl implements PurOrderService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java index 5cb25b73..c82dd1ca 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java @@ -9,12 +9,14 @@ import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.service.purchase.PurPlanDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurPlanDetailServiceImpl implements PurPlanDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java index 5e83afcf..8bf8efb6 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.purchase.PurPlanService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurPlanServiceImpl implements PurPlanService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java index f4e429a6..93c4fa16 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.req.purchase.PurOrderDetailRequest; import com.glxp.api.res.purchase.PurReturnedDetailResponse; import com.glxp.api.service.purchase.PurReturnedDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurReturnedDetailServiceImpl implements PurReturnedDetailService { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java index 7a586591..69210b7b 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.req.purchase.PurReturnedRequest; import com.glxp.api.res.purchase.PurReturnedResponse; import com.glxp.api.service.purchase.PurReturnedService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class PurReturnedServiceImpl implements PurReturnedService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java index a67f33d3..a9447556 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java @@ -9,12 +9,14 @@ import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; import com.glxp.api.service.purchase.SupCertService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SupCertServiceImpl implements SupCertService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java index cff03141..64e460b5 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.req.purchase.FilterCertSetsRequest; import com.glxp.api.service.purchase.SupCertSetService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SupCertSetServiceImpl implements SupCertSetService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index 8c963361..a53f54bb 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import com.glxp.api.service.purchase.SupCompanyService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SupCompanyServiceImpl implements SupCompanyService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java index 3d1bcce5..cd7d5dc1 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; import com.glxp.api.service.purchase.SupManufacturerService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SupManufacturerServiceImpl implements SupManufacturerService { @Resource diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index 42e0cca9..d776303b 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -11,12 +11,14 @@ import com.glxp.api.req.purchase.FilterPoductRequest; import com.glxp.api.res.purchase.SupProductResponse; import com.glxp.api.service.purchase.SupProductService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SupProductServiceImpl implements SupProductService { @Resource diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java index af59e17d..8113f18e 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportTimeRequest; import com.glxp.api.service.sync.BasicExportTimeService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class BasicExportTimeServiceImpl implements BasicExportTimeService { @Resource diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java index 7e128f73..97f99660 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java @@ -4,11 +4,13 @@ import com.glxp.api.dao.system.SyncDataBustypeDao; import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.service.sync.SyncDataBustypeService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SyncDataBustypeServiceImpl implements SyncDataBustypeService { @Resource diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java index 4f424c14..527428f6 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataSetServiceImpl.java @@ -8,11 +8,13 @@ import com.glxp.api.service.sync.SyncDataBustypeService; import com.glxp.api.service.sync.SyncDataSetService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SyncDataSetServiceImpl implements SyncDataSetService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java index 6396ce95..2e0d0263 100644 --- a/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java @@ -8,6 +8,7 @@ import com.glxp.api.entity.system.ClassifyCodeEntity; import com.glxp.api.req.system.FilterClassifyCodeRequest; import com.glxp.api.service.system.ClassifyCodeService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Arrays; @@ -15,6 +16,7 @@ import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ClassifyCodeServiceImpl implements ClassifyCodeService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java index 9631b5b0..c9bb86cb 100644 --- a/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.auth.FilterCompanyRequest; import com.glxp.api.service.system.CompanyService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class CompanyServiceImpl implements CompanyService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java index 59adadae..5c8dd591 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataBustypeServiceImpl.java @@ -5,11 +5,13 @@ import com.glxp.api.dao.system.SyncUploadDataBustypeDao; import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.service.system.SyncUploadDataBustypeService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SyncUploadDataBustypeServiceImpl implements SyncUploadDataBustypeService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java index c90722e2..8dc91692 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java @@ -6,11 +6,13 @@ import com.glxp.api.entity.system.SyncUploadDataSetEntity; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.system.SyncUploadDataSetService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SyncUploadDataSetServiceImpl implements SyncUploadDataSetService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java index f85ddb08..0a222845 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java @@ -8,11 +8,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysMenuHelpMapper; import com.glxp.api.entity.system.SysMenuHelpEntity; import com.glxp.api.service.system.SysMenuHelpService; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SysMenuHelpServiceImpl implements SysMenuHelpService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java index d23804b2..1202d1fa 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java @@ -8,11 +8,13 @@ import org.springframework.stereotype.Service; import com.glxp.api.dao.system.SysRemindMsgMapper; import com.glxp.api.entity.system.SysRemindMsgEntity; import com.glxp.api.service.system.SysRemindMsgService; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SysRemindMsgServiceImpl implements SysRemindMsgService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java index 89c964d5..11c662d2 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java @@ -6,11 +6,13 @@ import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindSetRequest; import com.glxp.api.service.system.SysRemindSetService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SysRemindSetServiceImpl implements SysRemindSetService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/SysServerLogServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysServerLogServiceImpl.java index afec6ec3..75f73e84 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysServerLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysServerLogServiceImpl.java @@ -2,7 +2,9 @@ package com.glxp.api.service.system.impl; import com.glxp.api.service.system.SysServerLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service +@Transactional(rollbackFor = Exception.class) public class SysServerLogServiceImpl implements SysServerLogService { } diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java index f278a4f2..a4364b7a 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java @@ -7,11 +7,13 @@ import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; import com.glxp.api.service.system.SystemPDFModuleService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { @Resource SystemPDFModuleDao systemPDFModuleDao; @@ -36,7 +38,7 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { @Override public SystemPDFModuleEntity findSystemPDFModule(FilterPdfModuleRequest filterPDFModuleRequest) { - return systemPDFModuleDao.findSystemPDFModule(filterPDFModuleRequest); + return systemPDFModuleDao.findSystemPDFModuleByKey(filterPDFModuleRequest); } @Override diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java index 0edb5581..0b96e2e5 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import com.glxp.api.service.system.SystemPDFTemplateRelevanceService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -14,6 +15,7 @@ import java.util.List; import java.util.stream.Collectors; @Service +@Transactional(rollbackFor = Exception.class) public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateRelevanceService { @Resource diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index 6f7ce486..4f2cccc6 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -7,11 +7,13 @@ import com.glxp.api.req.system.FilterPdfTemplateRequest; import com.glxp.api.req.system.SysPdfTemplateSaveRequest; import com.glxp.api.service.system.SystemPDFTemplateService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService { @Resource SystemPDFTemplateDao systemPDFTemplateDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index 72e9e597..24279477 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -8,6 +8,7 @@ import com.glxp.api.req.system.FilterParamConfigRequest; import com.glxp.api.req.system.SysParamConfigSaveRequest; import com.glxp.api.service.system.SystemParamConfigService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.HashMap; @@ -15,6 +16,7 @@ import java.util.List; import java.util.Map; @Service +@Transactional(rollbackFor = Exception.class) public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Resource SystemParamConfigDao systemParamConfigDao; diff --git a/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java index da79b2da..80ff17ed 100644 --- a/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.system.ThirdSysApiEntity; import com.glxp.api.req.system.FilterSysApiRequest; import com.glxp.api.service.system.ThirdSysApiService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThirdSysApiServiceImpl implements ThirdSysApiService { @Resource ThirdSysApiDao thirdSysApiDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index 4c3b818d..94c029e4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpExportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -16,6 +17,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { @Resource ThrCorpExportLogDao thrCorpExportLogDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index ed13d48a..a778ecba 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpImportDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -14,6 +15,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java index 050887ce..17d5dde3 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpImportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -14,6 +15,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService { @Resource ThrCorpImportLogDao thrCorpImportLogDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java index 3612a338..d3d58d6d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -10,12 +10,14 @@ import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.thrsys.ThrCorpService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrCorpServiceImpl implements ThrCorpService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index 037dda0b..edf61e19 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -25,6 +25,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrDeptServiceImpl implements ThrDeptService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java index 81745e75..04308639 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -14,6 +15,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java index fd192dcb..483f3ecc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsExportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -14,6 +15,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrInvProductsExportLogServiceImpl implements ThrInvProductsExportLogService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java index c160647b..ccffb124 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java @@ -7,6 +7,7 @@ import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsImportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -14,6 +15,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrInvProductsImportLogServiceImpl implements ThrInvProductsImportLogService { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java index 0698b7f4..2a169429 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -8,6 +8,7 @@ import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -15,6 +16,7 @@ import java.util.Date; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrInvProductsServiceImpl implements ThrInvProductsService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index acb12cff..af40e60f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -9,12 +9,14 @@ import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import com.glxp.api.service.thrsys.ThrInvWarehouseService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java index 12577493..0e3c58c5 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -7,12 +7,14 @@ import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.service.thrsys.ThrOrderDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java index 87ff8fa8..e53f0df2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; import com.glxp.api.service.thrsys.ThrOrderExportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrOrderExportLogServiceImpl implements ThrOrderExportLogService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java index 5fd93c04..f43fa3b4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; import com.glxp.api.service.thrsys.ThrOrderImportDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index cf36b145..c2ea007e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -15,6 +15,7 @@ import com.glxp.api.service.thrsys.ThrOrderService; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -25,6 +26,7 @@ import java.util.stream.Collectors; @Service +@Transactional(rollbackFor = Exception.class) public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { @Resource ThrOrderImportLogDao thrOrderImportLogDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index b6813e25..27839a21 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -14,6 +14,7 @@ import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.thrsys.ThrOrderService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -21,6 +22,7 @@ import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrOrderServiceImpl implements ThrOrderService { @Resource private ThrOrderDao thrOrderDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index 8deef846..9bc359a5 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; @Service -@Transactional +@Transactional(rollbackFor = Exception.class) public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java index 2da9ad88..640d8289 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.thrsys.ThrProductsAddEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.service.thrsys.ThrProductsAddService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrProductsAddServiceImpl implements ThrProductsAddService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java index ea03fe81..b42aa0f1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java @@ -8,12 +8,14 @@ import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; import com.glxp.api.req.thrsys.FilterThrProductsExportLogRequest; import com.glxp.api.service.thrsys.ThrProductsExportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrProductsExportLogServiceImpl implements ThrProductsExportLogService { @Resource ThrProductsExportLogDao thrProductsExportLogDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java index 98e0798b..16b0ad7f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; import com.glxp.api.service.thrsys.ThrProductsImportDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java index ffcda0fb..e8e23a5f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -6,12 +6,14 @@ import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; import com.glxp.api.service.thrsys.ThrProductsImportLogService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogService { @Resource ThrProductsImportLogDao thrProductsImportLogDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 17e94271..96d086ce 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -13,6 +13,7 @@ import com.glxp.api.service.thrsys.ThrProductsAddDiService; import com.glxp.api.service.thrsys.ThrProductsService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -27,6 +28,7 @@ import java.util.List; * @since 2023-01-10 */ @Service +@Transactional(rollbackFor = Exception.class) public class ThrProductsServiceImpl implements ThrProductsService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java index 78d66907..1fc64f0d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java @@ -13,6 +13,7 @@ import javax.annotation.Resource; import java.util.List; @Service +@Transactional(rollbackFor = Exception.class) public class ThrSystemBusApiServiceImpl implements ThrSystemBusApiService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java index e77bcb87..752c1505 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java @@ -18,6 +18,7 @@ import java.util.List; @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class ThrSystemDetailServiceImpl implements ThrSystemDetailService { @Resource diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java index 399817ae..9f5e252e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java @@ -10,6 +10,7 @@ import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.service.thrsys.ThrSystemService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -17,6 +18,7 @@ import java.util.List; @Slf4j @Service +@Transactional(rollbackFor = Exception.class) public class ThrSystemServiceImpl implements ThrSystemService { @Resource diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index 295a1b55..619fdf3a 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -25,6 +25,13 @@ WHERE id = #{id} + + - - select - - from sys_pdf_template_relevance_biz - where id = #{id,jdbcType=INTEGER} - - - - delete from sys_pdf_template_relevance_biz - where id = #{id,jdbcType=INTEGER} - - - - insert into sys_pdf_template_relevance_biz (templateId, customerId, adminId, - moduleId, localAction, remark1, - remark2, remark3, printType, - modelKey) - values (#{templateId,jdbcType=INTEGER}, #{customerId,jdbcType=BIGINT}, #{adminId,jdbcType=INTEGER}, - #{moduleId,jdbcType=INTEGER}, #{localAction,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR}, - #{remark2,jdbcType=VARCHAR}, #{remark3,jdbcType=VARCHAR}, #{printType,jdbcType=TINYINT}, - #{modelKey,jdbcType=VARCHAR}) - - - - insert into sys_pdf_template_relevance_biz - - - templateId, - - - customerId, - - - adminId, - - - moduleId, - - - localAction, - - - remark1, - - - remark2, - - - remark3, - - - printType, - - - modelKey, - - - - - #{templateId,jdbcType=INTEGER}, - - - #{customerId,jdbcType=BIGINT}, - - - #{adminId,jdbcType=INTEGER}, - - - #{moduleId,jdbcType=INTEGER}, - - - #{localAction,jdbcType=VARCHAR}, - - - #{remark1,jdbcType=VARCHAR}, - - - #{remark2,jdbcType=VARCHAR}, - - - #{remark3,jdbcType=VARCHAR}, - - - #{printType,jdbcType=TINYINT}, - - - #{modelKey,jdbcType=VARCHAR}, - - - - - - update sys_pdf_template_relevance_biz - - - templateId = #{templateId,jdbcType=INTEGER}, - - - customerId = #{customerId,jdbcType=BIGINT}, - - - adminId = #{adminId,jdbcType=INTEGER}, - - - moduleId = #{moduleId,jdbcType=INTEGER}, - - - localAction = #{localAction,jdbcType=VARCHAR}, - - - remark1 = #{remark1,jdbcType=VARCHAR}, - - - remark2 = #{remark2,jdbcType=VARCHAR}, - - - remark3 = #{remark3,jdbcType=VARCHAR}, - - - printType = #{printType,jdbcType=TINYINT}, - - - modelKey = #{modelKey,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - update sys_pdf_template_relevance_biz - set templateId = #{templateId,jdbcType=INTEGER}, - customerId = #{customerId,jdbcType=BIGINT}, - adminId = #{adminId,jdbcType=INTEGER}, - moduleId = #{moduleId,jdbcType=INTEGER}, - localAction = #{localAction,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - printType = #{printType,jdbcType=TINYINT}, - modelKey = #{modelKey,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - - - update sys_pdf_template_relevance_biz - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.templateId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.customerId,jdbcType=BIGINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adminId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.moduleId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.localAction,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark1,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark2,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark3,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.printType,jdbcType=TINYINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.modelKey,jdbcType=VARCHAR} - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - update sys_pdf_template_relevance_biz - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.templateId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.customerId,jdbcType=BIGINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adminId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.moduleId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.localAction,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark1,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark2,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark3,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.printType,jdbcType=TINYINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.modelKey,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into sys_pdf_template_relevance_biz - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, - printType, modelKey) - values - - (#{item.templateId,jdbcType=INTEGER}, #{item.customerId,jdbcType=BIGINT}, #{item.adminId,jdbcType=INTEGER}, - #{item.moduleId,jdbcType=INTEGER}, #{item.localAction,jdbcType=VARCHAR}, #{item.remark1,jdbcType=VARCHAR}, - #{item.remark2,jdbcType=VARCHAR}, #{item.remark3,jdbcType=VARCHAR}, #{item.printType,jdbcType=TINYINT}, - #{item.modelKey,jdbcType=VARCHAR}) - - - - - insert into sys_pdf_template_relevance_biz - - - id, - - templateId, - customerId, - adminId, - moduleId, - localAction, - remark1, - remark2, - remark3, - printType, - modelKey, - - values - - - #{id,jdbcType=INTEGER}, - - #{templateId,jdbcType=INTEGER}, - #{customerId,jdbcType=BIGINT}, - #{adminId,jdbcType=INTEGER}, - #{moduleId,jdbcType=INTEGER}, - #{localAction,jdbcType=VARCHAR}, - #{remark1,jdbcType=VARCHAR}, - #{remark2,jdbcType=VARCHAR}, - #{remark3,jdbcType=VARCHAR}, - #{printType,jdbcType=TINYINT}, - #{modelKey,jdbcType=VARCHAR}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - templateId = #{templateId,jdbcType=INTEGER}, - customerId = #{customerId,jdbcType=BIGINT}, - adminId = #{adminId,jdbcType=INTEGER}, - moduleId = #{moduleId,jdbcType=INTEGER}, - localAction = #{localAction,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - printType = #{printType,jdbcType=TINYINT}, - modelKey = #{modelKey,jdbcType=VARCHAR}, - - - - - insert into sys_pdf_template_relevance_biz - - - id, - - - templateId, - - - customerId, - - - adminId, - + + + + + + insert + ignore + INTO sys_pdf_template_relevance_biz + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey) + values (#{templateId}, + #{customerId}, + #{adminId}, + #{moduleId}, + #{localAction}, + #{remark1}, + #{remark2}, + #{remark3}, + #{printType}, + #{modelKey} +) + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml index 7b79c5a7..c499ea5f 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml @@ -21,462 +21,56 @@ id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey - - - - delete from sys_pdf_template_relevance_code - where id = #{id,jdbcType=INTEGER} - - - - insert into sys_pdf_template_relevance_code (templateId, customerId, adminId, - moduleId, localAction, remark1, - remark2, remark3, printType, - modelKey) - values (#{templateId,jdbcType=INTEGER}, #{customerId,jdbcType=BIGINT}, #{adminId,jdbcType=INTEGER}, - #{moduleId,jdbcType=INTEGER}, #{localAction,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR}, - #{remark2,jdbcType=VARCHAR}, #{remark3,jdbcType=VARCHAR}, #{printType,jdbcType=TINYINT}, - #{modelKey,jdbcType=VARCHAR}) - - - - insert into sys_pdf_template_relevance_code - - - templateId, - - - customerId, - - - adminId, - - - moduleId, - - - localAction, - - - remark1, - - - remark2, - - - remark3, - - - printType, - - - modelKey, - - - - - #{templateId,jdbcType=INTEGER}, - - - #{customerId,jdbcType=BIGINT}, - - - #{adminId,jdbcType=INTEGER}, - - - #{moduleId,jdbcType=INTEGER}, - - - #{localAction,jdbcType=VARCHAR}, - - - #{remark1,jdbcType=VARCHAR}, - - - #{remark2,jdbcType=VARCHAR}, - - - #{remark3,jdbcType=VARCHAR}, - - - #{printType,jdbcType=TINYINT}, - - - #{modelKey,jdbcType=VARCHAR}, - - - - - - update sys_pdf_template_relevance_code - - - templateId = #{templateId,jdbcType=INTEGER}, - - - customerId = #{customerId,jdbcType=BIGINT}, - - - adminId = #{adminId,jdbcType=INTEGER}, - - - moduleId = #{moduleId,jdbcType=INTEGER}, - - - localAction = #{localAction,jdbcType=VARCHAR}, - - - remark1 = #{remark1,jdbcType=VARCHAR}, - - - remark2 = #{remark2,jdbcType=VARCHAR}, - - - remark3 = #{remark3,jdbcType=VARCHAR}, - - - printType = #{printType,jdbcType=TINYINT}, - - - modelKey = #{modelKey,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - update sys_pdf_template_relevance_code - set templateId = #{templateId,jdbcType=INTEGER}, - customerId = #{customerId,jdbcType=BIGINT}, - adminId = #{adminId,jdbcType=INTEGER}, - moduleId = #{moduleId,jdbcType=INTEGER}, - localAction = #{localAction,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - printType = #{printType,jdbcType=TINYINT}, - modelKey = #{modelKey,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - - - update sys_pdf_template_relevance_code - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.templateId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.customerId,jdbcType=BIGINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adminId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.moduleId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.localAction,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark1,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark2,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark3,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.printType,jdbcType=TINYINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.modelKey,jdbcType=VARCHAR} - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - update sys_pdf_template_relevance_code - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.templateId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.customerId,jdbcType=BIGINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adminId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.moduleId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.localAction,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark1,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark2,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark3,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.printType,jdbcType=TINYINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.modelKey,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into sys_pdf_template_relevance_code - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, - printType, modelKey) - values - - (#{item.templateId,jdbcType=INTEGER}, #{item.customerId,jdbcType=BIGINT}, #{item.adminId,jdbcType=INTEGER}, - #{item.moduleId,jdbcType=INTEGER}, #{item.localAction,jdbcType=VARCHAR}, #{item.remark1,jdbcType=VARCHAR}, - #{item.remark2,jdbcType=VARCHAR}, #{item.remark3,jdbcType=VARCHAR}, #{item.printType,jdbcType=TINYINT}, - #{item.modelKey,jdbcType=VARCHAR}) - - - - - insert into sys_pdf_template_relevance_code - - - id, - - templateId, - customerId, - adminId, - moduleId, - localAction, - remark1, - remark2, - remark3, - printType, - modelKey, - - values - - - #{id,jdbcType=INTEGER}, - - #{templateId,jdbcType=INTEGER}, - #{customerId,jdbcType=BIGINT}, - #{adminId,jdbcType=INTEGER}, - #{moduleId,jdbcType=INTEGER}, - #{localAction,jdbcType=VARCHAR}, - #{remark1,jdbcType=VARCHAR}, - #{remark2,jdbcType=VARCHAR}, - #{remark3,jdbcType=VARCHAR}, - #{printType,jdbcType=TINYINT}, - #{modelKey,jdbcType=VARCHAR}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - templateId = #{templateId,jdbcType=INTEGER}, - customerId = #{customerId,jdbcType=BIGINT}, - adminId = #{adminId,jdbcType=INTEGER}, - moduleId = #{moduleId,jdbcType=INTEGER}, - localAction = #{localAction,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - printType = #{printType,jdbcType=TINYINT}, - modelKey = #{modelKey,jdbcType=VARCHAR}, - - - - - insert into sys_pdf_template_relevance_code - - - id, - - - templateId, - - - customerId, - - - adminId, - + + + + + + insert + ignore + INTO sys_pdf_template_relevance_code + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey) + values (#{templateId}, + #{customerId}, + #{adminId}, + #{moduleId}, + #{localAction}, + #{remark1}, + #{remark2}, + #{remark3}, + #{printType}, + #{modelKey} + ) + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml index 0261ca2b..8bf98fde 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml @@ -21,462 +21,36 @@ id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey - - - - delete from sys_pdf_template_relevance_label - where id = #{id,jdbcType=INTEGER} - - - - insert into sys_pdf_template_relevance_label (templateId, customerId, adminId, - moduleId, localAction, remark1, - remark2, remark3, printType, - modelKey) - values (#{templateId,jdbcType=INTEGER}, #{customerId,jdbcType=BIGINT}, #{adminId,jdbcType=INTEGER}, - #{moduleId,jdbcType=INTEGER}, #{localAction,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR}, - #{remark2,jdbcType=VARCHAR}, #{remark3,jdbcType=VARCHAR}, #{printType,jdbcType=TINYINT}, - #{modelKey,jdbcType=VARCHAR}) - - - - insert into sys_pdf_template_relevance_label - - - templateId, - - - customerId, - - - adminId, - - - moduleId, - - - localAction, - - - remark1, - - - remark2, - - - remark3, - - - printType, - - - modelKey, - - - - - #{templateId,jdbcType=INTEGER}, - - - #{customerId,jdbcType=BIGINT}, - - - #{adminId,jdbcType=INTEGER}, - - - #{moduleId,jdbcType=INTEGER}, - - - #{localAction,jdbcType=VARCHAR}, - - - #{remark1,jdbcType=VARCHAR}, - - - #{remark2,jdbcType=VARCHAR}, - - - #{remark3,jdbcType=VARCHAR}, - - - #{printType,jdbcType=TINYINT}, - - - #{modelKey,jdbcType=VARCHAR}, - - - - - - update sys_pdf_template_relevance_label - - - templateId = #{templateId,jdbcType=INTEGER}, - - - customerId = #{customerId,jdbcType=BIGINT}, - - - adminId = #{adminId,jdbcType=INTEGER}, - - - moduleId = #{moduleId,jdbcType=INTEGER}, - - - localAction = #{localAction,jdbcType=VARCHAR}, - - - remark1 = #{remark1,jdbcType=VARCHAR}, - - - remark2 = #{remark2,jdbcType=VARCHAR}, - - - remark3 = #{remark3,jdbcType=VARCHAR}, - - - printType = #{printType,jdbcType=TINYINT}, - - - modelKey = #{modelKey,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - update sys_pdf_template_relevance_label - set templateId = #{templateId,jdbcType=INTEGER}, - customerId = #{customerId,jdbcType=BIGINT}, - adminId = #{adminId,jdbcType=INTEGER}, - moduleId = #{moduleId,jdbcType=INTEGER}, - localAction = #{localAction,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - printType = #{printType,jdbcType=TINYINT}, - modelKey = #{modelKey,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - - - update sys_pdf_template_relevance_label - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.templateId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.customerId,jdbcType=BIGINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adminId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.moduleId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.localAction,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark1,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark2,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark3,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.printType,jdbcType=TINYINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.modelKey,jdbcType=VARCHAR} - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - update sys_pdf_template_relevance_label - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.templateId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.customerId,jdbcType=BIGINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adminId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.moduleId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.localAction,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark1,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark2,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark3,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.printType,jdbcType=TINYINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.modelKey,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into sys_pdf_template_relevance_label - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, - printType, modelKey) - values - - (#{item.templateId,jdbcType=INTEGER}, #{item.customerId,jdbcType=BIGINT}, #{item.adminId,jdbcType=INTEGER}, - #{item.moduleId,jdbcType=INTEGER}, #{item.localAction,jdbcType=VARCHAR}, #{item.remark1,jdbcType=VARCHAR}, - #{item.remark2,jdbcType=VARCHAR}, #{item.remark3,jdbcType=VARCHAR}, #{item.printType,jdbcType=TINYINT}, - #{item.modelKey,jdbcType=VARCHAR}) - - - - - insert into sys_pdf_template_relevance_label - - - id, - - templateId, - customerId, - adminId, - moduleId, - localAction, - remark1, - remark2, - remark3, - printType, - modelKey, - - values - - - #{id,jdbcType=INTEGER}, - - #{templateId,jdbcType=INTEGER}, - #{customerId,jdbcType=BIGINT}, - #{adminId,jdbcType=INTEGER}, - #{moduleId,jdbcType=INTEGER}, - #{localAction,jdbcType=VARCHAR}, - #{remark1,jdbcType=VARCHAR}, - #{remark2,jdbcType=VARCHAR}, - #{remark3,jdbcType=VARCHAR}, - #{printType,jdbcType=TINYINT}, - #{modelKey,jdbcType=VARCHAR}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - templateId = #{templateId,jdbcType=INTEGER}, - customerId = #{customerId,jdbcType=BIGINT}, - adminId = #{adminId,jdbcType=INTEGER}, - moduleId = #{moduleId,jdbcType=INTEGER}, - localAction = #{localAction,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - printType = #{printType,jdbcType=TINYINT}, - modelKey = #{modelKey,jdbcType=VARCHAR}, - - - - - insert into sys_pdf_template_relevance_label - - - id, - - - templateId, - - - customerId, - - - adminId, - + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml index f313d561..b07bedfe 100644 --- a/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml +++ b/src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml @@ -21,462 +21,37 @@ id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey - - - - delete from sys_pdf_template_relevance_statemen - where id = #{id,jdbcType=INTEGER} - - - - insert into sys_pdf_template_relevance_statemen (templateId, customerId, adminId, - moduleId, localAction, remark1, - remark2, remark3, printType, - modelKey) - values (#{templateId,jdbcType=INTEGER}, #{customerId,jdbcType=BIGINT}, #{adminId,jdbcType=INTEGER}, - #{moduleId,jdbcType=INTEGER}, #{localAction,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR}, - #{remark2,jdbcType=VARCHAR}, #{remark3,jdbcType=VARCHAR}, #{printType,jdbcType=TINYINT}, - #{modelKey,jdbcType=VARCHAR}) - - - - insert into sys_pdf_template_relevance_statemen - - - templateId, - - - customerId, - - - adminId, - - - moduleId, - - - localAction, - - - remark1, - - - remark2, - - - remark3, - - - printType, - - - modelKey, - - - - - #{templateId,jdbcType=INTEGER}, - - - #{customerId,jdbcType=BIGINT}, - - - #{adminId,jdbcType=INTEGER}, - - - #{moduleId,jdbcType=INTEGER}, - - - #{localAction,jdbcType=VARCHAR}, - - - #{remark1,jdbcType=VARCHAR}, - - - #{remark2,jdbcType=VARCHAR}, - - - #{remark3,jdbcType=VARCHAR}, - - - #{printType,jdbcType=TINYINT}, - - - #{modelKey,jdbcType=VARCHAR}, - - - - - - update sys_pdf_template_relevance_statemen - - - templateId = #{templateId,jdbcType=INTEGER}, - - - customerId = #{customerId,jdbcType=BIGINT}, - - - adminId = #{adminId,jdbcType=INTEGER}, - - - moduleId = #{moduleId,jdbcType=INTEGER}, - - - localAction = #{localAction,jdbcType=VARCHAR}, - - - remark1 = #{remark1,jdbcType=VARCHAR}, - - - remark2 = #{remark2,jdbcType=VARCHAR}, - - - remark3 = #{remark3,jdbcType=VARCHAR}, - - - printType = #{printType,jdbcType=TINYINT}, - - - modelKey = #{modelKey,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - update sys_pdf_template_relevance_statemen - set templateId = #{templateId,jdbcType=INTEGER}, - customerId = #{customerId,jdbcType=BIGINT}, - adminId = #{adminId,jdbcType=INTEGER}, - moduleId = #{moduleId,jdbcType=INTEGER}, - localAction = #{localAction,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - printType = #{printType,jdbcType=TINYINT}, - modelKey = #{modelKey,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - - - update sys_pdf_template_relevance_statemen - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.templateId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.customerId,jdbcType=BIGINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adminId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.moduleId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.localAction,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark1,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark2,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark3,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.printType,jdbcType=TINYINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.modelKey,jdbcType=VARCHAR} - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - update sys_pdf_template_relevance_statemen - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.templateId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.customerId,jdbcType=BIGINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.adminId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.moduleId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.localAction,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark1,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark2,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark3,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.printType,jdbcType=TINYINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.modelKey,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into sys_pdf_template_relevance_statemen - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, - printType, modelKey) - values - - (#{item.templateId,jdbcType=INTEGER}, #{item.customerId,jdbcType=BIGINT}, #{item.adminId,jdbcType=INTEGER}, - #{item.moduleId,jdbcType=INTEGER}, #{item.localAction,jdbcType=VARCHAR}, #{item.remark1,jdbcType=VARCHAR}, - #{item.remark2,jdbcType=VARCHAR}, #{item.remark3,jdbcType=VARCHAR}, #{item.printType,jdbcType=TINYINT}, - #{item.modelKey,jdbcType=VARCHAR}) - - - - - insert into sys_pdf_template_relevance_statemen - - - id, - - templateId, - customerId, - adminId, - moduleId, - localAction, - remark1, - remark2, - remark3, - printType, - modelKey, - - values - - - #{id,jdbcType=INTEGER}, - - #{templateId,jdbcType=INTEGER}, - #{customerId,jdbcType=BIGINT}, - #{adminId,jdbcType=INTEGER}, - #{moduleId,jdbcType=INTEGER}, - #{localAction,jdbcType=VARCHAR}, - #{remark1,jdbcType=VARCHAR}, - #{remark2,jdbcType=VARCHAR}, - #{remark3,jdbcType=VARCHAR}, - #{printType,jdbcType=TINYINT}, - #{modelKey,jdbcType=VARCHAR}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - templateId = #{templateId,jdbcType=INTEGER}, - customerId = #{customerId,jdbcType=BIGINT}, - adminId = #{adminId,jdbcType=INTEGER}, - moduleId = #{moduleId,jdbcType=INTEGER}, - localAction = #{localAction,jdbcType=VARCHAR}, - remark1 = #{remark1,jdbcType=VARCHAR}, - remark2 = #{remark2,jdbcType=VARCHAR}, - remark3 = #{remark3,jdbcType=VARCHAR}, - printType = #{printType,jdbcType=TINYINT}, - modelKey = #{modelKey,jdbcType=VARCHAR}, - - - - - insert into sys_pdf_template_relevance_statemen - - - id, - - - templateId, - - - customerId, - - - adminId, - + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index 295a1b55..39d387d0 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -6,15 +6,21 @@ From 4bee6cf615354f4a49ad9ab5a585f80215f6c148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 4 Apr 2023 18:32:03 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 38 +++++++++++++++---- .../SysPdfTemplateRelevanceCodeDao.java | 2 + .../system/SystemPDFTemplateRelevanceDao.java | 3 ++ .../req/basic/FilterOrderPrintRequest.java | 1 + ...SystemPDFTemplateRelevanceCodeService.java | 3 ++ ...emPDFTemplateRelevanceCodeServiceImpl.java | 5 +++ .../system/SysPdfTemplateRelevanceCodeDao.xml | 13 +++++++ .../system/SystemPDFTemplateRelevanceDao.xml | 14 +++++++ 8 files changed, 71 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index e6f16ddc..79c3e88e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -13,6 +13,7 @@ import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.entity.purchase.SupProductEntity; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; @@ -30,6 +31,7 @@ import com.glxp.api.service.inout.IoCodeService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.system.SystemPDFModuleService; +import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService; import com.glxp.api.service.system.SystemPDFTemplateRelevanceService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; @@ -68,6 +70,8 @@ public class BasicOrderPrintController { IBasicBussinessTypeService basicBussinessTypeService; @Resource IoCodeService ioCodeService; + @Resource + SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService; //校验模板是否正确 @AuthRuleAnnotation("") @@ -75,9 +79,11 @@ public class BasicOrderPrintController { public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) { - SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt = systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(), filterOrderPrintRequest.getAction()); - if (systemPDFTemplateRelevanceEntityt != null) { - SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(systemPDFTemplateRelevanceEntityt.getTemplateId() + ""); + + String name=getStatusName(filterOrderPrintRequest.getStatus()); + SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); + if (sysPdfTemplateRelevanceCodeEntity != null) { + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(sysPdfTemplateRelevanceCodeEntity.getTemplateId() + ""); if (systemPDFTemplateEntity == null) { return ResultVOUtils.error(999, "所属模板错误！"); } else { @@ -94,7 +100,8 @@ public class BasicOrderPrintController { @PostMapping("/udiwms/pdf/template/order/file") public void printSupCertProduction(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderPrintRequest.getTemplateId()); - SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt = systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(), filterOrderPrintRequest.getAction()); + String name=getStatusName(filterOrderPrintRequest.getStatus()); + SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction()); //打印单号标签 Map data = new HashMap<>(1); List list = new ArrayList<>(); @@ -122,8 +129,8 @@ public class BasicOrderPrintController { bizData.put("locInv", ioOrderResponse.getInvName() == null ? ' ' : ioOrderResponse.getInvName()); bizData.put("billNo", ioOrderResponse.getBillNo() == null ? ' ' : ioOrderResponse.getBillNo()); bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime())); - bizData.put("remark1", systemPDFTemplateRelevanceEntityt.getRemark1() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark1()); - bizData.put("remark2", systemPDFTemplateRelevanceEntityt.getRemark2() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark2()); + bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1()); + bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2()); bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName()); bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec()); @@ -171,8 +178,8 @@ public class BasicOrderPrintController { bizData.put("locInv", ioOrderResponse.getInvName() == null ? ' ' : ioOrderResponse.getInvName()); bizData.put("billNo", ioOrderResponse.getBillNo() == null ? ' ' : ioOrderResponse.getBillNo()); bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime())); - bizData.put("remark1", systemPDFTemplateRelevanceEntityt.getRemark1() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark1()); - bizData.put("remark2", systemPDFTemplateRelevanceEntityt.getRemark2() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark2()); + bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1()); + bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2()); bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName()); bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec()); @@ -198,4 +205,19 @@ public class BasicOrderPrintController { JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); } + + public String getStatusName(Integer type){ + String name=""; + if(type==3){ + name="ScanCodeVerification"; + }else if(type==5){ + name="ScanCodeCheck"; + }else if(type==10){ + name="ScanCode"; + }else if(type==7){ + name="ScanCodeAlready"; + } + return name; + } + } diff --git a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java index 59f5b695..b3a12455 100644 --- a/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java +++ b/src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java @@ -17,6 +17,8 @@ public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml index c27c54cb..1dc95b52 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml @@ -128,4 +128,18 @@ + + + From 3bc6ad96ddd9af9ec3eee5745fbc33294ea60cfc Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 4 Apr 2023 18:49:23 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/InvInnerOrderPrintController.java | 23 ++++++++++--------- .../purchase/SupCertController.java | 12 +++++----- .../api/dao/system/SystemPDFModuleDao.java | 2 ++ .../system/SystemPDFTemplateRelevanceDao.java | 7 ++++++ .../system/SystemPDFModuleService.java | 7 ++++++ .../impl/SystemPDFModuleServiceImpl.java | 17 ++++++++++++++ .../mapper/system/SystemPDFModuleDao.xml | 2 ++ .../system/SystemPDFTemplateRelevanceDao.xml | 13 +++++++++++ 8 files changed, 66 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 62fba612..6b2f8c2e 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -10,6 +10,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.inout.InspectionPDFTemplateRequest; @@ -87,13 +88,13 @@ public class InvInnerOrderPrintController { @PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/file") public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile( @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { - if (inspectionPDFTemplateRequest.getModuleId() == null) - inspectionPDFTemplateRequest.setModuleId(3); - SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(inspectionPDFTemplateRequest.getModuleId() + ""); - if (systemPDFModuleEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); + SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(inspectionPDFTemplateRequest.getId() + ""); + + if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); + SystemPDFTemplateEntity systemPDFTemplateEntity = - systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); + systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId())); if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); return ResultVOUtils.success(); @@ -105,14 +106,14 @@ public class InvInnerOrderPrintController { @RequestBody InnerOrderQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { - if (stockQRCodeTextPDFTemplateRequest.getModuleId() == null) - stockQRCodeTextPDFTemplateRequest.setModuleId(3); - SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(stockQRCodeTextPDFTemplateRequest.getModuleId() + ""); + SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(stockQRCodeTextPDFTemplateRequest.getId() + ""); + + if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); - if (systemPDFModuleEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置，请检查"); SystemPDFTemplateEntity systemPDFTemplateEntity = - systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); - if (systemPDFTemplateEntity == null) return null; + systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId())); + if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); + List printEntities = new ArrayList<>(); List mStockPrintEntities = new ArrayList<>(); FilterinnerOrderprintRequest filterinnerOrderprintRequest = new FilterinnerOrderprintRequest(); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 8be18294..f84c96d1 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -13,6 +13,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.purchase.*; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.exception.JsonException; @@ -281,18 +282,17 @@ public class SupCertController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数不能为空！"); } //查询模板文件是否存在 - FilterPdfModuleRequest filterPdfModuleRequest = new FilterPdfModuleRequest(); - filterPdfModuleRequest.setModelKey(inspectionPDFTemplateRequest.getModelKey()); - SystemPDFModuleEntity systemPDFModule = systemPDFModuleService.findSystemPDFModule(filterPdfModuleRequest); - if (null == systemPDFModule) { + + SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(inspectionPDFTemplateRequest.getId()); + if (null == sysPdfTemplateRelevanceStatemenEntity) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); } - SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(systemPDFModule.getTemplateId())); + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceStatemenEntity.getTemplateId())); if (null == systemPDFTemplateEntity) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); } - return ResultVOUtils.success(systemPDFModule.getTemplateId()); + return ResultVOUtils.success(sysPdfTemplateRelevanceStatemenEntity.getTemplateId()); } /** diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java index 094b2b3e..d9116ab0 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.system; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; @@ -20,6 +21,7 @@ public interface SystemPDFModuleDao { SystemPDFModuleEntity selectById(String id); + boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest); boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java index b3f5e78a..80b56fbc 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java @@ -1,5 +1,7 @@ package com.glxp.api.dao.system; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -50,6 +52,11 @@ public interface SystemPDFTemplateRelevanceDao { boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); + SysPdfTemplateRelevanceLabelEntity selectByLabelId(String id); + + SysPdfTemplateRelevanceStatemenEntity selectByStatemenId(String id); + + /** * 根据 customerId 删除 diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java index b04f6429..9288355b 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFModuleService.java @@ -1,6 +1,8 @@ package com.glxp.api.service.system; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; @@ -18,6 +20,11 @@ public interface SystemPDFModuleService { SystemPDFModuleEntity selectById(String id); + SysPdfTemplateRelevanceLabelEntity selectByLabelId(String id); + + SysPdfTemplateRelevanceStatemenEntity selectByStatemenId(String id); + + boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest); boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java index a4364b7a..758683bc 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFModuleServiceImpl.java @@ -2,6 +2,9 @@ package com.glxp.api.service.system.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SystemPDFModuleDao; +import com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; @@ -18,6 +21,10 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { @Resource SystemPDFModuleDao systemPDFModuleDao; + @Resource + SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao; + + @Override public List queryPage(FilterPdfModuleRequest FilterPDFModuleRequest) { int offset = (FilterPDFModuleRequest.getPage() - 1) * FilterPDFModuleRequest.getLimit(); @@ -46,6 +53,16 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService { return systemPDFModuleDao.selectById(id); } + @Override + public SysPdfTemplateRelevanceLabelEntity selectByLabelId(String id) { + return systemPDFTemplateRelevanceDao.selectByLabelId(id); + } + + @Override + public SysPdfTemplateRelevanceStatemenEntity selectByStatemenId(String id) { + return systemPDFTemplateRelevanceDao.selectByStatemenId(id); + } + @Override public boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest) { diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml index 7940c536..3677595e 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml @@ -45,6 +45,8 @@ WHERE id = #{id} + + UPDATE sys_pdf_module diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml index 1dc95b52..e27b8086 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml @@ -61,6 +61,19 @@ + + + insert From 15fc762c533a3629515824346a7d9e07f9ccc4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 4 Apr 2023 19:38:45 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/upload/DownloadController.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/java/com/glxp/api/upload/DownloadController.java b/src/main/java/com/glxp/api/upload/DownloadController.java index 7b25ef4a..ca05e366 100644 --- a/src/main/java/com/glxp/api/upload/DownloadController.java +++ b/src/main/java/com/glxp/api/upload/DownloadController.java @@ -90,4 +90,29 @@ public class DownloadController { } } + + @GetMapping(value = "/udiwms/donwload/printFile") + public void printFile(HttpServletResponse response, @RequestParam String fileName) throws IOException { + + String url="D:\\udi\\udiwms\\udiwmsfile\\pdf\\template\\"+fileName; + OutputStream os = null; + try { + FileInputStream input = new FileInputStream(new File(url)); + OutputStream out = response.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + } catch (IOException e) { + + } finally { + if (os != null) { + os.flush(); + os.close(); + } + } + } + } From f8fef1b86dfd61b8031f758dd80e201e1a2cdf1f Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 4 Apr 2023 22:33:48 +0800 Subject: [PATCH 8/9] cron --- src/main/java/com/glxp/api/task/AsyncSpsTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/task/AsyncSpsTask.java b/src/main/java/com/glxp/api/task/AsyncSpsTask.java index 314fefea..68a08c5d 100644 --- a/src/main/java/com/glxp/api/task/AsyncSpsTask.java +++ b/src/main/java/com/glxp/api/task/AsyncSpsTask.java @@ -36,7 +36,7 @@ public class AsyncSpsTask implements SchedulingConfigurer { scheduledRequest.setCronName("syncIdcSps"); logger.info("syncIdcSps----------------"); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); - String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/1 * * * ?"; + String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/3 * * * ?"; if (cron.isEmpty()) { logger.error("cron is null"); From a1d625c0d64bf9334c2bb18ee136b4234f18a9be Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 5 Apr 2023 08:53:19 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/idc/service/impl/IdcServiceImpl.java | 194 ++++++++++-------- 1 file changed, 109 insertions(+), 85 deletions(-) diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 935e3d62..88fa879c 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -27,7 +27,6 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.support.CronSequenceGenerator; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson.JSON; @@ -59,7 +58,6 @@ import okhttp3.Response; /*数据中继数据中心(接收)*/ @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class IdcServiceImpl implements IdcService { private static final Logger logger = LoggerFactory.getLogger(IdcServiceImpl.class); @Value("${file_path}") @@ -75,16 +73,22 @@ public class IdcServiceImpl implements IdcService { /*同步表,格式：同步设置表列名/同步设置表列名(子表时设置，主表不设置)/主表唯一列(多列逗号分隔)/主表关联列/子表关联列/数据库实际表/时间列/图片或文件列/数据条件/说明*/ private final String[] SYNC_TABLES= { "entrustAction//basic_entrust_accept/id//////委托验收","basicProducts//basic_udirel/id///updateTime///耗材字典","/basicProducts/basic_products/id/uuid/uuid////耗材字典信息详情", - "//company_product_relevance////updateTime///供应商关联信息", + "/companyCert/company_product_relevance/id/customerId/unitFk/updateTime///供应商关联信息", "basicCorp//basic_corp/id///updateTime///往来单位","typeThird//thr_bustype_origin/id///updateTime///第三方单据类型", "basicThirdCorp//thr_corp/id///updateTime///第三方往来单位","//thr_dept/id///updateTime///第三方部门", "//thr_inv_products/id///updateTime///第三方库存","basicThirdInv//thr_inv_warehouse/id//////第三方仓库", "basicThirdBusOrder//thr_order/id///updateTime///第三方业务单据","/basicThirdBusOrder/thr_order_detail/orderIdFk/id/orderIdFk/updateTime///第三方单据详情", - "basicThirdProducts//thr_products/id///updateTime///第三方产品信息","//sup_cert/id///updateTime/filePath//资质证书信息", + "basicThirdProducts//thr_products/id///updateTime///第三方产品信息", "//sup_cert_set/id///updateTime///供应商资质证书设置","companyCert//sup_company/customerId///updateTime///配送企业", "manufacturerCert//sup_manufacturer/id///updateTime///生产企业","productCert//sup_product/id///updateTime///产品资质信息", + "/companyCert/sup_cert/id/customerId/customerId/updateTime/filePath/type=1/配送企业资质证书信息", + "/manufacturerCert/sup_cert/id/manufacturerId/manufacturerIdFk/updateTime/filePath/type=2/生产企业资质证书信息", + "/productCert/sup_cert/id/productId/productIdFk/updateTime/filePath/type=3/产品资质证书信息", "//udicompany/id///updateTime///国际库医疗器械注册人信息"}; //"dbDiProducts//productinfo/id///updateTime///DI产品信息", + //"basicInv/////////仓库字典", + //"typeBus/////////业务单据类型", + //"typeScan/////////扫码单据类型", private int orderNum=0; @Resource @@ -119,11 +123,11 @@ public class IdcServiceImpl implements IdcService { BaseResponse response = JSON.parseObject(json,BaseResponse.class); return response; } - + return ResultVOUtils.success(object); } - + /*UDI系统上传自助平台*/ @Override public void asyncUdiTask() { @@ -136,7 +140,7 @@ public class IdcServiceImpl implements IdcService { logger.info("自助平台同步任务开始--------"); asyncDataTask(false); } - + /*拉取前一级中继服务数据*/ @Async @Override @@ -149,7 +153,7 @@ public class IdcServiceImpl implements IdcService { fetchTask(true); } - + private void fetchTask(boolean isIdc) { String host = getNextHost(); if(!isIdc) { @@ -160,7 +164,7 @@ public class IdcServiceImpl implements IdcService { logger.info("fetch from ip:"+host); if(!StringUtils.isEmpty(host)) { String result = post(host+"/spssync/common/list",null); - + if(IDCUtils.isJson(result)) { JSONObject json = JSON.parseObject(result); if(json!=null&&json.getInteger("code")==20000&&json.getString("data")!=null) { @@ -176,7 +180,7 @@ public class IdcServiceImpl implements IdcService { } } } - + @Async @Override public void asyncIdcTask() { @@ -186,7 +190,7 @@ public class IdcServiceImpl implements IdcService { dbDao.save("insert into idc_var (code,content) values ('system_type','IDC')"); } } - + private void asyncDataTask(boolean isUpload) { initTable(); @@ -200,23 +204,25 @@ public class IdcServiceImpl implements IdcService { } for(int i=0;i> keyList = dbDao.listKeyMysql(tnames[2]); String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; Map map = new HashMap(); @@ -229,7 +235,7 @@ public class IdcServiceImpl implements IdcService { map.put("isEnd", "1"); } map.put("sqlWhere", sqlWhere); - + map.put("tableKey", tnames[0]); map.put("tableName", tnames[2]); map.put("uniqueColumn", tnames[3]); @@ -243,7 +249,7 @@ public class IdcServiceImpl implements IdcService { scheduledRequest.setCronName("sync"+WordUtils.capitalizeFully(tnames[2], new char[]{'_'}).replace("_", "")); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); String cron = scheduledEntity!=null ? scheduledEntity.getCron() : ""; - + if(!StringUtils.isEmpty(cron)) { CronSequenceGenerator cronSequenceGenerator = new CronSequenceGenerator(cron); Date nextTimePoint = cronSequenceGenerator.next(DateUtil.parseDate(lastUpdateTime)); @@ -251,13 +257,13 @@ public class IdcServiceImpl implements IdcService { } if(sync) { if(syncMasterData(map,isUpload,syncIp)) { - setUpdateTime(tnames[2],DateUtil.formatDate(nowUpdateTime,"yyyy-MM-dd HH:mm:ss")); + setUpdateTime(tnames[2]+"."+tnames[0],DateUtil.formatDate(nowUpdateTime,"yyyy-MM-dd HH:mm:ss")); } } } } - - + + private String fetchData(String host,Map params) { OkHttpClient client = new OkHttpClient().newBuilder() @@ -276,12 +282,12 @@ public class IdcServiceImpl implements IdcService { Response response = client.newCall(request).execute(); result = response.body().string(); JSONObject json = JSONObject.parseObject(result); - + if(isLastLevel()) { if(json.get("code")!=null) { - success = analyToDB(host,json.getJSONObject("data"),files,false); + success = analyMiddle(host,json.getJSONObject("data"),files,false,true); } else { - success = analyToDB(host,json,files,false); + success = analyMiddle(host,json,files,false,true); } if(!success) logger.info("fetchData-->解析失败"); @@ -292,12 +298,12 @@ public class IdcServiceImpl implements IdcService { syncAddTaskStatus(json,false,success); } } - + if(success) { String ret = post(host+"/spssync/common/success",params); - + } - + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -353,7 +359,7 @@ public class IdcServiceImpl implements IdcService { IDCUtils.createDirectory(filePath +filePathSlash +datePath+"/"); if(!FileUtils.makeDirectory(backFilePath +backFileSlash +datePath)) IDCUtils.createDirectory(filePath +backFileSlash +datePath+"/"); - + FileUtils.SaveFileAs(content, fileName); FileUtils.SaveFileAs(content, backFileName); String[] saveFiles= {}; @@ -380,7 +386,7 @@ public class IdcServiceImpl implements IdcService { syncAddTaskStatus(json,true,true); /*解析入库*/ if(isLastLevel()) { - if(!analyToDB("",json,files,true)) + if(!analyMiddle("",json,files,true,true)) return ResultVOUtils.error(9000, "解析失败"); } else { //需要转发 @@ -393,7 +399,7 @@ public class IdcServiceImpl implements IdcService { } else { return ResultVOUtils.error(9000, "转发失败"); } - + } } return ResultVOUtils.success(); @@ -403,17 +409,17 @@ public class IdcServiceImpl implements IdcService { /*数据同步，从数据库获取数据下发或上传下级中继服务*/ @Override public BaseResponse send(Map params) { - - return send(params.get("messageType").toString(),params.get("tableName").toString(),params); - - + + return send(params.get("messageType").toString(),params.get("tableName").toString(),params); + + } @Override public BaseResponse send(String messageType,String tableName,Map params) { - + return ResultVOUtils.error(9999, ""); } - + @Override public void downloadFile(String fileName,HttpServletResponse response) { OutputStream os; @@ -440,7 +446,7 @@ public class IdcServiceImpl implements IdcService { dbDao.save(sql); } - + private void saveExportStatus(Map params) { Map map = new HashMap(); map.put("receiveStatus", "0"); @@ -480,8 +486,8 @@ public class IdcServiceImpl implements IdcService { dbDao.save(sql); } - - + + private boolean syncMasterData(Map params,boolean isUpload,String syncIp) { boolean success=false; String tableName = params.get("tableName").toString(); @@ -504,13 +510,13 @@ public class IdcServiceImpl implements IdcService { Map whereParams = new HashMap(); whereParams.put("sqlWhere", params.get("sqlWhere")); whereParams.put("dataWhere", params.get("dataWhere")); - + Map map = new HashMap(); String where = DBAUtils.convertWhere(column,whereParams,""); sql+=!StringUtils.isEmpty(where) ? " where "+where : ""; map.put("sql", sql); int total = dbDao.count(map); - + String isEnd = params.get("isEnd")!=null ? params.get("isEnd").toString() : "0"; int limit = 50; String[] files = new String[limit]; @@ -519,13 +525,13 @@ public class IdcServiceImpl implements IdcService { String messageType = params.get("messageType").toString(); saveIdcLog(messageType,"",tableName +">"+where,0,total); String filePathSlash = filePath.substring(filePath.length() -1).equals("/") ? "" : "/"; - + if(total>0) { success = true; - + whereParams.put("page", 0); whereParams.put("limit", limit); - + List> keyList = dbDao.listKeyMysql(tableName); String keyColumn = keyList!=null&&keyList.size()>0 ? keyList.get(0).get("columnName").toString() : "id"; for(int i=0;i json,boolean isUpload,boolean success) { String content = JSON.toJSONString(json); @@ -612,10 +618,10 @@ public class IdcServiceImpl implements IdcService { IDCUtils.createDirectory(filePath +datePath+"/"); if(!FileUtils.makeDirectory(backFilePath +datePath)) IDCUtils.createDirectory(filePath +datePath+"/"); - + FileUtils.SaveFileAs(content, fileName); FileUtils.SaveFileAs(content, backFileName); - + //type,transportType,superiorService,subordinateService,cacheFilePath Map map = new HashMap<>(); map.put("type", json.get("messageType")); @@ -624,16 +630,12 @@ public class IdcServiceImpl implements IdcService { map.put("taskId", json.get("messageId")); map.put("cacheFilePath", fileName); map.put("status", success ? "1" : "0"); - + saveExportStatus(map); } - - - - /*解析到数据库*/ - private boolean analyToDB(String host,JSONObject jsonObject,MultipartFile[] files,boolean isUpload) { - + + private boolean analyMiddle(String host,JSONObject jsonObject,MultipartFile[] files,boolean isUpload,boolean isToDB) { if(jsonObject.get("data")!=null) { String tableName = ""; String uniqueColumn = ""; @@ -653,7 +655,12 @@ public class IdcServiceImpl implements IdcService { filePathColumn = obj.getString("filePathColumn"); } if(!StringUtils.isEmpty(tableName)) { - return analyData(host,tableName,uniqueColumn,filePathColumn,list,isUpload); + if(isToDB) { + return analyToDB(host,tableName,uniqueColumn,filePathColumn,list,isUpload); + } else { + logger.info("files-->"+tableName); + return analyToFile(host,filePathColumn,list); + } } else { logger.error("数据格式错误：无数据标记"); } @@ -662,8 +669,24 @@ public class IdcServiceImpl implements IdcService { return false; } + private boolean analyToFile(String host,String filePathColumn,List> list) { + + if(list!=null&&list.size()>0&&!StringUtils.isEmpty(filePathColumn)) { + String[] files = new String[list.size()]; + logger.info("filePathColumn-->"+filePathColumn); + for(int i=0;i"+files[i]); + } + + batchDownloadFile(host,files); + } + return true; + } + /*解析到数据库*/ + /*按表名解析数据到数据库，子表暂未处理*/ - private boolean analyData(String host,String tableName,String uniqueColumn,String filePathColumn,List> list,boolean isUpload) { + private boolean analyToDB(String host,String tableName,String uniqueColumn,String filePathColumn,List> list,boolean isUpload) { String tName = DBAUtils.tableRealName(tableName); String sql="replace "+tName +"("; @@ -707,7 +730,7 @@ public class IdcServiceImpl implements IdcService { if(!StringUtils.isEmpty(filePathColumn)) { files[i] = list.get(i).get(filePathColumn) !=null ? list.get(i).get(filePathColumn).toString() : ""; } - + if("A,D,U".contains(operateMode)) { for(int z=0;z0 ? "," : ""; boolean ups = list.get(i).containsKey(attrName) ? true : false ; updateSet+=ups&&h>0 ? "," : ""; @@ -762,11 +785,11 @@ public class IdcServiceImpl implements IdcService { dbDao.update(upd + updateSet+" where "+updateWhere); h+=ups ? 1 : 0; } - + sql+=")"; n++; } - + for(int m=0;m<30;m++) { if(list.get(i).get("tableName"+m)!=null&&list.get(i).get("data"+m)!=null) { Object obj = list.get(i).get("data"+m); @@ -774,12 +797,12 @@ public class IdcServiceImpl implements IdcService { for (Object o : (List) obj) { chList.add((Map)o); } - analyData(host,list.get(i).get("tableName"+m).toString(),"","",chList,isUpload); + analyToDB(host,list.get(i).get("tableName"+m).toString(),"","",chList,isUpload); } else { break; } } - + } if(n>0) { result = (dbDao.save(sql)>0); @@ -787,6 +810,7 @@ public class IdcServiceImpl implements IdcService { logger.error(tableName+"-->fetchSave Fail"); } if(!isUpload&&!StringUtils.isEmpty(filePathColumn)) { + logger.info("downloadFile-->"+files.toString()); batchDownloadFile(host,files); } @@ -866,20 +890,20 @@ public class IdcServiceImpl implements IdcService { .addFormDataPart("fileName", fileName) .build(); - + Request request = new Request.Builder() .url(syncIp+"/spssync/common/downloadFile") .post(requestBody) .build(); try { Response result = client.newCall(request).execute(); - - - + + + if (MediaType.parse("application/force-download").equals(result.body().contentType())) { try (InputStream inputStream = result.body().byteStream()) { String filePathSlash = filePath.substring(filePath.length() -1).equals("/") ? "" : "/"; - + FileOutputStream outputStream =new FileOutputStream(filePath +filePathSlash+fileName); byte b[]=new byte[1024]; @@ -894,14 +918,14 @@ public class IdcServiceImpl implements IdcService { outputStream.flush(); - - + + } catch (Exception e) { - - + + } - } - + } + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -909,7 +933,7 @@ public class IdcServiceImpl implements IdcService { return true; } - + /*获取转发服务地址，当前值允许单向，只使用参数upper_server_ip*/ private String getNextHost() { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("upper_server_ip"); @@ -923,7 +947,7 @@ public class IdcServiceImpl implements IdcService { Map map = dbDao.get("select * from idc_var where code='system_type'"); return !(map!=null&&map.get("content")!=null&&map.get("content").toString().equals("IDC")) ; } - + /*是否需要转发*/ private boolean isRelay() { String relayHost = getNextHost(); @@ -934,7 +958,7 @@ public class IdcServiceImpl implements IdcService { private List> getList(String tableName,Map params) { String sql = "select "+tableName+".*,'A' as operateMode from "+tableName; Map column = getColumn(tableName); - + String where = DBAUtils.convertWhere(column,params,""); sql+=!StringUtils.isEmpty(where) ? " where "+where : ""; Map map = new HashMap(); @@ -1034,7 +1058,7 @@ public class IdcServiceImpl implements IdcService { } else { //国家库数据 if(id.equals("productinfo")) { - + } updateTime = "2000-01-01 00:00:00"; String sql = "insert into idc_status (id,statusTime) values ('"+id+"',cast('"+updateTime+"' as datetime))"; @@ -1064,7 +1088,7 @@ public class IdcServiceImpl implements IdcService { jdbcTemplate.execute("alter table basic_export_status add column cacheFilePath varchar(255)"); jdbcTemplate.execute("alter table basic_upload_status add column cacheFilePath varchar(255)"); } catch (Exception e) { - + } } private void alterTable(String tableName,String sql) { @@ -1074,6 +1098,6 @@ public class IdcServiceImpl implements IdcService { } } - + }