diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthCheckController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthCheckController.java index c1b646c..48dbab0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthCheckController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthCheckController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.auth; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthCheckEntity; import com.glxp.sale.admin.req.auth.AuthCheckRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -42,6 +43,7 @@ public class AuthCheckController { } + @AuthRuleAnnotation("") @PostMapping("/udiwms/auth/device/save") public BaseResponse save(@RequestBody @Valid AuthCheckEntity authCheckEntity, BindingResult bindingResult) { 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 bfa09be..9f2097e 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 @@ -11,13 +11,10 @@ import com.glxp.sale.admin.req.auth.CustomerInfoFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; -import com.glxp.sale.admin.service.auth.AuthRoleAdminService; import com.glxp.sale.admin.service.auth.CustomerInfoService; import com.glxp.sale.admin.service.auth.UserRegisterService; import com.glxp.sale.admin.service.auth.impl.CustomerContactService; import com.glxp.sale.admin.service.info.CompanyService; -import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService; -import com.glxp.sale.admin.service.param.SystemPDFTemplateService; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -47,12 +44,7 @@ public class CustomerController { private UserRegisterService userRegisterService; @Resource private AuthAdminService authAdminService; - @Resource - private AuthRoleAdminService authRoleAdminService; - @Resource - private SystemPDFTemplateService systemPDFTemplateService; - @Resource - private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService; + @AuthRuleAnnotation("") @GetMapping("/spms/customer/list") public BaseResponse filterCustomers(CustomerInfoFilterRequest customerFilterRequest) { 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 942bc11..cd55cf4 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 @@ -140,6 +140,7 @@ public class RegisterController { } + @AuthRuleAnnotation("") @GetMapping("salewarehouse/register/checkCompany") public BaseResponse checkCompany(@RequestParam("companyName") String companyName) { if (StringUtils.isBlank(companyName)) return ResultVOUtils.error(ResultEnum.DATA_ERROR, "企业名称不能为空"); @@ -152,6 +153,7 @@ public class RegisterController { } + @AuthRuleAnnotation("") @GetMapping("salewarehouse/register/getRegisterConfig") public BaseResponse getRegisterConfig() { @@ -191,6 +193,7 @@ public class RegisterController { return ResultVOUtils.success("删除成功"); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/update") public BaseResponse updateRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, BindingResult bindingResult) { @@ -205,6 +208,7 @@ public class RegisterController { return ResultVOUtils.success("添加成功"); } + @AuthRuleAnnotation("") @PostMapping("salewarehouse/register/save") public BaseResponse saveRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, HttpSession httpSession, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java index afbe9f4..5ed60e4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java @@ -49,6 +49,7 @@ public class BasicBusTypeChangeController { } + @AuthRuleAnnotation("") @PostMapping("/basic/bustype/change/insert") public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java index bf90e07..0e23a75 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java @@ -86,7 +86,7 @@ public class BussinessOriginTypeController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/udiwms/originBusType/update") public BaseResponse updateBussinessType(@RequestBody BussinessOriginTypeEntity bussinessTypeEntity, BindingResult bindingResult) { @@ -103,6 +103,7 @@ public class BussinessOriginTypeController { return ResultVOUtils.success("更新成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/originBusType/add") public BaseResponse addBussinessType(@RequestBody BussinessOriginTypeEntity bussinessTypeEntity, BindingResult bindingResult) { @@ -123,6 +124,7 @@ public class BussinessOriginTypeController { return ResultVOUtils.success("更新成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/originBusType/delete") public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest, 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 0616831..e123aca 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 @@ -41,7 +41,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.InputStream; -import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -138,7 +137,7 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/bussinessType/download") public BaseResponse downloadJoinBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest, BindingResult bindingResult) { @@ -187,7 +186,7 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @GetMapping("/udiwms/bussinessType/udimsFilter") public BaseResponse udimsFilter(UdimsFilterRequest udimsFilterRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index 6be4f09..a9b0628 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.collection.CollUtil; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; @@ -33,6 +34,7 @@ public class SpsSyncDownloadController { @Resource OrderService orderService; + @AuthRuleAnnotation("") @GetMapping("sps/sync/basic") public BaseResponse findProductInfo(SpsSyncDataRequest spsSyncDataRequest) { @@ -102,6 +104,7 @@ public class SpsSyncDownloadController { return baseResponse; } + @AuthRuleAnnotation("") @GetMapping("sps/sync/busType") public BaseResponse findBusType(SpsSyncDataRequest spsSyncDataRequest) { @@ -127,6 +130,7 @@ public class SpsSyncDownloadController { return baseResponse; } + @AuthRuleAnnotation("") @GetMapping("sps/sync/order") public BaseResponse findOrder(SpsSyncDataRequest spsSyncDataRequest) { BaseResponse baseResponse = spsSyncDownloadService.findOrder(spsSyncDataRequest); @@ -156,6 +160,7 @@ public class SpsSyncDownloadController { //udi同步数据 + @AuthRuleAnnotation("") @GetMapping("sps/sync/syncUdis") public BaseResponse syncUdi(SpsSyncDataRequest spsSyncDataRequest) { @@ -183,6 +188,7 @@ public class SpsSyncDownloadController { * @param postThirdSysUploadInfo * @return */ + @AuthRuleAnnotation("") @PostMapping("/sps/sync/order/syncOrderUploadInfo") public BaseResponse syncOrderUploadInfo(@RequestBody PostThirdSysUploadInfo postThirdSysUploadInfo, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadStatusController.java index 9f772c0..76a3b15 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadStatusController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadStatusController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.basic.BasicDownloadStatusEntity; import com.glxp.sale.admin.req.basic.BasicDownloadRequest; import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; @@ -35,13 +36,13 @@ public class SpsSyncDownloadStatusController { return ResultVOUtils.success("连接成功"); } - + @AuthRuleAnnotation("") @GetMapping("/spssync/download/basic/udiinfo/getStatus") public BaseResponse getStatus(BasicDownloadRequest basicDownloadRequest) { List basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest); return ResultVOUtils.success(basicDownloadStatusEntities); } - + @AuthRuleAnnotation("") @GetMapping("/spssync/download/basic/udiinfo/filter") public BaseResponse filterStatus(BasicDownloadRequest basicDownloadRequest) { List basicDownloadStatusEntities = basicDownloadService.filterDownloadStatus(basicDownloadRequest); @@ -53,7 +54,7 @@ public class SpsSyncDownloadStatusController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/spssync/download/basic/udiinfo/deleteByStatus") public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { @@ -65,6 +66,7 @@ public class SpsSyncDownloadStatusController { return ResultVOUtils.error(500, "删除失败!"); } + @AuthRuleAnnotation("") @PostMapping("/spssync/download/basic/udiinfo/updateStatus") public BaseResponse updateStatus(@RequestBody BasicDownloadStatusEntity basicDownloadStatusEntity) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java index eeec865..b416664 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java @@ -2,21 +2,21 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -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.constant.ConstantStatus; import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; import com.glxp.sale.admin.entity.basic.BasicExportStatusTimeEntity; -import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.req.basic.BasicExportStatusRequest; import com.glxp.sale.admin.req.basic.BasicExportTimeRequest; import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.basic.*; -import com.glxp.sale.admin.res.inventory.InvWarehouseExportResponse; +import com.glxp.sale.admin.res.basic.SpSyncUdiResponse; +import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; +import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; +import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; import com.glxp.sale.admin.service.basic.BasicExportService; import com.glxp.sale.admin.service.basic.BasicExportTimeService; import com.glxp.sale.admin.util.CustomUtil; @@ -62,7 +62,7 @@ public class SpsSyncExportStatusController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("/spssync/basic/udiinfo/deleteByStatus") public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) { @@ -74,6 +74,7 @@ public class SpsSyncExportStatusController { return ResultVOUtils.error(500, "删除失败!"); } + @AuthRuleAnnotation("") @PostMapping("/spssync/basic/udiinfo/updateStatus") public BaseResponse updateStatus(@RequestBody BasicExportStatusEntity basicExportStatusEntity) { if (StrUtil.isEmpty(basicExportStatusEntity.getReceiveStatus())) { @@ -87,7 +88,7 @@ public class SpsSyncExportStatusController { return ResultVOUtils.error(500, "更新成功!"); } - + @AuthRuleAnnotation("") @GetMapping("/spssync/basic/schedule/lastTime") public BaseResponse getLastUpdateTime(BasicExportTimeRequest basicExportTimeRequest) { List basicExportStatusEntities = basicExportTimeService.filterExportStatus(basicExportTimeRequest); @@ -98,6 +99,7 @@ public class SpsSyncExportStatusController { } } + @AuthRuleAnnotation("") @PostMapping("/spssync/basic/schedule/updateLastTime") public BaseResponse updateLastTime(@RequestBody BasicExportStatusTimeEntity basicExportStatusTimeEntity) { @@ -108,6 +110,7 @@ public class SpsSyncExportStatusController { return ResultVOUtils.error(500, "更新失败!"); } + @AuthRuleAnnotation("") @PostMapping("/spssync/basic/schedule/create") public BaseResponse createSchedule(@RequestBody BasicExportStatusRequest basicExportStatusRequest) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index d3944df..448d267 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.basic; import cn.hutool.core.collection.CollUtil; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.dao.auth.AuthAdminDao; @@ -22,6 +23,7 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.thrsys.*; +import com.glxp.sale.admin.req.basic.UdiInfoReqeust; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; @@ -32,7 +34,6 @@ import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.inventory.InvBusUserService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; -import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.thrsys.ThrSubInvWarehouseService; import com.glxp.sale.admin.thread.BasicBackUpdateProductService; import com.glxp.sale.admin.util.BeanUtils; @@ -48,7 +49,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.glxp.sale.admin.req.basic.UdiInfoReqeust; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; @@ -84,7 +84,7 @@ public class SpsSyncUploadController { @Resource InvBusUserService invBusUserService; - + @AuthRuleAnnotation("") @PostMapping("sps/sync/basic/upload") public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) { if (syncDataResponse != null) { @@ -93,7 +93,7 @@ public class SpsSyncUploadController { return ResultVOUtils.success("上传成功!"); } - + @AuthRuleAnnotation("") @PostMapping("sps/sync/busType/upload") public BaseResponse findBusType(@RequestBody SpsSyncBusResponse syncDataResponse) { if (syncDataResponse != null) { @@ -102,7 +102,7 @@ public class SpsSyncUploadController { return ResultVOUtils.success("上传成功!"); } - + @AuthRuleAnnotation("") @PostMapping("sps/sync/order/upload") public BaseResponse findOrder(@RequestBody SpsSyncOrderResponse syncDataResponse) { if (syncDataResponse != null) { @@ -111,6 +111,7 @@ public class SpsSyncUploadController { return ResultVOUtils.success("上传成功!"); } + @AuthRuleAnnotation("") @PostMapping("sps/sync/schedule/upload") public BaseResponse dealSchedule(@RequestBody BasicExportStatusEntity basicExportStatusEntity) { //todo diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/ClassifyCodeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/ClassifyCodeController.java index 15ec53b..14ba7b1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/ClassifyCodeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/ClassifyCodeController.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.ClassifyCodeEntity; import com.glxp.sale.admin.req.info.FilterClassifyCodeRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -19,6 +20,7 @@ public class ClassifyCodeController { @Resource ClassifyCodeService classifyCodeService; + @AuthRuleAnnotation("") @GetMapping("spms/classify/code/filter") public BaseResponse filterList(FilterClassifyCodeRequest filterDeviceKeyRequest) { List classifyCodeEntities = classifyCodeService.filteClassifyCode(filterDeviceKeyRequest); 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 2e04390..d206172 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 @@ -3,17 +3,13 @@ package com.glxp.sale.admin.controller.info; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; -import com.glxp.sale.admin.controller.basic.BasicUnitMaintainController; import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.sale.admin.entity.info.BasicProductSetEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; -import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; import com.glxp.sale.admin.req.info.CompanyRequest; import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; @@ -29,7 +25,6 @@ import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.CompanyProductsRelService; -import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.admin.util.SupplementVailUtil; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -47,7 +42,6 @@ import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; @RestController public class CompanyProductRelevanceController { @@ -232,6 +226,7 @@ public class CompanyProductRelevanceController { return ResultVOUtils.success("修改成功"); } + @AuthRuleAnnotation("") @PostMapping("/sale/info/deleteCompanyProductRelevance") public BaseResponse deleteCompanyProductRelevance(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { boolean b = companyProductRelevanceService.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 a682ecd..2fe9dc5 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 @@ -14,7 +14,6 @@ import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; import com.glxp.sale.admin.req.info.FilterCompanyUpdateLogRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; -import com.glxp.sale.admin.service.info.CompanySalesmanService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.info.CompanyUpdateLogService; import com.glxp.sale.common.enums.ResultEnum; @@ -41,8 +40,6 @@ public class CompanyUpdateLogController { @Resource private CompanyUpdateLogService companyUpdateLogService; @Resource - private CompanySalesmanService companySalesmanService; - @Resource private CompanyService companyService; @AuthRuleAnnotation("") 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 ae204bb..8cd8b2e 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.req.inout.DeleteRequest; @@ -34,6 +35,7 @@ public class DeviceKeyController { // @Resource // private JavaMailSender javaMailSender; + @AuthRuleAnnotation("") @GetMapping("sale/device/registerList") public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) { List deviceKeyEntities = deviceKeyService.findDeviceKey(filterDeviceKeyRequest); @@ -45,7 +47,7 @@ public class DeviceKeyController { return ResultVOUtils.success(pageSimpleResponse); } - + @AuthRuleAnnotation("") @PostMapping("sale/device/check") public BaseResponse checkRegister(@RequestBody @Valid DeviceKeyEntity deviceKeyEntity, BindingResult bindingResult) { @@ -59,6 +61,7 @@ public class DeviceKeyController { } + @AuthRuleAnnotation("") @PostMapping("/sale/info/registerKey") public BaseResponse registerKey(@RequestBody DeviceKeyEntity deviceKeyEntity) { String key = md5("glxp2020" + deviceKeyEntity.getImei()); @@ -74,7 +77,7 @@ public class DeviceKeyController { } } - + @AuthRuleAnnotation("") @PostMapping("/sale/info/deleterKey") public BaseResponse deleterKey(@RequestBody DeleteRequest deleteRequest) { @@ -83,7 +86,7 @@ public class DeviceKeyController { } - + @AuthRuleAnnotation("") @PostMapping("sale/device/register") public BaseResponse saveRegister(@RequestBody DeviceKeyEntity deviceKeyEntity, 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 2c87fff..a2e0be8 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 @@ -82,8 +82,6 @@ public class OrderController { @Resource InvWarehouseService invWarehouseService; @Resource - WarehouseUserService warehouseUserService; - @Resource CustomerService customerService; @Resource EntrustReceService entrustReceService; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/test/TestController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/test/TestController.java index 23eb893..d488be9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/test/TestController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/test/TestController.java @@ -1,29 +1,17 @@ package com.glxp.sale.admin.controller.test; import com.alibaba.fastjson.JSON; -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.param.SystemPDFModuleRequest; -import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.param.SystemPDFModuleResponse; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.util.Md5Utils; -import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.List; -import java.util.stream.Collectors; @RestController public class TestController { @@ -54,6 +42,7 @@ public class TestController { return ResultVOUtils.success(""); } + @AuthRuleAnnotation("") @GetMapping("/udplat/hosp/test") public BaseResponse hospList() { try { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java index 957c2c5..818823d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java @@ -76,4 +76,6 @@ public class BussinessTypResponse { private boolean secCheckCopy; private boolean checkSelect; //判断多选框是否勾选 + + private boolean checkSp; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/upload/ImageController.java b/api-admin/src/main/java/com/glxp/sale/admin/upload/ImageController.java index bba23c2..73026bd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/upload/ImageController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/upload/ImageController.java @@ -1,13 +1,12 @@ package com.glxp.sale.admin.upload; -import net.sf.jasperreports.engine.JRException; -import net.sf.jasperreports.engine.JasperExportManager; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; import javax.imageio.ImageIO; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.File; @@ -20,6 +19,7 @@ public class ImageController { @Value("${file_path}") private String filePath; + @AuthRuleAnnotation("") @GetMapping(value = "/udiwms/image/register/file/getImage") public void getImage(HttpServletResponse response , @RequestParam String type @@ -45,6 +45,7 @@ public class ImageController { } } + @AuthRuleAnnotation("") @GetMapping(value = "/udiwms/donwload/file") public void download(HttpServletResponse response, @RequestParam String fileName) throws IOException { @@ -68,7 +69,7 @@ public class ImageController { } } - + @AuthRuleAnnotation("") @GetMapping(value = "/spms/donwload/pdf") public void downloadPdf(HttpServletResponse response, @RequestParam String fileName) throws IOException {