diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/controller/BomHeaderController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/controller/BomHeaderController.java index 488f1b6..08204ed 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/controller/BomHeaderController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/controller/BomHeaderController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.wms.config.bomHeader.controller; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.system.query.QueryGenerator; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -88,6 +89,7 @@ public class BomHeaderController extends JeecgController<BomHeader, IBomHeaderSe */ @AutoLog(value = "bom主表-添加") @ApiOperation(value="bom主表-添加", notes="bom主表-添加") + @RequiresPermissions("bomHeader:add") @PostMapping(value = "/add") public Result<String> add(@RequestBody BomHeader bomHeader, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); @@ -105,6 +107,7 @@ public class BomHeaderController extends JeecgController<BomHeader, IBomHeaderSe */ @AutoLog(value = "bom主表-编辑") @ApiOperation(value="bom主表-编辑", notes="bom主表-编辑") + @RequiresPermissions("bomHeader:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody BomHeader bomHeader) { bomHeaderService.updateById(bomHeader); @@ -118,6 +121,7 @@ public class BomHeaderController extends JeecgController<BomHeader, IBomHeaderSe */ @AutoLog(value = "bom主表-通过id删除") @ApiOperation(value="bom主表-通过id删除", notes="bom主表-通过id删除") + @RequiresPermissions("bomHeader:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { bomHeaderService.delMain(id); @@ -131,6 +135,7 @@ public class BomHeaderController extends JeecgController<BomHeader, IBomHeaderSe */ @AutoLog(value = "bom主表-批量删除") @ApiOperation(value="bom主表-批量删除", notes="bom主表-批量删除") + @RequiresPermissions("bomHeader:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.bomHeaderService.delBatchMain(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/carrier/controller/CarrierController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/carrier/controller/CarrierController.java index c5f4022..f8b3df6 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/carrier/controller/CarrierController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/carrier/controller/CarrierController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -88,6 +89,7 @@ public class CarrierController extends JeecgController<Carrier, ICarrierService> */ @AutoLog(value = "承运商管理-添加") @ApiOperation(value="承运商管理-添加", notes="承运商管理-添加") + @RequiresPermissions("carrier:add") @PostMapping(value = "/add") public Result<String> add(@RequestBody Carrier carrier, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); @@ -106,6 +108,7 @@ public class CarrierController extends JeecgController<Carrier, ICarrierService> */ @AutoLog(value = "承运商管理-编辑") @ApiOperation(value="承运商管理-编辑", notes="承运商管理-编辑") + @RequiresPermissions("carrier:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody Carrier carrier) { carrierService.updateById(carrier); @@ -120,6 +123,7 @@ public class CarrierController extends JeecgController<Carrier, ICarrierService> */ @AutoLog(value = "承运商管理-通过id删除") @ApiOperation(value="承运商管理-通过id删除", notes="承运商管理-通过id删除") + @RequiresPermissions("carrier:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { carrierService.removeById(id); @@ -134,6 +138,7 @@ public class CarrierController extends JeecgController<Carrier, ICarrierService> */ @AutoLog(value = "承运商管理-批量删除") @ApiOperation(value="承运商管理-批量删除", notes="承运商管理-批量删除") + @RequiresPermissions("carrier:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.carrierService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java index 2d7748e..958b27f 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -89,6 +90,7 @@ public class CompanyController extends JeecgController<Company, ICompanyService> @AutoLog(value = "货主-添加") @ApiOperation(value="货主-添加", notes="货主-添加") @PostMapping(value = "/add") + @RequiresPermissions("company:add") public Result<String> add(@RequestBody Company company, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); if(StringUtils.isNotEmpty(warehouseCode)) { @@ -106,6 +108,7 @@ public class CompanyController extends JeecgController<Company, ICompanyService> */ @AutoLog(value = "货主-编辑") @ApiOperation(value="货主-编辑", notes="货主-编辑") + @RequiresPermissions("company:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody Company company) { companyService.updateById(company); @@ -120,6 +123,7 @@ public class CompanyController extends JeecgController<Company, ICompanyService> */ @AutoLog(value = "货主-通过id删除") @ApiOperation(value="货主-通过id删除", notes="货主-通过id删除") + @RequiresPermissions("company:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { companyService.removeById(id); @@ -134,6 +138,7 @@ public class CompanyController extends JeecgController<Company, ICompanyService> */ @AutoLog(value = "货主-批量删除") @ApiOperation(value="货主-批量删除", notes="货主-批量删除") + @RequiresPermissions("company:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.companyService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java index e126d53..4bc7d48 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java @@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletResponse; import com.aliyun.oss.ServiceException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -97,6 +98,7 @@ public class ContainerController extends JeecgController<Container, IContainerSe @AutoLog(value = "容器管理-添加") @ApiOperation(value="容器管理-添加", notes="容器管理-添加") @PostMapping(value = "/add") + @RequiresPermissions("container:add") public Result<String> add(@RequestBody Container container, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); if(StringUtils.isNotEmpty(warehouseCode)) { @@ -115,6 +117,7 @@ public class ContainerController extends JeecgController<Container, IContainerSe */ @AutoLog(value = "容器管理-编辑") @ApiOperation(value="容器管理-编辑", notes="容器管理-编辑") + @RequiresPermissions("container:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody Container container) { String locationCode = container.getLocationCode(); @@ -140,6 +143,7 @@ public class ContainerController extends JeecgController<Container, IContainerSe @AutoLog(value = "容器管理-通过id删除") @ApiOperation(value="容器管理-通过id删除", notes="容器管理-通过id删除") @DeleteMapping(value = "/delete") + @RequiresPermissions("container:delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { containerService.removeById(id); return Result.OK("删除成功!"); @@ -153,6 +157,7 @@ public class ContainerController extends JeecgController<Container, IContainerSe */ @AutoLog(value = "容器管理-批量删除") @ApiOperation(value="容器管理-批量删除", notes="容器管理-批量删除") + @RequiresPermissions("container:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.containerService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerCapacity/controller/ContainerCapacityController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerCapacity/controller/ContainerCapacityController.java index f88bfdd..3d51644 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerCapacity/controller/ContainerCapacityController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerCapacity/controller/ContainerCapacityController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -85,6 +87,7 @@ public class ContainerCapacityController extends JeecgController<ContainerCapaci @AutoLog(value = "容器容量管理-添加") @ApiOperation(value="容器容量管理-添加", notes="容器容量管理-添加") @PostMapping(value = "/add") + @RequiresPermissions("containerCapacity:add") public Result<String> add(@RequestBody ContainerCapacity containerCapacity, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); if(StringUtils.isNotEmpty(warehouseCode)) { @@ -102,6 +105,7 @@ public class ContainerCapacityController extends JeecgController<ContainerCapaci */ @AutoLog(value = "容器容量管理-编辑") @ApiOperation(value="容器容量管理-编辑", notes="容器容量管理-编辑") + @RequiresPermissions("containerCapacity:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody ContainerCapacity containerCapacity) { containerCapacityService.updateById(containerCapacity); @@ -116,6 +120,7 @@ public class ContainerCapacityController extends JeecgController<ContainerCapaci */ @AutoLog(value = "容器容量管理-通过id删除") @ApiOperation(value="容器容量管理-通过id删除", notes="容器容量管理-通过id删除") + @RequiresPermissions("containerCapacity:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { containerCapacityService.removeById(id); @@ -131,6 +136,7 @@ public class ContainerCapacityController extends JeecgController<ContainerCapaci @AutoLog(value = "容器容量管理-批量删除") @ApiOperation(value="容器容量管理-批量删除", notes="容器容量管理-批量删除") @DeleteMapping(value = "/deleteBatch") + @RequiresPermissions("containerCapacity:deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.containerCapacityService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerType/controller/ContainerTypeController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerType/controller/ContainerTypeController.java index f6b9a1b..a9d5be6 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerType/controller/ContainerTypeController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/containerType/controller/ContainerTypeController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -88,6 +89,7 @@ public class ContainerTypeController extends JeecgController<ContainerType, ICon */ @AutoLog(value = "容器类型-添加") @ApiOperation(value="容器类型-添加", notes="容器类型-添加") + @RequiresPermissions("containerType:add") @PostMapping(value = "/add") public Result<String> add(@RequestBody ContainerType containerType, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); @@ -106,6 +108,7 @@ public class ContainerTypeController extends JeecgController<ContainerType, ICon */ @AutoLog(value = "容器类型-编辑") @ApiOperation(value="容器类型-编辑", notes="容器类型-编辑") + @RequiresPermissions("containerType:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody ContainerType containerType) { containerTypeService.updateById(containerType); @@ -120,6 +123,7 @@ public class ContainerTypeController extends JeecgController<ContainerType, ICon */ @AutoLog(value = "容器类型-通过id删除") @ApiOperation(value="容器类型-通过id删除", notes="容器类型-通过id删除") + @RequiresPermissions("containerType:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { containerTypeService.removeById(id); @@ -134,6 +138,7 @@ public class ContainerTypeController extends JeecgController<ContainerType, ICon */ @AutoLog(value = "容器类型-批量删除") @ApiOperation(value="容器类型-批量删除", notes="容器类型-批量删除") + @RequiresPermissions("containerType:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.containerTypeService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/customer/controller/CustomerController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/customer/controller/CustomerController.java index 49d657b..2194228 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/customer/controller/CustomerController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/customer/controller/CustomerController.java @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -91,6 +92,7 @@ public class CustomerController extends JeecgController<Customer, ICustomerServi @AutoLog(value = "客户管理-添加") @ApiOperation(value="客户管理-添加", notes="客户管理-添加") @PostMapping(value = "/add") + @RequiresPermissions("customer:add") public Result<String> add(@RequestBody Customer customer, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); if(StringUtils.isNotEmpty(warehouseCode)) { @@ -108,6 +110,7 @@ public class CustomerController extends JeecgController<Customer, ICustomerServi */ @AutoLog(value = "客户管理-编辑") @ApiOperation(value="客户管理-编辑", notes="客户管理-编辑") + @RequiresPermissions("customer:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody Customer customer) { customerService.updateById(customer); @@ -121,6 +124,7 @@ public class CustomerController extends JeecgController<Customer, ICustomerServi * @return */ @AutoLog(value = "客户管理-通过id删除") + @RequiresPermissions("customer:delete") @ApiOperation(value="客户管理-通过id删除", notes="客户管理-通过id删除") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { @@ -136,6 +140,7 @@ public class CustomerController extends JeecgController<Customer, ICustomerServi */ @AutoLog(value = "客户管理-批量删除") @ApiOperation(value="客户管理-批量删除", notes="客户管理-批量删除") + @RequiresPermissions("customer:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.customerService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java index 668576b..e0820e2 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java @@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -91,6 +92,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi * @return */ @AutoLog(value = "物料管理-添加") + @RequiresPermissions("material:add") @ApiOperation(value="物料管理-添加", notes="物料管理-添加") @PostMapping(value = "/add") public Result<String> add(@RequestBody Material material, HttpServletRequest req) { @@ -110,6 +112,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi */ @AutoLog(value = "物料管理-编辑") @ApiOperation(value="物料管理-编辑", notes="物料管理-编辑") + @RequiresPermissions("material:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody Material material) { materialService.updateById(material); @@ -125,6 +128,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi @AutoLog(value = "物料管理-通过id删除") @ApiOperation(value="物料管理-通过id删除", notes="物料管理-通过id删除") @DeleteMapping(value = "/delete") + @RequiresPermissions("material:delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { materialService.removeById(id); return Result.OK("删除成功!"); @@ -139,6 +143,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi @AutoLog(value = "物料管理-批量删除") @ApiOperation(value="物料管理-批量删除", notes="物料管理-批量删除") @DeleteMapping(value = "/deleteBatch") + @RequiresPermissions("material:deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.materialService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -168,6 +173,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi * @param material */ @RequestMapping(value = "/exportXls") + @RequiresPermissions("material:exportXls") public ModelAndView exportXls(HttpServletRequest request, Material material) { return super.exportXls(request, material, Material.class, "物料管理"); } @@ -180,6 +186,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi */ @AutoLog(value = "物料管理-获取打印数据") @ApiOperation(value="物料管理-获取打印数据", notes="物料管理-获取打印数据") + @RequiresPermissions("material:print") @PostMapping(value = "/getPrintContent") @ResponseBody public Result getPrintContent(@RequestParam(name="ids",required=true) String ids) { @@ -196,7 +203,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + @RequiresPermissions("material:importExcel") + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, Material.class); } diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialArea/controller/MaterialAreaController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialArea/controller/MaterialAreaController.java index c8d7856..ebac358 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialArea/controller/MaterialAreaController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialArea/controller/MaterialAreaController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -83,6 +85,7 @@ public class MaterialAreaController extends JeecgController<MaterialArea, IMater * @return */ @AutoLog(value = "物料分区-添加") + @RequiresPermissions("materialArea:add") @ApiOperation(value="物料分区-添加", notes="物料分区-添加") @PostMapping(value = "/add") public Result<String> add(@RequestBody MaterialArea materialArea, HttpServletRequest req) { @@ -101,6 +104,7 @@ public class MaterialAreaController extends JeecgController<MaterialArea, IMater * @return */ @AutoLog(value = "物料分区-编辑") + @RequiresPermissions("materialArea:edit") @ApiOperation(value="物料分区-编辑", notes="物料分区-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody MaterialArea materialArea) { @@ -115,6 +119,7 @@ public class MaterialAreaController extends JeecgController<MaterialArea, IMater * @return */ @AutoLog(value = "物料分区-通过id删除") + @RequiresPermissions("materialArea:delete") @ApiOperation(value="物料分区-通过id删除", notes="物料分区-通过id删除") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { @@ -130,6 +135,7 @@ public class MaterialAreaController extends JeecgController<MaterialArea, IMater */ @AutoLog(value = "物料分区-批量删除") @ApiOperation(value="物料分区-批量删除", notes="物料分区-批量删除") + @RequiresPermissions("materialArea:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.materialAreaService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialMultiple/controller/MaterialMultipleController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialMultiple/controller/MaterialMultipleController.java index 031879b..3abcdfc 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialMultiple/controller/MaterialMultipleController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialMultiple/controller/MaterialMultipleController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -84,6 +86,7 @@ public class MaterialMultipleController extends JeecgController<MaterialMultiple */ @AutoLog(value = "物料单位换算-添加") @ApiOperation(value="物料单位换算-添加", notes="物料单位换算-添加") + @RequiresPermissions("materialMultiple:add") @PostMapping(value = "/add") public Result<String> add(@RequestBody MaterialMultiple materialMultiple, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); @@ -101,6 +104,7 @@ public class MaterialMultipleController extends JeecgController<MaterialMultiple * @return */ @AutoLog(value = "物料单位换算-编辑") + @RequiresPermissions("materialMultiple:deit") @ApiOperation(value="物料单位换算-编辑", notes="物料单位换算-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody MaterialMultiple materialMultiple) { @@ -115,6 +119,7 @@ public class MaterialMultipleController extends JeecgController<MaterialMultiple * @return */ @AutoLog(value = "物料单位换算-通过id删除") + @RequiresPermissions("materialMultiple:delete") @ApiOperation(value="物料单位换算-通过id删除", notes="物料单位换算-通过id删除") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { @@ -130,6 +135,7 @@ public class MaterialMultipleController extends JeecgController<MaterialMultiple */ @AutoLog(value = "物料单位换算-批量删除") @ApiOperation(value="物料单位换算-批量删除", notes="物料单位换算-批量删除") + @RequiresPermissions("materialMultiple:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.materialMultipleService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialType/controller/MaterialTypeController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialType/controller/MaterialTypeController.java index 5d93f4d..0c25079 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialType/controller/MaterialTypeController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialType/controller/MaterialTypeController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -83,6 +85,7 @@ public class MaterialTypeController extends JeecgController<MaterialType, IMater * @return */ @AutoLog(value = "物料类别-添加") + @RequiresPermissions("materialType:add") @ApiOperation(value="物料类别-添加", notes="物料类别-添加") @PostMapping(value = "/add") public Result<String> add(@RequestBody MaterialType materialType, HttpServletRequest req) { @@ -101,6 +104,7 @@ public class MaterialTypeController extends JeecgController<MaterialType, IMater * @return */ @AutoLog(value = "物料类别-编辑") + @RequiresPermissions("materialType:edit") @ApiOperation(value="物料类别-编辑", notes="物料类别-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody MaterialType materialType) { @@ -115,6 +119,7 @@ public class MaterialTypeController extends JeecgController<MaterialType, IMater * @return */ @AutoLog(value = "物料类别-通过id删除") + @RequiresPermissions("materialType:delete") @ApiOperation(value="物料类别-通过id删除", notes="物料类别-通过id删除") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { @@ -130,6 +135,7 @@ public class MaterialTypeController extends JeecgController<MaterialType, IMater */ @AutoLog(value = "物料类别-批量删除") @ApiOperation(value="物料类别-批量删除", notes="物料类别-批量删除") + @RequiresPermissions("materialType:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.materialTypeService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialUnit/controller/MaterialUnitController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialUnit/controller/MaterialUnitController.java index ffeaa93..fa839f2 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialUnit/controller/MaterialUnitController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialUnit/controller/MaterialUnitController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -85,6 +87,7 @@ public class MaterialUnitController extends JeecgController<MaterialUnit, IMater @AutoLog(value = "物料单位-添加") @ApiOperation(value="物料单位-添加", notes="物料单位-添加") @PostMapping(value = "/add") + @RequiresPermissions("materialUnit:add") public Result<String> add(@RequestBody MaterialUnit materialUnit, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); if(StringUtils.isNotEmpty(warehouseCode)) { @@ -102,6 +105,7 @@ public class MaterialUnitController extends JeecgController<MaterialUnit, IMater */ @AutoLog(value = "物料单位-编辑") @ApiOperation(value="物料单位-编辑", notes="物料单位-编辑") + @RequiresPermissions("materialUnit:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody MaterialUnit materialUnit) { materialUnitService.updateById(materialUnit); @@ -117,6 +121,7 @@ public class MaterialUnitController extends JeecgController<MaterialUnit, IMater @AutoLog(value = "物料单位-通过id删除") @ApiOperation(value="物料单位-通过id删除", notes="物料单位-通过id删除") @DeleteMapping(value = "/delete") + @RequiresPermissions("materialUnit:delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { materialUnitService.removeById(id); return Result.OK("删除成功!"); @@ -131,6 +136,7 @@ public class MaterialUnitController extends JeecgController<MaterialUnit, IMater @AutoLog(value = "物料单位-批量删除") @ApiOperation(value="物料单位-批量删除", notes="物料单位-批量删除") @DeleteMapping(value = "/deleteBatch") + @RequiresPermissions("materialUnit:deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.materialUnitService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialWarning/controller/MaterialWarningController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialWarning/controller/MaterialWarningController.java index f2c8729..2ad96cb 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialWarning/controller/MaterialWarningController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/materialWarning/controller/MaterialWarningController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -83,6 +85,7 @@ public class MaterialWarningController extends JeecgController<MaterialWarning, * @return */ @AutoLog(value = "物料预警-添加") + @RequiresPermissions("materialWarning:add") @ApiOperation(value="物料预警-添加", notes="物料预警-添加") @PostMapping(value = "/add") public Result<String> add(@RequestBody MaterialWarning materialWarning, HttpServletRequest req) { @@ -101,6 +104,7 @@ public class MaterialWarningController extends JeecgController<MaterialWarning, * @return */ @AutoLog(value = "物料预警-编辑") + @RequiresPermissions("materialWarning:edit") @ApiOperation(value="物料预警-编辑", notes="物料预警-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody MaterialWarning materialWarning) { @@ -115,6 +119,7 @@ public class MaterialWarningController extends JeecgController<MaterialWarning, * @return */ @AutoLog(value = "物料预警-通过id删除") + @RequiresPermissions("materialWarning:delete") @ApiOperation(value="物料预警-通过id删除", notes="物料预警-通过id删除") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { @@ -130,6 +135,7 @@ public class MaterialWarningController extends JeecgController<MaterialWarning, */ @AutoLog(value = "物料预警-批量删除") @ApiOperation(value="物料预警-批量删除", notes="物料预警-批量删除") + @RequiresPermissions("materialWarning:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.materialWarningService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java index b4aa648..2f363f8 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -85,6 +87,7 @@ public class PortController extends JeecgController<Port, IPortService> { @AutoLog(value = "出入口-添加") @ApiOperation(value="出入口-添加", notes="出入口-添加") @PostMapping(value = "/add") + @RequiresPermissions("port:add") public Result<String> add(@RequestBody Port port, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); if(StringUtils.isNotEmpty(warehouseCode)) { @@ -102,6 +105,7 @@ public class PortController extends JeecgController<Port, IPortService> { */ @AutoLog(value = "出入口-编辑") @ApiOperation(value="出入口-编辑", notes="出入口-编辑") + @RequiresPermissions("port:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody Port port) { portService.updateById(port); @@ -116,6 +120,7 @@ public class PortController extends JeecgController<Port, IPortService> { */ @AutoLog(value = "出入口-通过id删除") @ApiOperation(value="出入口-通过id删除", notes="出入口-通过id删除") + @RequiresPermissions("port:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { portService.removeById(id); @@ -130,6 +135,7 @@ public class PortController extends JeecgController<Port, IPortService> { */ @AutoLog(value = "出入口-批量删除") @ApiOperation(value="出入口-批量删除", notes="出入口-批量删除") + @RequiresPermissions("port:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.portService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/supplier/controller/SupplierController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/supplier/controller/SupplierController.java index 8b375e7..4eeec2f 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/supplier/controller/SupplierController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/supplier/controller/SupplierController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -89,6 +90,7 @@ public class SupplierController extends JeecgController<Supplier, ISupplierServi @AutoLog(value = "供应商管理-添加") @ApiOperation(value="供应商管理-添加", notes="供应商管理-添加") @PostMapping(value = "/add") + @RequiresPermissions("supplier:add") public Result<String> add(@RequestBody Supplier supplier, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); if(StringUtils.isNotEmpty(warehouseCode)) { @@ -106,6 +108,7 @@ public class SupplierController extends JeecgController<Supplier, ISupplierServi */ @AutoLog(value = "供应商管理-编辑") @ApiOperation(value="供应商管理-编辑", notes="供应商管理-编辑") + @RequiresPermissions("supplier:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody Supplier supplier) { supplierService.updateById(supplier); @@ -120,6 +123,7 @@ public class SupplierController extends JeecgController<Supplier, ISupplierServi */ @AutoLog(value = "供应商管理-通过id删除") @ApiOperation(value="供应商管理-通过id删除", notes="供应商管理-通过id删除") + @RequiresPermissions("supplier:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { supplierService.removeById(id); @@ -134,6 +138,7 @@ public class SupplierController extends JeecgController<Supplier, ISupplierServi */ @AutoLog(value = "供应商管理-批量删除") @ApiOperation(value="供应商管理-批量删除", notes="供应商管理-批量删除") + @RequiresPermissions("supplier:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.supplierService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java index ae488c4..49397a3 100644 --- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java +++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; @@ -87,6 +88,7 @@ public class ZoneController extends JeecgController<Zone, IZoneService> { */ @AutoLog(value = "库区管理-添加") @ApiOperation(value="库区管理-添加", notes="库区管理-添加") + @RequiresPermissions("zone:add") @PostMapping(value = "/add") public Result<String> add(@RequestBody Zone zone, HttpServletRequest req) { String warehouseCode = JwtUtil.getWarehouseCodeByToken(req); @@ -105,6 +107,7 @@ public class ZoneController extends JeecgController<Zone, IZoneService> { */ @AutoLog(value = "库区管理-编辑") @ApiOperation(value="库区管理-编辑", notes="库区管理-编辑") + @RequiresPermissions("zone:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<String> edit(@RequestBody Zone zone) { zoneService.updateById(zone); @@ -119,6 +122,7 @@ public class ZoneController extends JeecgController<Zone, IZoneService> { */ @AutoLog(value = "库区管理-通过id删除") @ApiOperation(value="库区管理-通过id删除", notes="库区管理-通过id删除") + @RequiresPermissions("zone:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { zoneService.removeById(id); @@ -133,6 +137,7 @@ public class ZoneController extends JeecgController<Zone, IZoneService> { */ @AutoLog(value = "库区管理-批量删除") @ApiOperation(value="库区管理-批量删除", notes="库区管理-批量删除") + @RequiresPermissions("zone:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.zoneService.removeByIds(Arrays.asList(ids.split(",")));