diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java index 740cccb..a56cbe1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.auth; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.CustomerContactEntity; import com.glxp.sale.admin.req.auth.CustomerContactFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; @@ -23,7 +24,7 @@ public class CustomerContactController { @Resource private CustomerContactService customerContactService; - + @AuthRuleAnnotation("") @GetMapping("salewarehouse/customerContact/list") public BaseResponse filterList(CustomerContactFilterRequest customerFilterRequest) { List customerContactEntityList = customerContactService.filterCustomerContact(customerFilterRequest); @@ -35,7 +36,7 @@ public class CustomerContactController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("salewarehouse/customerContact/add") public BaseResponse addContact(CustomerContactEntity customerContactEntity) { @@ -48,6 +49,7 @@ public class CustomerContactController { } + @AuthRuleAnnotation("") @GetMapping("salewarehouse/customerContact/delete") public BaseResponse deleteContact(DeleteRequest deleteRequest) { boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java index 4d2e0ea..391abf3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java @@ -2,13 +2,13 @@ package com.glxp.sale.admin.controller.auth; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.entity.auth.*; +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.entity.auth.CustomerDetailEntity; +import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; +import com.glxp.sale.admin.entity.auth.UpdateUserflagBean; import com.glxp.sale.admin.entity.info.CompanyEntity; -import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; -import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity; import com.glxp.sale.admin.req.auth.CustomerInfoFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; -import com.glxp.sale.admin.req.param.SystemPDFTemplateRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.AuthRoleAdminService; @@ -22,7 +22,6 @@ import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -32,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.ArrayList; import java.util.List; @RestController @@ -99,7 +97,7 @@ public class CustomerController { return ResultVOUtils.error(500, "用户信息为空"); } - + @AuthRuleAnnotation("") @PostMapping("salewarehouse/customer/update") public BaseResponse updateCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity, BindingResult bindingResult) { @@ -135,6 +133,7 @@ public class CustomerController { return ResultVOUtils.success("更新成功"); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/customer/modify") public BaseResponse modifyCustomer(@RequestBody @Valid CustomerDetailEntity customerDetailEntity, BindingResult bindingResult) { @@ -155,6 +154,7 @@ public class CustomerController { return ResultVOUtils.success("更新成功"); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/customer/delete") public BaseResponse deleteCustomers(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index 5c692bf..332df98 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.auth; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; +import com.glxp.sale.admin.dao.auth.AuthLicenseDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.AuthLicense; import com.glxp.sale.admin.entity.info.CompanyEntity; @@ -12,29 +13,26 @@ import com.glxp.sale.admin.res.auth.LoginUserInfoResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.AuthLoginService; import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.util.AppUtils; import com.glxp.sale.admin.util.IpUtils; import com.glxp.sale.admin.util.JwtUtils; import com.glxp.sale.admin.util.PasswordUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; -import com.glxp.sale.admin.util.AppUtils; -import com.glxp.sale.admin.dao.auth.AuthLicenseDao; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 登录相关 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index 0a5292f..c15ab38 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -8,7 +8,6 @@ import com.glxp.sale.admin.entity.auth.CustomerContactEntity; import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; import com.glxp.sale.admin.entity.auth.UserRegisterEntity; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.sale.admin.entity.info.ApilogEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.SetupEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; @@ -97,6 +96,7 @@ public class RegisterController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/getCheckcode") public BaseResponse getCheckcode(@RequestBody CheckCodeRequest checkCodeRequest, HttpSession httpSession) { @@ -166,6 +166,7 @@ public class RegisterController { return ResultVOUtils.success(rMap); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/deleteResiter") public BaseResponse deleteResiter(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -178,6 +179,7 @@ public class RegisterController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/update") public BaseResponse updateRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, BindingResult bindingResult) { @@ -192,6 +194,7 @@ public class RegisterController { return ResultVOUtils.success("添加成功"); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/save") public BaseResponse saveRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, HttpSession httpSession, BindingResult bindingResult) { @@ -243,6 +246,7 @@ public class RegisterController { return ResultVOUtils.success(userRegisterEntity.getUserName()); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/reset/passwd") public BaseResponse resetPasswd(@RequestBody @Valid ResetPasswdRequest resetPasswdRequest, HttpSession httpSession, BindingResult bindingResult) { @@ -286,6 +290,7 @@ public class RegisterController { return ResultVOUtils.success("密码修改成功"); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/check") public BaseResponse checkRegister(@RequestBody @Valid RegisterCheckRequest registerCheckRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java index 2552cf1..fbec264 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicThirdSysController.java @@ -1,12 +1,12 @@ package com.glxp.sale.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.sale.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.basic.BasicThirdSysResponse; import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService; import com.glxp.sale.admin.service.basic.BasicThirdSysService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; @@ -15,7 +15,6 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import java.util.List; -import java.util.stream.Collectors; @RestController public class BasicThirdSysController { @@ -42,6 +40,7 @@ public class BasicThirdSysController { @Resource SystemParamConfigService systemParamConfigService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/thirdsys/filter") public BaseResponse filter(FilterBasicThirdSysRequest filterBasicThirdSysRequest, BindingResult bindingResult) { @@ -77,7 +76,7 @@ public class BasicThirdSysController { } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/thirdsys/selectIp") public BaseResponse selectIp(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest, BindingResult bindingResult) { @@ -89,6 +88,7 @@ public class BasicThirdSysController { return ResultVOUtils.success(basicThirdSysEntity); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/thirdsys/update") public BaseResponse save(@RequestBody @Valid BasicThirdSysEntity basicThirdSysEntity, BindingResult bindingResult) { @@ -125,7 +125,7 @@ public class BasicThirdSysController { return ResultVOUtils.success("更新成功"); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/thirdsys/filterDetail") public BaseResponse filterDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest, BindingResult bindingResult) { @@ -143,6 +143,7 @@ public class BasicThirdSysController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/thirdsys/filterDetailByKey") public BaseResponse filterDetailByKey(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest, BindingResult bindingResult) { @@ -155,6 +156,7 @@ public class BasicThirdSysController { return ResultVOUtils.success(basicThirdSysDetailEntity); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/thirdsys/saveDetail") public BaseResponse saveDetail(@RequestBody @Valid BasicThirdSysDetailEntity basicThirdSysDetailEntity, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java index 60a1789..451855f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; @@ -32,7 +33,6 @@ import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -67,6 +67,7 @@ public class BasicUnitMaintainController { @Resource private OrderService orderService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/unit/maintain/filter") public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { @@ -94,6 +95,7 @@ public class BasicUnitMaintainController { return ResultVOUtils.success(rMap); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/unit/maintain/filter2") public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { @@ -111,6 +113,7 @@ public class BasicUnitMaintainController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/save") public BaseResponse save(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest, BindingResult bindingResult) { @@ -130,12 +133,14 @@ public class BasicUnitMaintainController { return ResultVOUtils.success(); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/update") public BaseResponse update(@RequestBody BasicUnitMaintainEntity basicUnitMaintainSaveRequest) { basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest); return ResultVOUtils.success("修改成功"); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/unit/download") public BaseResponse downloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { @@ -161,7 +166,7 @@ public class BasicUnitMaintainController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/combine") public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) { @@ -205,7 +210,7 @@ public class BasicUnitMaintainController { return ResultVOUtils.success("选入成功"); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/unit/maintain/combineAll") public BaseResponse combineAll(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) { @@ -226,6 +231,7 @@ public class BasicUnitMaintainController { return ResultVOUtils.success("后台正在添加，请稍后刷新查看！"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/combineSingle") public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) { @@ -264,6 +270,7 @@ public class BasicUnitMaintainController { } //解除绑定 + @AuthRuleAnnotation("") @GetMapping("/udiwms/unit/thirdSys/removeRl") public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) { BasicUnitMaintainEntity udiRelevanceEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId()); @@ -288,6 +295,7 @@ public class BasicUnitMaintainController { return ResultVOUtils.success("解除绑定成功！"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/unit/maintain/delete") public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -315,6 +323,7 @@ public class BasicUnitMaintainController { } //查询ERP往来单位 + @AuthRuleAnnotation("") @GetMapping("/udiwms/unitMaintain/filterErp") public BaseResponse filterErp(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) { @@ -379,6 +388,7 @@ public class BasicUnitMaintainController { } //获取产品信息详情（多平台） + @AuthRuleAnnotation("") @GetMapping("/udiwms/unitMaintain/thirdSys/detail") public BaseResponse getThirdSysDetail(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java index 9f49961..620e5c7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java @@ -1,16 +1,13 @@ package com.glxp.sale.admin.controller.basic; -import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantType; -import com.glxp.sale.admin.dao.basic.BussinessChangeTypeDao; import com.glxp.sale.admin.entity.basic.BussinessChangeTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; -import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.basic.BussinessChangeTypeService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; @@ -94,7 +91,7 @@ public class BussinessChangeTypeController { return ResultVOUtils.success(bussinessTypeEntities); } - + @AuthRuleAnnotation("") @PostMapping("/spms/bussinessChangeType/delete") public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -106,6 +103,7 @@ public class BussinessChangeTypeController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/spms/bussinessChangeType/update") public BaseResponse updateBussinessType(@RequestBody BussinessChangeTypeEntity bussinessTypeEntity, BindingResult bindingResult) { @@ -121,7 +119,7 @@ public class BussinessChangeTypeController { return ResultVOUtils.success("更新成功"); } - + @AuthRuleAnnotation("") @PostMapping("/spms/bussinessChangeType/insert") public BaseResponse insertBussinessType(@RequestBody BussinessChangeTypeEntity bussinessTypeEntity, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java index a9a9ab1..9051ce3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessChangeTypeEntity; @@ -11,7 +12,6 @@ import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.BusNoUserRequest; import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest; -import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -52,6 +52,7 @@ public class BussinessLocalTypeController { @Resource private StockOrderService stockOrderService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/localBusType/filterJoin") public BaseResponse filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { @@ -75,6 +76,7 @@ public class BussinessLocalTypeController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/localBusType/filterByBus") public BaseResponse filterByBus(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { @@ -88,7 +90,7 @@ public class BussinessLocalTypeController { return ResultVOUtils.success(bussinessTypeEntity.getLocalAction()); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/localBusType/filter") public BaseResponse filterBussinessType(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { @@ -110,7 +112,7 @@ public class BussinessLocalTypeController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/localBusType/filterUnUse") public BaseResponse filterUnUse(BusNoUserRequest busNoUserRequest, BindingResult bindingResult) { @@ -134,7 +136,7 @@ public class BussinessLocalTypeController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/localBusType/delete") public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -167,6 +169,7 @@ public class BussinessLocalTypeController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/localBusType/update") public BaseResponse updateBussinessType(@RequestBody BussinessLocalTypeEntity bussinessTypeEntity, BindingResult bindingResult) { @@ -182,7 +185,7 @@ public class BussinessLocalTypeController { return ResultVOUtils.success("更新成功"); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/localBusType/add") public BaseResponse addBussinessType(@RequestBody BussinessLocalTypeEntity bussinessTypeEntity, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index 040f17f..68e2b00 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -73,6 +73,7 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/bussinessType/joinFilter") public BaseResponse filterJoinBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { @@ -94,7 +95,7 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/bussinessType/delete") public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -119,6 +120,7 @@ public class BussinessTypeController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/bussinessType/update") public BaseResponse updateBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity, BindingResult bindingResult) { @@ -134,7 +136,7 @@ public class BussinessTypeController { return ResultVOUtils.success("更新成功"); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/bussinessType/insert") public BaseResponse insertBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity, BindingResult bindingResult) { @@ -163,6 +165,7 @@ public class BussinessTypeController { } //扫码单据类型导入 + @AuthRuleAnnotation("") @PostMapping("/udiwms/busstiness/file/upload") public BaseResponse uploadProducts(@RequestParam("file") List files) { for (int i = 0; i < files.size(); i++) { @@ -194,6 +197,7 @@ public class BussinessTypeController { * * @return */ + @AuthRuleAnnotation("") @GetMapping("/warehouse/bussinessType/candidateBussinessType") public BaseResponse candidateBussinessType(CndidateRequest cndidateRequest) { if (StrUtil.isBlank(cndidateRequest.getMainAction())) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java index b6ad92c..72eba35 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpExportLogController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.basic.CorpExportLogEntity; @@ -39,6 +40,7 @@ public class CorpExportLogController { @Resource private BasicUnitMaintainService basicUnitMaintainService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/corps/exportLog/filter") public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, BindingResult bindingResult) { @@ -56,6 +58,7 @@ public class CorpExportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/corps/exportLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -68,6 +71,7 @@ public class CorpExportLogController { } //往来单位excel文件下载 + @AuthRuleAnnotation("") @GetMapping("/udiwms/corps/exportLog/download") public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { @@ -104,6 +108,7 @@ public class CorpExportLogController { } //往来单位导出生成Excel，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/corps/importLog/export") public BaseResponse excelDownload(@RequestBody CorpsExportRequest corpsExportRequest) { @@ -122,6 +127,7 @@ public class CorpExportLogController { } //往来单位上传SMP，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/corps/importLog/uploadSmp") public BaseResponse uploadSmp(@RequestBody CorpsExportRequest corpsExportRequest) { CorpExportLogEntity corpExportLogEntity = new CorpExportLogEntity(); @@ -137,6 +143,7 @@ public class CorpExportLogController { } //往来单位接口下载（第三方使用） + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/corps/download") public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java index 76f035e..11efe28 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/CorpImportLogController.java @@ -78,7 +78,7 @@ public class CorpImportLogController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/corps/importLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -98,6 +98,7 @@ public class CorpImportLogController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/corps/importLog/delete") public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -112,6 +113,7 @@ public class CorpImportLogController { //往来单位信息文件导入 + @AuthRuleAnnotation("") @PostMapping("/udiwms/corps/importLog/upload") public BaseResponse uploadProducts(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { @@ -156,6 +158,7 @@ public class CorpImportLogController { //往来单位信息接口上传 + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/corps/upload") public BaseResponse postUdiInfo(@RequestBody PostCorpsRequest postCorpsRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java index c058413..373b74c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java @@ -122,6 +122,7 @@ public class UdiInfoController { //获取同步库医疗器械注册人信息 + @AuthRuleAnnotation("") @GetMapping("udiwms/udiinfo/filterCompany") public BaseResponse filterCompany(FilterUdiInfoRequest productInfoFilterRequest) { @@ -141,6 +142,7 @@ public class UdiInfoController { } //获取本地已维护UDI信息 + @AuthRuleAnnotation("") @GetMapping("udiwms/udiinfo/local/filterByUuid") public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { @@ -149,6 +151,7 @@ public class UdiInfoController { } //获取ERP产品信息 + @AuthRuleAnnotation("") @GetMapping("udiwms/udiinfo/erp/products") public BaseResponse getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest, BindingResult bindingResult) { @@ -213,6 +216,7 @@ public class UdiInfoController { } + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/instrument/maintain/filterProduct") public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) { List udiInfoEntities diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java index 0960827..5e8d720 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java @@ -62,6 +62,7 @@ public class UdiInfoExportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/products/exportLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -111,6 +112,7 @@ public class UdiInfoExportLogController { } //产品信息导出生成Excel，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/products/importLog/export") public BaseResponse excelDownload(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { @@ -131,6 +133,7 @@ public class UdiInfoExportLogController { } //产品信息上传SMP，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/products/importLog/uploadSmp") public BaseResponse uploadSmp(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { @@ -149,6 +152,7 @@ public class UdiInfoExportLogController { //产品信息接口下载（第三方使用） + @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/products/download") public BaseResponse downloadProducts(FilterUdiInfoRequest filterUdiInfoRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java index 9785198..6e5ee07 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoImportLogController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.io.IoUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.basic.UdiInfoImportDetailEntity; import com.glxp.sale.admin.entity.basic.UdiInfoImportLogEntity; @@ -46,6 +47,7 @@ public class UdiInfoImportLogController { BasicUdiInfoImportService basicUdiInfoImportService; private static final Logger log = LoggerFactory.getLogger(UdiInfoImportLogController.class); + @AuthRuleAnnotation("") @GetMapping("/udiwms/products/importLog/filter") public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -63,6 +65,7 @@ public class UdiInfoImportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/products/importLog/filterDetail") public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -80,7 +83,7 @@ public class UdiInfoImportLogController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/products/importLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -100,6 +103,7 @@ public class UdiInfoImportLogController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/products/importLog/delete") public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -114,6 +118,7 @@ public class UdiInfoImportLogController { //产品信息文件导入 + @AuthRuleAnnotation("") @PostMapping("/udiwms/products/importLog/upload") public BaseResponse uploadProducts(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { String filePath = "D:\\udiwms\\filePath\\"; @@ -160,6 +165,7 @@ public class UdiInfoImportLogController { //产品信息接口上传 + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/products/upload") public BaseResponse postUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -197,6 +203,7 @@ public class UdiInfoImportLogController { //扫码精灵产品信息接口上传 + @AuthRuleAnnotation("") @PostMapping("/udiwms/basic/products/srUpload") public BaseResponse postSrUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -233,6 +240,7 @@ public class UdiInfoImportLogController { } //供应商平台产品信息下载 + @AuthRuleAnnotation("") @GetMapping("/udiwms/products/smp/download") public BaseResponse downloadSmpUdi(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 6903217..e0cf655 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -3,9 +3,13 @@ package com.glxp.sale.admin.controller.basic; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.config.WebSocketServer; import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.entity.basic.*; +import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.sale.admin.entity.basic.FilterSysEntity; +import com.glxp.sale.admin.entity.basic.UdiInfoEntity; +import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; @@ -78,6 +82,7 @@ public class UdiRelevanceController { //客户端器械信息下载 + @AuthRuleAnnotation("") @GetMapping("/udi/udirel/download") public BaseResponse downloadProducts(FilterUdiInfoRequest filterUdiInfoRequest, BindingResult bindingResult) { @@ -98,6 +103,7 @@ public class UdiRelevanceController { //器械信息维护首页 + @AuthRuleAnnotation("") @GetMapping("/udi/udirel/filterUdi") public BaseResponse filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest, BindingResult bindingResult) { @@ -131,6 +137,7 @@ public class UdiRelevanceController { //供应商器械信息选入 + @AuthRuleAnnotation("") @GetMapping("/udi/udirel/filterSmUdi") public BaseResponse filterSmUdi(FilterUdiInfoRequest filterUdiInfoRequest, BindingResult bindingResult) { @@ -168,6 +175,7 @@ public class UdiRelevanceController { //多选删除 + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/deleteAll") public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -179,6 +187,7 @@ public class UdiRelevanceController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/deleteById") public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -215,6 +224,7 @@ public class UdiRelevanceController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/update") public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceEntity udiRelevanceEntity, BindingResult bindingResult) { @@ -227,6 +237,7 @@ public class UdiRelevanceController { } //新增或修改关联 + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/revleance") public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) { @@ -292,6 +303,7 @@ public class UdiRelevanceController { //选入查询结果的所有DI + @AuthRuleAnnotation("") @GetMapping("/udi/udirel/combineAll") public BaseResponse combineAll(FilterUdiInfoRequest productInfoFilterRequest) { basicUpdateProductService.relAllUdi(productInfoFilterRequest); @@ -299,6 +311,7 @@ public class UdiRelevanceController { } //更换关联ERP产品 + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/modifyRel") public BaseResponse modifyRel(@RequestBody CombineRequest combineRequest) { @@ -326,6 +339,7 @@ public class UdiRelevanceController { } //单独选入ERP产品 + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/addErp") public BaseResponse addErp(@RequestBody CombineRequest combineRequest) { String errMsg = basicUpdateProductService.addLocalProduct(combineRequest); @@ -338,6 +352,7 @@ public class UdiRelevanceController { //一键选入ERP产品 + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/addAllErp") public BaseResponse addAllErp(@RequestBody CombineRequest combineRequest) { @@ -376,6 +391,7 @@ public class UdiRelevanceController { } //上传产品信息至供应商管理平台 + @AuthRuleAnnotation("") @PostMapping("/udiwms/smp/udirl/upload") public BaseResponse uploadSMP(@RequestBody CombineRequest combineRequest) { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_uploadProduct_url"); @@ -420,6 +436,7 @@ public class UdiRelevanceController { } //接收供应商或第三方服务上传产品信息 + @AuthRuleAnnotation("") @PostMapping("/udiwms/udirl/thirdSys/upload") public BaseResponse uploadThirdServcie(@RequestBody PostThirdSysPiRequest postThirdSysPiRequest) { @@ -464,6 +481,7 @@ public class UdiRelevanceController { } //获取产品信息详情（多平台） + @AuthRuleAnnotation("") @GetMapping("/udiwms/udirel/thirdSys/filter") public BaseResponse getThirdSysfilter(FilterUdiInfoRequest filterUdiInfoRequest, BindingResult bindingResult) { @@ -494,6 +512,7 @@ public class UdiRelevanceController { //获取对照过滤列表 + @AuthRuleAnnotation("") @GetMapping("/udiwms/udirel/thirdSys/detail") public BaseResponse getThirdSysDetail(FilterUdiInfoRequest filterUdiInfoRequest, BindingResult bindingResult) { @@ -611,6 +630,7 @@ public class UdiRelevanceController { } //解除绑定产品信息ID + @AuthRuleAnnotation("") @GetMapping("/udiwms/udirl/thirdSys/remove") public BaseResponse removeThirdId(RemoveRelRequest removeRelRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); @@ -653,6 +673,7 @@ public class UdiRelevanceController { //解除绑定DI器械信息 + @AuthRuleAnnotation("") @GetMapping("/udiwms/udirl/di/remove") public BaseResponse removeDI(RemoveRelRequest removeRelRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); @@ -677,12 +698,14 @@ public class UdiRelevanceController { } //获取是否启用供应商维护产品信息 + @AuthRuleAnnotation("") @GetMapping("/udiwms/udiinfo/spcombie") public BaseResponse getSBCombie() { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sp_combie_products"); return ResultVOUtils.success(systemParamConfigEntity); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/udirl/lock/status") public BaseResponse uploadThirdServcie(@RequestBody LockUdiRequest lockUdiRequest) { if (lockUdiRequest.getLockStatus() != null && lockUdiRequest.getIds().size() > 0) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java index 28c7f80..df3aceb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyCertController.java @@ -1,15 +1,13 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.info.CompanyCertEntity; -import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.info.CompanyRequest; import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; -import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.info.FilterCompanyCertRequest; -import com.glxp.sale.admin.req.inout.StockOrderDetailFilterRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.info.CompanyCertService; @@ -41,6 +39,7 @@ public class CompanyCertController { @Value("${file_path}") private String filePath; + @AuthRuleAnnotation("") @GetMapping("/sale/info/company/cert/filter") public BaseResponse filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest, BindingResult bindingResult) { @@ -57,6 +56,7 @@ public class CompanyCertController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/companyCert") public BaseResponse getCompanyCertInfo(CompanyRequest companyRequest) { CompanyCertEntity companyCertEntity = companyCertService.findCompanyCert(companyRequest.getCustomerId()); @@ -66,6 +66,7 @@ public class CompanyCertController { return ResultVOUtils.error(500, "空"); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanyCert") public BaseResponse getCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest) { filterCompanyCertRequest.setCustomerId(getCustomerId()); @@ -77,6 +78,7 @@ public class CompanyCertController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/insertCompanyCert") public BaseResponse insertCompanyCert(@RequestBody CompanyCertEntity companyCertEntity) { companyCertEntity.setCreate_time(new Date()); @@ -85,6 +87,7 @@ public class CompanyCertController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/updateCompanyCert") public BaseResponse updateCompanyCert(@RequestBody CompanyCertEntity companyCertEntity) { @@ -92,6 +95,7 @@ public class CompanyCertController { return ResultVOUtils.success("修改成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/deleteCompanyCert") public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = companyCertService.deleteById(deleteCompanyFileRequest.getId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java index 0391725..ffa9ca9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.CustomerContactEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; @@ -46,6 +47,7 @@ public class CompanyController { @Resource private CompanyUpdateLogService companyUpdateLogService; + @AuthRuleAnnotation("") @GetMapping("/warehouse/info/company") public BaseResponse getCompanyInfo(CompanyRequest companyRequest) { CompanyEntity companyEntity = companyService.findCompany(companyRequest.getCustomerId()); @@ -55,6 +57,7 @@ public class CompanyController { return ResultVOUtils.error(500, "企业信息为空"); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/getSubCompany") public BaseResponse getSubCompany(FilterCompanyRequest companyRequest) { // companyRequest.setCustomerId(getCustomerId()); @@ -66,6 +69,7 @@ public class CompanyController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/getSubCompany2") public BaseResponse getSubCompany2(FilterCompanyRequest companyRequest) { List companyEntities = companyService.getSubCompany2(companyRequest); @@ -76,6 +80,7 @@ public class CompanyController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/warehouse/info/modifyCompany") public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) { // if (companyEntity.getParentCompany() != null && !companyEntity.getParentCompany().equals("")) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java index 2f8b485..84bb01b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; @@ -43,6 +44,7 @@ public class CompanyProductRelevanceController { @Resource CompanyService companyService; + @AuthRuleAnnotation("") @GetMapping("/sale/info/company/product/relevance/filter") public BaseResponse filterCompanyProductRelevance(CompanyProductRelevanceRequest companyProductRelevanceRequest, BindingResult bindingResult) { @@ -70,6 +72,7 @@ public class CompanyProductRelevanceController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/companyProductRelevance") public BaseResponse getCompanyProductRelevanceInfo(CompanyRequest companyRequest) { CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevance(companyRequest.getCustomerId()); @@ -79,6 +82,7 @@ public class CompanyProductRelevanceController { return ResultVOUtils.error(500, "空"); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanyProductRelevance") public BaseResponse getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) { // filterCompanyProductRelevanceRequest.setCustomerId(getCustomerId()); @@ -90,6 +94,7 @@ public class CompanyProductRelevanceController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/insertCompanyProductRelevance") public BaseResponse insertCompanyProductRelevance(@RequestBody CompanyProductRelevanceEntity companyProductRelevanceEntity) { if (companyProductRelevanceService.findCompanyProductRelevanceByProductUuid(companyProductRelevanceEntity) != null) { @@ -109,7 +114,7 @@ public class CompanyProductRelevanceController { return ResultVOUtils.success("成功"); } - + @AuthRuleAnnotation("") @PostMapping("/sale/info/insertFilter") public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId()); @@ -123,7 +128,7 @@ public class CompanyProductRelevanceController { return ResultVOUtils.success("后台正在导入，请稍后刷新查看！"); } - + @AuthRuleAnnotation("") @PostMapping("/sale/info/updateCompanyProductRelevance") public BaseResponse updateCompanyProductRelevance(@RequestBody CompanyProductRelevanceEntity companyProductRelevanceEntity) { companyProductRelevanceEntity.setUpdate_time(new Date()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanController.java index 58fd50d..e384d5b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; import com.glxp.sale.admin.exception.JsonException; @@ -37,6 +38,8 @@ public class CompanySalesmanController { private CompanySalesmanService companySalesmanService; @Value("${file_path}") private String filePath; + + @AuthRuleAnnotation("") @GetMapping("/sale/info/company/salesman/filter") public BaseResponse filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest, BindingResult bindingResult) { @@ -53,6 +56,7 @@ public class CompanySalesmanController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/companySalesman") public BaseResponse getCompanySalesmanInfo(CompanyRequest companyRequest) { CompanySalesmanEntity companySalesmanEntity = companySalesmanService.findCompanySalesman(companyRequest.getCustomerId()); @@ -62,6 +66,7 @@ public class CompanySalesmanController { return ResultVOUtils.error(500, "空"); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanySalesman") public BaseResponse getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest) { filterCompanySalesmanRequest.setCustomerId(getCustomerId()); @@ -73,6 +78,7 @@ public class CompanySalesmanController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/insertCompanySalesman") public BaseResponse insertCompanySalesman(@RequestBody CompanySalesmanEntity companySalesmanEntity) { companySalesmanEntity.setCreate_time(new Date()); @@ -82,6 +88,7 @@ public class CompanySalesmanController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/updateCompanySalesman") public BaseResponse updateCompanySalesman(@RequestBody CompanySalesmanEntity companySalesmanEntity) { companySalesmanEntity.setUpdate_time(new Date()); @@ -110,6 +117,7 @@ public class CompanySalesmanController { return ResultVOUtils.success("修改成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/deleteCompanySalesman") public BaseResponse deleteCompanySalesman(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = companySalesmanService.deleteById(deleteCompanyFileRequest.getId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanUpdateLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanUpdateLogController.java index f4bed80..2d137c0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanUpdateLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanySalesmanUpdateLogController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; import com.glxp.sale.admin.entity.info.CompanySalesmanUpdateLogEntity; @@ -15,7 +16,6 @@ import com.glxp.sale.admin.service.info.CompanySalesmanUpdateLogService; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -26,7 +26,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.File; import java.util.Date; import java.util.List; @@ -39,6 +38,7 @@ public class CompanySalesmanUpdateLogController { @Resource private CompanySalesmanService companySalesmanService; + @AuthRuleAnnotation("") @GetMapping("/sale/info/company/salesman/update/log/filter") public BaseResponse filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest, BindingResult bindingResult) { @@ -55,6 +55,7 @@ public class CompanySalesmanUpdateLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/companySalesmanUpdateLog") public BaseResponse getCompanySalesmanUpdateLogInfo(CompanyRequest companyRequest) { CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity = companySalesmanUpdateLogService.findCompanySalesmanUpdateLog(companyRequest.getCustomerId()); @@ -64,6 +65,7 @@ public class CompanySalesmanUpdateLogController { return ResultVOUtils.error(500, "空"); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanySalesmanUpdateLog") public BaseResponse getCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest) { filterCompanySalesmanUpdateLogRequest.setCustomerId(getCustomerId()); @@ -75,6 +77,7 @@ public class CompanySalesmanUpdateLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/insertCompanySalesmanUpdateLog") public BaseResponse insertCompanySalesmanUpdateLog(@RequestBody CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity) { CompanySalesmanEntity companySalesmanEntity = new CompanySalesmanEntity(); @@ -90,6 +93,7 @@ public class CompanySalesmanUpdateLogController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/updateCompanySalesmanUpdateLog") public BaseResponse updateCompanySalesmanUpdateLog(@RequestBody CompanySalesmanUpdateLogEntity companySalesmanUpdateLogEntity) { CompanySalesmanEntity companySalesmanEntity = new CompanySalesmanEntity(); @@ -119,6 +123,7 @@ public class CompanySalesmanUpdateLogController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/deleteCompanySalesmanUpdateLog") public BaseResponse deleteCompanySalesmanUpdateLog(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = companySalesmanUpdateLogService.deleteById(deleteCompanyFileRequest.getId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyUpdateLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyUpdateLogController.java index af2ccad..a682ecd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyUpdateLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyUpdateLogController.java @@ -3,8 +3,8 @@ package com.glxp.sale.admin.controller.info; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; -import com.glxp.sale.admin.entity.auth.CustomerContactEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanySalesmanEntity; import com.glxp.sale.admin.entity.info.CompanyUpdateLogEntity; @@ -31,7 +31,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.File; import java.util.Date; import java.util.List; @@ -46,6 +45,7 @@ public class CompanyUpdateLogController { @Resource private CompanyService companyService; + @AuthRuleAnnotation("") @GetMapping("/sale/info/company/update/log/filter") public BaseResponse filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest, BindingResult bindingResult) { @@ -66,6 +66,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/companyUpdateLog") public BaseResponse getCompanyUpdateLogInfo(CompanyRequest companyRequest) { CompanyUpdateLogEntity companyUpdateLogEntity = companyUpdateLogService.findCompanyUpdateLog(companyRequest.getCustomerId()); @@ -75,6 +76,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.error(500, "空"); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanyUpdateLog") public BaseResponse getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest) { filterCompanyUpdateLogRequest.setCustomerId(getCustomerId()); @@ -86,6 +88,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanyUpdateLogOne") public BaseResponse getCompanyUpdateLogOne(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest) { filterCompanyUpdateLogRequest.setCustomerId(getCustomerId()); @@ -99,6 +102,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.error(ResultEnum.DATA_NOT); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/addCompanyUpdateLog") public BaseResponse addCompanyUpdateLog(@RequestBody CompanyEntity companyEntity) { String jsonStr = JSON.toJSONString(companyEntity); @@ -107,6 +111,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.success("添加成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/applyUpdate") public BaseResponse applyUpdate(@RequestBody CompanyUpdateLogEntity companyUpdateLogEntity) { CompanyEntity companyEntity = new CompanyEntity(); @@ -122,6 +127,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.success("提交成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/applyUpdateManage") public BaseResponse applyUpdateManage(@RequestBody CompanyUpdateLogEntity companyUpdateLogEntity) { CompanyEntity companyEntity = new CompanyEntity(); @@ -141,6 +147,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/insertCompanyUpdateLog") public BaseResponse insertCompanyUpdateLog(@RequestBody CompanyUpdateLogEntity companyUpdateLogEntity) { CompanySalesmanEntity companySalesmanEntity = new CompanySalesmanEntity(); @@ -155,6 +162,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/updateCompanyUpdateLog") public BaseResponse updateCompanyUpdateLog(@RequestBody CompanyUpdateLogEntity companyUpdateLogEntity) { CompanySalesmanEntity companySalesmanEntity = new CompanySalesmanEntity(); @@ -183,6 +191,7 @@ public class CompanyUpdateLogController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/deleteCompanyUpdateLog") public BaseResponse deleteCompanyUpdateLog(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = companyUpdateLogService.deleteById(deleteCompanyFileRequest.getId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java index 806d924..58460cd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/DeviceKeyController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.info.DeviceKeyEntity; import com.glxp.sale.admin.req.info.FilterDeviceKeyRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -26,6 +27,7 @@ public class DeviceKeyController { @Resource DeviceKeyService deviceKeyService; + @AuthRuleAnnotation("") @GetMapping("sale/device/registerList") public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) { List deviceKeyEntities = deviceKeyService.findDeviceKey(filterDeviceKeyRequest); @@ -37,7 +39,7 @@ public class DeviceKeyController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("sale/device/check") public BaseResponse checkRegister(@RequestBody @Valid DeviceKeyEntity deviceKeyEntity, BindingResult bindingResult) { @@ -51,6 +53,7 @@ public class DeviceKeyController { } + @AuthRuleAnnotation("") @PostMapping("/sale/info/registerKey") public BaseResponse registerKey(@RequestBody DeviceKeyEntity deviceKeyEntity) { String key = md5("glxp2020" + deviceKeyEntity.getImei()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SetupController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SetupController.java index 9bc190e..30104b0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SetupController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SetupController.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.controller.info; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.info.SetupEntity; import com.glxp.sale.admin.req.info.CompanyRequest; import com.glxp.sale.admin.service.info.SetupService; @@ -18,6 +19,7 @@ public class SetupController { @Resource private SetupService setupService; + @AuthRuleAnnotation("") @GetMapping("/sale/info/setup") public BaseResponse getCompanyInfo(CompanyRequest companyRequest) { SetupEntity setupEntity = setupService.findSetup(companyRequest.getCustomerId()+""); @@ -27,6 +29,7 @@ public class SetupController { return ResultVOUtils.error(500, "设置信息为空"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/setup/modify") public BaseResponse modifyCompany(@RequestBody SetupEntity setupEntity) { setupService.insertSetup(setupEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicCertController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicCertController.java index 25a60e9..dfe0f3d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicCertController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicCertController.java @@ -1,18 +1,15 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; -import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; import com.glxp.sale.admin.exception.JsonException; -import com.glxp.sale.admin.req.info.CompanyRequest; import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; -import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicCertService; -import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicCertService; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -42,6 +39,7 @@ public class SuppliersEnterpriseBasicCertController { @Resource private SuppliersEnterpriseBasicCertService suppliersEnterpriseBasicCertService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/enterprise/basic/cert/filter") public BaseResponse filterCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest, BindingResult bindingResult) { @@ -58,6 +56,7 @@ public class SuppliersEnterpriseBasicCertController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/enterprise/basic/cert/companyCert") public BaseResponse getCompanyCertInfo(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest) { SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity = @@ -68,6 +67,7 @@ public class SuppliersEnterpriseBasicCertController { return ResultVOUtils.error(500, "空"); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/enterprise/basic/cert/getCompanyCert") public BaseResponse getCompanyCert(FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest) { // filterSuppliersEnterpriseBasicCertRequest.setEnterpriseId(getCustomerId()); @@ -79,6 +79,7 @@ public class SuppliersEnterpriseBasicCertController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/info/suppliers/enterprise/basic/cert/insertCompanyCert") public BaseResponse insertCompanyCert(@RequestBody SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity) { supplierEnterpriseBasicCertEntity.setCreate_time(new Date()); @@ -87,6 +88,7 @@ public class SuppliersEnterpriseBasicCertController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/info/suppliers/enterprise/basic/cert/updateCompanyCert") public BaseResponse updateCompanyCert(@RequestBody SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity) { @@ -94,6 +96,7 @@ public class SuppliersEnterpriseBasicCertController { return ResultVOUtils.success("修改成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/info/suppliers/enterprise/basic/cert/deleteCompanyCert") public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = suppliersEnterpriseBasicCertService.deleteById(deleteCompanyFileRequest.getId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicController.java index 2a481a7..3873b98 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersEnterpriseBasicController.java @@ -1,22 +1,18 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; -import com.glxp.sale.admin.entity.auth.CustomerContactEntity; -import com.glxp.sale.admin.entity.auth.CustomerDetailEntity; -import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.SupplierEnterpriseBasicCertEntity; import com.glxp.sale.admin.entity.info.SuppliersEnterpriseBasicEntity; import com.glxp.sale.admin.entity.info.SuppliersRegistrationBasicEntity; import com.glxp.sale.admin.exception.JsonException; -import com.glxp.sale.admin.req.auth.CustomerInfoFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.info.FilterSuppliersEnterpriseBasicCertRequest; import com.glxp.sale.admin.req.info.SuppliersEnterpriseBasicRequest; import com.glxp.sale.admin.req.info.SuppliersRegistrationBasicRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; -import com.glxp.sale.admin.service.auth.impl.CustomerContactService; import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicCertService; import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicService; import com.glxp.sale.admin.service.info.SuppliersRegistrationBasicService; @@ -54,6 +50,7 @@ public class SuppliersEnterpriseBasicController { @Resource private SuppliersEnterpriseBasicCertService suppliersEnterpriseBasicCertService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/enterprise/basic/getCompanyInfo") public BaseResponse getCompanyInfo(SuppliersEnterpriseBasicRequest suppliersEnterpriseBasicRequest) { SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity = suppliersEnterpriseBasicService.findCompany(suppliersEnterpriseBasicRequest.getId()); @@ -63,6 +60,7 @@ public class SuppliersEnterpriseBasicController { return ResultVOUtils.error(500, "企业信息为空"); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/enterprise/basic/getCompanyList") public BaseResponse getCompanyList(SuppliersEnterpriseBasicRequest suppliersEnterpriseBasicRequest) { // suppliersEnterpriseBasicRequest.setId(suppliersEnterpriseBasicRequest.getId()); @@ -74,6 +72,7 @@ public class SuppliersEnterpriseBasicController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/info/suppliers/enterprise/basic/addCompany") public BaseResponse addCompany(@RequestBody SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity) { suppliersEnterpriseBasicEntity.setCreateDate(new Date()); @@ -86,6 +85,7 @@ public class SuppliersEnterpriseBasicController { } } + @AuthRuleAnnotation("") @PostMapping("/udiwms/info/suppliers/enterprise/basic/modifyCompany") public BaseResponse modifyCompany(@RequestBody SuppliersEnterpriseBasicEntity suppliersEnterpriseBasicEntity) { suppliersEnterpriseBasicEntity.setUpdateDate(new Date()); @@ -97,6 +97,7 @@ public class SuppliersEnterpriseBasicController { } } + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/enterprise/basic/delete") public BaseResponse deleteContact(DeleteRequest deleteRequest) { FilterSuppliersEnterpriseBasicCertRequest filterSuppliersEnterpriseBasicCertRequest = diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersRegistrationBasicController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersRegistrationBasicController.java index 9e562e3..43bf72f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersRegistrationBasicController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/SuppliersRegistrationBasicController.java @@ -1,11 +1,11 @@ package com.glxp.sale.admin.controller.info; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.info.SuppliersRegistrationBasicEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; -import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.info.SuppliersRegistrationBasicRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; @@ -37,6 +37,7 @@ public class SuppliersRegistrationBasicController { @Value("${file_path}") private String filePath; + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/registration/basic/getRegistrationInfo") public BaseResponse getRegistrationInfo(SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest) { SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity = suppliersRegistrationBasicService.findRegistration(suppliersRegistrationBasicRequest.getId()); @@ -46,6 +47,7 @@ public class SuppliersRegistrationBasicController { return ResultVOUtils.error(500, "企业信息为空"); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/registration/basic/getRegistrationList") public BaseResponse getRegistrationList(SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest) { // suppliersRegistrationBasicRequest.setId(suppliersRegistrationBasicRequest.getId()); @@ -57,6 +59,7 @@ public class SuppliersRegistrationBasicController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/info/suppliers/registration/basic/addRegistration") public BaseResponse addRegistration(@RequestBody SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity) { suppliersRegistrationBasicEntity.setCreate_date(new Date()); @@ -69,6 +72,7 @@ public class SuppliersRegistrationBasicController { } } + @AuthRuleAnnotation("") @PostMapping("/udiwms/info/suppliers/registration/basic/modifyRegistration") public BaseResponse modifyRegistration(@RequestBody SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity) { suppliersRegistrationBasicEntity.setUpdate_date(new Date()); @@ -100,6 +104,7 @@ public class SuppliersRegistrationBasicController { } } + @AuthRuleAnnotation("") @GetMapping("/udiwms/info/suppliers/registration/basic/delete") public BaseResponse delete(DeleteCompanyFileRequest deleteCompanyFileRequest) { if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath())) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java index 6fae798..22ef65a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/IOOrderStatusController.java @@ -2,25 +2,25 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; -import com.glxp.sale.admin.entity.inout.*; -import com.glxp.sale.admin.entity.udid.UdiEntity; -import com.glxp.sale.admin.req.inout.OrderFilterRequest; +import com.glxp.sale.admin.entity.inout.ErpOrderEntity; +import com.glxp.sale.admin.entity.inout.IOOrderStatusEntity; +import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest; -import com.glxp.sale.admin.req.inout.UpdateExportStatusRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.inout.DlOrderResponse; import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inout.IOOrderStatusService; import com.glxp.sale.admin.service.inout.OrderDetailService; import com.glxp.sale.admin.service.inout.OrderService; -import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.ArrayList; @@ -70,6 +70,7 @@ public class IOOrderStatusController { } //更新订单 + @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/deleteStatus") public BaseResponse deleteStatus(@RequestBody OrderStatusFilterRequest orderStatusFilterRequest, BindingResult bindingResult) { @@ -84,7 +85,7 @@ public class IOOrderStatusController { return ResultVOUtils.success("更新成功"); } - + @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/updateStatus") public BaseResponse updateStatus(@RequestBody IOOrderStatusEntity orderStatusFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 57cd66a..5321445 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.inout; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; @@ -13,8 +14,6 @@ import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.basic.BussinessTypeService; -import com.glxp.sale.admin.service.basic.UdiInfoService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; import com.glxp.sale.admin.thread.InvProductsTrService; @@ -63,6 +62,7 @@ public class OrderController { @Value("${file_path}") private String filePath; + @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/getUdi") public BaseResponse getUdi(@RequestParam("code") String code) { UdiEntity udiEntity = FilterUdiUtils.getUdi(code); @@ -70,6 +70,7 @@ public class OrderController { return ResultVOUtils.success(udiEntity); } + @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/status") public BaseResponse listOrderByStatus(OrderFilterRequest orderFilterRequest) { List orderEntityList = orderService.filterList(orderFilterRequest); @@ -81,6 +82,7 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/error") public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { // orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_FAIL); @@ -109,6 +111,7 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/repeat") public BaseResponse listOrderRepeat(OrderQueryRequest orderQueryRequest) { List orderEntityList = orderService.listOrderRepeat(orderQueryRequest); @@ -120,6 +123,7 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("udiwms/inout/order/delete") public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -133,6 +137,7 @@ public class OrderController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateUnit") public BaseResponse updateUnit(@RequestBody @Valid OrderEntity orderEntity, BindingResult bindingResult) { @@ -153,6 +158,7 @@ public class OrderController { return ResultVOUtils.success("添加成功"); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/filter") public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { @@ -194,6 +200,7 @@ public class OrderController { //手持终端下载订单校验 + @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/download") public BaseResponse downloadOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { @@ -234,6 +241,7 @@ public class OrderController { } //手持终端验收完成后，更新订单状态 + @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/check/updateStatus") public BaseResponse updateStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, BindingResult bindingResult) { @@ -260,7 +268,7 @@ public class OrderController { return ResultVOUtils.success("更新成功"); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/filterCode") public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest, BindingResult bindingResult) { @@ -279,6 +287,7 @@ public class OrderController { } //更新订单 + @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateExportStatus") public BaseResponse updateExportStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, BindingResult bindingResult) { @@ -295,6 +304,7 @@ public class OrderController { //导出订单（json) + @AuthRuleAnnotation("") @PostMapping("warehouse/inout/order/exportXml") public void exportXml(@RequestBody DeleteRequest deleteRequest, HttpServletResponse res) { List orderIds = deleteRequest.getIds(); @@ -329,7 +339,7 @@ public class OrderController { // return ResultVOUtils.success("文件生成成功！！"); } - + @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/order/mergeOrder")//TODO 合并订单 public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) { @@ -383,6 +393,7 @@ public class OrderController { //异常单据撤回 + @AuthRuleAnnotation("") @GetMapping("/spms/inout/order/revoke") public BaseResponse revokeOrder(OrderFilterRequest orderFilterRequest, BindingResult bindingResult) { @@ -418,6 +429,7 @@ public class OrderController { * @param billNo 单据号 * @return */ + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/supplementOrder") public BaseResponse supplementOrder(@RequestParam("billNo") String billNo) { if (StrUtil.isBlank(billNo)) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index a86b4b2..5c0c420 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -2,12 +2,10 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; -import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; @@ -15,7 +13,6 @@ import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderEntity; -import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.httpclient.ErpOrderClient; import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.req.param.SystemParamConfigRequest; @@ -24,7 +21,6 @@ import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse; import com.glxp.sale.admin.res.inout.ErpOrderResponse; -import com.glxp.sale.admin.res.inout.PurchaseinResponse; import com.glxp.sale.admin.service.basic.BussinessOriginTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; @@ -50,11 +46,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -271,7 +264,7 @@ public class OrderDetailController { return ResultVOUtils.success(); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/erpOrder/updateBind") public BaseResponse updateBind(@RequestBody ErpOrderEntity erpOrderEntity, BindingResult bindingResult) { @@ -289,6 +282,7 @@ public class OrderDetailController { } } + @AuthRuleAnnotation("") @PostMapping("/udiwms/erpOrder/updateBindSup") public BaseResponse updateBindSup(@RequestBody ErpOrderEntity erpOrderEntity, BindingResult bindingResult) { @@ -327,7 +321,7 @@ public class OrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/warehouse/deleteErpOrder") public BaseResponse deleteErpOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -414,6 +408,7 @@ public class OrderDetailController { return ResultVOUtils.success("后台已自动更新，请稍后刷新查看！"); } + @AuthRuleAnnotation("") @PostMapping("/warehouse/selectErpOrder") public BaseResponse selectErpOrder(@RequestBody ImportErpOrderRequest importErpOrderRequest, BindingResult bindingResult) { @@ -502,6 +497,7 @@ public class OrderDetailController { // return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！"); // } + @AuthRuleAnnotation("") @PostMapping("/warehouse/repeatPrintCheck")//TODO 重新校验 public BaseResponse repeatPrintCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index 1293a7a..0f31af8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -1,11 +1,12 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.controller.inout.inventory.InvPrintController; import com.glxp.sale.admin.entity.auth.AuthAdmin; -import com.glxp.sale.admin.entity.basic.*; +import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.StockPrintEntity; import com.glxp.sale.admin.entity.basic.StockPrinttREntity; import com.glxp.sale.admin.entity.info.CompanyEntity; @@ -27,7 +28,6 @@ import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; -import com.glxp.sale.admin.service.inventory.InCodeLogService; import com.glxp.sale.admin.service.inventory.InvStockPrintService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.util.CustomUtil; @@ -85,6 +85,7 @@ public class StockOrderController { @Resource OrderService orderService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/error") public BaseResponse listStockOrderNoDealWith(StockOrderFilterRequest stockOrderFilterRequest) { List stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest); @@ -96,6 +97,7 @@ public class StockOrderController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/postDealWith") public BaseResponse postDealWith(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) { @@ -123,6 +125,7 @@ public class StockOrderController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/insertWeb") public BaseResponse insertWeb(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) { @@ -225,6 +228,7 @@ public class StockOrderController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/delete") public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -239,6 +243,7 @@ public class StockOrderController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/error/delete") public BaseResponse deleteErrorOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -252,6 +257,7 @@ public class StockOrderController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/filter") public BaseResponse filterOrder(StockOrderFilterRequest stockOrderFilterRequest, BindingResult bindingResult) { @@ -285,7 +291,7 @@ public class StockOrderController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/filterDetail") public BaseResponse filterDetail(StockOrderFilterRequest stockOrderFilterRequest, BindingResult bindingResult) { @@ -342,7 +348,7 @@ public class StockOrderController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/submit") public BaseResponse submitStockOrder(@RequestParam("id") String id) { StockOrderEntity stockOrderEntity = new StockOrderEntity(); @@ -352,14 +358,14 @@ public class StockOrderController { return ResultVOUtils.success(); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/update") public BaseResponse submitStockOrder(@RequestBody StockOrderEntity stockOrderEntity) { stockOrderService.updateById(stockOrderEntity); return ResultVOUtils.success(); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/new/submit") public BaseResponse submitNewStockOrder(@RequestParam("id") String id) { StockOrderEntity stockOrderEntity = new StockOrderEntity(); @@ -369,6 +375,7 @@ public class StockOrderController { return ResultVOUtils.success(); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/new/repealSubmit") public BaseResponse repealSubmitNewStockOrder(@RequestParam("id") String id) { StockOrderEntity stockOrderEntity = new StockOrderEntity(); @@ -378,6 +385,7 @@ public class StockOrderController { return ResultVOUtils.success(); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/error/submit") public BaseResponse submitStockOrderError(@RequestParam("id") String id) { StockOrderEntity stockOrderEntity = new StockOrderEntity(); @@ -386,6 +394,7 @@ public class StockOrderController { return ResultVOUtils.success(); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/qrcode/generate/text") public BaseResponse generateStockOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) { @@ -504,6 +513,7 @@ public class StockOrderController { return genKey; } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/generateBillNo") public BaseResponse stockOrderGenerateBillNo(@RequestParam("action") String action) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index 2d0a574..0853915 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -1,32 +1,26 @@ package com.glxp.sale.admin.controller.inout; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.entity.auth.AuthAdmin; -import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; -import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; -import com.glxp.sale.admin.entity.inout.OrderEntity; -import com.glxp.sale.admin.entity.inout.StockQRCodeTextEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.exception.JsonException; -import com.glxp.sale.admin.httpclient.ErpOrderClient; import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.sale.admin.req.inout.*; +import com.glxp.sale.admin.req.inout.DeleteRequest; +import com.glxp.sale.admin.req.inout.StockOrderDetailFilterRequest; +import com.glxp.sale.admin.req.inout.StockOrderIdsRequest; +import com.glxp.sale.admin.req.inout.StockSelectDataEntity; import com.glxp.sale.admin.req.param.SystemParamConfigRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; -import com.glxp.sale.admin.res.inout.PurchaseinResponse; import com.glxp.sale.admin.res.inout.StockOrderDetailQueryProductResponse; import com.glxp.sale.admin.res.inout.StockOrderDetailResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; @@ -35,19 +29,18 @@ import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; -import com.glxp.sale.admin.service.inout.*; +import com.glxp.sale.admin.service.inout.StockOrderDetailService; +import com.glxp.sale.admin.service.inout.StockOrderDetailTempService; +import com.glxp.sale.admin.service.inout.StockQRCodeTextService; import com.glxp.sale.admin.service.param.SystemParamConfigService; -import com.glxp.sale.admin.thread.InvDlErpStockService; import com.glxp.sale.admin.thread.IoTransInoutService; import com.glxp.sale.admin.util.FilterUdiUtils; -import com.glxp.sale.admin.util.HttpClient; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; @@ -55,8 +48,8 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.List; @RestController public class StockOrderDetailController { @@ -85,6 +78,7 @@ public class StockOrderDetailController { @Resource BussinessLocalTypeService bussinessLocalTypeService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filter") public BaseResponse filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, BindingResult bindingResult) { @@ -102,6 +96,7 @@ public class StockOrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filter2") public BaseResponse filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, BindingResult bindingResult) { @@ -123,6 +118,7 @@ public class StockOrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/temp/filter") public BaseResponse filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, BindingResult bindingResult) { @@ -140,7 +136,7 @@ public class StockOrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/getStockOrderDetails") public BaseResponse getStockOrderDetails(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, BindingResult bindingResult) { @@ -158,7 +154,7 @@ public class StockOrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping(value = "/udiwms/stock/order/detail") public BaseResponse stockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, BindingResult bindingResult) { @@ -174,6 +170,7 @@ public class StockOrderDetailController { return ResultVOUtils.success(erpOrderEntities); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/uploadCount") public BaseResponse uploadCount(@RequestParam("orderId") String orderId, @RequestParam("code") String code) { UdiEntity udiEntity = FilterUdiUtils.getUdi(code); @@ -221,6 +218,7 @@ public class StockOrderDetailController { return ResultVOUtils.error(ResultEnum.DATA_NOT); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/getInstrument") public BaseResponse getStockOrderDetailInstrument(@RequestParam("count") String count, @RequestParam("code") String code) { UdiEntity udiEntity = FilterUdiUtils.getUdi(code); @@ -244,6 +242,7 @@ public class StockOrderDetailController { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/detail/getInstrumentById") public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) { @@ -322,6 +321,7 @@ public class StockOrderDetailController { return false; } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/addFromCode") public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId, @RequestParam("count") String count, @@ -364,7 +364,7 @@ public class StockOrderDetailController { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品"); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/queryProduct") public BaseResponse queryProduct(@RequestParam("code") String code, @RequestParam("customerId") String customerId) { UdiEntity udiEntity = null; @@ -407,6 +407,7 @@ public class StockOrderDetailController { } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filterProduct") public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) { @@ -463,6 +464,7 @@ public class StockOrderDetailController { return basicInstrumentMaintainRelevanceResponses; } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/copy") public BaseResponse uploadCount(@RequestParam("id") String id) { if (StringUtils.isNotBlank(id)) { @@ -477,7 +479,7 @@ public class StockOrderDetailController { return ResultVOUtils.error(ResultEnum.DATA_NOT); } - + @AuthRuleAnnotation("") @GetMapping(value = "/udiwms/stock/order/detail/upload") public BaseResponse upload(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, BindingResult bindingResult) { @@ -512,6 +514,7 @@ public class StockOrderDetailController { return ResultVOUtils.error(500, "修改失败"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/detail/delete") public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -526,6 +529,7 @@ public class StockOrderDetailController { } } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/detail/temp/delete") public BaseResponse deleteTemp(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java index 9179b55..6178b7e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java @@ -1,67 +1,58 @@ package com.glxp.sale.admin.controller.inout; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.entity.basic.StockPrintEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; -import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity; +import com.glxp.sale.admin.entity.inout.StockOrderEntity; +import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity; +import com.glxp.sale.admin.entity.inout.StockQRCodeTextEntity; import com.glxp.sale.admin.entity.inventory.StockPrintTempEntity; -import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; +import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.sale.admin.req.basic.FilterStockprintRequest; +import com.glxp.sale.admin.req.inout.DeleteRequest; +import com.glxp.sale.admin.req.inout.StockQRCodeTextFilterRequest; import com.glxp.sale.admin.req.inventory.DeleteStPrintTempRequest; import com.glxp.sale.admin.req.inventory.FilterStPrintTempRequest; +import com.glxp.sale.admin.req.itextpdf.InspectionPDFTemplateRequest; import com.glxp.sale.admin.req.itextpdf.PdfPrintCountEntity; +import com.glxp.sale.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; -import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; +import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse; import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.service.inout.StockOrderDetailService; +import com.glxp.sale.admin.service.inout.StockOrderService; +import com.glxp.sale.admin.service.inout.StockQRCodeTextService; import com.glxp.sale.admin.service.inventory.InvStockPrintService; import com.glxp.sale.admin.service.inventory.StockPrintTempService; +import com.glxp.sale.admin.service.param.SystemPDFModuleService; import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService; +import com.glxp.sale.admin.service.param.SystemPDFTemplateService; import com.glxp.sale.admin.thread.JaspaperService; import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.JasperUtils; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.github.pagehelper.PageInfo; -import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; -import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; -import com.glxp.sale.admin.req.inout.DeleteRequest; -import com.glxp.sale.admin.req.inout.StockQRCodeTextFilterRequest; -import com.glxp.sale.admin.req.itextpdf.InspectionPDFTemplateRequest; -import com.glxp.sale.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; -import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.service.basic.BussinessTypeService; -import com.glxp.sale.admin.service.basic.UdiInfoService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; -import com.glxp.sale.admin.service.inout.StockOrderDetailService; -import com.glxp.sale.admin.service.inout.StockOrderDetailTempService; -import com.glxp.sale.admin.service.inout.StockOrderService; -import com.glxp.sale.admin.service.inout.StockQRCodeTextService; -import com.glxp.sale.admin.service.param.SystemPDFModuleService; -import com.glxp.sale.admin.service.param.SystemPDFTemplateService; -import com.glxp.sale.admin.service.param.SystemParamConfigService; -import com.glxp.sale.admin.thread.IoTransInoutService; -import com.glxp.sale.admin.util.JasperUtils; -import com.glxp.sale.common.enums.ResultEnum; -import com.glxp.sale.common.res.BaseResponse; -import com.glxp.sale.common.util.ResultVOUtils; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @RestController public class StockQRCodeTextController { @@ -90,6 +81,7 @@ public class StockQRCodeTextController { @Resource private JaspaperService jaspaperService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/qrcode/text/filter") public BaseResponse filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest, BindingResult bindingResult) { @@ -118,6 +110,7 @@ public class StockQRCodeTextController { } //-----------打印码 + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/file") public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile( @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { @@ -136,6 +129,7 @@ public class StockQRCodeTextController { return ResultVOUtils.success(); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/stock/qrcode/text/file") public BaseResponse stockQRCodeTextPDFFromTemplateFile( @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, @@ -221,6 +215,7 @@ public class StockQRCodeTextController { } + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/stock/qrcode/text/maxfile") public BaseResponse stockQRCodeMaxTextPDFFromTemplateFile( @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest @@ -301,7 +296,7 @@ public class StockQRCodeTextController { } - + @AuthRuleAnnotation("") @GetMapping("/spms/stock/qrcode/filterTemp") public BaseResponse filterTemp(FilterStPrintTempRequest filterStPrintTempRequest, BindingResult bindingResult) { @@ -330,6 +325,7 @@ public class StockQRCodeTextController { //-----------打印订单 + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/inspection/stock/order/file") public BaseResponse inspectionStockOrderPDFFromTemplateFile( @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { @@ -349,6 +345,7 @@ public class StockQRCodeTextController { return ResultVOUtils.success(); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/stock/order/file") public void stockOrderPDFFromTemplateFile( @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, @@ -396,7 +393,7 @@ public class StockQRCodeTextController { } } - + @AuthRuleAnnotation("") @GetMapping(value = "/udiwms/stock/qrcode/text/upload") public BaseResponse upload(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest, BindingResult bindingResult) { @@ -412,6 +409,7 @@ public class StockQRCodeTextController { return ResultVOUtils.error(500, "修改失败"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/qrcode/text/delete") public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java index 9cfcf4b..1e0623d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/UdiTraceController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inout; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.inout.WarehouseQueryRequest; @@ -27,6 +28,7 @@ public class UdiTraceController { @Resource UdiRelevanceService udiRelevanceService; + @AuthRuleAnnotation("") @GetMapping("udiwarehouse/trace/filter") public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 1f4f702..84be66a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -1,24 +1,17 @@ package com.glxp.sale.admin.controller.inout; -import cn.hutool.db.sql.Order; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; -import com.glxp.sale.admin.controller.inout.utils.InoutUtils; import com.glxp.sale.admin.dao.auth.AuthLicenseDao; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.AuthLicense; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.ErpOrderEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; -import com.glxp.sale.admin.entity.inout.Warehousetemp; -import com.glxp.sale.admin.entity.receipt.MipsBarcodeEntity; -import com.glxp.sale.admin.entity.receipt.ProductOrderDetailEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.inout.*; @@ -27,18 +20,14 @@ import com.glxp.sale.admin.res.inout.WarehouseResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; import com.glxp.sale.admin.service.basic.BussinessTypeService; -import com.glxp.sale.admin.service.basic.UdiInfoService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.service.inout.CodesService; import com.glxp.sale.admin.service.inout.CodesTempService; -import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.inout.MyErpOrderService; import com.glxp.sale.admin.service.inout.OrderService; -import com.glxp.sale.admin.service.inout.CodesService; -import com.glxp.sale.admin.service.receipt.MipsBarcodeService; -import com.glxp.sale.admin.service.receipt.ProductInfoService; import com.glxp.sale.admin.thread.IoTransInoutService; -import com.glxp.sale.admin.util.*; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -53,7 +42,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Random; import java.util.stream.Collectors; @@ -82,6 +70,7 @@ public class WareHouseController { @Resource private AuthLicenseDao authLicenseDao; + @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/list") public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = codesService.listWarehouse(warehouseQueryRequest); @@ -99,7 +88,7 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/code/deleteCodes") public BaseResponse deleteCodes(@RequestBody DeleteCodeRequest deleteCodeRequest, BindingResult bindingResult) { @@ -115,7 +104,7 @@ public class WareHouseController { return ResultVOUtils.success("删除成功"); } - + @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/findByNo") public BaseResponse findByNo(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = codesService.findByNo(warehouseQueryRequest); @@ -133,6 +122,7 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/findByOrderId") public BaseResponse findByOrderId(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = codesService.findByOrderId(warehouseQueryRequest); @@ -150,6 +140,7 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("spms/inout/dlcode/findByOrderId") public BaseResponse downloadCodesByOrderId(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = codesService.findByOrderId(warehouseQueryRequest); @@ -161,6 +152,7 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/findAllByOrderId") public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) { List warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest); @@ -178,7 +170,7 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/findErrorByOrderId") public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) { List warehousetempList = codesTempService.findByOrderId(warehouseQueryRequest); @@ -190,7 +182,7 @@ public class WareHouseController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/commit")//TODO 重新提交 public BaseResponse commitOrder(@RequestBody CommitRequest commitRequest, BindingResult bindingResult) { @@ -202,7 +194,7 @@ public class WareHouseController { return ResultVOUtils.success("提交成功"); } - + @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/addCommit")//补录提交 public BaseResponse addCommitOrder(@RequestBody CommitRequest commitRequest, BindingResult bindingResult) { @@ -217,6 +209,7 @@ public class WareHouseController { return ResultVOUtils.success("提交成功"); } + @AuthRuleAnnotation("") @GetMapping("warehouse/inout/submitOrderWeb") public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) { orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS); @@ -224,7 +217,7 @@ public class WareHouseController { // return ResultVOUtils.success(); } - + @AuthRuleAnnotation("") @PostMapping("warehouse/inout/saveOrderWeb") public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { OrderEntity orderEntity1 = new OrderEntity(); @@ -239,7 +232,7 @@ public class WareHouseController { return ResultVOUtils.success(); } - + @AuthRuleAnnotation("") @GetMapping("warehouse/inout/deleteCodesTempById") public BaseResponse deleteCodesTempById(@RequestParam("id") Long id) { WarehouseEntity warehouseEntity = new WarehouseEntity(); @@ -249,6 +242,7 @@ public class WareHouseController { } //网页端数据上传调用接口 + @AuthRuleAnnotation("") @PostMapping("warehouse/inout/addOrderWeb") public BaseResponse addOrderWeb(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) { @@ -351,6 +345,7 @@ public class WareHouseController { } //网页端数据上传调用接口 + @AuthRuleAnnotation("") @PostMapping("warehouse/inout/postOrdersWeb") public BaseResponse postOrdersWeb(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) { @@ -369,6 +364,7 @@ public class WareHouseController { } //手持端数据上传调用接口 + @AuthRuleAnnotation("") @PostMapping("warehouse/inout/postOrders") public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) { @@ -419,7 +415,7 @@ public class WareHouseController { } - + @AuthRuleAnnotation("") @PostMapping("/admin/warehouse/inout/save") public BaseResponse save(@RequestBody @Valid WarehouseSaveRequest warehouseSaveRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java index 770a9f0..913b67b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inout.inventory; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.IncodeStatus; import com.glxp.sale.admin.entity.basic.StockPrintEntity; import com.glxp.sale.admin.entity.inventory.InCodeLogEntity; @@ -33,6 +34,7 @@ public class InvPrintController { @Resource InCodeLogService inCodeLogService; + @AuthRuleAnnotation("") @PostMapping("/udiwarehouse/stockPrint/filter") public BaseResponse filterAll(@RequestBody FilterStockprintRequest stockprintRequest, BindingResult bindingResult) { @@ -52,6 +54,7 @@ public class InvPrintController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/spms/stockPrint/filter") public BaseResponse filterSp( FilterStockprintRequest stockprintRequest, BindingResult bindingResult) { @@ -71,7 +74,7 @@ public class InvPrintController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("udiwms/stockprint/post") public BaseResponse postInCode(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java index 04a7a37..462821b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inventory; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.entity.info.CompanyEntity; @@ -17,8 +18,6 @@ import com.glxp.sale.admin.res.inventory.InvProductStatResponse; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inventory.InvPreProductDetailService; import com.glxp.sale.admin.service.inventory.InvPreProductService; -import com.glxp.sale.admin.service.inventory.InvProductDetailService; -import com.glxp.sale.admin.service.inventory.InvProductService; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -44,6 +43,7 @@ public class InvPreProductsController { @Resource private CompanyService companyService; + @AuthRuleAnnotation("") @GetMapping("spms/pre/inv/products/filter") public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) { boolean showSup = false; @@ -65,7 +65,7 @@ public class InvPreProductsController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("spms/pre/inv/products/filterDetail") public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductRequest) { if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { @@ -96,7 +96,7 @@ public class InvPreProductsController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("spms/pre/inv/products/delete") public BaseResponse deleteInvProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -118,7 +118,7 @@ public class InvPreProductsController { } } - + @AuthRuleAnnotation("") @GetMapping("spms/pre/inv/products/stat") public BaseResponse statInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java index 7c8fc41..f0c8c60 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.inventory; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantType; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; @@ -61,6 +62,7 @@ public class InvProductsController { @Resource private CompanyService companyService; + @AuthRuleAnnotation("") @GetMapping("spms/inv/products/filter") public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) { boolean showSup = false; @@ -83,6 +85,7 @@ public class InvProductsController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("spms/inv/products/filterDetail") public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductRequest) { if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { @@ -117,7 +120,7 @@ public class InvProductsController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("spms/inv/products/delete") public BaseResponse deleteInvProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -139,7 +142,7 @@ public class InvProductsController { } } - + @AuthRuleAnnotation("") @GetMapping("spms/inv/products/stat") public BaseResponse statInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) { @@ -171,6 +174,7 @@ public class InvProductsController { return ResultVOUtils.success(invProductStatResponse); } + @AuthRuleAnnotation("") @GetMapping("spms/inv/products/trace") public BaseResponse filterTrace(FilterCodeTraceRequest filterCodeTraceRequest) { if (filterCodeTraceRequest.getCode() == null) { @@ -219,6 +223,7 @@ public class InvProductsController { } + @AuthRuleAnnotation("") @GetMapping("spms/inv/products/order/trace") public BaseResponse filterOrderTrace(FilterCodeTraceRequest filterCodeTraceRequest) { if (filterCodeTraceRequest.getCode() == null) { @@ -268,6 +273,7 @@ public class InvProductsController { * @param filterInvProductRequest * @return */ + @AuthRuleAnnotation("") @GetMapping("/spms/inv/products/stockStatistics") public BaseResponse stockStatistics(FilterInvProductRequest filterInvProductRequest) { boolean showSup = false; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java index c607ce8..f73c439 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -2,29 +2,15 @@ package com.glxp.sale.admin.controller.inventory; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.entity.auth.AuthPermissionRule; -import com.glxp.sale.admin.entity.inout.OrderEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.sale.admin.req.auth.AuthPermissionRuleSaveRequest; import com.glxp.sale.admin.req.info.DeleteRequest; -import com.glxp.sale.admin.req.inout.PostOrderRequest; -import com.glxp.sale.admin.req.inventory.FilterInvProductRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse; -import com.glxp.sale.admin.res.inventory.InvProductPageRespnonse; -import com.glxp.sale.admin.res.inventory.InvProductResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseExportResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseResponse; -import com.glxp.sale.admin.service.inventory.InvProductService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; -import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.admin.util.FileUtils; -import com.glxp.sale.admin.util.PermissionRuleTreeUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -44,14 +30,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.glxp.sale.admin.constant.Constant.SYSTEM_CUSTOMER_ID; - @RestController public class InvWarehouseController { @Resource InvWarehouseService invWarehouseService; + @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filter") public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); @@ -62,6 +47,7 @@ public class InvWarehouseController { return ResultVOUtils.success(restMap); } + @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterAll") public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { filterInvWarehouseRequest.setPid(0); @@ -83,7 +69,7 @@ public class InvWarehouseController { return invWarehouseResponses; } - + @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/save") public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, BindingResult bindingResult) { @@ -104,6 +90,7 @@ public class InvWarehouseController { return ResultVOUtils.success("添加成功！"); } + @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/edit") public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity, BindingResult bindingResult) { @@ -123,6 +110,7 @@ public class InvWarehouseController { return ResultVOUtils.success(); } + @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/delete") public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { @@ -138,6 +126,7 @@ public class InvWarehouseController { //仓库信息文件导出 + @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/exportJson") public void exportJson(@RequestBody DeleteRequest deleteRequest, HttpServletResponse res) { FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); @@ -157,6 +146,7 @@ public class InvWarehouseController { //仓库信息文件导入 + @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/uploadJson") public BaseResponse uploadOrders(@RequestParam("file") List files) { for (int i = 0; i < files.size(); i++) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java index cbd62d1..671ab10 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/itextpdf/PDFDawnloadController.java @@ -1,9 +1,8 @@ package com.glxp.sale.admin.controller.itextpdf; -import cn.hutool.core.io.FileUtil; -import cn.hutool.extra.qrcode.QrCodeUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.inout.ErpOrderEntity; import com.glxp.sale.admin.entity.inout.FilterErpOrderRequest; @@ -13,8 +12,8 @@ import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity; import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; -import com.glxp.sale.admin.req.itextpdf.InoutOrderDetailPDFFileRequest; import com.glxp.sale.admin.req.itextpdf.InoutOrderDetailPDFCodeRequest; +import com.glxp.sale.admin.req.itextpdf.InoutOrderDetailPDFFileRequest; import com.glxp.sale.admin.req.itextpdf.InspectionPDFTemplateRequest; import com.glxp.sale.admin.req.param.SystemPDFTemplateRequest; import com.glxp.sale.admin.service.basic.BussinessTypeService; @@ -29,13 +28,14 @@ import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.awt.image.BufferedImage; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -62,6 +62,7 @@ public class PDFDawnloadController { * * @throws Exception */ + @AuthRuleAnnotation("") @GetMapping("/udiwms/pdf/download/test") public void downloadTestPDF(HttpServletRequest request, HttpServletResponse response) throws Exception { // ITextPDFUtils.exportPDFTest(request, response); @@ -80,6 +81,7 @@ public class PDFDawnloadController { /** * 代码生成，配置从前端传入 */ + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/download/inout/order/success") public void downloadInoutOrderSuccessPDF(@RequestBody InoutOrderDetailPDFCodeRequest inoutOrderDetailPDFCodeRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -104,6 +106,7 @@ public class PDFDawnloadController { /** * 代码生成模板，模板数据从数据库获取 */ + @AuthRuleAnnotation("") @PostMapping("/udiwms/template/pdf/order/detail/code") public void orderDetailPDFFromTemplateCode( @RequestBody InoutOrderDetailPDFCodeRequest inoutOrderDetailPDFCodeRequest, @@ -144,6 +147,7 @@ public class PDFDawnloadController { /** * 模板导入，模板文件路径从数据库获取 */ + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/order/detail/file") public void orderDetailPDFFromTemplateFile( @RequestBody InoutOrderDetailPDFFileRequest inoutOrderDetailPDFFileRequest, @@ -184,6 +188,7 @@ public class PDFDawnloadController { } + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/preview") public BaseResponse previewPDFTemplate( @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { @@ -195,6 +200,7 @@ public class PDFDawnloadController { /** * 订单，模板检测 code */ + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/inspection/order/detail/code") public BaseResponse inspectionOrderDetailPDFFromTemplateCode( @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { @@ -218,6 +224,7 @@ public class PDFDawnloadController { /** * 订单，模板检测 file */ + @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/inspection/order/detail/file") public BaseResponse inspectionOrderDetailPDFFromTemplateFile( @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java index 8f9526d..2b1fe39 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java @@ -23,9 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; @RestController @@ -128,6 +126,7 @@ public class SystemParamConfigController { //key搜索 + @AuthRuleAnnotation("") @GetMapping("/udiwms/sys/config/selectByKey") public BaseResponse selectByKey(SystemParamConfigRequest systemParamConfigRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpExportLogController.java index 89d1686..18a688e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpExportLogController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity; @@ -53,6 +54,7 @@ public class ThrCorpExportLogController { @Resource BasicThirdSysDetailService basicThirdSysDetailService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrCorp/exportLog/filter") public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, BindingResult bindingResult) { @@ -70,6 +72,7 @@ public class ThrCorpExportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrCorp/exportLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -82,6 +85,7 @@ public class ThrCorpExportLogController { } //往来单位excel文件下载 + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrCorp/exportLog/download") public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { @@ -118,6 +122,7 @@ public class ThrCorpExportLogController { } //往来单位导出生成Excel，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrCorp/importLog/export") public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { @@ -146,6 +151,7 @@ public class ThrCorpExportLogController { //第三方往来单位接口下载（第三方使用） + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrsys/thrCorp/download") public BaseResponse downloadThrCorps(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpImportLogController.java index f4580e7..aab554d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpImportLogController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.thrsys; import cn.hutool.core.io.IoUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity; import com.glxp.sale.admin.entity.thrsys.ThrCorpImportDetailEntity; @@ -41,6 +42,7 @@ public class ThrCorpImportLogController { @Resource ThrCorpService thrCorpService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrCorp/importLog/filter") public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -58,6 +60,7 @@ public class ThrCorpImportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrCorp/importLog/filterDetail") public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -75,6 +78,7 @@ public class ThrCorpImportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrCorp/importLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -93,6 +97,7 @@ public class ThrCorpImportLogController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrCorp/importLog/uploadCorps") public BaseResponse uploadCorps(@RequestParam("file") List files) { String filePath = "D:\\udiwms\\filePath\\"; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpsController.java index 7ca1ee4..9076064 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrCorpsController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity; import com.glxp.sale.admin.entity.thrsys.ThrCorpImportLogEntity; @@ -37,7 +38,7 @@ public class ThrCorpsController { @Resource private ThrCorpImportLogService thrCorpImportLogService; - + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrsys/getCorps") public BaseResponse getCorps(FilterThrCorpRequest filterThrCorpRequest, BindingResult bindingResult) { @@ -55,6 +56,7 @@ public class ThrCorpsController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/delCorps") public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -66,6 +68,7 @@ public class ThrCorpsController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/corp/delAll") public BaseResponse delAll() { thrCorpService.deleteAll(); @@ -74,6 +77,7 @@ public class ThrCorpsController { //第三方服务上传（包括文件导入后上传） + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/postCorps") public BaseResponse postCorps(@RequestBody PostThrCorpRequest postThrCorpRequest, BindingResult bindingResult) { @@ -107,6 +111,7 @@ public class ThrCorpsController { } //接口一键全部 + @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/corp/downloadAll") public BaseResponse downloadAll(FilterThrCorpRequest filterThrProductsRequest) { String data = (String) redisUtil.get(Constant.dlThrProducts); @@ -131,6 +136,7 @@ public class ThrCorpsController { } //选中或者下载全部 + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/corp/corpsDlAll") public BaseResponse corpsDlAll(@RequestBody BasicUnitMaintainFilterRequest filterThrCorpRequest) { filterThrCorpRequest.setThirdSysFk(filterThrCorpRequest.getThirdSys()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderController.java index f81c053..8d8b2df 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.thrsys; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.inout.ErpOrderEntity; import com.glxp.sale.admin.entity.inout.FilterErpOrderRequest; @@ -61,6 +62,7 @@ public class ThrOrderController { @Resource private OrderDetailService myErpOrderService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrsys/getOrders") public BaseResponse getOrders(FilterThrOrderRequest filterThrOrderRequest, BindingResult bindingResult) { @@ -78,7 +80,7 @@ public class ThrOrderController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrsys/getOrderDetails") public BaseResponse getOrderDetails(FilterThrOrderDetailRequest filterThrOrderDetailRequest, BindingResult bindingResult) { @@ -96,7 +98,7 @@ public class ThrOrderController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/postOrderDetail") public BaseResponse postOrderDetail(@RequestBody PostThrOrderRequest postThrOrderRequest, BindingResult bindingResult) { @@ -151,6 +153,7 @@ public class ThrOrderController { return ResultVOUtils.success("单据上传成功！"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/delOrder") public BaseResponse delOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -181,6 +184,7 @@ public class ThrOrderController { } } + @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/order/delAll") public BaseResponse delAll() { thrOrderService.deleteAll(); @@ -188,7 +192,7 @@ public class ThrOrderController { return ResultVOUtils.success("删除成功"); } - + @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/orders/downloadAll") public BaseResponse downloadAll(FilterThrOrderRequest filterThrProductsRequest) { String data = (String) redisUtil.get(Constant.dlThrOrders); @@ -217,6 +221,7 @@ public class ThrOrderController { } } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/orders/orderDownload") public BaseResponse orderDownload(@RequestBody FilterThrOrderRequest filterThrProductsRequest) { String data = (String) redisUtil.get(Constant.dlThrOrders); @@ -244,6 +249,8 @@ public class ThrOrderController { return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); } } + + @AuthRuleAnnotation("") @PostMapping("/udiwms/smp/postOrder") public BaseResponse postSmpOrder(@RequestBody PostSmpOrderRequest postSmpOrderRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderExportLogController.java index 68f00b3..736e3c6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderExportLogController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity; @@ -57,6 +58,7 @@ public class ThrOrderExportLogController { @Value("${file_path}") String filePath; + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrOrder/exportLog/filter") public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, BindingResult bindingResult) { @@ -74,6 +76,7 @@ public class ThrOrderExportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrOrder/exportLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -86,6 +89,7 @@ public class ThrOrderExportLogController { } //业务单据excel文件下载 + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrOrder/exportLog/download") public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { @@ -122,6 +126,7 @@ public class ThrOrderExportLogController { } //业务单据导出生成Excel，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrOrder/importLog/export") public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { @@ -150,6 +155,7 @@ public class ThrOrderExportLogController { } //业务单据上传SMP，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrOrder/importLog/uploadSmp") public BaseResponse uploadSmp(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { @@ -168,6 +174,7 @@ public class ThrOrderExportLogController { } //第三方业务单据接口下载（第三方使用） + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrsys/thrOrder/download") public BaseResponse downloadThrOrders(FilterOrderRequest filterErpOrderRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java index 01a9ca1..bed8a8f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrOrderImportLogController.java @@ -2,8 +2,8 @@ package com.glxp.sale.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; -import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderImportDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrOrderImportLogEntity; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; @@ -44,6 +44,7 @@ public class ThrOrderImportLogController { @Resource BussinessTypeService bussinessTypeService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrOrder/importLog/filter") public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -62,6 +63,7 @@ public class ThrOrderImportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrOrder/importLog/filterDetail") public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -79,7 +81,7 @@ public class ThrOrderImportLogController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrOrder/importLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -99,6 +101,7 @@ public class ThrOrderImportLogController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrOrder/importLog/delete") public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -111,7 +114,7 @@ public class ThrOrderImportLogController { return ResultVOUtils.error(500, "删除成功"); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrOrder/importLog/upload") public BaseResponse uploadProducts(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java index a295f5b..ccb159a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsImportLogEntity; @@ -41,7 +42,7 @@ public class ThrProductsController { @Resource UdiRelevanceService udiRelevanceService; - + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrsys/getThrProducts") public BaseResponse getThrProducts(FilterThrProductsRequest filterThrProductsRequest, BindingResult bindingResult) { @@ -60,6 +61,7 @@ public class ThrProductsController { } //TODO + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/delThrProducts") public BaseResponse delThrProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -107,7 +109,7 @@ public class ThrProductsController { else return "删除失败！"; } - + @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/products/delAll") public BaseResponse delAll() { thrProductsService.deleteAll(); @@ -116,6 +118,7 @@ public class ThrProductsController { //第三方服务上传（包括文件导入后上传） + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/postThrProducts") public BaseResponse postThrProducts(@RequestBody PostThrProductsRequest postThrProductsRequest, BindingResult bindingResult) { @@ -155,6 +158,7 @@ public class ThrProductsController { } //接口一键下载全部 + @AuthRuleAnnotation("") @RequestMapping("/udiwms/thrsys/products/downloadAll") public BaseResponse downloadAll(FilterThrProductsRequest filterThrProductsRequest) { String data = (String) redisUtil.get(Constant.dlThrProducts); @@ -180,6 +184,7 @@ public class ThrProductsController { //接口一键下载全部 + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/products/productsDlAll") public BaseResponse productsDlAll(@RequestBody FilterThrProductsRequest filterThrProductsRequest) { filterThrProductsRequest.setThirdSysFk(filterThrProductsRequest.getThirdSys()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsExportLogController.java index 237bc93..f6f8c14 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsExportLogController.java @@ -1,18 +1,17 @@ package com.glxp.sale.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsExportLogEntity; -import com.glxp.sale.admin.httpclient.ErpBasicClient; import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest; import com.glxp.sale.admin.req.basic.FilterUdiEpLogRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.ThrProductsExportRequest; import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.basic.ErpProductsResponse; import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService; import com.glxp.sale.admin.service.thrsys.ThrProductsExportLogService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; @@ -49,6 +48,7 @@ public class ThrProductsExportLogController { @Resource BasicThirdSysDetailService basicThirdSysDetailService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrProducts/exportLog/filter") public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, BindingResult bindingResult) { @@ -66,6 +66,7 @@ public class ThrProductsExportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrProducts/exportLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -78,6 +79,7 @@ public class ThrProductsExportLogController { } //产品信息excel文件下载 + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrProducts/exportLog/download") public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { @@ -114,6 +116,7 @@ public class ThrProductsExportLogController { } //产品信息导出生成Excel，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrProducts/importLog/export") public BaseResponse excelDownload(@RequestBody ThrProductsExportRequest thrProductsExportRequest) { @@ -143,6 +146,7 @@ public class ThrProductsExportLogController { //产品信息上传供应商管理平台，并创建生成记录 + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrProducts/importLog/uploadSmp") public BaseResponse uploadSmp(@RequestBody ThrProductsExportRequest thrProductsExportRequest) { @@ -160,6 +164,7 @@ public class ThrProductsExportLogController { } //第三方产品信息接口下载（第三方使用） + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrsys/thrProducts/download") public BaseResponse getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java index e9aa63b..478f9b7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsImportLogController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.thrsys; import cn.hutool.core.io.IoUtil; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsImportDetailEntity; @@ -40,7 +41,7 @@ public class ThrProductsImportLogController { @Resource ThrProductsImportService thrProductsImportService; - + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrProducts//importLog/filter") public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -58,6 +59,7 @@ public class ThrProductsImportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/thrProducts/importLog/filterDetail") public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -75,6 +77,7 @@ public class ThrProductsImportLogController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrProducts//importLog/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { @@ -95,6 +98,7 @@ public class ThrProductsImportLogController { } //产品信息导入 + @AuthRuleAnnotation("") @PostMapping("/udiwms/thrProducts/importLog/upload") public BaseResponse uploadPi(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { String filePath = "D:\\udiwms\\filePath\\"; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/UdplatGoodsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/UdplatGoodsController.java index 61f38ee..ae58c18 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/UdplatGoodsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/UdplatGoodsController.java @@ -22,12 +22,14 @@ public class UdplatGoodsController { private UdplatGoodsService udplatGoodsService; // @AuthRuleAnnotation("udidl_udplatGoods_all") + @AuthRuleAnnotation("") @PostMapping("/list") public BaseResponse getList(@RequestBody BaseParam param) { return udplatGoodsService.getList(param); } // @AuthRuleAnnotation("udidl_udplatGoods_all") + @AuthRuleAnnotation("") @PostMapping("/import") public BaseResponse importExcel(MultipartFile file,int type){ try diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/UdplatGoodsImportController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/UdplatGoodsImportController.java index 5ca53ae..7f2c601 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/UdplatGoodsImportController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/UdplatGoodsImportController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.thrsys.ThrImportLogEntity; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.req.inout.DeleteRequest; @@ -21,7 +22,7 @@ public class UdplatGoodsImportController { @Resource ThrImportLogService thrImportLogService; - + @AuthRuleAnnotation("") @GetMapping("/filter") public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -39,7 +40,7 @@ public class UdplatGoodsImportController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/deleteLog") public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {