diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/AgreementInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/AgreementInfoController.java index 84db97a..6fa0637 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/AgreementInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/AgreementInfoController.java @@ -50,7 +50,7 @@ public class AgreementInfoController extends BaseController { /** * 查询协议信息列表 */ - @SaCheckPermission("platform:agreementInfo:list") + //@SaCheckPermission("platform:agreementInfo:list") @GetMapping("/list") public TableDataInfo list(AgreementInfoBo bo, PageQuery pageQuery) { return agreementInfoService.queryPageList(bo, pageQuery); @@ -59,7 +59,7 @@ public class AgreementInfoController extends BaseController { /** * 导出协议信息列表 */ - @SaCheckPermission("platform:agreementInfo:export") + //@SaCheckPermission("platform:agreementInfo:export") @Log(title = "协议信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(AgreementInfoBo bo, HttpServletResponse response) { @@ -72,7 +72,7 @@ public class AgreementInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:agreementInfo:query") + //@SaCheckPermission("platform:agreementInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -82,7 +82,7 @@ public class AgreementInfoController extends BaseController { /** * 新增协议信息 */ - @SaCheckPermission("platform:agreementInfo:add") + //@SaCheckPermission("platform:agreementInfo:add") @Log(title = "协议信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -93,7 +93,7 @@ public class AgreementInfoController extends BaseController { /** * 修改协议信息 */ - @SaCheckPermission("platform:agreementInfo:edit") + //@SaCheckPermission("platform:agreementInfo:edit") @Log(title = "协议信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -106,7 +106,7 @@ public class AgreementInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:agreementInfo:remove") + //@SaCheckPermission("platform:agreementInfo:remove") @Log(title = "协议信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/CheckTypeController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/CheckTypeController.java index 26c0151..3be02f7 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/CheckTypeController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/CheckTypeController.java @@ -39,7 +39,7 @@ public class CheckTypeController extends BaseController { /** * 查询考核类型-类别列表 */ - @SaCheckPermission("platform:checkType:list") + //@SaCheckPermission("platform:checkType:list") @GetMapping("/list") public TableDataInfo list(CheckTypeBo bo, PageQuery pageQuery) { return checkTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class CheckTypeController extends BaseController { /** * 导出考核类型-类别列表 */ - @SaCheckPermission("platform:checkType:export") + //@SaCheckPermission("platform:checkType:export") @Log(title = "考核类型-类别", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(CheckTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class CheckTypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:checkType:query") + //@SaCheckPermission("platform:checkType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class CheckTypeController extends BaseController { /** * 新增考核类型-类别 */ - @SaCheckPermission("platform:checkType:add") + //@SaCheckPermission("platform:checkType:add") @Log(title = "考核类型-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class CheckTypeController extends BaseController { /** * 修改考核类型-类别 */ - @SaCheckPermission("platform:checkType:edit") + //@SaCheckPermission("platform:checkType:edit") @Log(title = "考核类型-类别", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class CheckTypeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:checkType:remove") + //@SaCheckPermission("platform:checkType:remove") @Log(title = "考核类型-类别", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractInfoController.java index a6d64cb..eaf96fc 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractInfoController.java @@ -44,7 +44,7 @@ public class ContractInfoController extends BaseController { /** * 查询合同信息列表 */ - @SaCheckPermission("platform:contractInfo:list") + //@SaCheckPermission("platform:contractInfo:list") @GetMapping("/list") public TableDataInfo list(ContractInfoBo bo, PageQuery pageQuery) { return contractInfoService.queryPageList(bo, pageQuery); @@ -53,7 +53,7 @@ public class ContractInfoController extends BaseController { /** * 导出合同信息列表 */ - @SaCheckPermission("platform:contractInfo:export") + //@SaCheckPermission("platform:contractInfo:export") @Log(title = "合同信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ContractInfoBo bo, HttpServletResponse response) { @@ -66,7 +66,7 @@ public class ContractInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:contractInfo:query") + //@SaCheckPermission("platform:contractInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -76,7 +76,7 @@ public class ContractInfoController extends BaseController { /** * 新增合同信息 */ - @SaCheckPermission("platform:contractInfo:add") + //@SaCheckPermission("platform:contractInfo:add") @Log(title = "合同信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -87,7 +87,7 @@ public class ContractInfoController extends BaseController { /** * 修改合同信息 */ - @SaCheckPermission("platform:contractInfo:edit") + //@SaCheckPermission("platform:contractInfo:edit") @Log(title = "合同信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -100,7 +100,7 @@ public class ContractInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:contractInfo:remove") + //@SaCheckPermission("platform:contractInfo:remove") @Log(title = "合同信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -110,7 +110,7 @@ public class ContractInfoController extends BaseController { - @SaCheckPermission("platform:contractInfo:queryContractInfoByProjectId") + //@SaCheckPermission("platform:contractInfo:queryContractInfoByProjectId") @GetMapping("/queryContractInfoByProjectId") public R queryContractInfoByProjectId(@NotNull(message = "项目id不能为空") @Param("projectId") String projectId) { @@ -120,7 +120,7 @@ public class ContractInfoController extends BaseController { /** * 获取项目名称下拉框 */ - @SaCheckPermission("platform:contractInfo:getNames") + //@SaCheckPermission("platform:contractInfo:getNames") @GetMapping("/getNames") public R> getNames() { List rs = contractInfoService.getNames(); @@ -128,7 +128,7 @@ public class ContractInfoController extends BaseController { } - @SaCheckPermission("platform:contractInfo:getContractNamesByProjectName") + //@SaCheckPermission("platform:contractInfo:getContractNamesByProjectName") @PostMapping("/getContractNamesByProjectName") public R> getContractNamesByProjectName(@RequestBody Map requestBody) { String projectName = requestBody.get("projectName"); @@ -141,7 +141,7 @@ public class ContractInfoController extends BaseController { * 获取合同对应的运维单位 (乙方) * */ - @SaCheckPermission("platform:contractInfo:getIoCompany") + //@SaCheckPermission("platform:contractInfo:getIoCompany") @GetMapping("/getIoCompany") public R getIoCompany(@Param("name") String name) { String rs = contractInfoService.getIoCompany(name); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractTypeController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractTypeController.java index 7beb393..8bfe853 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractTypeController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ContractTypeController.java @@ -39,7 +39,7 @@ public class ContractTypeController extends BaseController { /** * 查询合同类别-类别列表 */ - @SaCheckPermission("platform:contractType:list") + //@SaCheckPermission("platform:contractType:list") @GetMapping("/list") public TableDataInfo list(ContractTypeBo bo, PageQuery pageQuery) { return contractTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class ContractTypeController extends BaseController { /** * 导出合同类别-类别列表 */ - @SaCheckPermission("platform:contractType:export") + //@SaCheckPermission("platform:contractType:export") @Log(title = "合同类别-类别", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ContractTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class ContractTypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:contractType:query") + //@SaCheckPermission("platform:contractType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class ContractTypeController extends BaseController { /** * 新增合同类别-类别 */ - @SaCheckPermission("platform:contractType:add") + //@SaCheckPermission("platform:contractType:add") @Log(title = "合同类别-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class ContractTypeController extends BaseController { /** * 修改合同类别-类别 */ - @SaCheckPermission("platform:contractType:edit") + //@SaCheckPermission("platform:contractType:edit") @Log(title = "合同类别-类别", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class ContractTypeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:contractType:remove") + //@SaCheckPermission("platform:contractType:remove") @Log(title = "合同类别-类别", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DailyInspectionReportController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DailyInspectionReportController.java index b28bd69..2b3c9ad 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DailyInspectionReportController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DailyInspectionReportController.java @@ -39,7 +39,7 @@ public class DailyInspectionReportController extends BaseController { /** * 查询巡检日报列表 */ - @SaCheckPermission("platform:inspectionDailyReport:list") + //@SaCheckPermission("platform:inspectionDailyReport:list") @GetMapping("/list") public TableDataInfo list(DailyInspectionReportBo bo, PageQuery pageQuery) { return dailyInspectionReportService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class DailyInspectionReportController extends BaseController { /** * 导出巡检日报列表 */ - @SaCheckPermission("platform:inspectionDailyReport:export") + //@SaCheckPermission("platform:inspectionDailyReport:export") @Log(title = "巡检日报", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DailyInspectionReportBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class DailyInspectionReportController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:inspectionDailyReport:query") + //@SaCheckPermission("platform:inspectionDailyReport:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -71,7 +71,7 @@ public class DailyInspectionReportController extends BaseController { /** * 新增巡检日报 */ - @SaCheckPermission("platform:inspectionDailyReport:add") + //@SaCheckPermission("platform:inspectionDailyReport:add") @Log(title = "巡检日报", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class DailyInspectionReportController extends BaseController { /** * 修改巡检日报 */ - @SaCheckPermission("platform:inspectionDailyReport:edit") + //@SaCheckPermission("platform:inspectionDailyReport:edit") @Log(title = "巡检日报", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class DailyInspectionReportController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:inspectionDailyReport:remove") + //@SaCheckPermission("platform:inspectionDailyReport:remove") @Log(title = "巡检日报", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DistrictInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DistrictInfoController.java index cbe87e7..c7e82b4 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DistrictInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DistrictInfoController.java @@ -41,7 +41,7 @@ public class DistrictInfoController extends BaseController { /** * 查询区域信息-用于下拉框列表 */ - @SaCheckPermission("platform:districtInfo:list") + //@SaCheckPermission("platform:districtInfo:list") @GetMapping("/list") public TableDataInfo list(DistrictInfoBo bo, PageQuery pageQuery) { return districtInfoService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class DistrictInfoController extends BaseController { /** * 导出区域信息-用于下拉框列表 */ - @SaCheckPermission("platform:districtInfo:export") + //@SaCheckPermission("platform:districtInfo:export") @Log(title = "区域信息-用于下拉框", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DistrictInfoBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class DistrictInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:districtInfo:query") + //@SaCheckPermission("platform:districtInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -73,7 +73,7 @@ public class DistrictInfoController extends BaseController { /** * 新增区域信息-用于下拉框 */ - @SaCheckPermission("platform:districtInfo:add") + //@SaCheckPermission("platform:districtInfo:add") @Log(title = "区域信息-用于下拉框", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class DistrictInfoController extends BaseController { /** * 修改区域信息-用于下拉框 */ - @SaCheckPermission("platform:districtInfo:edit") + //@SaCheckPermission("platform:districtInfo:edit") @Log(title = "区域信息-用于下拉框", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -97,7 +97,7 @@ public class DistrictInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:districtInfo:remove") + //@SaCheckPermission("platform:districtInfo:remove") @Log(title = "区域信息-用于下拉框", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -106,7 +106,7 @@ public class DistrictInfoController extends BaseController { } - @SaCheckPermission("platform:districtInfo:queryAll") + //@SaCheckPermission("platform:districtInfo:queryAll") @GetMapping("/queryAll") public R> queryAll() { return R.ok(districtInfoService.queryAll()); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DocumentInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DocumentInfoController.java index 331af21..a083f49 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DocumentInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DocumentInfoController.java @@ -39,7 +39,7 @@ public class DocumentInfoController extends BaseController { /** * 查询文档信息列表 */ - @SaCheckPermission("platform:documentInfo:list") + //@SaCheckPermission("platform:documentInfo:list") @GetMapping("/list") public TableDataInfo list(DocumentInfoBo bo, PageQuery pageQuery) { return documentInfoService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class DocumentInfoController extends BaseController { /** * 导出文档信息列表 */ - @SaCheckPermission("platform:documentInfo:export") + //@SaCheckPermission("platform:documentInfo:export") @Log(title = "文档信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DocumentInfoBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class DocumentInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:documentInfo:query") + //@SaCheckPermission("platform:documentInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class DocumentInfoController extends BaseController { /** * 新增文档信息 */ - @SaCheckPermission("platform:documentInfo:add") + //@SaCheckPermission("platform:documentInfo:add") @Log(title = "文档信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class DocumentInfoController extends BaseController { /** * 修改文档信息 */ - @SaCheckPermission("platform:documentInfo:edit") + //@SaCheckPermission("platform:documentInfo:edit") @Log(title = "文档信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class DocumentInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:documentInfo:remove") + //@SaCheckPermission("platform:documentInfo:remove") @Log(title = "文档信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DocumentTypeController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DocumentTypeController.java index 923590f..222bf97 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DocumentTypeController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/DocumentTypeController.java @@ -39,7 +39,7 @@ public class DocumentTypeController extends BaseController { /** * 查询文件类别-类别列表 */ - @SaCheckPermission("platform:documentType:list") + //@SaCheckPermission("platform:documentType:list") @GetMapping("/list") public TableDataInfo list(DocumentTypeBo bo, PageQuery pageQuery) { return documentTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class DocumentTypeController extends BaseController { /** * 导出文件类别-类别列表 */ - @SaCheckPermission("platform:documentType:export") + //@SaCheckPermission("platform:documentType:export") @Log(title = "文件类别-类别", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DocumentTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class DocumentTypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:documentType:query") + //@SaCheckPermission("platform:documentType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class DocumentTypeController extends BaseController { /** * 新增文件类别-类别 */ - @SaCheckPermission("platform:documentType:add") + //@SaCheckPermission("platform:documentType:add") @Log(title = "文件类别-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class DocumentTypeController extends BaseController { /** * 修改文件类别-类别 */ - @SaCheckPermission("platform:documentType:edit") + //@SaCheckPermission("platform:documentType:edit") @Log(title = "文件类别-类别", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class DocumentTypeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:documentType:remove") + //@SaCheckPermission("platform:documentType:remove") @Log(title = "文件类别-类别", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationInfoController.java index 2fd3779..80e5b7e 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationInfoController.java @@ -43,13 +43,13 @@ public class EvaluationInfoController extends BaseController { /** * 查询考核评分信息列表 */ - @SaCheckPermission("platform:evaluationInfo:list") + //@SaCheckPermission("platform:evaluationInfo:list") @GetMapping("/list") public TableDataInfo list(EvaluationInfoBo bo, PageQuery pageQuery) { return evaluationInfoService.queryPageList(bo, pageQuery); } - @SaCheckPermission("platform:evaluationInfo:listForScore") + //@SaCheckPermission("platform:evaluationInfo:listForScore") @GetMapping("/listForScore") public TableDataInfo listForScore(EvaluationInfoBo bo, PageQuery pageQuery) { return evaluationInfoService.queryPageListForScore(bo, pageQuery); @@ -59,7 +59,7 @@ public class EvaluationInfoController extends BaseController { /** * 导出考核评分信息列表 */ - @SaCheckPermission("platform:evaluationInfo:export") + //@SaCheckPermission("platform:evaluationInfo:export") @Log(title = "考核评分信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(EvaluationInfoBo bo, HttpServletResponse response) { @@ -72,7 +72,7 @@ public class EvaluationInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:evaluationInfo:query") + //@SaCheckPermission("platform:evaluationInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -82,7 +82,7 @@ public class EvaluationInfoController extends BaseController { /** * 新增考核评分信息 */ - @SaCheckPermission("platform:evaluationInfo:add") + //@SaCheckPermission("platform:evaluationInfo:add") @Log(title = "考核评分信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -93,7 +93,7 @@ public class EvaluationInfoController extends BaseController { /** * 修改考核评分信息 */ - @SaCheckPermission("platform:evaluationInfo:edit") + //@SaCheckPermission("platform:evaluationInfo:edit") @Log(title = "考核评分信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -106,7 +106,7 @@ public class EvaluationInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:evaluationInfo:remove") + //@SaCheckPermission("platform:evaluationInfo:remove") @Log(title = "考核评分信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -115,7 +115,7 @@ public class EvaluationInfoController extends BaseController { } - @SaCheckPermission("platform:evaluationInfo:addBySelect") + //@SaCheckPermission("platform:evaluationInfo:addBySelect") @RepeatSubmit() @PostMapping("/addBySelect") public R addBySelect(@Validated(AddGroup.class) @RequestBody EvaluationDto dto) { @@ -125,7 +125,7 @@ public class EvaluationInfoController extends BaseController { - @SaCheckPermission("platform:evaluationInfo:isScoreExits") + //@SaCheckPermission("platform:evaluationInfo:isScoreExits") @GetMapping("/isScoreExits") public R isScoreExits(EvaluationInfoBo bo) { Date checkTime = bo.getCheckTime(); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationTemplateController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationTemplateController.java index 6f33fb5..808afd0 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationTemplateController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/EvaluationTemplateController.java @@ -42,7 +42,7 @@ public class EvaluationTemplateController extends BaseController { /** * 查询考核评分信息-模板列表 */ - @SaCheckPermission("platform:evaluationTemplate:list") + //@SaCheckPermission("platform:evaluationTemplate:list") @GetMapping("/list") public TableDataInfo list(EvaluationTemplateBo bo, PageQuery pageQuery) { return evaluationTemplateService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class EvaluationTemplateController extends BaseController { /** * 导出考核评分信息-模板列表 */ - @SaCheckPermission("platform:evaluationTemplate:export") + //@SaCheckPermission("platform:evaluationTemplate:export") @Log(title = "考核评分信息-模板", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(EvaluationTemplateBo bo, HttpServletResponse response) { @@ -64,7 +64,7 @@ public class EvaluationTemplateController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:evaluationTemplate:query") + //@SaCheckPermission("platform:evaluationTemplate:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -74,7 +74,7 @@ public class EvaluationTemplateController extends BaseController { /** * 新增考核评分信息-模板 */ - @SaCheckPermission("platform:evaluationTemplate:add") + //@SaCheckPermission("platform:evaluationTemplate:add") @Log(title = "考核评分信息-模板", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -85,7 +85,7 @@ public class EvaluationTemplateController extends BaseController { /** * 修改考核评分信息-模板 */ - @SaCheckPermission("platform:evaluationTemplate:edit") + //@SaCheckPermission("platform:evaluationTemplate:edit") @Log(title = "考核评分信息-模板", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -98,7 +98,7 @@ public class EvaluationTemplateController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:evaluationTemplate:remove") + //@SaCheckPermission("platform:evaluationTemplate:remove") @Log(title = "考核评分信息-模板", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -112,7 +112,7 @@ public class EvaluationTemplateController extends BaseController { * @param flag * @return */ - @SaCheckPermission("platform:evaluationTemplate:queryByFlag") + //@SaCheckPermission("platform:evaluationTemplate:queryByFlag") @GetMapping("/queryByFlag") public R> queryByFlag(@Param("flag") String flag) { List rs = evaluationTemplateService.queryByFlag(flag); @@ -120,7 +120,7 @@ public class EvaluationTemplateController extends BaseController { } - @SaCheckPermission("platform:evaluationTemplate:batchEdit") + //@SaCheckPermission("platform:evaluationTemplate:batchEdit") @Log(title = "考核评分信息-模板", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/batchEdit") @@ -129,7 +129,7 @@ public class EvaluationTemplateController extends BaseController { } - @SaCheckPermission("platform:evaluationTemplate:getTree") + //@SaCheckPermission("platform:evaluationTemplate:getTree") @GetMapping("/getTree") public R> getTree() { Map rs = evaluationTemplateService.getTree(); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultCategoryTypeController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultCategoryTypeController.java index e69e54d..f27f0b8 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultCategoryTypeController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultCategoryTypeController.java @@ -39,7 +39,7 @@ public class FaultCategoryTypeController extends BaseController { /** * 查询故障大类-类别列表 */ - @SaCheckPermission("platform:categoryType:list") + //@SaCheckPermission("platform:categoryType:list") @GetMapping("/list") public TableDataInfo list(FaultCategoryTypeBo bo, PageQuery pageQuery) { return faultCategoryTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class FaultCategoryTypeController extends BaseController { /** * 导出故障大类-类别列表 */ - @SaCheckPermission("platform:categoryType:export") + //@SaCheckPermission("platform:categoryType:export") @Log(title = "故障大类-类别", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(FaultCategoryTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class FaultCategoryTypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:categoryType:query") + //@SaCheckPermission("platform:categoryType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class FaultCategoryTypeController extends BaseController { /** * 新增故障大类-类别 */ - @SaCheckPermission("platform:categoryType:add") + //@SaCheckPermission("platform:categoryType:add") @Log(title = "故障大类-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class FaultCategoryTypeController extends BaseController { /** * 修改故障大类-类别 */ - @SaCheckPermission("platform:categoryType:edit") + //@SaCheckPermission("platform:categoryType:edit") @Log(title = "故障大类-类别", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class FaultCategoryTypeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:categoryType:remove") + //@SaCheckPermission("platform:categoryType:remove") @Log(title = "故障大类-类别", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultSubcategoryTypeController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultSubcategoryTypeController.java index fa1c3c4..8844a8d 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultSubcategoryTypeController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/FaultSubcategoryTypeController.java @@ -39,7 +39,7 @@ public class FaultSubcategoryTypeController extends BaseController { /** * 查询故障小类-类别列表 */ - @SaCheckPermission("platform:subcategoryType:list") + //@SaCheckPermission("platform:subcategoryType:list") @GetMapping("/list") public TableDataInfo list(FaultSubcategoryTypeBo bo, PageQuery pageQuery) { return faultSubcategoryTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class FaultSubcategoryTypeController extends BaseController { /** * 导出故障小类-类别列表 */ - @SaCheckPermission("platform:subcategoryType:export") + //@SaCheckPermission("platform:subcategoryType:export") @Log(title = "故障小类-类别", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(FaultSubcategoryTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class FaultSubcategoryTypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:subcategoryType:query") + //@SaCheckPermission("platform:subcategoryType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class FaultSubcategoryTypeController extends BaseController { /** * 新增故障小类-类别 */ - @SaCheckPermission("platform:subcategoryType:add") + //@SaCheckPermission("platform:subcategoryType:add") @Log(title = "故障小类-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class FaultSubcategoryTypeController extends BaseController { /** * 修改故障小类-类别 */ - @SaCheckPermission("platform:subcategoryType:edit") + //@SaCheckPermission("platform:subcategoryType:edit") @Log(title = "故障小类-类别", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class FaultSubcategoryTypeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:subcategoryType:remove") + //@SaCheckPermission("platform:subcategoryType:remove") @Log(title = "故障小类-类别", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/InspectionPlanInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/InspectionPlanInfoController.java index 22093f4..5ca30c2 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/InspectionPlanInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/InspectionPlanInfoController.java @@ -44,7 +44,7 @@ public class InspectionPlanInfoController extends BaseController { /** * 查询巡检计划列表 */ - @SaCheckPermission("platform:inspectPlanInfo:list") + //@SaCheckPermission("platform:inspectPlanInfo:list") @GetMapping("/list") public TableDataInfo list(InspectionPlanInfoBo bo, PageQuery pageQuery) { return inspectionPlanInfoService.queryPageList(bo, pageQuery); @@ -53,7 +53,7 @@ public class InspectionPlanInfoController extends BaseController { /** * 导出巡检计划列表 */ - @SaCheckPermission("platform:inspectPlanInfo:export") + //@SaCheckPermission("platform:inspectPlanInfo:export") @Log(title = "巡检计划", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(InspectionPlanInfoBo bo, HttpServletResponse response) { @@ -66,7 +66,7 @@ public class InspectionPlanInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:inspectPlanInfo:query") + //@SaCheckPermission("platform:inspectPlanInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -76,7 +76,7 @@ public class InspectionPlanInfoController extends BaseController { /** * 新增巡检计划 */ - @SaCheckPermission("platform:inspectPlanInfo:add") + //@SaCheckPermission("platform:inspectPlanInfo:add") @Log(title = "巡检计划", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -87,7 +87,7 @@ public class InspectionPlanInfoController extends BaseController { /** * 修改巡检计划 */ - @SaCheckPermission("platform:inspectPlanInfo:edit") + //@SaCheckPermission("platform:inspectPlanInfo:edit") @Log(title = "巡检计划", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -100,7 +100,7 @@ public class InspectionPlanInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:inspectPlanInfo:remove") + //@SaCheckPermission("platform:inspectPlanInfo:remove") @Log(title = "巡检计划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -109,7 +109,7 @@ public class InspectionPlanInfoController extends BaseController { } - @SaCheckPermission("platform:inspectPlanInfo:createPlans") + //@SaCheckPermission("platform:inspectPlanInfo:createPlans") @GetMapping("/createPlans") public R createPlans(@NotNull(message = "主键不能为空") @Param("contractId") String contractId, @@ -120,14 +120,14 @@ public class InspectionPlanInfoController extends BaseController { - @SaCheckPermission("platform:inspectPlanInfo:getIoCompanyNames") + //@SaCheckPermission("platform:inspectPlanInfo:getIoCompanyNames") @GetMapping("/getIoCompanyNames") public R> getIoCompanyNames() { Set rs = inspectionPlanInfoService.getIoCompanyNames(); return R.ok(rs); } - @SaCheckPermission("platform:inspectPlanInfo:findLeafNodeInfos") + //@SaCheckPermission("platform:inspectPlanInfo:findLeafNodeInfos") @GetMapping("/findLeafNodeInfos") public R> findLeafNodeInfos( @Param("categoryId") String categoryId) { List rs = inspectionPlanInfoService.findLeafNodeInfos(categoryId); @@ -135,7 +135,7 @@ public class InspectionPlanInfoController extends BaseController { } - @SaCheckPermission("platform:inspectPlanInfo:createPlansByHands") + //@SaCheckPermission("platform:inspectPlanInfo:createPlansByHands") @PostMapping("/createPlansByHands") public R createPlansByHand(@RequestBody RoutineWorkDto routineWorkDto) { String contractId = routineWorkDto.getContractId(); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/LargeRatingTypeController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/LargeRatingTypeController.java index 864adf4..befa194 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/LargeRatingTypeController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/LargeRatingTypeController.java @@ -39,7 +39,7 @@ public class LargeRatingTypeController extends BaseController { /** * 查询评分大类-类别列表 */ - @SaCheckPermission("platform:ratingType:list") + //@SaCheckPermission("platform:ratingType:list") @GetMapping("/list") public TableDataInfo list(LargeRatingTypeBo bo, PageQuery pageQuery) { return largeRatingTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class LargeRatingTypeController extends BaseController { /** * 导出评分大类-类别列表 */ - @SaCheckPermission("platform:ratingType:export") + //@SaCheckPermission("platform:ratingType:export") @Log(title = "评分大类-类别", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(LargeRatingTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class LargeRatingTypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:ratingType:query") + //@SaCheckPermission("platform:ratingType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class LargeRatingTypeController extends BaseController { /** * 新增评分大类-类别 */ - @SaCheckPermission("platform:ratingType:add") + //@SaCheckPermission("platform:ratingType:add") @Log(title = "评分大类-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class LargeRatingTypeController extends BaseController { /** * 修改评分大类-类别 */ - @SaCheckPermission("platform:ratingType:edit") + //@SaCheckPermission("platform:ratingType:edit") @Log(title = "评分大类-类别", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class LargeRatingTypeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:ratingType:remove") + //@SaCheckPermission("platform:ratingType:remove") @Log(title = "评分大类-类别", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/MaterialInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/MaterialInfoController.java index 3d68a46..998a3e1 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/MaterialInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/MaterialInfoController.java @@ -39,7 +39,7 @@ public class MaterialInfoController extends BaseController { /** * 查询材料库-信息列表 */ - @SaCheckPermission("platform:matrialInfo:list") + //@SaCheckPermission("platform:matrialInfo:list") @GetMapping("/list") public TableDataInfo list(MaterialInfoBo bo, PageQuery pageQuery) { return materialInfoService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class MaterialInfoController extends BaseController { /** * 导出材料库-信息列表 */ - @SaCheckPermission("platform:matrialInfo:export") + //@SaCheckPermission("platform:matrialInfo:export") @Log(title = "材料库-信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(MaterialInfoBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class MaterialInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:matrialInfo:query") + //@SaCheckPermission("platform:matrialInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class MaterialInfoController extends BaseController { /** * 新增材料库-信息 */ - @SaCheckPermission("platform:matrialInfo:add") + //@SaCheckPermission("platform:matrialInfo:add") @Log(title = "材料库-信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class MaterialInfoController extends BaseController { /** * 修改材料库-信息 */ - @SaCheckPermission("platform:matrialInfo:edit") + //@SaCheckPermission("platform:matrialInfo:edit") @Log(title = "材料库-信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class MaterialInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:matrialInfo:remove") + //@SaCheckPermission("platform:matrialInfo:remove") @Log(title = "材料库-信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/NoticeInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/NoticeInfoController.java index e11a763..b6b6360 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/NoticeInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/NoticeInfoController.java @@ -39,7 +39,7 @@ public class NoticeInfoController extends BaseController { /** * 查询公告通知信息列表 */ - @SaCheckPermission("platform:noticeInfo:list") + //@SaCheckPermission("platform:noticeInfo:list") @GetMapping("/list") public TableDataInfo list(NoticeInfoBo bo, PageQuery pageQuery) { return noticeInfoService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class NoticeInfoController extends BaseController { /** * 导出公告通知信息列表 */ - @SaCheckPermission("platform:noticeInfo:export") + //@SaCheckPermission("platform:noticeInfo:export") @Log(title = "公告通知信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(NoticeInfoBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class NoticeInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:noticeInfo:query") + //@SaCheckPermission("platform:noticeInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class NoticeInfoController extends BaseController { /** * 新增公告通知信息 */ - @SaCheckPermission("platform:noticeInfo:add") + //@SaCheckPermission("platform:noticeInfo:add") @Log(title = "公告通知信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class NoticeInfoController extends BaseController { /** * 修改公告通知信息 */ - @SaCheckPermission("platform:noticeInfo:edit") + //@SaCheckPermission("platform:noticeInfo:edit") @Log(title = "公告通知信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class NoticeInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:noticeInfo:remove") + //@SaCheckPermission("platform:noticeInfo:remove") @Log(title = "公告通知信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/OrganizationTypeController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/OrganizationTypeController.java index bbc3707..8934530 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/OrganizationTypeController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/OrganizationTypeController.java @@ -39,7 +39,7 @@ public class OrganizationTypeController extends BaseController { /** * 查询所属机构-类别列表 */ - @SaCheckPermission("platform:organizationType:list") + //@SaCheckPermission("platform:organizationType:list") @GetMapping("/list") public TableDataInfo list(OrganizationTypeBo bo, PageQuery pageQuery) { return organizationTypeService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class OrganizationTypeController extends BaseController { /** * 导出所属机构-类别列表 */ - @SaCheckPermission("platform:organizationType:export") + //@SaCheckPermission("platform:organizationType:export") @Log(title = "所属机构-类别", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(OrganizationTypeBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class OrganizationTypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:organizationType:query") + //@SaCheckPermission("platform:organizationType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class OrganizationTypeController extends BaseController { /** * 新增所属机构-类别 */ - @SaCheckPermission("platform:organizationType:add") + //@SaCheckPermission("platform:organizationType:add") @Log(title = "所属机构-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class OrganizationTypeController extends BaseController { /** * 修改所属机构-类别 */ - @SaCheckPermission("platform:organizationType:edit") + //@SaCheckPermission("platform:organizationType:edit") @Log(title = "所属机构-类别", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class OrganizationTypeController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:organizationType:remove") + //@SaCheckPermission("platform:organizationType:remove") @Log(title = "所属机构-类别", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PartyInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PartyInfoController.java index 915f6fa..5acdbe0 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PartyInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PartyInfoController.java @@ -39,7 +39,7 @@ public class PartyInfoController extends BaseController { /** * 查询单位信息-用于下拉框列表 */ - @SaCheckPermission("platform:partyInfo:list") + //@SaCheckPermission("platform:partyInfo:list") @GetMapping("/list") public TableDataInfo list(PartyInfoBo bo, PageQuery pageQuery) { return partyInfoService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class PartyInfoController extends BaseController { /** * 导出单位信息-用于下拉框列表 */ - @SaCheckPermission("platform:partyInfo:export") + //@SaCheckPermission("platform:partyInfo:export") @Log(title = "单位信息-用于下拉框", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(PartyInfoBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class PartyInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:partyInfo:query") + //@SaCheckPermission("platform:partyInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class PartyInfoController extends BaseController { /** * 新增单位信息-用于下拉框 */ - @SaCheckPermission("platform:partyInfo:add") + //@SaCheckPermission("platform:partyInfo:add") @Log(title = "单位信息-用于下拉框", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class PartyInfoController extends BaseController { /** * 修改单位信息-用于下拉框 */ - @SaCheckPermission("platform:partyInfo:edit") + //@SaCheckPermission("platform:partyInfo:edit") @Log(title = "单位信息-用于下拉框", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class PartyInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:partyInfo:remove") + //@SaCheckPermission("platform:partyInfo:remove") @Log(title = "单位信息-用于下拉框", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PerformanceManagementController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PerformanceManagementController.java index d003bb8..9c23160 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PerformanceManagementController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PerformanceManagementController.java @@ -50,7 +50,7 @@ public class PerformanceManagementController extends BaseController { /** * 查询考核管理列表 */ - @SaCheckPermission("platform:management:list") + //@SaCheckPermission("platform:management:list") @GetMapping("/list") public TableDataInfo list(PerformanceManagementBo bo, PageQuery pageQuery) { return performanceManagementService.queryPageList(bo, pageQuery); @@ -59,7 +59,7 @@ public class PerformanceManagementController extends BaseController { /** * 导出考核管理列表 */ - @SaCheckPermission("platform:management:export") + //@SaCheckPermission("platform:management:export") @Log(title = "考核管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(PerformanceManagementBo bo, HttpServletResponse response) throws IOException { @@ -83,7 +83,7 @@ public class PerformanceManagementController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:management:query") + //@SaCheckPermission("platform:management:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -93,7 +93,7 @@ public class PerformanceManagementController extends BaseController { /** * 新增考核管理 */ - @SaCheckPermission("platform:management:add") + //@SaCheckPermission("platform:management:add") @Log(title = "考核管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -104,7 +104,7 @@ public class PerformanceManagementController extends BaseController { /** * 修改考核管理 */ - @SaCheckPermission("platform:management:edit") + //@SaCheckPermission("platform:management:edit") @Log(title = "考核管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -117,7 +117,7 @@ public class PerformanceManagementController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:management:remove") + //@SaCheckPermission("platform:management:remove") @Log(title = "考核管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PointInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PointInfoController.java index 64d04af..35b6a2d 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PointInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/PointInfoController.java @@ -40,7 +40,7 @@ public class PointInfoController extends BaseController { /** * 查询点位信息列表 */ - @SaCheckPermission("platform:pointInfo:list") + //@SaCheckPermission("platform:pointInfo:list") @GetMapping("/list") public TableDataInfo list(PointInfoBo bo, PageQuery pageQuery) { return pointInfoService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class PointInfoController extends BaseController { /** * 导出点位信息列表 */ - @SaCheckPermission("platform:pointInfo:export") + //@SaCheckPermission("platform:pointInfo:export") @Log(title = "点位信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(PointInfoBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class PointInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:pointInfo:query") + //@SaCheckPermission("platform:pointInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -72,7 +72,7 @@ public class PointInfoController extends BaseController { /** * 新增点位信息 */ - @SaCheckPermission("platform:pointInfo:add") + //@SaCheckPermission("platform:pointInfo:add") @Log(title = "点位信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class PointInfoController extends BaseController { /** * 修改点位信息 */ - @SaCheckPermission("platform:pointInfo:edit") + //@SaCheckPermission("platform:pointInfo:edit") @Log(title = "点位信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class PointInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:pointInfo:remove") + //@SaCheckPermission("platform:pointInfo:remove") @Log(title = "点位信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -105,7 +105,7 @@ public class PointInfoController extends BaseController { } - @SaCheckPermission("platform:pointInfo:queryPointNames") + //@SaCheckPermission("platform:pointInfo:queryPointNames") @GetMapping("/queryPointNames") public R> queryPointNames() { List rs = pointInfoService.queryPointNames(); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectCategoryPointController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectCategoryPointController.java index 4aae472..aa167b5 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectCategoryPointController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectCategoryPointController.java @@ -41,7 +41,7 @@ public class ProjectCategoryPointController extends BaseController { /** * 查询项目目录-点位列表 */ - @SaCheckPermission("platform:projectCategoryPoint:list") + //@SaCheckPermission("platform:projectCategoryPoint:list") @GetMapping("/list") public TableDataInfo list(ProjectCategoryPointBo bo, PageQuery pageQuery) { return projectCategoryPointService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class ProjectCategoryPointController extends BaseController { /** * 导出项目目录-点位列表 */ - @SaCheckPermission("platform:projectCategoryPoint:export") + //@SaCheckPermission("platform:projectCategoryPoint:export") @Log(title = "项目目录-点位", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ProjectCategoryPointBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class ProjectCategoryPointController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:projectCategoryPoint:query") + //@SaCheckPermission("platform:projectCategoryPoint:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -73,7 +73,7 @@ public class ProjectCategoryPointController extends BaseController { /** * 新增项目目录-点位 */ - @SaCheckPermission("platform:projectCategoryPoint:add") + //@SaCheckPermission("platform:projectCategoryPoint:add") @Log(title = "项目目录-点位", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class ProjectCategoryPointController extends BaseController { /** * 修改项目目录-点位 */ - @SaCheckPermission("platform:projectCategoryPoint:edit") + //@SaCheckPermission("platform:projectCategoryPoint:edit") @Log(title = "项目目录-点位", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -97,7 +97,7 @@ public class ProjectCategoryPointController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:projectCategoryPoint:remove") + //@SaCheckPermission("platform:projectCategoryPoint:remove") @Log(title = "项目目录-点位", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -110,7 +110,7 @@ public class ProjectCategoryPointController extends BaseController { * 获取服务目录- (父+子) * */ - @SaCheckPermission("platform:projectCategoryPoint:queryAll") + //@SaCheckPermission("platform:projectCategoryPoint:queryAll") @GetMapping("/queryAll") public R> queryAll() { return R.ok(projectCategoryPointService.queryAll()); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java index 08c8047..e944662 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ProjectInfoController.java @@ -42,7 +42,7 @@ public class ProjectInfoController extends BaseController { /** * 查询项目信息列表 */ - @SaCheckPermission("platform:projectInfo:list") + //@SaCheckPermission("platform:projectInfo:list") @GetMapping("/list") public TableDataInfo list(ProjectInfoBo bo, PageQuery pageQuery) { return projectInfoService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class ProjectInfoController extends BaseController { /** * 导出项目信息列表 */ - @SaCheckPermission("platform:projectInfo:export") + //@SaCheckPermission("platform:projectInfo:export") @Log(title = "项目信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ProjectInfoBo bo, HttpServletResponse response) { @@ -64,7 +64,7 @@ public class ProjectInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:projectInfo:query") + //@SaCheckPermission("platform:projectInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -74,7 +74,7 @@ public class ProjectInfoController extends BaseController { /** * 新增项目信息 */ - @SaCheckPermission("platform:projectInfo:add") + //@SaCheckPermission("platform:projectInfo:add") @Log(title = "项目信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -85,7 +85,7 @@ public class ProjectInfoController extends BaseController { /** * 修改项目信息 */ - @SaCheckPermission("platform:projectInfo:edit") + //@SaCheckPermission("platform:projectInfo:edit") @Log(title = "项目信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -98,7 +98,7 @@ public class ProjectInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:projectInfo:remove") + //@SaCheckPermission("platform:projectInfo:remove") @Log(title = "项目信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -109,7 +109,7 @@ public class ProjectInfoController extends BaseController { /** * 获取项目名称下拉框 */ - @SaCheckPermission("platform:projectInfo:getNames") + //@SaCheckPermission("platform:projectInfo:getNames") @GetMapping("/getNames") public R> getNames() { return R.ok(projectInfoService.getNames()); @@ -119,7 +119,7 @@ public class ProjectInfoController extends BaseController { /** * 根据项目名称获取合同名称 */ - @SaCheckPermission("platform:projectInfo:getContractNameByProjectName") + //@SaCheckPermission("platform:projectInfo:getContractNameByProjectName") @GetMapping("/getContractNameByProjectName") public R getContractNameByProjectName(@Param("projectName") String projectName) { String contractName = projectInfoService.getContractNameByProjectName(projectName); @@ -127,7 +127,7 @@ public class ProjectInfoController extends BaseController { } - @SaCheckPermission("platform:projectInfo:getContractInfoByProjectName") + //@SaCheckPermission("platform:projectInfo:getContractInfoByProjectName") @GetMapping("/getContractInfoByProjectName") public R> getContractInfoByProjectName(@Param("projectName") String projectName) { List rs = projectInfoService.getContractInfoByProjectName(projectName); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java index 662e712..c5d264b 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/RoutineInspectionInfoController.java @@ -49,7 +49,7 @@ public class RoutineInspectionInfoController extends BaseController { /** * 查询日常巡检-计划列表 */ - @SaCheckPermission("platform:routineInspectionInfo:list") + //@SaCheckPermission("platform:routineInspectionInfo:list") @GetMapping("/list") public TableDataInfo list(RoutineInspectionInfoBo bo, PageQuery pageQuery) { return routineInspectionInfoService.queryPageList(bo, pageQuery); @@ -58,7 +58,7 @@ public class RoutineInspectionInfoController extends BaseController { /** * 导出日常巡检-计划列表 */ - @SaCheckPermission("platform:routineInspectionInfo:export") + //@SaCheckPermission("platform:routineInspectionInfo:export") @Log(title = "日常巡检-计划", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(RoutineInspectionInfoBo bo, HttpServletResponse response) { @@ -71,7 +71,7 @@ public class RoutineInspectionInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:routineInspectionInfo:query") + //@SaCheckPermission("platform:routineInspectionInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -81,7 +81,7 @@ public class RoutineInspectionInfoController extends BaseController { /** * 新增日常巡检-计划 */ - @SaCheckPermission("platform:routineInspectionInfo:add") + //@SaCheckPermission("platform:routineInspectionInfo:add") @Log(title = "日常巡检-计划", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -92,7 +92,7 @@ public class RoutineInspectionInfoController extends BaseController { /** * 修改日常巡检-计划 */ - @SaCheckPermission("platform:routineInspectionInfo:edit") + //@SaCheckPermission("platform:routineInspectionInfo:edit") @Log(title = "日常巡检-计划", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -105,7 +105,7 @@ public class RoutineInspectionInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:routineInspectionInfo:remove") + //@SaCheckPermission("platform:routineInspectionInfo:remove") @Log(title = "日常巡检-计划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -118,7 +118,7 @@ public class RoutineInspectionInfoController extends BaseController { * @param routineInspectionDto * @return */ - @SaCheckPermission("platform:routineInspectionInfo:createRoutineInspection") + //@SaCheckPermission("platform:routineInspectionInfo:createRoutineInspection") @PostMapping("/createRoutineInspection") public R createPlans(@RequestBody RoutineInspectionDto routineInspectionDto) { List finishStatus = routineInspectionDto.getFinishStatus(); @@ -143,13 +143,13 @@ public class RoutineInspectionInfoController extends BaseController { /** * 查询日常巡检-计划列表 */ - @SaCheckPermission("platform:routineInspectionInfo:specialList") + //@SaCheckPermission("platform:routineInspectionInfo:specialList") @GetMapping("/specialList") public TableDataInfo specialList(RoutineInspectionInfoBo bo, PageQuery pageQuery) { return routineInspectionInfoService.queryPageSpecialList(bo, pageQuery); } - @SaCheckPermission("platform:routineInspectionInfo:autoCreatePlans") + //@SaCheckPermission("platform:routineInspectionInfo:autoCreatePlans") @PostMapping("/autoCreatePlans") public R autoCreatePlans(@RequestBody RoutineWorkDto routineWorkDto) { String contractId = routineWorkDto.getContractId(); @@ -160,7 +160,7 @@ public class RoutineInspectionInfoController extends BaseController { } - @SaCheckPermission("platform:routineInspectionInfo:createSpecialInspection") + //@SaCheckPermission("platform:routineInspectionInfo:createSpecialInspection") @PostMapping("/createSpecialInspection") public R createSpecialInspection(@RequestBody RoutineInspectionDto routineInspectionDto) { String projectName = routineInspectionDto.getProjectName(); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ServiceCatalogCategoryController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ServiceCatalogCategoryController.java index 2be62d6..239c028 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ServiceCatalogCategoryController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ServiceCatalogCategoryController.java @@ -41,7 +41,7 @@ public class ServiceCatalogCategoryController extends BaseController { /** * 查询服务目录-类别列表 */ - @SaCheckPermission("platform:catalogCategory:list") + //@SaCheckPermission("platform:catalogCategory:list") @GetMapping("/list") public TableDataInfo list(ServiceCatalogCategoryBo bo, PageQuery pageQuery) { return serviceCatalogCategoryService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class ServiceCatalogCategoryController extends BaseController { /** * 导出服务目录-类别列表 */ - @SaCheckPermission("platform:catalogCategory:export") + //@SaCheckPermission("platform:catalogCategory:export") @Log(title = "服务目录-类别", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(ServiceCatalogCategoryBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class ServiceCatalogCategoryController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:catalogCategory:query") + //@SaCheckPermission("platform:catalogCategory:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -73,7 +73,7 @@ public class ServiceCatalogCategoryController extends BaseController { /** * 新增服务目录-类别 */ - @SaCheckPermission("platform:catalogCategory:add") + //@SaCheckPermission("platform:catalogCategory:add") @Log(title = "服务目录-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class ServiceCatalogCategoryController extends BaseController { /** * 修改服务目录-类别 */ - @SaCheckPermission("platform:catalogCategory:edit") + //@SaCheckPermission("platform:catalogCategory:edit") @Log(title = "服务目录-类别", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -97,7 +97,7 @@ public class ServiceCatalogCategoryController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:catalogCategory:remove") + //@SaCheckPermission("platform:catalogCategory:remove") @Log(title = "服务目录-类别", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -108,7 +108,7 @@ public class ServiceCatalogCategoryController extends BaseController { /** * 获取服务目录- (父+子) */ - @SaCheckPermission("platform:catalogCategory:queryAll") + //@SaCheckPermission("platform:catalogCategory:queryAll") @GetMapping("/queryAll") public R> queryAll() { return R.ok(serviceCatalogCategoryService.queryAll()); @@ -120,7 +120,7 @@ public class ServiceCatalogCategoryController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:catalogCategory:querySubInfoById") + //@SaCheckPermission("platform:catalogCategory:querySubInfoById") @GetMapping("querySubInfoById/{id}") public R> querySubInfoById(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -128,7 +128,7 @@ public class ServiceCatalogCategoryController extends BaseController { } - @SaCheckPermission("platform:catalogCategory:queryCategory") + //@SaCheckPermission("platform:catalogCategory:queryCategory") @GetMapping("/queryCategory") public R> queryCategory() { return R.ok(serviceCatalogCategoryService.queryCategory()); @@ -139,7 +139,7 @@ public class ServiceCatalogCategoryController extends BaseController { * * @return */ - @SaCheckPermission("platform:catalogCategory:buildFullTree") + //@SaCheckPermission("platform:catalogCategory:buildFullTree") @GetMapping("/queryBuildFullTree") public R> buildFullTree() { return R.ok(serviceCatalogCategoryService.buildFullTree()); @@ -151,7 +151,7 @@ public class ServiceCatalogCategoryController extends BaseController { * * @return */ - @SaCheckPermission("platform:catalogCategory:queryAllCategoryName") + //@SaCheckPermission("platform:catalogCategory:queryAllCategoryName") @GetMapping("/queryAllCategoryName") public R> queryAllCategoryName() { List rs = serviceCatalogCategoryService.queryAllCatalogName(); @@ -162,7 +162,7 @@ public class ServiceCatalogCategoryController extends BaseController { /** * 新增服务目录-类别 */ - @SaCheckPermission("platform:catalogCategory:saveCategory") + //@SaCheckPermission("platform:catalogCategory:saveCategory") @Log(title = "服务目录-类别", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/saveCategory") @@ -172,7 +172,7 @@ public class ServiceCatalogCategoryController extends BaseController { - @SaCheckPermission("platform:catalogCategory:queryOutCategoryName") + //@SaCheckPermission("platform:catalogCategory:queryOutCategoryName") @GetMapping("/queryOutCategoryName") public R> queryOutCategoryName() { List rs = serviceCatalogCategoryService.queryOutCategoryName(); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDealInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDealInfoController.java index e23b26b..1db4fad 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDealInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDealInfoController.java @@ -40,7 +40,7 @@ public class WorkDealInfoController extends BaseController { /** * 查询工单处理信息列表 */ - @SaCheckPermission("platform:dealInfo:list") + //@SaCheckPermission("platform:dealInfo:list") @GetMapping("/list") public TableDataInfo list(WorkDealInfoBo bo, PageQuery pageQuery) { return workDealInfoService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class WorkDealInfoController extends BaseController { /** * 导出工单处理信息列表 */ - @SaCheckPermission("platform:dealInfo:export") + //@SaCheckPermission("platform:dealInfo:export") @Log(title = "工单处理信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WorkDealInfoBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class WorkDealInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:dealInfo:query") + //@SaCheckPermission("platform:dealInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -72,7 +72,7 @@ public class WorkDealInfoController extends BaseController { /** * 新增工单处理信息 */ - @SaCheckPermission("platform:dealInfo:add") + //@SaCheckPermission("platform:dealInfo:add") @Log(title = "工单处理信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class WorkDealInfoController extends BaseController { /** * 修改工单处理信息 */ - @SaCheckPermission("platform:dealInfo:edit") + //@SaCheckPermission("platform:dealInfo:edit") @Log(title = "工单处理信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class WorkDealInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:dealInfo:remove") + //@SaCheckPermission("platform:dealInfo:remove") @Log(title = "工单处理信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -104,7 +104,7 @@ public class WorkDealInfoController extends BaseController { return toAjax(workDealInfoService.deleteWithValidByIds(List.of(ids), true)); } - @SaCheckPermission("platform:dealInfo:query") + //@SaCheckPermission("platform:dealInfo:query") @GetMapping("/getInfoByOrderId") public R getInfoByOrderId(@Param("workOrderId") String workOrderId) { WorkDealInfoVo rs = workDealInfoService.getInfoByOrderId(workOrderId); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDelayProcessController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDelayProcessController.java index 1b6e6be..d6ff1b6 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDelayProcessController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkDelayProcessController.java @@ -41,7 +41,7 @@ public class WorkDelayProcessController extends BaseController { /** * 查询工单延期流程信息列表 */ - @SaCheckPermission("platform:delayProcess:list") + //@SaCheckPermission("platform:delayProcess:list") @GetMapping("/list") public TableDataInfo list(WorkDelayProcessBo bo, PageQuery pageQuery) { return workDelayProcessService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class WorkDelayProcessController extends BaseController { /** * 导出工单延期流程信息列表 */ - @SaCheckPermission("platform:delayProcess:export") + //@SaCheckPermission("platform:delayProcess:export") @Log(title = "工单延期流程信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WorkDelayProcessBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class WorkDelayProcessController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:delayProcess:query") + //@SaCheckPermission("platform:delayProcess:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -73,7 +73,7 @@ public class WorkDelayProcessController extends BaseController { /** * 新增工单延期流程信息 */ - @SaCheckPermission("platform:delayProcess:add") + //@SaCheckPermission("platform:delayProcess:add") @Log(title = "工单延期流程信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class WorkDelayProcessController extends BaseController { /** * 修改工单延期流程信息 */ - @SaCheckPermission("platform:delayProcess:edit") + //@SaCheckPermission("platform:delayProcess:edit") @Log(title = "工单延期流程信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -97,7 +97,7 @@ public class WorkDelayProcessController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:delayProcess:remove") + //@SaCheckPermission("platform:delayProcess:remove") @Log(title = "工单延期流程信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -105,7 +105,7 @@ public class WorkDelayProcessController extends BaseController { return toAjax(workDelayProcessService.deleteWithValidByIds(List.of(ids), true)); } - @SaCheckPermission("platform:delayProcess:queryProcess") + //@SaCheckPermission("platform:delayProcess:queryProcess") @GetMapping("/queryProcess") public R> queryProcess(WorkDelayProcessBo bo) { List rs = workDelayProcessService.queryList(bo); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderDelayController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderDelayController.java index 751f5e1..6df7142 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderDelayController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderDelayController.java @@ -39,7 +39,7 @@ public class WorkOrderDelayController extends BaseController { /** * 查询工单延期审核列表 */ - @SaCheckPermission("platform:orderDelay:list") + //@SaCheckPermission("platform:orderDelay:list") @GetMapping("/list") public TableDataInfo list(WorkOrderDelayBo bo, PageQuery pageQuery) { return workOrderDelayService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class WorkOrderDelayController extends BaseController { /** * 导出工单延期审核列表 */ - @SaCheckPermission("platform:orderDelay:export") + //@SaCheckPermission("platform:orderDelay:export") @Log(title = "工单延期审核", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WorkOrderDelayBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class WorkOrderDelayController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:orderDelay:query") + //@SaCheckPermission("platform:orderDelay:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -71,7 +71,7 @@ public class WorkOrderDelayController extends BaseController { /** * 新增工单延期审核 */ - @SaCheckPermission("platform:orderDelay:add") + //@SaCheckPermission("platform:orderDelay:add") @Log(title = "工单延期审核", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class WorkOrderDelayController extends BaseController { /** * 修改工单延期审核 */ - @SaCheckPermission("platform:orderDelay:edit") + //@SaCheckPermission("platform:orderDelay:edit") @Log(title = "工单延期审核", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class WorkOrderDelayController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:orderDelay:remove") + //@SaCheckPermission("platform:orderDelay:remove") @Log(title = "工单延期审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderDelayHistoryController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderDelayHistoryController.java index a0b63b7..434718c 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderDelayHistoryController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderDelayHistoryController.java @@ -41,7 +41,7 @@ public class WorkOrderDelayHistoryController extends BaseController { /** * 查询工单延期审核-历史操作列表 */ - @SaCheckPermission("platform:orderDelayHistory:list") + //@SaCheckPermission("platform:orderDelayHistory:list") @GetMapping("/list") public TableDataInfo list(WorkOrderDelayHistoryBo bo, PageQuery pageQuery) { return workOrderDelayHistoryService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class WorkOrderDelayHistoryController extends BaseController { /** * 导出工单延期审核-历史操作列表 */ - @SaCheckPermission("platform:orderDelayHistory:export") + //@SaCheckPermission("platform:orderDelayHistory:export") @Log(title = "工单延期审核-历史操作", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WorkOrderDelayHistoryBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class WorkOrderDelayHistoryController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:orderDelayHistory:query") + //@SaCheckPermission("platform:orderDelayHistory:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -73,7 +73,7 @@ public class WorkOrderDelayHistoryController extends BaseController { /** * 新增工单延期审核-历史操作 */ - @SaCheckPermission("platform:orderDelayHistory:add") + //@SaCheckPermission("platform:orderDelayHistory:add") @Log(title = "工单延期审核-历史操作", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class WorkOrderDelayHistoryController extends BaseController { /** * 修改工单延期审核-历史操作 */ - @SaCheckPermission("platform:orderDelayHistory:edit") + //@SaCheckPermission("platform:orderDelayHistory:edit") @Log(title = "工单延期审核-历史操作", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -97,7 +97,7 @@ public class WorkOrderDelayHistoryController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:orderDelayHistory:remove") + //@SaCheckPermission("platform:orderDelayHistory:remove") @Log(title = "工单延期审核-历史操作", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -106,7 +106,7 @@ public class WorkOrderDelayHistoryController extends BaseController { } - @SaCheckPermission("platform:orderDelayHistory:queryByWorkOrderId") + //@SaCheckPermission("platform:orderDelayHistory:queryByWorkOrderId") @GetMapping("/queryByWorkOrderId") public R> queryByWorkOrderId(@Param("workOrderId") String workOrderId) { List rs = workOrderDelayHistoryService.queryByWorkOrderId(workOrderId); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java index 8a8fe05..4b9b3f5 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java @@ -47,7 +47,7 @@ public class WorkOrderInfoController extends BaseController { /** * 查询工单信息列表 */ - @SaCheckPermission("platform:workOrder:list") + ////@SaCheckPermission("platform:workOrder:list") @GetMapping("/list") public TableDataInfo list(WorkOrderInfoBo bo, PageQuery pageQuery) { return workOrderInfoService.queryPageList(bo, pageQuery); @@ -56,7 +56,7 @@ public class WorkOrderInfoController extends BaseController { /** * 导出工单信息列表 */ - @SaCheckPermission("platform:workOrder:export") + //@SaCheckPermission("platform:workOrder:export") @Log(title = "工单信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WorkOrderInfoBo bo, HttpServletResponse response) { @@ -69,7 +69,7 @@ public class WorkOrderInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:workOrder:query") + //@SaCheckPermission("platform:workOrder:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -79,7 +79,7 @@ public class WorkOrderInfoController extends BaseController { /** * 新增工单信息 */ - @SaCheckPermission("platform:workOrder:add") + //@SaCheckPermission("platform:workOrder:add") @Log(title = "工单信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/add") @@ -90,7 +90,7 @@ public class WorkOrderInfoController extends BaseController { /** * 修改工单信息 */ - @SaCheckPermission("platform:workOrder:edit") + //@SaCheckPermission("platform:workOrder:edit") @Log(title = "工单信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/update") @@ -103,7 +103,7 @@ public class WorkOrderInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:workOrder:remove") + //@SaCheckPermission("platform:workOrder:remove") @Log(title = "工单信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -111,14 +111,14 @@ public class WorkOrderInfoController extends BaseController { return toAjax(workOrderInfoService.deleteWithValidByIds(List.of(ids), true)); } - @SaCheckPermission("platform:workOrder:createOrders") + //@SaCheckPermission("platform:workOrder:createOrders") @PostMapping("/createOrders") public R> createOrders(@RequestBody InspectionPlanInfo inspectionPlanInfo) { List rs = workOrderInfoService.createOrders(inspectionPlanInfo); return R.ok(rs); } - @SaCheckPermission("platform:workOrder:dispatchOrder") + //@SaCheckPermission("platform:workOrder:dispatchOrder") @PostMapping("/dispatchOrder") public R dispatchOrder(@RequestBody WorkOrderInfoBo bo ) { workOrderInfoService.dispatchOrder(bo); @@ -127,7 +127,7 @@ public class WorkOrderInfoController extends BaseController { - @SaCheckPermission("platform:workOrder:takeOrder") + //@SaCheckPermission("platform:workOrder:takeOrder") @GetMapping("/takeOrder") public R takeOrder(String workOrderId ) { workOrderInfoService.takeOrder(workOrderId); @@ -135,7 +135,7 @@ public class WorkOrderInfoController extends BaseController { } - @SaCheckPermission("platform:workOrder:dealOrder") + //@SaCheckPermission("platform:workOrder:dealOrder") @PostMapping("/dealOrder") public R dealOrder(@RequestBody WorkOrderInfoBo bo ) { workOrderInfoService.dealOrder(bo); @@ -143,7 +143,7 @@ public class WorkOrderInfoController extends BaseController { } - @SaCheckPermission("platform:workOrder:rollBackOrder") + //@SaCheckPermission("platform:workOrder:rollBackOrder") @PostMapping("/rollBackOrder") public R rollBackOrder(@RequestBody WorkOrderInfoBo bo ) { workOrderInfoService.rollBackOrder(bo); @@ -151,7 +151,7 @@ public class WorkOrderInfoController extends BaseController { } - @SaCheckPermission("platform:workOrder:delayOrder") + //@SaCheckPermission("platform:workOrder:delayOrder") @PostMapping("/delayOrder") public R delayOrder(@RequestBody WorkOrderInfoBo bo ) { workOrderInfoService.delayOrder(bo); @@ -159,7 +159,7 @@ public class WorkOrderInfoController extends BaseController { } - @SaCheckPermission("platform:workOrder:delaySubmit ") + //@SaCheckPermission("platform:workOrder:delaySubmit ") @PostMapping("/delaySubmit") public R delaySubmit (@RequestBody WorkOrderDelayBo bo ) { workOrderInfoService.delaySubmit(bo); @@ -167,14 +167,14 @@ public class WorkOrderInfoController extends BaseController { } - @SaCheckPermission("platform:workOrder:initReviewOrder") + //@SaCheckPermission("platform:workOrder:initReviewOrder") @PostMapping("/initReviewOrder") public R initReviewOrder(@RequestBody WorkReviewInfoBo bo ) { workOrderInfoService.initReviewOrder(bo); return R.ok("初审工单成功!"); } - @SaCheckPermission("platform:workOrder:lastReviewOrder") + //@SaCheckPermission("platform:workOrder:lastReviewOrder") @PostMapping("/lastReviewOrder") public R lastReviewOrder(@RequestBody WorkReviewInfoBo bo ) { workOrderInfoService.lastReviewOrder(bo); @@ -182,14 +182,14 @@ public class WorkOrderInfoController extends BaseController { } - @SaCheckPermission("platform:workOrder:dealWithList") + //@SaCheckPermission("platform:workOrder:dealWithList") @GetMapping("/dealWithList") public TableDataInfo dealWithList(WorkOrderInfoBo bo, PageQuery pageQuery) { TableDataInfo rs = workOrderInfoService.dealWithList(bo, pageQuery); return rs; } - @SaCheckPermission("platform:workOrder:reviewList") + //@SaCheckPermission("platform:workOrder:reviewList") @GetMapping("/reviewList") public TableDataInfo reviewList(WorkOrderInfoBo bo, PageQuery pageQuery) { TableDataInfo rs = workOrderInfoService.reviewList(bo, pageQuery); @@ -197,10 +197,16 @@ public class WorkOrderInfoController extends BaseController { } - @SaCheckPermission("platform:workOrder:dispatchList") + //@SaCheckPermission("platform:workOrder:dispatchList") @GetMapping("/dispatchList") public TableDataInfo dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery) { TableDataInfo rs = workOrderInfoService.dispatchList(bo, pageQuery); return rs; } + + @GetMapping("/getMaintenanceUnit") + public R getMaintenanceUnit(String workOrderId ) { + String unitName = workOrderInfoService.getMaintenanceUnit(workOrderId); + return R.ok("获取对应的运维单位信息!", unitName); + } } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderProcessController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderProcessController.java index e320694..f8bdcf3 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderProcessController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderProcessController.java @@ -42,7 +42,7 @@ public class WorkOrderProcessController extends BaseController { /** * 查询工单流程信息列表 */ - @SaCheckPermission("platform:orderProcess:list") + //@SaCheckPermission("platform:orderProcess:list") @GetMapping("/list") public TableDataInfo list(WorkOrderProcessBo bo, PageQuery pageQuery) { return workOrderProcessService.queryPageList(bo, pageQuery); @@ -51,7 +51,7 @@ public class WorkOrderProcessController extends BaseController { /** * 导出工单流程信息列表 */ - @SaCheckPermission("platform:orderProcess:export") + //@SaCheckPermission("platform:orderProcess:export") @Log(title = "工单流程信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WorkOrderProcessBo bo, HttpServletResponse response) { @@ -64,7 +64,7 @@ public class WorkOrderProcessController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:orderProcess:query") + //@SaCheckPermission("platform:orderProcess:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -74,7 +74,7 @@ public class WorkOrderProcessController extends BaseController { /** * 新增工单流程信息 */ - @SaCheckPermission("platform:orderProcess:add") + //@SaCheckPermission("platform:orderProcess:add") @Log(title = "工单流程信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -85,7 +85,7 @@ public class WorkOrderProcessController extends BaseController { /** * 修改工单流程信息 */ - @SaCheckPermission("platform:orderProcess:edit") + //@SaCheckPermission("platform:orderProcess:edit") @Log(title = "工单流程信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -98,7 +98,7 @@ public class WorkOrderProcessController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:orderProcess:remove") + //@SaCheckPermission("platform:orderProcess:remove") @Log(title = "工单流程信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @@ -107,14 +107,14 @@ public class WorkOrderProcessController extends BaseController { } - @SaCheckPermission("platform:orderProcess:queryProcess") + //@SaCheckPermission("platform:orderProcess:queryProcess") @GetMapping("/queryProcess") public R> queryProcess(WorkOrderProcessBo bo) { List rs = workOrderProcessService.queryList(bo); return R.ok(rs); } - @SaCheckPermission("platform:orderProcess:historyInfo") + //@SaCheckPermission("platform:orderProcess:historyInfo") @GetMapping("/historyInfo") public R> historyInfo(WorkOrderProcessBo bo) { List rs = workOrderProcessService.historyInfo(bo); diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkReviewInfoController.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkReviewInfoController.java index 50622ef..8f073ec 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkReviewInfoController.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkReviewInfoController.java @@ -39,7 +39,7 @@ public class WorkReviewInfoController extends BaseController { /** * 查询工单审批信息列表 */ - @SaCheckPermission("platform:reviewInfo:list") + //@SaCheckPermission("platform:reviewInfo:list") @GetMapping("/list") public TableDataInfo list(WorkReviewInfoBo bo, PageQuery pageQuery) { return workReviewInfoService.queryPageList(bo, pageQuery); @@ -48,7 +48,7 @@ public class WorkReviewInfoController extends BaseController { /** * 导出工单审批信息列表 */ - @SaCheckPermission("platform:reviewInfo:export") + //@SaCheckPermission("platform:reviewInfo:export") @Log(title = "工单审批信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WorkReviewInfoBo bo, HttpServletResponse response) { @@ -61,7 +61,7 @@ public class WorkReviewInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("platform:reviewInfo:query") + //@SaCheckPermission("platform:reviewInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -71,7 +71,7 @@ public class WorkReviewInfoController extends BaseController { /** * 新增工单审批信息 */ - @SaCheckPermission("platform:reviewInfo:add") + //@SaCheckPermission("platform:reviewInfo:add") @Log(title = "工单审批信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class WorkReviewInfoController extends BaseController { /** * 修改工单审批信息 */ - @SaCheckPermission("platform:reviewInfo:edit") + //@SaCheckPermission("platform:reviewInfo:edit") @Log(title = "工单审批信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,7 +95,7 @@ public class WorkReviewInfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("platform:reviewInfo:remove") + //@SaCheckPermission("platform:reviewInfo:remove") @Log(title = "工单审批信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java index 6cd22dd..dbb5fed 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/WorkOrderInfoVo.java @@ -182,6 +182,7 @@ public class WorkOrderInfoVo implements Serializable { * 5 终审 * 6 结案 * 7 处理中(已延期) + * 8 作废 */ @ExcelProperty(value = "当前状态") private Long status; diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java index 1e7d540..5c9d8c0 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java @@ -132,4 +132,6 @@ public interface IWorkOrderInfoService { TableDataInfo dispatchList(WorkOrderInfoBo bo, PageQuery pageQuery); void dispatchOrder(WorkOrderInfoBo bo); + + String getMaintenanceUnit(String workOrderId); } diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java index 3717151..a15423a 100644 --- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java +++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.dto.RoleDTO; import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.DateUtils; @@ -127,8 +128,26 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { */ @Override public TableDataInfo queryPageList(WorkOrderInfoBo bo, PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); + log.info("用户昵称:{}-->角色{}-->部门:{}",loginUser.getNickname(),loginUser.getRoles(),loginUser.getDeptName()); LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + String username = loginUser.getUsername(); + // 获取用户角色列表 + List roles = loginUser.getRoles(); + // 提前判断是否有 "监理" 和 "业主" 角色 + boolean hasUnitRole = roles.stream().anyMatch(role -> "运维人员".equals(role.getRoleName())); + boolean hasSupervisorRole = roles.stream().anyMatch(role -> "监理".equals(role.getRoleName())); + boolean hasOwnerRole = roles.stream().anyMatch(role -> "业主".equals(role.getRoleName())); + if (hasUnitRole){ + List records = result.getRecords(); + List sortedRecords = records.stream() + //根据单位过滤 + .filter(item -> item.getMaintenanceUnit().equals(loginUser.getDeptName())) + .collect(Collectors.toList()); + result.setRecords(sortedRecords); + result.setTotal(sortedRecords.size()); + } return TableDataInfo.build(result); } @@ -392,6 +411,9 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { @Override public TableDataInfo dealWithList(WorkOrderInfoBo bo, PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); + String username = loginUser.getUsername(); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); List records = result.getRecords(); @@ -399,6 +421,8 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { .filter(record -> record.getStatus() != null && (record.getStatus() == 1 || record.getStatus() == 2 || record.getStatus() == 7) ) + // TODO 角色过滤 + .filter(item -> "admin".equals(username) || item.getMaintenanceUnit().equals(loginUser.getDeptName())) .collect(Collectors.toList()); // 封装 @@ -436,6 +460,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { result.setRecords(filterRecords); + result.setTotal(filterRecords.size()); return TableDataInfo.build(result); } @@ -512,15 +537,40 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { @Override public TableDataInfo reviewList(WorkOrderInfoBo bo, PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); List records = result.getRecords(); + + // 获取用户角色列表 + List roles = loginUser.getRoles(); + + // 提前判断是否有 "监理" 和 "业主" 角色 + boolean hasSupervisorRole = roles.stream().anyMatch(role -> "监理".equals(role.getRoleName())); + boolean hasOwnerRole = roles.stream().anyMatch(role -> "业主".equals(role.getRoleName())); + List filterRecords = records.stream() .filter(record -> record.getStatus() != null - && record.getStatus() >= 4 - && record.getStatus() != 7 && record.getStatus() != 8) + && (record.getStatus() == 4 || record.getStatus() == 5)) + .filter(record -> { + // 如果都没有这两个角色,则保留所有 status == 4 || 5 的记录 + if (!hasSupervisorRole && !hasOwnerRole) { + return true; + } + // 监理:只保留 status == 4 + if (hasSupervisorRole && record.getStatus() == 4) { + return true; + } + // 业主:只保留 status == 5 + if (hasOwnerRole && record.getStatus() == 5) { + return true; + } + return false; + }) .collect(Collectors.toList()); + result.setRecords(filterRecords); + result.setTotal(filterRecords.size()); return TableDataInfo.build(result); } @@ -1054,6 +1104,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { ) .collect(Collectors.toList()); result.setRecords(filterRecords); + result.setTotal(filterRecords.size()); return TableDataInfo.build(result); } @@ -1149,4 +1200,14 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService { } + @Override + public String getMaintenanceUnit(String workOrderId) { + WorkOrderInfoVo workOrderInfoVo = baseMapper.selectVoById(workOrderId); + String maintenanceUnit = workOrderInfoVo.getMaintenanceUnit(); + if (maintenanceUnit != null){ + return maintenanceUnit; + } + return null; + } + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index 73ada3b..9dd0831 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -42,7 +42,7 @@ public class SysOssController extends BaseController { /** * 查询OSS对象存储列表 */ - @SaCheckPermission("system:oss:list") + //@SaCheckPermission("system:oss:list") @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { return ossService.queryPageList(bo, pageQuery); @@ -53,7 +53,7 @@ public class SysOssController extends BaseController { * * @param ossIds OSS对象ID串 */ - @SaCheckPermission("system:oss:list") + //@SaCheckPermission("system:oss:list") @GetMapping("/listByIds/{ossIds}") public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { @@ -66,7 +66,7 @@ public class SysOssController extends BaseController { * * @param file 文件 */ - @SaCheckPermission("system:oss:upload") + //@SaCheckPermission("system:oss:upload") @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R upload(@RequestPart("file") MultipartFile file) { @@ -86,7 +86,7 @@ public class SysOssController extends BaseController { * * @param ossId OSS对象ID */ - @SaCheckPermission("system:oss:download") + //@SaCheckPermission("system:oss:download") @GetMapping("/download/{ossId}") public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { ossService.download(ossId, response); @@ -97,7 +97,7 @@ public class SysOssController extends BaseController { * * @param ossIds OSS对象ID串 */ - @SaCheckPermission("system:oss:remove") + //@SaCheckPermission("system:oss:remove") @Log(title = "OSS对象存储", businessType = BusinessType.DELETE) @DeleteMapping("/{ossIds}") public R remove(@NotEmpty(message = "主键不能为空")