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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java

@@ -6,6 +6,7 @@ import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
 import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,6 +22,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/document")
+    @PreAuthorize("@ss.hasPermi('caseManagement:createaward')")
     public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.createDocument(caseApplication);
     }
@@ -41,6 +43,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @GetMapping("/logistics")
+    @PreAuthorize("@ss.hasPermi('delivery:detail')")
     public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
         return adjudicationService.getLogisticsInfo(caseApplication);
     }
@@ -51,6 +54,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/signature")
+    @PreAuthorize("@ss.hasPermi('awardManagement:sign')")
     public AjaxResult signature(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.signature(caseApplication);
     }
@@ -61,6 +65,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/caseFile")
+    @PreAuthorize("@ss.hasPermi('awardManagement:file')")
     public AjaxResult caseFile(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.caseFile(caseApplication);
     }
@@ -71,6 +76,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/service")
+    @PreAuthorize("@ss.hasPermi('awardManagement:sendaward')")
     public AjaxResult service(@RequestBody BookSendVO bookSendVO){
         return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
     }
@@ -80,6 +86,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/stamp")
+    @PreAuthorize("@ss.hasPermi('awardManagement:signprint')")
     public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.stamp(caseApplication);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

@@ -36,7 +36,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 查询立案数据
      */
-    @PreAuthorize("@ss.hasPermi('caseApplication:list')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
     @GetMapping("/list")
     public TableDataInfo list(CaseApplication caseApplication)
     {
@@ -48,7 +48,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 新增立案数据
      */
-    @PreAuthorize("@ss.hasPermi('caseApplication:add')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:add')")
     @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
     @PostMapping("/addCaseApplication")
     public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
@@ -64,7 +64,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 修改立案数据
      */
-    @PreAuthorize("@ss.hasPermi('caseApplication:edit')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:update')")
     @Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
     @PostMapping("/editCaseApplication")
     public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
@@ -77,7 +77,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 提交立案申请
      */
-    @PreAuthorize("@ss.hasPermi('caseApplication:submit')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:submit')")
     @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
     @PostMapping("/submitCaseApplication")
     public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
@@ -89,7 +89,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 删除立案数据
      */
-    @PreAuthorize("@ss.hasPermi('caseApplication:remove')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:delete')")
     @Log(title = "删除立案数据", businessType = BusinessType.DELETE)
     @PostMapping("/removeCaseApplication")
     public AjaxResult removeCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
@@ -101,6 +101,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 查询立案信息
      */
+    @PreAuthorize("@ss.hasPermi('caseManagement:detail')")
     @PostMapping("/selectCaseApplication")
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
     {
@@ -119,7 +120,7 @@ public class CaseApplicationController  extends BaseController {
     }
 
     @Log(title = "立案信息导入", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('caseApplication:import')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<CaseApplication> util = new ExcelUtil<CaseApplication>(CaseApplication.class);
@@ -143,7 +144,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 组庭审核
      */
-    @PreAuthorize("@ss.hasPermi('caseApplication:pendTralCheck')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:checkgroup')")
     @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
     @PostMapping("/pendTralCheck")
     public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication)
@@ -154,7 +155,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 组庭确认
      */
-    @PreAuthorize("@ss.hasPermi('caseApplication:pendTralSure')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:confirmgroup')")
     @Log(title = "组庭确认", businessType = BusinessType.UPDATE)
     @PostMapping("/pendTralSure")
     public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication)
@@ -200,7 +201,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 提交立案审查
      */
-    @PreAuthorize("@ss.hasPermi('caseApplication:submitCaseApplicationCheck')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:check')")
     @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
     @PostMapping("/submitCaseApplicationCheck")
     public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java

@@ -6,6 +6,7 @@ import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.service.ICaseArbitrateService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,6 +23,7 @@ public class CaseArbitrateController extends BaseController {
      * @return
      */
     @PutMapping("/method")
+    @PreAuthorize("@ss.hasPermi('caseManagement:checkarbitrationway')")
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
             ,Integer opinion){
         return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
@@ -33,6 +35,7 @@ public class CaseArbitrateController extends BaseController {
      * @return
      */
     @PostMapping("/writtenHear")
+    @PreAuthorize("@ss.hasPermi('caseManagement:offlinehear')")
     public AjaxResult writtenHear(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
         return caseArbitrateService.writtenHear(arbitrateRecord);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java

@@ -8,6 +8,7 @@ import com.ruoyi.wisdomarbitrate.domain.dto.CaseEvidenceDTO;
 import com.ruoyi.wisdomarbitrate.domain.vo.CaseEvidenceVO;
 import com.ruoyi.wisdomarbitrate.service.ICaseEvidenceService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -35,6 +36,7 @@ public class CaseEvidenceController extends BaseController {
      * @return
      */
     @GetMapping("/{id}")
+    @PreAuthorize("@ss.hasPermi('caseManagement:detail')")
     public AjaxResult getCaseDetailsById(@PathVariable Long id) {
         String username = this.getUsername();
         return caseEvidenceService.getCaseDetailsById(id,username);
@@ -61,6 +63,7 @@ public class CaseEvidenceController extends BaseController {
      * @return
      */
     @GetMapping("/all")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
     public TableDataInfo getCaseListAll(@RequestParam String identityNum) {
         startPage();
         List<CaseEvidenceVO> list = caseEvidenceService.getCaseListAll(identityNum);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java

@@ -22,7 +22,7 @@ public class CaseLogRecordController   extends BaseController {
     /**
      * 查询案件日志列表
      */
-    @PreAuthorize("@ss.hasPermi('caseLogRecord:list')")
+    @PreAuthorize("@ss.hasPermi('caseLog:list')")
     @GetMapping("/list")
     public TableDataInfo list(CaseLogRecord caseLogRecord)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CasePaymentController.java

@@ -5,6 +5,7 @@ import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.service.ICasePaymentService;
 import com.ruoyi.wisdomarbitrate.domain.dto.CasePayDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,6 +25,7 @@ public class CasePaymentController {
      * @param casePayDTO 缴费传入参数
      * @return 统一响应结果
      */
+    @PreAuthorize("@ss.hasPermi('caseManagement:pay')")
     @PostMapping("/casePay")
     public AjaxResult casePay(@Validated @RequestBody CasePayDTO casePayDTO) {
         return paymentService.casePay(casePayDTO);
@@ -34,6 +36,7 @@ public class CasePaymentController {
      * @param caseApplication
      * @return
      */
+    @PreAuthorize("@ss.hasPermi('paymentManagement:payconfirm')")
     @PutMapping("/confirm")
     public AjaxResult confirmPayment(@Validated @RequestBody CaseApplication caseApplication) {
         return paymentService.confirmPayment(caseApplication);