Browse Source

Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev

bgy 2 years ago
parent
commit
d1093d9717

+ 7
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java View File

6
 import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
6
 import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
7
 import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
7
 import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
8
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
9
+import org.springframework.security.access.prepost.PreAuthorize;
9
 import org.springframework.validation.annotation.Validated;
10
 import org.springframework.validation.annotation.Validated;
10
 import org.springframework.web.bind.annotation.*;
11
 import org.springframework.web.bind.annotation.*;
11
 
12
 
21
      * @return
22
      * @return
22
      */
23
      */
23
     @PostMapping("/document")
24
     @PostMapping("/document")
25
+    @PreAuthorize("@ss.hasPermi('caseManagement:createaward')")
24
     public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){
26
     public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){
25
         return adjudicationService.createDocument(caseApplication);
27
         return adjudicationService.createDocument(caseApplication);
26
     }
28
     }
41
      * @return
43
      * @return
42
      */
44
      */
43
     @GetMapping("/logistics")
45
     @GetMapping("/logistics")
46
+    @PreAuthorize("@ss.hasPermi('delivery:detail')")
44
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
47
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
45
         return adjudicationService.getLogisticsInfo(caseApplication);
48
         return adjudicationService.getLogisticsInfo(caseApplication);
46
     }
49
     }
51
      * @return
54
      * @return
52
      */
55
      */
53
     @PostMapping("/signature")
56
     @PostMapping("/signature")
57
+    @PreAuthorize("@ss.hasPermi('awardManagement:sign')")
54
     public AjaxResult signature(@Validated @RequestBody CaseApplication caseApplication){
58
     public AjaxResult signature(@Validated @RequestBody CaseApplication caseApplication){
55
         return adjudicationService.signature(caseApplication);
59
         return adjudicationService.signature(caseApplication);
56
     }
60
     }
61
      * @return
65
      * @return
62
      */
66
      */
63
     @PostMapping("/caseFile")
67
     @PostMapping("/caseFile")
68
+    @PreAuthorize("@ss.hasPermi('awardManagement:file')")
64
     public AjaxResult caseFile(@Validated @RequestBody CaseApplication caseApplication){
69
     public AjaxResult caseFile(@Validated @RequestBody CaseApplication caseApplication){
65
         return adjudicationService.caseFile(caseApplication);
70
         return adjudicationService.caseFile(caseApplication);
66
     }
71
     }
71
      * @return
76
      * @return
72
      */
77
      */
73
     @PostMapping("/service")
78
     @PostMapping("/service")
79
+    @PreAuthorize("@ss.hasPermi('awardManagement:sendaward')")
74
     public AjaxResult service(@RequestBody BookSendVO bookSendVO){
80
     public AjaxResult service(@RequestBody BookSendVO bookSendVO){
75
         return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
81
         return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
76
     }
82
     }
80
      * @return
86
      * @return
81
      */
87
      */
82
     @PostMapping("/stamp")
88
     @PostMapping("/stamp")
89
+    @PreAuthorize("@ss.hasPermi('awardManagement:signprint')")
83
     public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){
90
     public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){
84
         return adjudicationService.stamp(caseApplication);
91
         return adjudicationService.stamp(caseApplication);
85
     }
92
     }

+ 10
- 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java View File

36
     /**
36
     /**
37
      * 查询立案数据
37
      * 查询立案数据
38
      */
38
      */
39
-    @PreAuthorize("@ss.hasPermi('caseApplication:list')")
39
+    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
40
     @GetMapping("/list")
40
     @GetMapping("/list")
41
     public TableDataInfo list(CaseApplication caseApplication)
41
     public TableDataInfo list(CaseApplication caseApplication)
42
     {
42
     {
48
     /**
48
     /**
49
      * 新增立案数据
49
      * 新增立案数据
50
      */
50
      */
51
-    @PreAuthorize("@ss.hasPermi('caseApplication:add')")
51
+    @PreAuthorize("@ss.hasPermi('caseManagement:add')")
52
     @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
52
     @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
53
     @PostMapping("/addCaseApplication")
53
     @PostMapping("/addCaseApplication")
54
     public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
54
     public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
64
     /**
64
     /**
65
      * 修改立案数据
65
      * 修改立案数据
66
      */
66
      */
67
-    @PreAuthorize("@ss.hasPermi('caseApplication:edit')")
67
+    @PreAuthorize("@ss.hasPermi('caseManagement:update')")
68
     @Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
68
     @Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
69
     @PostMapping("/editCaseApplication")
69
     @PostMapping("/editCaseApplication")
70
     public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
70
     public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
77
     /**
77
     /**
78
      * 提交立案申请
78
      * 提交立案申请
79
      */
79
      */
80
-    @PreAuthorize("@ss.hasPermi('caseApplication:submit')")
80
+    @PreAuthorize("@ss.hasPermi('caseManagement:submit')")
81
     @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
81
     @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
82
     @PostMapping("/submitCaseApplication")
82
     @PostMapping("/submitCaseApplication")
83
     public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
83
     public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
89
     /**
89
     /**
90
      * 删除立案数据
90
      * 删除立案数据
91
      */
91
      */
92
-    @PreAuthorize("@ss.hasPermi('caseApplication:remove')")
92
+    @PreAuthorize("@ss.hasPermi('caseManagement:delete')")
93
     @Log(title = "删除立案数据", businessType = BusinessType.DELETE)
93
     @Log(title = "删除立案数据", businessType = BusinessType.DELETE)
94
     @PostMapping("/removeCaseApplication")
94
     @PostMapping("/removeCaseApplication")
95
     public AjaxResult removeCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
95
     public AjaxResult removeCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
101
     /**
101
     /**
102
      * 查询立案信息
102
      * 查询立案信息
103
      */
103
      */
104
+    @PreAuthorize("@ss.hasPermi('caseManagement:detail')")
104
     @PostMapping("/selectCaseApplication")
105
     @PostMapping("/selectCaseApplication")
105
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
106
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
106
     {
107
     {
119
     }
120
     }
120
 
121
 
121
     @Log(title = "立案信息导入", businessType = BusinessType.IMPORT)
122
     @Log(title = "立案信息导入", businessType = BusinessType.IMPORT)
122
-    @PreAuthorize("@ss.hasPermi('caseApplication:import')")
123
+    @PreAuthorize("@ss.hasPermi('caseManagement:import')")
123
     @PostMapping("/importData")
124
     @PostMapping("/importData")
124
     public AjaxResult importData(MultipartFile file) throws Exception {
125
     public AjaxResult importData(MultipartFile file) throws Exception {
125
         ExcelUtil<CaseApplication> util = new ExcelUtil<CaseApplication>(CaseApplication.class);
126
         ExcelUtil<CaseApplication> util = new ExcelUtil<CaseApplication>(CaseApplication.class);
143
     /**
144
     /**
144
      * 组庭审核
145
      * 组庭审核
145
      */
146
      */
146
-    @PreAuthorize("@ss.hasPermi('caseApplication:pendTralCheck')")
147
+    @PreAuthorize("@ss.hasPermi('caseManagement:checkgroup')")
147
     @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
148
     @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
148
     @PostMapping("/pendTralCheck")
149
     @PostMapping("/pendTralCheck")
149
     public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication)
150
     public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication)
154
     /**
155
     /**
155
      * 组庭确认
156
      * 组庭确认
156
      */
157
      */
157
-    @PreAuthorize("@ss.hasPermi('caseApplication:pendTralSure')")
158
+    @PreAuthorize("@ss.hasPermi('caseManagement:confirmgroup')")
158
     @Log(title = "组庭确认", businessType = BusinessType.UPDATE)
159
     @Log(title = "组庭确认", businessType = BusinessType.UPDATE)
159
     @PostMapping("/pendTralSure")
160
     @PostMapping("/pendTralSure")
160
     public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication)
161
     public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication)
200
     /**
201
     /**
201
      * 提交立案审查
202
      * 提交立案审查
202
      */
203
      */
203
-    @PreAuthorize("@ss.hasPermi('caseApplication:submitCaseApplicationCheck')")
204
+    @PreAuthorize("@ss.hasPermi('caseManagement:check')")
204
     @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
205
     @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
205
     @PostMapping("/submitCaseApplicationCheck")
206
     @PostMapping("/submitCaseApplicationCheck")
206
     public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication)
207
     public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication)

+ 3
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java View File

6
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
6
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
7
 import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService;
7
 import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService;
8
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
9
+import org.springframework.security.access.prepost.PreAuthorize;
9
 import org.springframework.validation.annotation.Validated;
10
 import org.springframework.validation.annotation.Validated;
10
 import org.springframework.web.bind.annotation.*;
11
 import org.springframework.web.bind.annotation.*;
11
 
12
 
22
      * @return
23
      * @return
23
      */
24
      */
24
     @PutMapping("/method")
25
     @PutMapping("/method")
26
+    @PreAuthorize("@ss.hasPermi('caseManagement:checkarbitrationway')")
25
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
27
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
26
             ,Integer opinion){
28
             ,Integer opinion){
27
         return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
29
         return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
33
      * @return
35
      * @return
34
      */
36
      */
35
     @PostMapping("/writtenHear")
37
     @PostMapping("/writtenHear")
38
+    @PreAuthorize("@ss.hasPermi('caseManagement:offlinehear')")
36
     public AjaxResult writtenHear(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
39
     public AjaxResult writtenHear(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
37
         return caseArbitrateService.writtenHear(arbitrateRecord);
40
         return caseArbitrateService.writtenHear(arbitrateRecord);
38
     }
41
     }

+ 3
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java View File

8
 import com.ruoyi.wisdomarbitrate.domain.vo.CaseEvidenceVO;
8
 import com.ruoyi.wisdomarbitrate.domain.vo.CaseEvidenceVO;
9
 import com.ruoyi.wisdomarbitrate.service.ICaseEvidenceService;
9
 import com.ruoyi.wisdomarbitrate.service.ICaseEvidenceService;
10
 import org.springframework.beans.factory.annotation.Autowired;
10
 import org.springframework.beans.factory.annotation.Autowired;
11
+import org.springframework.security.access.prepost.PreAuthorize;
11
 import org.springframework.validation.annotation.Validated;
12
 import org.springframework.validation.annotation.Validated;
12
 import org.springframework.web.bind.annotation.*;
13
 import org.springframework.web.bind.annotation.*;
13
 import org.springframework.web.multipart.MultipartFile;
14
 import org.springframework.web.multipart.MultipartFile;
35
      * @return
36
      * @return
36
      */
37
      */
37
     @GetMapping("/{id}")
38
     @GetMapping("/{id}")
39
+    @PreAuthorize("@ss.hasPermi('caseManagement:detail')")
38
     public AjaxResult getCaseDetailsById(@PathVariable Long id) {
40
     public AjaxResult getCaseDetailsById(@PathVariable Long id) {
39
         String username = this.getUsername();
41
         String username = this.getUsername();
40
         return caseEvidenceService.getCaseDetailsById(id,username);
42
         return caseEvidenceService.getCaseDetailsById(id,username);
61
      * @return
63
      * @return
62
      */
64
      */
63
     @GetMapping("/all")
65
     @GetMapping("/all")
66
+    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
64
     public TableDataInfo getCaseListAll(@RequestParam String identityNum) {
67
     public TableDataInfo getCaseListAll(@RequestParam String identityNum) {
65
         startPage();
68
         startPage();
66
         List<CaseEvidenceVO> list = caseEvidenceService.getCaseListAll(identityNum);
69
         List<CaseEvidenceVO> list = caseEvidenceService.getCaseListAll(identityNum);

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java View File

22
     /**
22
     /**
23
      * 查询案件日志列表
23
      * 查询案件日志列表
24
      */
24
      */
25
-    @PreAuthorize("@ss.hasPermi('caseLogRecord:list')")
25
+    @PreAuthorize("@ss.hasPermi('caseLog:list')")
26
     @GetMapping("/list")
26
     @GetMapping("/list")
27
     public TableDataInfo list(CaseLogRecord caseLogRecord)
27
     public TableDataInfo list(CaseLogRecord caseLogRecord)
28
     {
28
     {

+ 3
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CasePaymentController.java View File

5
 import com.ruoyi.wisdomarbitrate.service.ICasePaymentService;
5
 import com.ruoyi.wisdomarbitrate.service.ICasePaymentService;
6
 import com.ruoyi.wisdomarbitrate.domain.dto.CasePayDTO;
6
 import com.ruoyi.wisdomarbitrate.domain.dto.CasePayDTO;
7
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.beans.factory.annotation.Autowired;
8
+import org.springframework.security.access.prepost.PreAuthorize;
8
 import org.springframework.validation.annotation.Validated;
9
 import org.springframework.validation.annotation.Validated;
9
 import org.springframework.web.bind.annotation.*;
10
 import org.springframework.web.bind.annotation.*;
10
 
11
 
24
      * @param casePayDTO 缴费传入参数
25
      * @param casePayDTO 缴费传入参数
25
      * @return 统一响应结果
26
      * @return 统一响应结果
26
      */
27
      */
28
+    @PreAuthorize("@ss.hasPermi('caseManagement:pay')")
27
     @PostMapping("/casePay")
29
     @PostMapping("/casePay")
28
     public AjaxResult casePay(@Validated @RequestBody CasePayDTO casePayDTO) {
30
     public AjaxResult casePay(@Validated @RequestBody CasePayDTO casePayDTO) {
29
         return paymentService.casePay(casePayDTO);
31
         return paymentService.casePay(casePayDTO);
34
      * @param caseApplication
36
      * @param caseApplication
35
      * @return
37
      * @return
36
      */
38
      */
39
+    @PreAuthorize("@ss.hasPermi('paymentManagement:payconfirm')")
37
     @PutMapping("/confirm")
40
     @PutMapping("/confirm")
38
     public AjaxResult confirmPayment(@Validated @RequestBody CaseApplication caseApplication) {
41
     public AjaxResult confirmPayment(@Validated @RequestBody CaseApplication caseApplication) {
39
         return paymentService.confirmPayment(caseApplication);
42
         return paymentService.confirmPayment(caseApplication);