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

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

@@ -22,7 +22,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/document")
-    @PreAuthorize("@ss.hasPermi('caseManagement:createaward')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:createaward')")
     public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.createDocument(caseApplication);
     }
@@ -54,7 +54,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/signature")
-    @PreAuthorize("@ss.hasPermi('awardManagement:sign')")
+    @PreAuthorize("@ss.hasPermi('awardManagement:list:sign')")
     public AjaxResult signature(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.signature(caseApplication);
     }
@@ -65,7 +65,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/caseFile")
-    @PreAuthorize("@ss.hasPermi('awardManagement:file')")
+    @PreAuthorize("@ss.hasPermi('awardManagement:list:file')")
     public AjaxResult caseFile(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.caseFile(caseApplication);
     }
@@ -76,7 +76,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/service")
-    @PreAuthorize("@ss.hasPermi('awardManagement:sendaward')")
+    @PreAuthorize("@ss.hasPermi('awardManagement:list:sendaward')")
     public AjaxResult service(@RequestBody BookSendVO bookSendVO){
         return adjudicationService.service(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
     }
@@ -86,7 +86,7 @@ public class AdjudicationController extends BaseController {
      * @return
      */
     @PostMapping("/stamp")
-    @PreAuthorize("@ss.hasPermi('awardManagement:signprint')")
+    @PreAuthorize("@ss.hasPermi('awardManagement:list:signprint')")
     public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){
         return adjudicationService.stamp(caseApplication);
     }

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

@@ -21,7 +21,7 @@ public class ArbitratorController   extends BaseController {
     /**
      * 查询仲裁员信息
      */
-    @PreAuthorize("@ss.hasPermi('arbitrator:list')")
+//    @PreAuthorize("@ss.hasPermi('arbitrator:list')")
     @GetMapping("/list")
     public TableDataInfo list(Arbitrator arbitrator)
     {

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
 import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
@@ -17,14 +18,14 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 
-
 @RestController
 @RequestMapping("/caseApplication")
-public class CaseApplicationController  extends BaseController {
+public class CaseApplicationController extends BaseController {
     @Autowired
     private ICaseApplicationService caseApplicationService;
 
@@ -34,8 +35,7 @@ public class CaseApplicationController  extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('caseManagement:list')")
     @GetMapping("/list")
-    public TableDataInfo list(CaseApplication caseApplication)
-    {
+    public TableDataInfo list(CaseApplication caseApplication) {
         startPage();
         List<CaseApplication> list = caseApplicationService.selectCaseApplicationList(caseApplication);
         return getDataTable(list);
@@ -44,7 +44,7 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 新增立案数据
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:add')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:add')")
     @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
     @PostMapping("/addCaseApplication")
     public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
@@ -57,11 +57,10 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 修改立案数据
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:update')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:update')")
     @Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
     @PostMapping("/editCaseApplication")
-    public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
 
         caseApplication.setUpdateBy(getUsername());
         return toAjax(caseApplicationService.editCaseApplication(caseApplication));
@@ -70,11 +69,10 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 提交立案申请
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:submit')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')")
     @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
     @PostMapping("/submitCaseApplication")
-    public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
 
         return toAjax(caseApplicationService.submitCaseApplication(caseApplication));
     }
@@ -82,11 +80,10 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 删除立案数据
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:delete')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')")
     @Log(title = "删除立案数据", businessType = BusinessType.DELETE)
     @PostMapping("/removeCaseApplication")
-    public AjaxResult removeCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult removeCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
 
         return toAjax(caseApplicationService.deletecaseApplicationByIds(caseApplication));
     }
@@ -94,10 +91,9 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 查询立案信息
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:detail')")
+     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
     @PostMapping("/selectCaseApplication")
-    public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication);
         return success(caseApplicationselect);
     }
@@ -106,20 +102,19 @@ public class CaseApplicationController  extends BaseController {
      * 立案申请导入模板下载
      */
     @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response)
-    {
+    public void importTemplate(HttpServletResponse response) {
         ExcelUtil<CaseApplication> util = new ExcelUtil<CaseApplication>(CaseApplication.class);
         util.importTemplateExcel(response, "立案申请数据");
     }
 
     @Log(title = "立案信息导入", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('caseManagement:import')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
         ExcelUtil<CaseApplication> util = new ExcelUtil<CaseApplication>(CaseApplication.class);
         List<CaseApplication> caseApplicationList = util.importExcel(file.getInputStream());
         String operName = getUsername();
-        String message = caseApplicationService.importCaseApplication(caseApplicationList,operName);
+        String message = caseApplicationService.importCaseApplication(caseApplicationList, operName);
         return success(message);
     }
 
@@ -129,30 +124,27 @@ public class CaseApplicationController  extends BaseController {
     @PreAuthorize("@ss.hasPermi('caseApplication:pendTral')")
     @Log(title = "组庭", businessType = BusinessType.UPDATE)
     @PostMapping("/pendTral")
-    public AjaxResult pendTral(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult pendTral(@Validated @RequestBody CaseApplication caseApplication) {
         return toAjax(caseApplicationService.pendTral(caseApplication));
     }
 
     /**
      * 组庭审核
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:checkgroup')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkgroup')")
     @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
     @PostMapping("/pendTralCheck")
-    public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) {
         return toAjax(caseApplicationService.pendTralCheck(caseApplication));
     }
 
     /**
      * 组庭确认
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:confirmgroup')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:confirmgroup')")
     @Log(title = "组庭确认", businessType = BusinessType.UPDATE)
     @PostMapping("/pendTralSure")
-    public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication) {
         return toAjax(caseApplicationService.pendTralSure(caseApplication));
     }
 
@@ -162,8 +154,7 @@ public class CaseApplicationController  extends BaseController {
     @PreAuthorize("@ss.hasPermi('caseApplication:verificationArbitrateRecord')")
     @Log(title = "核验裁决书", businessType = BusinessType.UPDATE)
     @PostMapping("/verificationArbitrateRecord")
-    public AjaxResult verificationArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult verificationArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
         return toAjax(caseApplicationService.verificationArbitrateRecord(caseApplication));
     }
 
@@ -173,32 +164,28 @@ public class CaseApplicationController  extends BaseController {
     @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')")
     @Log(title = "审核裁决书", businessType = BusinessType.UPDATE)
     @PostMapping("/checkArbitrateRecord")
-    public AjaxResult checkArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult checkArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
         return toAjax(caseApplicationService.checkArbitrateRecord(caseApplication));
     }
 
 
-
     /**
      * 是否指派仲裁员
      */
     @PreAuthorize("@ss.hasPermi('caseApplication:pendingAppointArbotrar')")
     @Log(title = "是否指派仲裁员", businessType = BusinessType.UPDATE)
     @PostMapping("/pendingAppointArbotrar")
-    public AjaxResult pendingAppointArbotrar(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult pendingAppointArbotrar(@Validated @RequestBody CaseApplication caseApplication) {
         return toAjax(caseApplicationService.pendingAppointArbotrar(caseApplication));
     }
 
     /**
      * 提交立案审查
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:check')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:check')")
     @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
     @PostMapping("/submitCaseApplicationCheck")
-    public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication) {
 
         return toAjax(caseApplicationService.submitCaseApplicationCheck(caseApplication));
     }
@@ -206,22 +193,20 @@ public class CaseApplicationController  extends BaseController {
     /**
      * 确认缴费查询立案信息
      */
+    @PreAuthorize("@ss.hasPermi('paymentManagement:list:detail')")
     @PostMapping("/selectCaseApplicationConfirm")
-    public AjaxResult selectCaseApplicationConfirm(@Validated @RequestBody CaseApplication caseApplication)
-    {
+    public AjaxResult selectCaseApplicationConfirm(@Validated @RequestBody CaseApplication caseApplication) {
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplicationConfirm(caseApplication);
         return success(caseApplicationselect);
     }
 
 
-
     /**
      * 发送房间号短信
      */
     @Anonymous
     @PostMapping("/sendRoomNoMessage")
-    public AjaxResult sendRoomNoMessage(@Validated @RequestBody SendRoomNoMessageVO messageVO)
-    {
+    public AjaxResult sendRoomNoMessage(@Validated @RequestBody SendRoomNoMessageVO messageVO) {
         String result = caseApplicationService.sendRoomNoMessage(messageVO);
         return success(result);
     }

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

@@ -23,7 +23,7 @@ public class CaseArbitrateController extends BaseController {
      * @return
      */
     @PutMapping("/method")
-    @PreAuthorize("@ss.hasPermi('caseManagement:checkarbitrationway')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
             ,Integer opinion){
         return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
@@ -35,7 +35,7 @@ public class CaseArbitrateController extends BaseController {
      * @return
      */
     @PostMapping("/writtenHear")
-    @PreAuthorize("@ss.hasPermi('caseManagement:offlinehear')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:hear')")
     public AjaxResult writtenHear(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
         return caseArbitrateService.writtenHear(arbitrateRecord);
     }

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

@@ -36,7 +36,7 @@ public class CaseEvidenceController extends BaseController {
      * @return
      */
     @GetMapping("/{id}")
-    @PreAuthorize("@ss.hasPermi('caseManagement:detail')")
+     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
     public AjaxResult getCaseDetailsById(@PathVariable Long id) {
         String username = this.getUsername();
         return caseEvidenceService.getCaseDetailsById(id,username);

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

@@ -25,7 +25,7 @@ public class CasePaymentController {
      * @param casePayDTO 缴费传入参数
      * @return 统一响应结果
      */
-    @PreAuthorize("@ss.hasPermi('caseManagement:pay')")
+    @PreAuthorize("@ss.hasPermi('caseManagement:list:pay')")
     @PostMapping("/casePay")
     public AjaxResult casePay(@Validated @RequestBody CasePayDTO casePayDTO) {
         return paymentService.casePay(casePayDTO);
@@ -36,7 +36,7 @@ public class CasePaymentController {
      * @param caseApplication
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('paymentManagement:payconfirm')")
+    @PreAuthorize("@ss.hasPermi('paymentManagement:list:payconfirm')")
     @PutMapping("/confirm")
     public AjaxResult confirmPayment(@Validated @RequestBody CaseApplication caseApplication) {
         return paymentService.confirmPayment(caseApplication);