Ver código fonte

提交代码

JX.Li 1 ano atrás
pai
commit
88346bc4e6
15 arquivos alterados com 93 adições e 93 exclusões
  1. 6 6
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZComprehensiveController.java
  2. 7 7
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngiineeringPhotoController.java
  3. 6 6
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEnginMaterialQualityController.java
  4. 6 6
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEnginSpecificationsController.java
  5. 9 9
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringCivilController.java
  6. 8 8
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringDangerousController.java
  7. 6 6
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java
  8. 7 7
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringInfoController.java
  9. 9 9
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringInfrastructureController.java
  10. 6 6
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringMaterialController.java
  11. 6 6
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringMaterialsResetsController.java
  12. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringNodeController.java
  13. 6 6
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringPipeJackingController.java
  14. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringReviewController.java
  15. 5 5
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZMaterialStatisticsController.java

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZComprehensiveController.java

@@ -42,7 +42,7 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 查询开栓|安检|维修列表
      */
-    @SaCheckPermission("zdsz:openbolt:list")
+//    @SaCheckPermission("zdsz:openbolt:list")
     @GetMapping("/list")
     public TableDataInfo<ZComprehensiveVo> list(@Validated(QueryGroup.class) ZComprehensiveBo bo, PageQuery pageQuery) {
         return iZComprehensiveService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 导出开栓|安检|维修列表
      */
-    @SaCheckPermission("zdsz:openbolt:export")
+//    @SaCheckPermission("zdsz:openbolt:export")
     @Log(title = "开栓|安检|维修", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZComprehensiveBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ZComprehensiveController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:openbolt:query")
+//    @SaCheckPermission("zdsz:openbolt:query")
     @GetMapping("/{id}")
     public R<ZComprehensiveVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -74,7 +74,7 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 新增开栓|安检|维修
      */
-    @SaCheckPermission("zdsz:openbolt:add")
+//    @SaCheckPermission("zdsz:openbolt:add")
     @Log(title = "开栓|安检|维修", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -88,7 +88,7 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 修改开栓|安检|维修
      */
-    @SaCheckPermission("zdsz:openbolt:edit")
+//    @SaCheckPermission("zdsz:openbolt:edit")
     @Log(title = "开栓|安检|维修", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -104,7 +104,7 @@ public class ZComprehensiveController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:openbolt:remove")
+//    @SaCheckPermission("zdsz:openbolt:remove")
     @Log(title = "开栓|安检|维修", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

+ 7 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngiineeringPhotoController.java

@@ -42,7 +42,7 @@ public class ZEngiineeringPhotoController extends BaseController {
     /**
      * 查询照片列表
      */
-    @SaCheckPermission("zdsz:engiineeringPhoto:list")
+//    @SaCheckPermission("zdsz:engiineeringPhoto:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngiineeringPhotoVo> list(ZEngiineeringPhotoBo bo, PageQuery pageQuery) {
         return iZEngiineeringPhotoService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class ZEngiineeringPhotoController extends BaseController {
     /**
      * 导出照片列表
      */
-    @SaCheckPermission("zdsz:engiineeringPhoto:export")
+//    @SaCheckPermission("zdsz:engiineeringPhoto:export")/
     @Log(title = "照片", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngiineeringPhotoBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ZEngiineeringPhotoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engiineeringPhoto:query")
+//    @SaCheckPermission("zdsz:engiineeringPhoto:query")
     @GetMapping("/{id}")
     public R<ZEngiineeringPhotoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -74,7 +74,7 @@ public class ZEngiineeringPhotoController extends BaseController {
     /**
      * 新增照片
      */
-    @SaCheckPermission("zdsz:engiineeringPhoto:add")
+//    @SaCheckPermission("zdsz:engiineeringPhoto:add")
     @Log(title = "照片", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +85,7 @@ public class ZEngiineeringPhotoController extends BaseController {
     /**
      * 修改照片
      */
-    @SaCheckPermission("zdsz:engiineeringPhoto:edit")
+//    @SaCheckPermission("zdsz:engiineeringPhoto:edit")
     @Log(title = "照片", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,7 +98,7 @@ public class ZEngiineeringPhotoController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engiineeringPhoto:remove")
+//    @SaCheckPermission("zdsz:engiineeringPhoto:remove")
     @Log(title = "照片", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -110,7 +110,7 @@ public class ZEngiineeringPhotoController extends BaseController {
      * 删除照片也删除obs
      *
      */
-    @SaCheckPermission("zdsz:engiineeringPhoto:remove")
+//    @SaCheckPermission("zdsz:engiineeringPhoto:remove")
     @Log(title = "照片", businessType = BusinessType.DELETE)
     @DeleteMapping("/url")
     public R remove1(ZEngiineeringPhotoBo bo) {

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEnginMaterialQualityController.java

@@ -42,7 +42,7 @@ public class ZEnginMaterialQualityController extends BaseController {
     /**
      * 查询工程材质列表
      */
-    @SaCheckPermission("zdsz:enginMaterialQuality:list")
+//    @SaCheckPermission("zdsz:enginMaterialQuality:list")
     @GetMapping("/list")
     public TableDataInfo<ZEnginMaterialQualityVo> list(ZEnginMaterialQualityBo bo, PageQuery pageQuery) {
         return iZEnginMaterialQualityService.queryPageList(bo, pageQuery);
@@ -58,7 +58,7 @@ public class ZEnginMaterialQualityController extends BaseController {
     /**
      * 导出工程材质列表
      */
-    @SaCheckPermission("zdsz:enginMaterialQuality:export")
+//    @SaCheckPermission("zdsz:enginMaterialQuality:export")
     @Log(title = "工程材质", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEnginMaterialQualityBo bo, HttpServletResponse response) {
@@ -71,7 +71,7 @@ public class ZEnginMaterialQualityController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:enginMaterialQuality:query")
+//    @SaCheckPermission("zdsz:enginMaterialQuality:query")
     @GetMapping("/{id}")
     public R<ZEnginMaterialQualityVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -81,7 +81,7 @@ public class ZEnginMaterialQualityController extends BaseController {
     /**
      * 新增工程材质
      */
-    @SaCheckPermission("zdsz:enginMaterialQuality:add")
+//    @SaCheckPermission("zdsz:enginMaterialQuality:add")
     @Log(title = "工程材质", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -92,7 +92,7 @@ public class ZEnginMaterialQualityController extends BaseController {
     /**
      * 修改工程材质
      */
-    @SaCheckPermission("zdsz:enginMaterialQuality:edit")
+//    @SaCheckPermission("zdsz:enginMaterialQuality:edit")
     @Log(title = "工程材质", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -105,7 +105,7 @@ public class ZEnginMaterialQualityController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:enginMaterialQuality:remove")
+//    @SaCheckPermission("zdsz:enginMaterialQuality:remove")
     @Log(title = "工程材质", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEnginSpecificationsController.java

@@ -42,7 +42,7 @@ public class ZEnginSpecificationsController extends BaseController {
     /**
      * 查询工程材质规格列表
      */
-    @SaCheckPermission("zdsz:enginSpecifications:list")
+//    @SaCheckPermission("zdsz:enginSpecifications:list")
     @GetMapping("/list")
     public TableDataInfo<ZEnginSpecificationsVo> list(ZEnginSpecificationsBo bo, PageQuery pageQuery) {
         return iZEnginSpecificationsService.queryPageList(bo, pageQuery);
@@ -57,7 +57,7 @@ public class ZEnginSpecificationsController extends BaseController {
     /**
      * 导出工程材质规格列表
      */
-    @SaCheckPermission("zdsz:enginSpecifications:export")
+//    @SaCheckPermission("zdsz:enginSpecifications:export")
     @Log(title = "工程材质规格", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEnginSpecificationsBo bo, HttpServletResponse response) {
@@ -70,7 +70,7 @@ public class ZEnginSpecificationsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:enginSpecifications:query")
+//    @SaCheckPermission("zdsz:enginSpecifications:query")
     @GetMapping("/{id}")
     public R<ZEnginSpecificationsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -80,7 +80,7 @@ public class ZEnginSpecificationsController extends BaseController {
     /**
      * 新增工程材质规格
      */
-    @SaCheckPermission("zdsz:enginSpecifications:add")
+//    @SaCheckPermission("zdsz:enginSpecifications:add")
     @Log(title = "工程材质规格", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -91,7 +91,7 @@ public class ZEnginSpecificationsController extends BaseController {
     /**
      * 修改工程材质规格
      */
-    @SaCheckPermission("zdsz:enginSpecifications:edit")
+//    @SaCheckPermission("zdsz:enginSpecifications:edit")
     @Log(title = "工程材质规格", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -104,7 +104,7 @@ public class ZEnginSpecificationsController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:enginSpecifications:remove")
+//    @SaCheckPermission("zdsz:enginSpecifications:remove")
     @Log(title = "工程材质规格", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

+ 9 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringCivilController.java

@@ -70,7 +70,7 @@ public class ZEngineeringCivilController extends BaseController {
     /**
      * 导出民用工程列表
      */
-    @SaCheckPermission("zdsz:engineeringCivil:export")
+//    @SaCheckPermission("zdsz:engineeringCivil:export")
     @Log(title = "民用工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringCivilBo bo, HttpServletResponse response) {
@@ -83,7 +83,7 @@ public class ZEngineeringCivilController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringCivil:query")
+//    @SaCheckPermission("zdsz:engineeringCivil:query")
     @GetMapping("/{id}")
     public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZEngineeringCivilService.queryById(id));
@@ -93,7 +93,7 @@ public class ZEngineeringCivilController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringCivil:query")
+//    @SaCheckPermission("zdsz:engineeringCivil:query")
     @PostMapping("/query")
     public R<ZEngineeringCivilVo> query(@RequestBody ZEngineeringCivilBo zEngineeringCivilBo) {
         return R.ok(iZEngineeringCivilService.queryByEntityBo(zEngineeringCivilBo));
@@ -102,7 +102,7 @@ public class ZEngineeringCivilController extends BaseController {
     /**
      * 可视化进度点击房间查历史
      */
-    @SaCheckPermission("zdsz:engineeringCivil:query")
+//    @SaCheckPermission("zdsz:engineeringCivil:query")
     @PostMapping("/queryProcess")
     public R<ZEngineeringCivilVo> queryProcess(@RequestBody Map<String,String> params) {
         ZEngineeringCivilVo vo = iZEngineeringCivilService.queryProcess(params);
@@ -113,7 +113,7 @@ public class ZEngineeringCivilController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringCivil:query")
+//    @SaCheckPermission("zdsz:engineeringCivil:query")
     @GetMapping("/{id}/{type}")
     public R<ZEngineeringCivilVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id, @NotNull(message = "节点类型不能为空") @PathVariable String type) {
         return R.ok(iZEngineeringCivilService.query(id,type));
@@ -125,7 +125,7 @@ public class ZEngineeringCivilController extends BaseController {
 
     @Log(title = "民用工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SaCheckPermission("zdsz:engineeringCivil:add")
+//    @SaCheckPermission("zdsz:engineeringCivil:add")
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringCivilBo bo) {
         return toAjax(iZEngineeringCivilService.insertByBo(bo));
@@ -134,7 +134,7 @@ public class ZEngineeringCivilController extends BaseController {
     /**
      * 修改民用工程
      */
-    @SaCheckPermission("zdsz:engineeringCivil:edit")
+//    @SaCheckPermission("zdsz:engineeringCivil:edit")
     @Log(title = "民用工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -147,7 +147,7 @@ public class ZEngineeringCivilController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringCivil:remove")
+//    @SaCheckPermission("zdsz:engineeringCivil:remove")
     @Log(title = "民用工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
@@ -159,7 +159,7 @@ public class ZEngineeringCivilController extends BaseController {
     public R getObtainRoomcCompletionInformationList(@RequestBody ZEngineeringCivilBo zEngineeringCivilBo) {
         return R.ok(iZEngineeringCivilService.getObtainRoomcCompletionInformationList(zEngineeringCivilBo));
     }
-    @SaCheckPermission("zdsz:engineeringCivil:export")
+//    @SaCheckPermission("zdsz:engineeringCivil:export")
     @Log(title = "民用工程", businessType = BusinessType.EXPORT)
     @PostMapping("/getAreaCompletionInformationListexport")
     public void getAreaCompletionInformationListexport(ZEngineeringCivilBo bo,  HttpServletResponse response) {

+ 8 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringDangerousController.java

@@ -45,7 +45,7 @@ public class ZEngineeringDangerousController extends BaseController {
     /**
      * 查询危险工程列表
      */
-    @SaCheckPermission("zdsz:engineeringDangerous:list")
+//    @SaCheckPermission("zdsz:engineeringDangerous:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringDangerousVo> list(ZEngineeringDangerousBo bo, PageQuery pageQuery) {
         return iZEngineeringDangerousService.queryPageList(bo, pageQuery);
@@ -54,7 +54,7 @@ public class ZEngineeringDangerousController extends BaseController {
     /**
      * 导出危险工程列表
      */
-    @SaCheckPermission("zdsz:engineeringDangerous:export")
+//    @SaCheckPermission("zdsz:engineeringDangerous:export")
     @Log(title = "危险工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringDangerousBo bo, HttpServletResponse response) {
@@ -67,7 +67,7 @@ public class ZEngineeringDangerousController extends BaseController {
      *
      * @param
      */
-    @SaCheckPermission("zdsz:engineeringDangerous:query")
+//    @SaCheckPermission("zdsz:engineeringDangerous:query")
     @GetMapping("/query/{id}")
     public R<ZEngineeringDangerousVo> query(@NotNull(message = "主键不能为空")
                                                 @PathVariable String id) {
@@ -77,7 +77,7 @@ public class ZEngineeringDangerousController extends BaseController {
     /**
      * 新增危险工程
      */
-    @SaCheckPermission("zdsz:engineeringDangerous:add")
+//    @SaCheckPermission("zdsz:engineeringDangerous:add")
     @Log(title = "危险工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -89,7 +89,7 @@ public class ZEngineeringDangerousController extends BaseController {
     /**
      * 修改危险工程
      */
-    @SaCheckPermission("zdsz:engineeringDangerous:edit")
+//    @SaCheckPermission("zdsz:engineeringDangerous:edit")
     @Log(title = "危险工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -102,7 +102,7 @@ public class ZEngineeringDangerousController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringDangerous:remove")
+//    @SaCheckPermission("zdsz:engineeringDangerous:remove")
     @Log(title = "危险工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -114,7 +114,7 @@ public class ZEngineeringDangerousController extends BaseController {
      * 危险工程历史
      *
      */
-    @SaCheckPermission("zdsz:engineeringIndustry:query")
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
     @GetMapping("/{id}")
     public R<ZEngineeringDangerousVo> queryEngineeringDangerous(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZEngineeringDangerousService.queryEngineeringDangerous(id));
@@ -124,7 +124,7 @@ public class ZEngineeringDangerousController extends BaseController {
      * 危险工程-下拉
      *
      */
-    @SaCheckPermission("zdsz:engineeringDangerous:list")
+//    @SaCheckPermission("zdsz:engineeringDangerous:list")
     @GetMapping("/nameAndIdList")
     public R<List<Map<String, Object>>> selectEnginNameAndId(ZEngineeringDangerousBo bo) {
         return R.ok(iZEngineeringDangerousService.selectEnginNameAndId(bo));

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java

@@ -42,7 +42,7 @@ public class ZEngineeringIndustryController extends BaseController {
     /**
      * 查询工业工程|市政工程列表
      */
-    @SaCheckPermission("zdsz:engineeringIndustry:list")
+//    @SaCheckPermission("zdsz:engineeringIndustry:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringIndustryVo> list(ZEngineeringIndustryBo bo, PageQuery pageQuery,String type) {
         bo.setType(type);
@@ -52,7 +52,7 @@ public class ZEngineeringIndustryController extends BaseController {
     /**
      * 导出工业工程|市政工程列表
      */
-    @SaCheckPermission("zdsz:engineeringIndustry:export")
+//    @SaCheckPermission("zdsz:engineeringIndustry:export")
     @Log(title = "工业工程|市政工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringIndustryBo bo, HttpServletResponse response) {
@@ -65,7 +65,7 @@ public class ZEngineeringIndustryController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringIndustry:query")
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
     @GetMapping("/{id}")
     public R<ZEngineeringIndustryVo> getInfo(@NotNull(message = "主键不能为空")@PathVariable String id) {
         return R.ok(iZEngineeringIndustryService.queryById(id));
@@ -74,7 +74,7 @@ public class ZEngineeringIndustryController extends BaseController {
     /**
      * 新增工业工程|市政工程
      */
-    @SaCheckPermission("zdsz:engineeringIndustry:add")
+//    @SaCheckPermission("zdsz:engineeringIndustry:add")
     @Log(title = "工业工程|市政工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +85,7 @@ public class ZEngineeringIndustryController extends BaseController {
     /**
      * 修改工业工程|市政工程
      */
-    @SaCheckPermission("zdsz:engineeringIndustry:edit")
+//    @SaCheckPermission("zdsz:engineeringIndustry:edit")
     @Log(title = "工业工程|市政工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,7 +98,7 @@ public class ZEngineeringIndustryController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringIndustry:remove")
+//    @SaCheckPermission("zdsz:engineeringIndustry:remove")
     @Log(title = "工业工程|市政工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")@PathVariable String[] ids) {

+ 7 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringInfoController.java

@@ -42,7 +42,7 @@ public class ZEngineeringInfoController extends BaseController {
     /**
      * 查询工程详情列表
      */
-    @SaCheckPermission("zdsz:engineeringInfo:list")
+//    @SaCheckPermission("zdsz:engineeringInfo:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringInfoVo> list(ZEngineeringInfoBo bo, PageQuery pageQuery) {
         return iZEngineeringInfoService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class ZEngineeringInfoController extends BaseController {
     /**
      * 导出工程详情列表
      */
-    @SaCheckPermission("zdsz:engineeringInfo:export")
+//    @SaCheckPermission("zdsz:engineeringInfo:export")
     @Log(title = "工程详情", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringInfoBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ZEngineeringInfoController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringInfo:query")
+//    @SaCheckPermission("zdsz:engineeringInfo:query")
     @GetMapping("/{id}")
     public R<ZEngineeringInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -74,7 +74,7 @@ public class ZEngineeringInfoController extends BaseController {
     /**
      * 新增工程详情
      */
-    @SaCheckPermission("zdsz:engineeringInfo:add")
+//    @SaCheckPermission("zdsz:engineeringInfo:add")
     @Log(title = "工程详情", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +85,7 @@ public class ZEngineeringInfoController extends BaseController {
     /**
      * 修改工程详情
      */
-    @SaCheckPermission("zdsz:engineeringInfo:edit")
+//    @SaCheckPermission("zdsz:engineeringInfo:edit")
     @Log(title = "工程详情", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,14 +98,14 @@ public class ZEngineeringInfoController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringInfo:remove")
+//    @SaCheckPermission("zdsz:engineeringInfo:remove")
     @Log(title = "工程详情", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String[] ids) {
         return toAjax(iZEngineeringInfoService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
-    @SaCheckPermission("zdsz:engineeringInfo:remove")
+//    @SaCheckPermission("zdsz:engineeringInfo:remove")
     @Log(title = "信息删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/deleteById")
     public R deleteById(@RequestBody  ZEngineeringInfoBo bo) {

+ 9 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringInfrastructureController.java

@@ -47,7 +47,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 查询基建工程下拉
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
     @GetMapping("/select")
     public R<List<ZEngineeringInfrastructureSelectVo>> select(ZEngineeringInfrastructureBo bo) {
         try{
@@ -60,7 +60,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 查询基建工程列表
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringInfrastructureVo> list(ZEngineeringInfrastructureBo bo, PageQuery pageQuery) {
         return iZEngineeringInfrastructureService.queryPageList(bo, pageQuery);
@@ -69,7 +69,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 导出基建工程列表
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:export")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:export")
     @Log(title = "基建工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringInfrastructureBo bo, HttpServletResponse response) {
@@ -82,7 +82,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:query")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:query")
     @GetMapping("/{id}")
     public R<ZEngineeringInfrastructureVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -103,7 +103,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 新增基建工程
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:add")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:add")
     @Log(title = "基建工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -113,7 +113,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 新增基建工程App
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:add")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:add")
     @Log(title = "基建工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/AddApp")
@@ -124,7 +124,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 基建工程审核
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:review")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:review")
     @Log(title = "基建工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/review")
@@ -136,7 +136,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
     /**
      * 修改基建工程
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:edit")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:edit")
     @Log(title = "基建工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -149,7 +149,7 @@ public class ZEngineeringInfrastructureController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringInfrastructure:remove")
+//    @SaCheckPermission("zdsz:engineeringInfrastructure:remove")
     @Log(title = "基建工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringMaterialController.java

@@ -42,7 +42,7 @@ public class ZEngineeringMaterialController extends BaseController {
     /**
      * 查询工程用料列表
      */
-    @SaCheckPermission("zdsz:engineeringMaterial:list")
+//    @SaCheckPermission("zdsz:engineeringMaterial:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringMaterialVo> list(ZEngineeringMaterialBo bo, PageQuery pageQuery) {
         return iZEngineeringMaterialService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class ZEngineeringMaterialController extends BaseController {
     /**
      * 导出工程用料列表
      */
-    @SaCheckPermission("zdsz:engineeringMaterial:export")
+//    @SaCheckPermission("zdsz:engineeringMaterial:export")
     @Log(title = "工程用料", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringMaterialBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ZEngineeringMaterialController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringMaterial:query")
+//    @SaCheckPermission("zdsz:engineeringMaterial:query")
     @GetMapping("/{id}")
     public R<ZEngineeringMaterialVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -74,7 +74,7 @@ public class ZEngineeringMaterialController extends BaseController {
     /**
      * 新增工程用料
      */
-    @SaCheckPermission("zdsz:engineeringMaterial:add")
+//    @SaCheckPermission("zdsz:engineeringMaterial:add")
     @Log(title = "工程用料", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +85,7 @@ public class ZEngineeringMaterialController extends BaseController {
     /**
      * 修改工程用料
      */
-    @SaCheckPermission("zdsz:engineeringMaterial:edit")
+//    @SaCheckPermission("zdsz:engineeringMaterial:edit")
     @Log(title = "工程用料", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,7 +98,7 @@ public class ZEngineeringMaterialController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringMaterial:remove")
+//    @SaCheckPermission("zdsz:engineeringMaterial:remove")
     @Log(title = "工程用料", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringMaterialsResetsController.java

@@ -42,7 +42,7 @@ public class ZEngineeringMaterialsResetsController extends BaseController {
     /**
      * 查询工程用料预设列表
      */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:list")
+//    @SaCheckPermission("zdsz:engineeringMaterialsResets:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringMaterialsResetsVo> list(ZEngineeringMaterialsResetsBo bo, PageQuery pageQuery) {
         return iZEngineeringMaterialsResetsService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class ZEngineeringMaterialsResetsController extends BaseController {
     /**
      * 导出工程用料预设列表
      */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:export")
+//    @SaCheckPermission("zdsz:engineeringMaterialsResets:export")
     @Log(title = "工程用料预设", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringMaterialsResetsBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class ZEngineeringMaterialsResetsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:query")
+//    @SaCheckPermission("zdsz:engineeringMaterialsResets:query")
     @GetMapping("/{id}")
     public R<ZEngineeringMaterialsResetsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -74,7 +74,7 @@ public class ZEngineeringMaterialsResetsController extends BaseController {
     /**
      * 新增工程用料预设
      */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:add")
+//    @SaCheckPermission("zdsz:engineeringMaterialsResets:add")
     @Log(title = "工程用料预设", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +85,7 @@ public class ZEngineeringMaterialsResetsController extends BaseController {
     /**
      * 修改工程用料预设
      */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:edit")
+//    @SaCheckPermission("zdsz:engineeringMaterialsResets:edit")
     @Log(title = "工程用料预设", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,7 +98,7 @@ public class ZEngineeringMaterialsResetsController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringMaterialsResets:remove")
+//    @SaCheckPermission("zdsz:engineeringMaterialsResets:remove")
     @Log(title = "工程用料预设", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringNodeController.java

@@ -44,7 +44,7 @@ public class ZEngineeringNodeController extends BaseController {
     /**
      * 查询工程节点列表
      */
-    @SaCheckPermission("zdsz:engineeringNode:list")
+//    @SaCheckPermission("zdsz:engineeringNode:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringNodeVo> list(ZEngineeringNodeBo bo, PageQuery pageQuery) {
         return iZEngineeringNodeService.queryPageList(bo, pageQuery);
@@ -53,7 +53,7 @@ public class ZEngineeringNodeController extends BaseController {
     /**
      * 导出工程节点列表
      */
-    @SaCheckPermission("zdsz:engineeringNode:export")
+//    @SaCheckPermission("zdsz:engineeringNode:export")
     @Log(title = "工程节点", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringNodeBo bo, HttpServletResponse response) {

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringPipeJackingController.java

@@ -66,7 +66,7 @@ public class ZEngineeringPipeJackingController extends BaseController {
     /**
      * 导出顶管工程列表
      */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:export")
+//    @SaCheckPermission("zdsz:engineeringPipeJacking:export")
     @Log(title = "顶管工程", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringPipeJackingBo bo, HttpServletResponse response) {
@@ -92,7 +92,7 @@ public class ZEngineeringPipeJackingController extends BaseController {
      * @param id 主键
      * @param type 节点类型
      */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:query")
+//    @SaCheckPermission("zdsz:engineeringPipeJacking:query")
     @GetMapping("/{id}/{type}")
     public R<ZEngineeringPipeJackingVo> getInfo(@NotNull(message = "主键不能为空")
                                                 @PathVariable("id") String id,@NotNull(message = "节点类型不能为空")
@@ -104,7 +104,7 @@ public class ZEngineeringPipeJackingController extends BaseController {
     /**
      * 新增顶管工程
      */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:add")
+//    @SaCheckPermission("zdsz:engineeringPipeJacking:add")
     @Log(title = "顶管工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -116,7 +116,7 @@ public class ZEngineeringPipeJackingController extends BaseController {
     /**
      * 新增顶管工程App
      */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:add")
+//    @SaCheckPermission("zdsz:engineeringPipeJacking:add")
     @Log(title = "顶管工程", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/AppAdd")
@@ -128,7 +128,7 @@ public class ZEngineeringPipeJackingController extends BaseController {
     /**
      * 修改顶管工程
      */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:edit")
+//    @SaCheckPermission("zdsz:engineeringPipeJacking:edit")
     @Log(title = "顶管工程", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -141,7 +141,7 @@ public class ZEngineeringPipeJackingController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringPipeJacking:remove")
+//    @SaCheckPermission("zdsz:engineeringPipeJacking:remove")
     @Log(title = "顶管工程", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R remove(@NotEmpty(message = "主键不能为空")

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringReviewController.java

@@ -49,7 +49,7 @@ public class ZEngineeringReviewController extends BaseController {
     /**
      * 查询工程审核列表
      */
-    @SaCheckPermission("zdsz:engineeringReview:list")
+//    @SaCheckPermission("zdsz:engineeringReview:list")
     @GetMapping("/list")
     public TableDataInfo<ZEngineeringReviewVo> list(ZEngineeringReviewBo bo, PageQuery pageQuery) {
         return iZEngineeringReviewService.queryPageList(bo, pageQuery);
@@ -58,7 +58,7 @@ public class ZEngineeringReviewController extends BaseController {
     /**
      * 导出工程审核列表
      */
-    @SaCheckPermission("zdsz:engineeringReview:export")
+//    @SaCheckPermission("zdsz:engineeringReview:export")
     @Log(title = "工程审核", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringReviewBo bo, HttpServletResponse response) {
@@ -91,7 +91,7 @@ public class ZEngineeringReviewController extends BaseController {
     /**
      * 修改工程审核
      */
-    @SaCheckPermission("zdsz:engineeringReview:edit")
+//    @SaCheckPermission("zdsz:engineeringReview:edit")
     @Log(title = "工程审核", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -104,7 +104,7 @@ public class ZEngineeringReviewController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:engineeringReview:remove")
+//    @SaCheckPermission("zdsz:engineeringReview:remove")
     @Log(title = "工程审核", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

+ 5 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZMaterialStatisticsController.java

@@ -53,7 +53,7 @@ public class ZMaterialStatisticsController extends BaseController {
     /**
      * 导出用料统计列表
      */
-    @SaCheckPermission("zdsz:materialStatistics:export")
+//    @SaCheckPermission("zdsz:materialStatistics:export")
     @Log(title = "用料统计", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZMaterialStatisticsBo bo, HttpServletResponse response) {
@@ -66,7 +66,7 @@ public class ZMaterialStatisticsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:materialStatistics:query")
+//    @SaCheckPermission("zdsz:materialStatistics:query")
     @GetMapping("/{id}")
     public R<ZMaterialStatisticsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -76,7 +76,7 @@ public class ZMaterialStatisticsController extends BaseController {
     /**
      * 新增用料统计
      */
-    @SaCheckPermission("zdsz:materialStatistics:add")
+//    @SaCheckPermission("zdsz:materialStatistics:add")
     @Log(title = "用料统计", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -87,7 +87,7 @@ public class ZMaterialStatisticsController extends BaseController {
     /**
      * 修改用料统计
      */
-    @SaCheckPermission("zdsz:materialStatistics:edit")
+//    @SaCheckPermission("zdsz:materialStatistics:edit")
     @Log(title = "用料统计", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -100,7 +100,7 @@ public class ZMaterialStatisticsController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:materialStatistics:remove")
+//    @SaCheckPermission("zdsz:materialStatistics:remove")
     @Log(title = "用料统计", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")