系统接口权限整理,修改

This commit is contained in:
liuzhaotian
2025-03-10 11:33:17 +08:00
parent 54e6cdf43e
commit 4d31aad2e7
26 changed files with 141 additions and 173 deletions
@@ -54,7 +54,7 @@ public class PackController {
@GetMapping("/getOrderPlate")
@Operation(summary = "查看生产订单对应的没有打包的板材信息")
@Parameter(name = "orderId", description = "生产单Id", required = true)
@PreAuthorize("@ss.hasPermission('manage:pack-palte:query')")
@PreAuthorize("@ss.hasAnyPermissions('manage:pack:export-lost-plate','manage:pack:pack')")
public CommonResult<List<PlateDetailsRespVO>> getOrderPlateList(@Valid @RequestParam("orderId") Long orderId) {
return success(packService.getOrderPlateList(orderId));
@@ -65,7 +65,7 @@ public class PackController {
@GetMapping("/getOrderPlateList")
@Operation(summary = "查询多个生产单对应的板材信息")
@Parameter(name = "orderIds", description = "生产单ID", required = true)
@PreAuthorize("@ss.hasPermission('manage:pack:create')")
@PreAuthorize("@ss.hasAnyPermissions('manage:pack:create','manage:pack:pre-pack','manage:pack:pack')")
public CommonResult<List<PlateDetailsRespVO>> getOrdersPlateList(@Valid @RequestParam("orderIds") List<Long> orderIds) {
return success(packService.getOrdersPlateList(orderIds));
@@ -75,7 +75,7 @@ public class PackController {
@GetMapping("/getOrderPack")
@Operation(summary = "查看生产订单对应的包裹信息-未分页")
@PreAuthorize("@ss.hasPermission('manage:pack:query')")
@PreAuthorize("@ss.hasAnyPermissions('manage:pack:export-pack-num','manage:pack:pack')")
public CommonResult<List<OrderPackageVO>> getOrderPack(@Valid PackageDetailsReqVO reqVO) {
return success(packService.getOrderPack(reqVO));
@@ -85,7 +85,7 @@ public class PackController {
@GetMapping("/getPageOrderPack")
@Operation(summary = "查看生产订单对应的包裹信息-分页")
@PreAuthorize("@ss.hasPermission('manage:pack:query')")
@PreAuthorize("@ss.hasPermission('manage:pack:pack-details')")
public CommonResult<PageResult<OrderPackageVO>> getPageOrderPack(@Valid PackageDetailsReqVO reqVO) {
return success(packService.getPageOrderPack(reqVO));
@@ -96,7 +96,7 @@ public class PackController {
@GetMapping("/queryPackageDetails")
@Operation(summary = "查询包裹的详细信息")
@PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack','manage:pack:query')")
@PreAuthorize("@ss.hasAnyPermissions('manage:pack:pack-details','manage:pack:query')")
public CommonResult<PageResult<PackageDetailsRespVO>> queryPackageDetails(@Valid PackDetailsReqVO reqVO){
return CommonResult.success(productionStatusService.queryPackageDetails(reqVO));
@@ -174,7 +174,7 @@ public class PackController {
@PutMapping("/unpacking")
@Operation(summary = "拆包-更改包裹为未封包")
@PreAuthorize("@ss.hasPermission('manage:pack:update')")
@PreAuthorize("@ss.hasPermission('manage:pack:unpacking')")
public CommonResult<OrderPackRespVO> unpacking(@Valid @RequestBody PackingReqVO reqVO) {
OrderPackRespVO unpacking = packService.unpacking(reqVO.getPackageId());
@@ -214,7 +214,7 @@ public class PackController {
@PostMapping("/insertOtherPack")
@Operation(summary = "新增外部配件-即新增一个包裹")
@PreAuthorize("@ss.hasPermission('manage:pack:insert')")
@PreAuthorize("@ss.hasPermission('manage:pack:external-parts')")
public CommonResult<OrderPackRespVO> addNewOtherPack(@Valid @RequestBody OtherPackReqVO reqVO) {
return success(packService.addNewOtherPack(reqVO));
@@ -224,7 +224,7 @@ public class PackController {
@PutMapping("/insertOther")
@Operation(summary = "新增外部配件")
@PreAuthorize("@ss.hasPermission('manage:pack:insert')")
@PreAuthorize("@ss.hasPermission('manage:pack:external-parts')")
public CommonResult<OrderPartsRespVO> addNewOtherParts (@Valid @RequestBody OtherPackReqVO reqVO) {
return success(packService.addNewOtherParts(reqVO));
@@ -249,7 +249,7 @@ public class PackController {
@GetMapping("/getPrePackInfo")
@Operation(summary = "查询预打包优化信息")
@PreAuthorize("@ss.hasPermission('manage:pack:query')")
@PreAuthorize("@ss.hasPermission('manage:pack:pre-pack')")
public CommonResult<String> getPrePackInfo ( @RequestParam("orderId") Long orderId) {
return success(packService.getPrePackInfo(orderId));
@@ -261,7 +261,7 @@ public class PackController {
@PostMapping("/saveOptimizeInfo")
@Operation(summary = "预打包保存优化信息")
@PreAuthorize("@ss.hasPermission('manage:pack:insert')")
@PreAuthorize("@ss.hasPermission('manage:pack:pre-pack')")
public CommonResult<Boolean> saveOptimizeInfo(@Valid @RequestBody PrePackReqVO reqVO) {
packService.saveOptimizeInfo(reqVO);
@@ -1,37 +1,35 @@
package com.cf.imes.module.manage.controller.admin.parts;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.pojo.PageParam;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.excel.core.util.ExcelUtils;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.manage.controller.admin.parts.vo.*;
import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO;
import com.cf.imes.module.manage.service.parts.PartsExcelListener;
import com.cf.imes.module.manage.service.parts.PartsService;
import com.cf.imes.module.manage.util.file.ExcelReadUtil;
import io.swagger.v3.oas.annotations.Parameters;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.*;
import javax.servlet.http.*;
import javax.validation.constraints.NotEmpty;
import java.util.*;
import java.io.IOException;
import com.cf.imes.framework.common.pojo.PageParam;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import com.cf.imes.framework.excel.core.util.ExcelUtils;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import java.io.IOException;
import java.util.List;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.IMPORT;
@Tag(name = "管理后台 - 配件管理")
@@ -79,7 +77,7 @@ public class PartsController {
@Parameter(name = "id", description = "编号", required = true, example = "1024"),
@Parameter(name = "organId", description = "板材所属组织ID", example = "1024")
})
@PreAuthorize("@ss.hasAnyPermissions('system:accessory:query','base:accessory:query')")
@PreAuthorize("@ss.hasAnyPermissions('system:accessory:update','base:accessory:update')")
public CommonResult<PartsRespVO> get(@RequestParam("id") Long id,
@RequestParam(value = "organId", required = false, defaultValue = "0") Long organId) {
PartsDO partsDO = partsService.get(id, organId);
@@ -110,6 +108,7 @@ public class PartsController {
@GetMapping("/get-import-template")
@Operation(summary = "获得导入配件模板")
@Parameter(name = "value", description = "文件类型", required = true, example = "0")
@PreAuthorize("@ss.hasAnyPermissions('system:accessory:export-template','base:accessory:export-template')")
public void importTemplate(HttpServletResponse response, @RequestParam("value") @NotEmpty(message = "文件路径不能为空") String value) {
partsService.exportTemplate(response, value);
}
@@ -1,38 +1,37 @@
package com.cf.imes.module.manage.controller.admin.plate;
import com.cf.imes.module.manage.controller.admin.plate.vo.plate.*;
import com.cf.imes.module.manage.service.plate.PlateExcelListener;
import com.cf.imes.module.manage.util.file.ExcelReadUtil;
import io.swagger.v3.oas.annotations.Parameters;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import java.util.*;
import java.io.IOException;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.pojo.PageParam;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import com.cf.imes.framework.excel.core.util.ExcelUtils;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateImportExcelVO;
import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlatePageReqVO;
import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateRespVO;
import com.cf.imes.module.manage.controller.admin.plate.vo.plate.PlateSaveReqVO;
import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO;
import com.cf.imes.module.manage.service.plate.PlateExcelListener;
import com.cf.imes.module.manage.service.plate.PlateService;
import com.cf.imes.module.manage.util.file.ExcelReadUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.IMPORT;
@Tag(name = "管理后台 - 板材库管理")
@RestController
@@ -47,7 +46,6 @@ public class PlateController {
@PostMapping("/create")
@Operation(summary = "创建板材信息")
// @PreAuthorize("@ss.hasPermission('manage:plate:create')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:create','base:plate:create')")
public CommonResult<Long> createPlate(@Valid @RequestBody PlateSaveReqVO createReqVO) {
return success(plateService.createPlate(createReqVO));
@@ -55,7 +53,6 @@ public class PlateController {
@PutMapping("/update")
@Operation(summary = "更新板材信息")
// @PreAuthorize("@ss.hasPermission('manage:plate:update')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:update','base:plate:update')")
public CommonResult<Boolean> updatePlate(@Valid @RequestBody PlateSaveReqVO updateReqVO) {
plateService.updatePlate(updateReqVO);
@@ -68,7 +65,6 @@ public class PlateController {
@Parameter(name = "id", description = "编号", required = true, example = "1024"),
@Parameter(name = "organId", description = "板材所属组织ID", example = "1024")
})
// @PreAuthorize("@ss.hasPermission('manage:plate:delete')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:delete','base:plate:delete')")
public CommonResult<Boolean> deletePlate(@RequestParam("id") Long id,
@RequestParam(value = "organId",required = false, defaultValue = "0") Long organId) {
@@ -82,8 +78,7 @@ public class PlateController {
@Parameter(name = "id", description = "编号", required = true, example = "1024"),
@Parameter(name = "organId", description = "板材所属组织ID", required = true, example = "1024")
})
// @PreAuthorize("@ss.hasPermission('manage:plate:query')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:update','base:plate:update')")
public CommonResult<PlateRespVO> getPlate(@RequestParam("id") Long id,
@RequestParam("organId") Long organId) {
PlateDO plate = plateService.getPlate(id, organId);
@@ -92,7 +87,6 @@ public class PlateController {
@GetMapping("/page")
@Operation(summary = "获得板材信息分页")
// @PreAuthorize("@ss.hasPermission('manage:plate:query')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')")
public CommonResult<PageResult<PlateRespVO>> getPlatePage(@Valid PlatePageReqVO pageReqVO) {
PageResult<PlateDO> pageResult = plateService.getPlatePage(pageReqVO);
@@ -101,7 +95,6 @@ public class PlateController {
@GetMapping("/export")
@Operation(summary = "导出板材信息")
// @PreAuthorize("@ss.hasPermission('manage:plate:export')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:export','base:plate:export')")
@OperateLog(type = EXPORT)
public void exportPlateExcel(@Valid PlatePageReqVO pageReqVO,
@@ -114,9 +107,8 @@ public class PlateController {
}
@GetMapping("/get-import-template")
@Operation(summary = "获得导入板材模板")
// @PreAuthorize("@ss.hasPermission('manage:plate:export')")
@PreAuthorize("@ss.hasAnyPermissions('manage:plate:export','base:plate:export')")
@Operation(summary = "获得导入用户模板")
@PreAuthorize("@ss.hasAnyPermissions('system:plate:export-template','base:plate:export-template')")
public void importTemplate(HttpServletResponse response) throws IOException {
// // 手动创建导出 demo
// List<PlateImportExcelVO> list = Arrays.asList(
@@ -1,37 +1,35 @@
package com.cf.imes.module.manage.controller.admin.plate;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.pojo.PageParam;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.excel.core.util.ExcelUtils;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlatePageReqVO;
import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateRespVO;
import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateSaveReqVO;
import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateUptReqVO;
import com.cf.imes.module.manage.dal.dataobject.remainplaten.RemainPlateDO;
import com.cf.imes.module.manage.service.remainplaten.RemainPlateService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import java.util.*;
import java.io.IOException;
import com.cf.imes.framework.common.pojo.PageParam;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.object.BeanUtils;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import com.cf.imes.framework.excel.core.util.ExcelUtils;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.List;
import java.util.Set;
@Tag(name = "管理后台 - 生产单余料板表")
import static com.cf.imes.framework.common.pojo.CommonResult.success;
import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 余料管理")
@RestController
@RequestMapping("/manage/remain-plate")
@Validated
@@ -64,7 +62,7 @@ public class RemainPlateController {
@PutMapping("/updateStatus")
@Operation(summary = "余料板批量核销")
@PreAuthorize("@ss.hasPermission('manage:remain-plate:update')")
@PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:update','manage:remain-plate:write-off')")
public CommonResult<Boolean> updateRemainPlate(@RequestBody RemainPlateUptReqVO updateReqVO) {
remainPlateService.updateRemainPlateStatus(updateReqVO.getIds(),
updateReqVO.getStatus(),
@@ -75,7 +73,7 @@ public class RemainPlateController {
@PutMapping("/revertUpdate")
@Operation(summary = "余料板批量释放")
@PreAuthorize("@ss.hasPermission('manage:remain-plate:update')")
@PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:update','manage:remain-plate:release')")
public CommonResult<Boolean> revertRemainPlate(@RequestBody RemainPlateUptReqVO updateReqVO) {
remainPlateService.revertRemainPlateStatus(updateReqVO.getIds(),updateReqVO.getStatus());
return success(true);
@@ -101,7 +99,7 @@ public class RemainPlateController {
@GetMapping("/page")
@Operation(summary = "获得生产单余料板表分页")
@PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:query','placeorder:optimize')")
@PreAuthorize("@ss.hasAnyPermissions('manage:remain-plate:query','placeorder:optimize','placeorder:remain-insert')")
public CommonResult<PageResult<RemainPlateRespVO>> getRemainPlatePage(@Valid RemainPlatePageReqVO pageReqVO) {
PageResult<RemainPlateDO> pageResult = remainPlateService.getRemainPlatePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RemainPlateRespVO.class));