Browse Source

去掉权限注解

liujing-123 1 week ago
parent
commit
8d8f047e5f
11 changed files with 58 additions and 55 deletions
  1. 6 6
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/caxx/CaxxController.java
  2. 5 5
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/CrkxxController.java
  3. 6 6
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/cwxx/CwxxController.java
  4. 1 1
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/cwxx/vo/CwxxSaveReqVO.java
  5. 5 5
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/cwxxyear/CwxxYearController.java
  6. 6 6
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/dwxx/DwxxController.java
  7. 6 6
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/hwk/HwkController.java
  8. 6 6
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/lqjcxx/LqjcxxController.java
  9. 6 6
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/syxx/SyxxController.java
  10. 5 5
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/zjxx/ZjxxController.java
  11. 6 3
      delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/cwxx/CwxxServiceImpl.java

+ 6 - 6
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/caxx/CaxxController.java

@@ -44,14 +44,14 @@ public class CaxxController {
44 44
 
45 45
     @PostMapping("/create")
46 46
     @Operation(summary = "创建仓廒信息;")
47
-    @PreAuthorize("@ss.hasPermission('coding:caxx:create')")
47
+//    @PreAuthorize("@ss.hasPermission('coding:caxx:create')")
48 48
     public CommonResult<Long> createCaxx(@Valid @RequestBody CaxxSaveReqVO createReqVO) {
49 49
         return success(caxxService.createCaxx(createReqVO));
50 50
     }
51 51
 
52 52
     @PutMapping("/update")
53 53
     @Operation(summary = "更新仓廒信息;")
54
-    @PreAuthorize("@ss.hasPermission('coding:caxx:update')")
54
+    //@PreAuthorize("@ss.hasPermission('coding:caxx:update')")
55 55
     public CommonResult<Boolean> updateCaxx(@Valid @RequestBody CaxxSaveReqVO updateReqVO) {
56 56
         caxxService.updateCaxx(updateReqVO);
57 57
         return success(true);
@@ -61,7 +61,7 @@ public class CaxxController {
61 61
     @DeleteMapping("/delete")
62 62
     @Operation(summary = "删除仓廒信息;")
63 63
     @Parameter(name = "id", description = "编号", required = true)
64
-    @PreAuthorize("@ss.hasPermission('coding:caxx:delete')")
64
+    //@PreAuthorize("@ss.hasPermission('coding:caxx:delete')")
65 65
     public CommonResult<Boolean> deleteCaxx(@RequestParam("id") Long id) {
66 66
         caxxService.deleteCaxx(id);
67 67
         return success(true);
@@ -70,7 +70,7 @@ public class CaxxController {
70 70
     @GetMapping("/get")
71 71
     @Operation(summary = "获得仓廒信息;")
72 72
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
73
-    @PreAuthorize("@ss.hasPermission('coding:caxx:query')")
73
+    //@PreAuthorize("@ss.hasPermission('coding:caxx:query')")
74 74
     public CommonResult<CaxxRespVO> getCaxx(@RequestParam("id") Long id) {
75 75
         CaxxDO caxx = caxxService.getCaxx(id);
76 76
         return success(BeanUtils.toBean(caxx, CaxxRespVO.class));
@@ -78,7 +78,7 @@ public class CaxxController {
78 78
 
79 79
     @GetMapping("/getByKqBm")
80 80
     @Operation(summary = "库区人员获得仓廒信息;")
81
-    @PreAuthorize("@ss.hasPermission('coding:caxx:queryByKqBm')")
81
+    //@PreAuthorize("@ss.hasPermission('coding:caxx:queryByKqBm')")
82 82
     public CommonResult<List<CaxxRespVO>> getCaxx() {
83 83
         List<CaxxDO> pageResult = caxxService.getCaxxByKqBm();
84 84
         return success(BeanUtils.toBean(pageResult, CaxxRespVO.class));
@@ -87,7 +87,7 @@ public class CaxxController {
87 87
 
88 88
     @GetMapping("/page")
89 89
     @Operation(summary = "获得仓廒信息;分页")
90
-    @PreAuthorize("@ss.hasPermission('coding:caxx:query')")
90
+    //@PreAuthorize("@ss.hasPermission('coding:caxx:query')")
91 91
     public CommonResult<PageResult<CaxxRespVO>> getCaxxPage(@Valid CaxxPageReqVO pageReqVO) {
92 92
         PageResult<CaxxDO> pageResult = caxxService.getCaxxPage(pageReqVO);
93 93
         return success(BeanUtils.toBean(pageResult, CaxxRespVO.class));

+ 5 - 5
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/CrkxxController.java

@@ -44,14 +44,14 @@ public class CrkxxController {
44 44
 
45 45
     @PostMapping("/create")
46 46
     @Operation(summary = "创建出入库信息")
47
-    @PreAuthorize("@ss.hasPermission('coding:crkxx:create')")
47
+    //@PreAuthorize("@ss.hasPermission('coding:crkxx:create')")
48 48
     public CommonResult<Long> createCrkxx(@Valid @RequestBody CrkxxSaveReqVO createReqVO) {
49 49
         return success(crkxxService.createCrkxx(createReqVO));
50 50
     }
51 51
 
52 52
     @PutMapping("/update")
53 53
     @Operation(summary = "更新出入库信息")
54
-    @PreAuthorize("@ss.hasPermission('coding:crkxx:update')")
54
+    //@PreAuthorize("@ss.hasPermission('coding:crkxx:update')")
55 55
     public CommonResult<Boolean> updateCrkxx(@Valid @RequestBody CrkxxSaveReqVO updateReqVO) {
56 56
         crkxxService.updateCrkxx(updateReqVO);
57 57
         return success(true);
@@ -60,7 +60,7 @@ public class CrkxxController {
60 60
     @DeleteMapping("/delete")
61 61
     @Operation(summary = "删除出入库信息")
62 62
     @Parameter(name = "id", description = "编号", required = true)
63
-    @PreAuthorize("@ss.hasPermission('coding:crkxx:delete')")
63
+   // @PreAuthorize("@ss.hasPermission('coding:crkxx:delete')")
64 64
     public CommonResult<Boolean> deleteCrkxx(@RequestParam("id") Long id) {
65 65
         crkxxService.deleteCrkxx(id);
66 66
         return success(true);
@@ -69,7 +69,7 @@ public class CrkxxController {
69 69
     @GetMapping("/get")
70 70
     @Operation(summary = "获得出入库信息")
71 71
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
72
-    @PreAuthorize("@ss.hasPermission('coding:crkxx:query')")
72
+   // @PreAuthorize("@ss.hasPermission('coding:crkxx:query')")
73 73
     public CommonResult<CrkxxRespVO> getCrkxx(@RequestParam("id") Long id) {
74 74
         CrkxxDO crkxx = crkxxService.getCrkxx(id);
75 75
 
@@ -79,7 +79,7 @@ public class CrkxxController {
79 79
 
80 80
     @PostMapping("/page")
81 81
     @Operation(summary = "获得出入库信息分页")
82
-    @PreAuthorize("@ss.hasPermission('coding:crkxx:query')")
82
+    //@PreAuthorize("@ss.hasPermission('coding:crkxx:query')")
83 83
     public CommonResult<PageResult<CrkxxRespVO>> getCrkxxPage(@Valid @RequestBody CrkxxPageReqVO pageReqVO) {
84 84
         PageResult<CrkxxRespVO> crkxxRespVOPageResult = crkxxService.getCrkxxPageFiles(pageReqVO);
85 85
 

+ 6 - 6
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/cwxx/CwxxController.java

@@ -40,14 +40,14 @@ public class CwxxController {
40 40
 
41 41
     @PostMapping("/create")
42 42
     @Operation(summary = "创建财务信息")
43
-    @PreAuthorize("@ss.hasPermission('coding:cwxx:create')")
43
+//    @PreAuthorize("@ss.hasPermission('coding:cwxx:create')")
44 44
     public CommonResult<Long> createCwxx(@Valid @RequestBody CwxxSaveReqVO createReqVO) {
45 45
         return success(cwxxService.createCwxx(createReqVO));
46 46
     }
47 47
 
48 48
     @PutMapping("/update")
49 49
     @Operation(summary = "更新财务信息")
50
-    @PreAuthorize("@ss.hasPermission('coding:cwxx:update')")
50
+//    @PreAuthorize("@ss.hasPermission('coding:cwxx:update')")
51 51
     public CommonResult<Boolean> updateCwxx(@Valid @RequestBody CwxxSaveReqVO updateReqVO) {
52 52
         cwxxService.updateCwxx(updateReqVO);
53 53
         return success(true);
@@ -56,7 +56,7 @@ public class CwxxController {
56 56
     @DeleteMapping("/delete")
57 57
     @Operation(summary = "删除财务信息")
58 58
     @Parameter(name = "id", description = "编号", required = true)
59
-    @PreAuthorize("@ss.hasPermission('coding:cwxx:delete')")
59
+//    @PreAuthorize("@ss.hasPermission('coding:cwxx:delete')")
60 60
     public CommonResult<Boolean> deleteCwxx(@RequestParam("id") Long id) {
61 61
         cwxxService.deleteCwxx(id);
62 62
         return success(true);
@@ -65,21 +65,21 @@ public class CwxxController {
65 65
     @GetMapping("/get")
66 66
     @Operation(summary = "获得财务信息")
67 67
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
68
-    @PreAuthorize("@ss.hasPermission('coding:cwxx:query')")
68
+//    @PreAuthorize("@ss.hasPermission('coding:cwxx:query')")
69 69
     public CommonResult<CwxxRespVO> getCwxx(@RequestParam("id") Long id) {
70 70
         return success(cwxxService.getCwxx(id));
71 71
     }
72 72
 
73 73
     @GetMapping("/getByKqBm")
74 74
     @Operation(summary = "根据库区编码获得财务信息")
75
-    @PreAuthorize("@ss.hasPermission('coding:cwxx:queryByKqBm')")
75
+//    @PreAuthorize("@ss.hasPermission('coding:cwxx:queryByKqBm')")
76 76
     public CommonResult<CwxxRespVO> getCwxxByKqBm() {
77 77
         return success(cwxxService.getCwxxByKqBm());
78 78
     }
79 79
 
80 80
     @GetMapping("/page")
81 81
     @Operation(summary = "获得财务信息分页")
82
-    @PreAuthorize("@ss.hasPermission('coding:cwxx:query')")
82
+//    @PreAuthorize("@ss.hasPermission('coding:cwxx:query')")
83 83
     public CommonResult<PageResult<CwxxRespVO>> getCwxxPage(@Valid CwxxPageReqVO pageReqVO) {
84 84
         PageResult<CwxxDO> pageResult = cwxxService.getCwxxPage(pageReqVO);
85 85
         return success(BeanUtils.toBean(pageResult, CwxxRespVO.class));

+ 1 - 1
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/cwxx/vo/CwxxSaveReqVO.java

@@ -24,7 +24,7 @@ public class CwxxSaveReqVO {
24 24
     private String gd;
25 25
 
26 26
     @Schema(description = "单位id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3720")
27
-    @NotNull(message = "单位id不能为空")
27
+//    @NotNull(message = "单位id不能为空")
28 28
     private Long deptId;
29 29
 
30 30
     @Schema(description = "库区id", example = "1934")

+ 5 - 5
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/cwxxyear/CwxxYearController.java

@@ -40,14 +40,14 @@ public class CwxxYearController {
40 40
 
41 41
     @PostMapping("/create")
42 42
     @Operation(summary = "创建财年务情况")
43
-    @PreAuthorize("@ss.hasPermission('coding:cwxx-year:create')")
43
+   // @PreAuthorize("@ss.hasPermission('coding:cwxx-year:create')")
44 44
     public CommonResult<Long> createCwxxYear(@Valid @RequestBody CwxxYearSaveReqVO createReqVO) {
45 45
         return success(cwxxYearService.createCwxxYear(createReqVO));
46 46
     }
47 47
 
48 48
     @PutMapping("/update")
49 49
     @Operation(summary = "更新财年务情况")
50
-    @PreAuthorize("@ss.hasPermission('coding:cwxx-year:update')")
50
+   // @PreAuthorize("@ss.hasPermission('coding:cwxx-year:update')")
51 51
     public CommonResult<Boolean> updateCwxxYear(@Valid @RequestBody CwxxYearSaveReqVO updateReqVO) {
52 52
         cwxxYearService.updateCwxxYear(updateReqVO);
53 53
         return success(true);
@@ -56,7 +56,7 @@ public class CwxxYearController {
56 56
     @DeleteMapping("/delete")
57 57
     @Operation(summary = "删除财年务情况")
58 58
     @Parameter(name = "id", description = "编号", required = true)
59
-    @PreAuthorize("@ss.hasPermission('coding:cwxx-year:delete')")
59
+   // @PreAuthorize("@ss.hasPermission('coding:cwxx-year:delete')")
60 60
     public CommonResult<Boolean> deleteCwxxYear(@RequestParam("id") Long id) {
61 61
         cwxxYearService.deleteCwxxYear(id);
62 62
         return success(true);
@@ -65,7 +65,7 @@ public class CwxxYearController {
65 65
     @GetMapping("/get")
66 66
     @Operation(summary = "获得财年务情况")
67 67
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
68
-    @PreAuthorize("@ss.hasPermission('coding:cwxx-year:query')")
68
+  //  @PreAuthorize("@ss.hasPermission('coding:cwxx-year:query')")
69 69
     public CommonResult<CwxxYearRespVO> getCwxxYear(@RequestParam("id") Long id) {
70 70
         CwxxYearDO cwxxYear = cwxxYearService.getCwxxYear(id);
71 71
         return success(BeanUtils.toBean(cwxxYear, CwxxYearRespVO.class));
@@ -73,7 +73,7 @@ public class CwxxYearController {
73 73
 
74 74
     @GetMapping("/page")
75 75
     @Operation(summary = "获得财年务情况分页")
76
-    @PreAuthorize("@ss.hasPermission('coding:cwxx-year:query')")
76
+    //@PreAuthorize("@ss.hasPermission('coding:cwxx-year:query')")
77 77
     public CommonResult<PageResult<CwxxYearRespVO>> getCwxxYearPage(@Valid CwxxYearPageReqVO pageReqVO) {
78 78
         PageResult<CwxxYearDO> pageResult = cwxxYearService.getCwxxYearPage(pageReqVO);
79 79
         return success(BeanUtils.toBean(pageResult, CwxxYearRespVO.class));

+ 6 - 6
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/dwxx/DwxxController.java

@@ -39,14 +39,14 @@ public class DwxxController {
39 39
 
40 40
     @PostMapping("/create")
41 41
     @Operation(summary = "创建单位信息")
42
-    @PreAuthorize("@ss.hasPermission('coding:dwxx:create')")
42
+//    @PreAuthorize("@ss.hasPermission('coding:dwxx:create')")
43 43
     public CommonResult<Long> createDwxx(@Valid @RequestBody DwxxSaveReqVO createReqVO) {
44 44
         return success(dwxxService.createDwxx(createReqVO));
45 45
     }
46 46
 
47 47
     @PutMapping("/update")
48 48
     @Operation(summary = "更新单位信息")
49
-    @PreAuthorize("@ss.hasPermission('coding:dwxx:update')")
49
+//    @PreAuthorize("@ss.hasPermission('coding:dwxx:update')")
50 50
     public CommonResult<Boolean> updateDwxx(@Valid @RequestBody DwxxSaveReqVO updateReqVO) {
51 51
         dwxxService.updateDwxx(updateReqVO);
52 52
         return success(true);
@@ -55,7 +55,7 @@ public class DwxxController {
55 55
     @DeleteMapping("/delete")
56 56
     @Operation(summary = "删除单位信息")
57 57
     @Parameter(name = "id", description = "编号", required = true)
58
-    @PreAuthorize("@ss.hasPermission('coding:dwxx:delete')")
58
+//    @PreAuthorize("@ss.hasPermission('coding:dwxx:delete')")
59 59
     public CommonResult<Boolean> deleteDwxx(@RequestParam("id") Long id) {
60 60
         dwxxService.deleteDwxx(id);
61 61
         return success(true);
@@ -64,7 +64,7 @@ public class DwxxController {
64 64
     @GetMapping("/getByKqBm")
65 65
     @Operation(summary = "根据库区获得单位信息")
66 66
     @Parameter( required = true, example = "1024")
67
-    @PreAuthorize("@ss.hasPermission('coding:dwxx:kqbm')")
67
+//    @PreAuthorize("@ss.hasPermission('coding:dwxx:kqbm')")
68 68
     public CommonResult<DwxxRespVO> getDwxxByKqBm() {
69 69
         DwxxDO dwxx = dwxxService.getDwxxByKqBm();
70 70
         return success(BeanUtils.toBean(dwxx, DwxxRespVO.class));
@@ -72,7 +72,7 @@ public class DwxxController {
72 72
     @GetMapping("/get")
73 73
     @Operation(summary = "获得单位信息")
74 74
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
75
-    @PreAuthorize("@ss.hasPermission('coding:dwxx:query')")
75
+//    @PreAuthorize("@ss.hasPermission('coding:dwxx:query')")
76 76
     public CommonResult<DwxxRespVO> getDwxx(@RequestParam("id") Long id) {
77 77
         DwxxDO dwxx = dwxxService.getDwxx(id);
78 78
         return success(BeanUtils.toBean(dwxx, DwxxRespVO.class));
@@ -80,7 +80,7 @@ public class DwxxController {
80 80
 
81 81
     @GetMapping("/page")
82 82
     @Operation(summary = "获得单位信息分页")
83
-    @PreAuthorize("@ss.hasPermission('coding:dwxx:query')")
83
+//    @PreAuthorize("@ss.hasPermission('coding:dwxx:query')")
84 84
     public CommonResult<PageResult<DwxxRespVO>> getDwxxPage(@Valid DwxxPageReqVO pageReqVO) {
85 85
         PageResult<DwxxDO> pageResult = dwxxService.getDwxxPage(pageReqVO);
86 86
         return success(BeanUtils.toBean(pageResult, DwxxRespVO.class));

+ 6 - 6
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/hwk/HwkController.java

@@ -41,14 +41,14 @@ public class HwkController {
41 41
 
42 42
     @PostMapping("/create")
43 43
     @Operation(summary = "创建货位卡信息")
44
-    @PreAuthorize("@ss.hasPermission('coding:hwk:create')")
44
+   // @PreAuthorize("@ss.hasPermission('coding:hwk:create')")
45 45
     public CommonResult<Long> createHwk(@Valid @RequestBody HwkSaveReqVO createReqVO) {
46 46
         return success(hwkService.createHwk(createReqVO));
47 47
     }
48 48
 
49 49
     @PutMapping("/update")
50 50
     @Operation(summary = "更新货位卡信息")
51
-    @PreAuthorize("@ss.hasPermission('coding:hwk:update')")
51
+   // @PreAuthorize("@ss.hasPermission('coding:hwk:update')")
52 52
     public CommonResult<Boolean> updateHwk(@Valid @RequestBody HwkSaveReqVO updateReqVO) {
53 53
         hwkService.updateHwk(updateReqVO);
54 54
         return success(true);
@@ -57,7 +57,7 @@ public class HwkController {
57 57
     @DeleteMapping("/delete")
58 58
     @Operation(summary = "删除货位卡信息")
59 59
     @Parameter(name = "id", description = "编号", required = true)
60
-    @PreAuthorize("@ss.hasPermission('coding:hwk:delete')")
60
+    //@PreAuthorize("@ss.hasPermission('coding:hwk:delete')")
61 61
     public CommonResult<Boolean> deleteHwk(@RequestParam("id") Long id) {
62 62
         hwkService.deleteHwk(id);
63 63
         return success(true);
@@ -65,7 +65,7 @@ public class HwkController {
65 65
     @GetMapping("/getInfoByCfId")
66 66
     @Operation(summary = "根据仓房id获得货位卡信息")
67 67
     @Parameter(name = "cfId", description = "仓房编号", required = true, example = "1024")
68
-    @PreAuthorize("@ss.hasPermission('coding:hwk:queryByCfId')")
68
+   // @PreAuthorize("@ss.hasPermission('coding:hwk:queryByCfId')")
69 69
     public CommonResult<HwkRespVO> getHwkByCfId(@RequestParam("cfId") Long cfId) {
70 70
         HwkDO hwk = hwkService.getHwkByCfId(cfId);
71 71
         HwkRespVO hwkRespVO = BeanUtils.toBean(hwk, HwkRespVO.class);
@@ -74,7 +74,7 @@ public class HwkController {
74 74
     @GetMapping("/get")
75 75
     @Operation(summary = "获得货位卡信息")
76 76
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
77
-    @PreAuthorize("@ss.hasPermission('coding:hwk:query')")
77
+  //  @PreAuthorize("@ss.hasPermission('coding:hwk:query')")
78 78
     public CommonResult<HwkRespVO> getHwk(@RequestParam("id") Long id) {
79 79
         HwkDO hwk = hwkService.getHwk(id);
80 80
         return success(BeanUtils.toBean(hwk, HwkRespVO.class));
@@ -82,7 +82,7 @@ public class HwkController {
82 82
 
83 83
     @GetMapping("/page")
84 84
     @Operation(summary = "获得货位卡信息分页")
85
-    @PreAuthorize("@ss.hasPermission('coding:hwk:query')")
85
+  //  @PreAuthorize("@ss.hasPermission('coding:hwk:query')")
86 86
     public CommonResult<PageResult<HwkRespVO>> getHwkPage(@Valid HwkPageReqVO pageReqVO) {
87 87
         PageResult<HwkDO> pageResult = hwkService.getHwkPage(pageReqVO);
88 88
         PageResult<HwkRespVO> hwkRespVOPageResult = BeanUtils.toBean(pageResult, HwkRespVO.class);

+ 6 - 6
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/lqjcxx/LqjcxxController.java

@@ -39,14 +39,14 @@ public class LqjcxxController {
39 39
 
40 40
     @PostMapping("/create")
41 41
     @Operation(summary = "创建粮情检测信息")
42
-    @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:create')")
42
+    //@PreAuthorize("@ss.hasPermission('delivery:lqjcxx:create')")
43 43
     public CommonResult<Long> createLqjcxx(@Valid @RequestBody LqjcxxSaveReqVO createReqVO) {
44 44
         return success(lqjcxxService.createLqjcxx(createReqVO));
45 45
     }
46 46
 
47 47
     @PutMapping("/update")
48 48
     @Operation(summary = "更新粮情检测信息")
49
-    @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:update')")
49
+   // @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:update')")
50 50
     public CommonResult<Boolean> updateLqjcxx(@Valid @RequestBody LqjcxxSaveReqVO updateReqVO) {
51 51
         lqjcxxService.updateLqjcxx(updateReqVO);
52 52
         return success(true);
@@ -55,7 +55,7 @@ public class LqjcxxController {
55 55
     @DeleteMapping("/delete")
56 56
     @Operation(summary = "删除粮情检测信息")
57 57
     @Parameter(name = "id", description = "编号", required = true)
58
-    @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:delete')")
58
+   //@PreAuthorize("@ss.hasPermission('delivery:lqjcxx:delete')")
59 59
     public CommonResult<Boolean> deleteLqjcxx(@RequestParam("id") Long id) {
60 60
         lqjcxxService.deleteLqjcxx(id);
61 61
         return success(true);
@@ -64,7 +64,7 @@ public class LqjcxxController {
64 64
     @GetMapping("/get-by-cfid")
65 65
     @Operation(summary = "根据仓房id获得粮情检测信息")
66 66
     @Parameter(name = "cfid", description = "编号", required = true, example = "1024")
67
-    @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:querybycdandhwk')")
67
+   // @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:querybycdandhwk')")
68 68
     public CommonResult<LqjcxxRespVO> getLqjcxxByCfId(@RequestParam("cfId") Long cfId) {
69 69
         LqjcxxDO lqjcxx = lqjcxxService.getLqjcxxByCfId(cfId);
70 70
         LqjcxxRespVO lqjcxxRespVO = BeanUtils.toBean(lqjcxx, LqjcxxRespVO.class);
@@ -75,7 +75,7 @@ public class LqjcxxController {
75 75
     @GetMapping("/get")
76 76
     @Operation(summary = "获得粮情检测信息")
77 77
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
78
-    @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:query')")
78
+  //  @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:query')")
79 79
     public CommonResult<LqjcxxRespVO> getLqjcxx(@RequestParam("id") Long id) {
80 80
         LqjcxxDO lqjcxx = lqjcxxService.getLqjcxx(id);
81 81
         return success(BeanUtils.toBean(lqjcxx, LqjcxxRespVO.class));
@@ -83,7 +83,7 @@ public class LqjcxxController {
83 83
 
84 84
     @GetMapping("/page")
85 85
     @Operation(summary = "获得粮情检测信息分页")
86
-    @PreAuthorize("@ss.hasPermission('delivery:lqjcxx:query')")
86
+    //@PreAuthorize("@ss.hasPermission('delivery:lqjcxx:query')")
87 87
     public CommonResult<PageResult<LqjcxxRespVO>> getLqjcxxPage(@Valid LqjcxxPageReqVO pageReqVO) {
88 88
         PageResult<LqjcxxDO> pageResult = lqjcxxService.getLqjcxxPage(pageReqVO);
89 89
         return success(BeanUtils.toBean(pageResult, LqjcxxRespVO.class));

+ 6 - 6
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/syxx/SyxxController.java

@@ -43,14 +43,14 @@ public class SyxxController {
43 43
 
44 44
     @PostMapping("/create")
45 45
     @Operation(summary = "创建损益信息")
46
-    @PreAuthorize("@ss.hasPermission('delivery:syxx:create')")
46
+   // @PreAuthorize("@ss.hasPermission('delivery:syxx:create')")
47 47
     public CommonResult<Long> createSyxx(@Valid @RequestBody SyxxSaveReqVO createReqVO) {
48 48
         return success(syxxService.createSyxx(createReqVO));
49 49
     }
50 50
 
51 51
     @PutMapping("/update")
52 52
     @Operation(summary = "更新损益信息")
53
-    @PreAuthorize("@ss.hasPermission('delivery:syxx:update')")
53
+    //@PreAuthorize("@ss.hasPermission('delivery:syxx:update')")
54 54
     public CommonResult<Boolean> updateSyxx(@Valid @RequestBody SyxxSaveReqVO updateReqVO) {
55 55
         syxxService.updateSyxx(updateReqVO);
56 56
         return success(true);
@@ -59,7 +59,7 @@ public class SyxxController {
59 59
     @DeleteMapping("/delete")
60 60
     @Operation(summary = "删除损益信息")
61 61
     @Parameter(name = "id", description = "编号", required = true)
62
-    @PreAuthorize("@ss.hasPermission('delivery:syxx:delete')")
62
+   // @PreAuthorize("@ss.hasPermission('delivery:syxx:delete')")
63 63
     public CommonResult<Boolean> deleteSyxx(@RequestParam("id") Long id) {
64 64
         syxxService.deleteSyxx(id);
65 65
         return success(true);
@@ -68,7 +68,7 @@ public class SyxxController {
68 68
     @GetMapping("/get")
69 69
     @Operation(summary = "获得损益信息")
70 70
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
71
-    @PreAuthorize("@ss.hasPermission('delivery:syxx:query')")
71
+   // @PreAuthorize("@ss.hasPermission('delivery:syxx:query')")
72 72
     public CommonResult<SyxxRespVO> getSyxx(@RequestParam("id") Long id) {
73 73
         SyxxDO syxx = syxxService.getSyxx(id);
74 74
         return success(BeanUtils.toBean(syxx, SyxxRespVO.class));
@@ -76,14 +76,14 @@ public class SyxxController {
76 76
     @GetMapping("/get-by-cf")
77 77
     @Operation(summary = "根据仓房获得损益信息")
78 78
     @Parameter(name = "id", description = "仓房id", required = true, example = "1024")
79
-    @PreAuthorize("@ss.hasPermission('delivery:syxx:querybycf')")
79
+   // @PreAuthorize("@ss.hasPermission('delivery:syxx:querybycf')")
80 80
     public CommonResult<SyxxRespVO> getZjxx(@RequestParam("cfId") Long cfId) {
81 81
         SyxxDO syxxDO = syxxService.getSyxxByCfId(cfId);
82 82
         return success(BeanUtils.toBean(syxxDO, SyxxRespVO.class));
83 83
     }
84 84
     @GetMapping("/page")
85 85
     @Operation(summary = "获得损益信息分页")
86
-    @PreAuthorize("@ss.hasPermission('delivery:syxx:query')")
86
+   // @PreAuthorize("@ss.hasPermission('delivery:syxx:query')")
87 87
     public CommonResult<PageResult<SyxxRespVO>> getSyxxPage(@Valid SyxxPageReqVO pageReqVO) {
88 88
         PageResult<SyxxDO> pageResult = syxxService.getSyxxPage(pageReqVO);
89 89
         return success(BeanUtils.toBean(pageResult, SyxxRespVO.class));

+ 5 - 5
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/zjxx/ZjxxController.java

@@ -46,14 +46,14 @@ public class ZjxxController {
46 46
 
47 47
     @PostMapping("/create")
48 48
     @Operation(summary = "创建质检信息")
49
-    @PreAuthorize("@ss.hasPermission('delivery:zjxx:create')")
49
+    //@PreAuthorize("@ss.hasPermission('delivery:zjxx:create')")
50 50
     public CommonResult<Long> createZjxx(@Valid @RequestBody ZjxxSaveReqVO createReqVO) {
51 51
         return success(zjxxService.createZjxx(createReqVO));
52 52
     }
53 53
 
54 54
     @PutMapping("/update")
55 55
     @Operation(summary = "更新质检信息")
56
-    @PreAuthorize("@ss.hasPermission('delivery:zjxx:update')")
56
+    //@PreAuthorize("@ss.hasPermission('delivery:zjxx:update')")
57 57
     public CommonResult<Boolean> updateZjxx(@Valid @RequestBody ZjxxSaveReqVO updateReqVO) {
58 58
         zjxxService.updateZjxx(updateReqVO);
59 59
         return success(true);
@@ -62,7 +62,7 @@ public class ZjxxController {
62 62
     @DeleteMapping("/delete")
63 63
     @Operation(summary = "删除质检信息")
64 64
     @Parameter(name = "id", description = "编号", required = true)
65
-    @PreAuthorize("@ss.hasPermission('delivery:zjxx:delete')")
65
+  //  @PreAuthorize("@ss.hasPermission('delivery:zjxx:delete')")
66 66
     public CommonResult<Boolean> deleteZjxx(@RequestParam("id") Long id) {
67 67
         zjxxService.deleteZjxx(id);
68 68
         return success(true);
@@ -71,7 +71,7 @@ public class ZjxxController {
71 71
     @GetMapping("/get")
72 72
     @Operation(summary = "获得质检信息")
73 73
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
74
-    @PreAuthorize("@ss.hasPermission('delivery:zjxx:query')")
74
+   // @PreAuthorize("@ss.hasPermission('delivery:zjxx:query')")
75 75
     public CommonResult<ZjxxRespVO> getZjxx(@RequestParam("id") Long id) {
76 76
         ZjxxDO zjxx = zjxxService.getZjxx(id);
77 77
         //质检信息的图片字符转-》list
@@ -81,7 +81,7 @@ public class ZjxxController {
81 81
 
82 82
     @PostMapping("/page")
83 83
     @Operation(summary = "获得质检信息分页")
84
-    @PreAuthorize("@ss.hasPermission('delivery:zjxx:query')")
84
+   // @PreAuthorize("@ss.hasPermission('delivery:zjxx:query')")
85 85
     public CommonResult<PageResult<ZjxxRespVO>> getZjxxPage(@Valid @RequestBody ZjxxPageReqVO pageReqVO) {
86 86
         PageResult<ZjxxRespVO> pageResult = zjxxService.getZjxxPageFiles(pageReqVO);
87 87
 

+ 6 - 3
delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/cwxx/CwxxServiceImpl.java

@@ -109,17 +109,20 @@ public class CwxxServiceImpl implements CwxxService {
109 109
             throw exception(ERROR, "不存在用户信息");
110 110
         }
111 111
         if (ObjectUtils.isEmpty(kqbm)) {
112
-            throw exception(ERROR, "当前用户不存在库区编码");
112
+//            throw exception(ERROR, "当前用户不存在库区编码");
113
+            return null;
113 114
         }
114 115
         //查询库区信息
115 116
         List<KqxxDO> kqbm1 = kqxxMapper.selectList(new QueryWrapper<KqxxDO>().eq("KQBM", kqbm));
116 117
         if (CollectionUtils.isEmpty(kqbm1)) {
117
-            throw exception(ERROR, "当前库区编码下无库区信息");
118
+//            throw exception(ERROR, "当前库区编码下无库区信息");
119
+            return null;
118 120
         }
119 121
         //查询财务信息
120 122
         List<CwxxDO> cwxxDOS = cwxxMapper.selectList(new QueryWrapper<CwxxDO>().eq("KQID", kqbm1.get(0).getId()));
121 123
         if (CollectionUtils.isEmpty(cwxxDOS)) {
122
-            throw exception(ERROR, "当前库区编码下无信息");
124
+            //当前库区编码下无信息
125
+            return null;
123 126
         }
124 127
 //        int currentYear = Year.now().getValue();
125 128
 //        int startYear = currentYear - 2; // 近三年的起始年份