Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into bgy

# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
#	ruoyi-system/pom.xml

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * 启动程序
@@ -12,6 +13,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableScheduling
+@EnableSwagger2
 public class RuoYiApplication
 {
     public static void main(String[] args)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.annotation.Anonymous;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,6 +35,7 @@ import com.ruoyi.system.service.ISysUserService;
  * 
  * @author ruoyi
  */
+@Api("用户信息管理")
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController
@@ -52,6 +55,7 @@ public class SysUserController extends BaseController
     /**
      * 获取用户列表
      */
+    @ApiOperation(value = "获取用户列表",notes = "分页获取用户列表")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user)

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

@@ -1,191 +0,0 @@
-package com.ruoyi.web.controller.wisdomarbitrate;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-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.core.redis.RedisCache;
-import com.ruoyi.wisdomarbitrate.StringIdsReq;
-import com.ruoyi.wisdomarbitrate.domain.BatchCaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
-import com.ruoyi.wisdomarbitrate.domain.vo.BookSendVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.LogisticsInfoVO;
-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.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/adjudication")
-public class AdjudicationController extends BaseController {
-    @Autowired
-    private IAdjudicationService adjudicationService;
-
-    /**
-     * 根据签署流程id查询批量签名链接
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
-    @PostMapping("/selectBatchSignUrl")
-    public AjaxResult selectBatchSignUrl(@RequestBody StringIdsReq idsReq) {
-        if(CollectionUtil.isEmpty(idsReq.getIds())|| StrUtil.isEmpty(idsReq.getPsnAccount())){
-            return error("参数校验失败");
-        }
-        SealSignRecord sealSignRecordselect = adjudicationService.selectBatchSignUrl(idsReq);
-        return success(sealSignRecordselect);
-    }
-
-    /**
-     * 根据签署流程id查询批量用印链接
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
-    @PostMapping("/selectBatchSealUrl")
-    public AjaxResult selectBatchSealUrl(@RequestBody StringIdsReq idsReq) {
-        if(CollectionUtil.isEmpty(idsReq.getIds())|| StrUtil.isEmpty(idsReq.getPsnAccount())){
-            return error("参数校验失败");
-        }
-        SealSignRecord sealSignRecordselect = adjudicationService.selectBatchSealUrl(idsReq);
-        return success(sealSignRecordselect);
-    }
-    /**
-     * 根据仲裁员手机号分页查询待签名/待用印的案件
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
-    @GetMapping("/pageSignAdjudicate")
-    public TableDataInfo pageSignAdjudicate(@RequestParam(value = "personAccount",required = false) String personAccount, @RequestParam("caseStatus") Integer caseStatus)  {
-        startPage();
-        List<CaseApplication> list = adjudicationService.selectSealSigning(personAccount,caseStatus);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 生成裁决书
-     * @param caseApplication
-     * @return
-     */
-    @PostMapping("/document")
-    public AjaxResult createDocument(@Validated @RequestBody CaseApplication caseApplication){
-        if (caseApplication.getId() == null) {
-            return AjaxResult.error("案件id不能为空");
-        }
-        return adjudicationService.createDocument(caseApplication);
-    }
-    /**
-     * 批量生成裁决书
-     * @param caseApplication
-     * @return
-     */
-    @PostMapping("/batchDocument")
-    public AjaxResult batchDocument(@Validated @RequestBody BatchCaseApplication caseApplication){
-        if (CollectionUtil.isEmpty(caseApplication.getIds())) {
-            return AjaxResult.error("参数校验失败");
-        }
-        return adjudicationService.batchDocument(caseApplication.getIds());
-    }
-
-    /**
-     * 重新生成裁决书
-     * @param caseApplication
-     * @return
-     */
-    @PostMapping("/regenerationDocument")
-    public AjaxResult regenerationDocument(@Validated @RequestBody CaseApplication caseApplication){
-        return adjudicationService.regenerationDocument(caseApplication);
-    }
-
-    /**
-     * 裁决书送达(电子邮件)
-     * @param bookSendVO
-     * @return
-     */
-    @PostMapping("/delivery")
-    public AjaxResult sendDocumentByEmail(@RequestBody BookSendVO bookSendVO){
-        return adjudicationService.sendDocumentByEmail(bookSendVO.getId(),bookSendVO.getAppEmail(),bookSendVO.getResEmail(),bookSendVO.getApptrackingNum(),bookSendVO.getRestrackingNum());
-    }
-
-    /**
-     * 根据快递单号查询物流信息
-     * @param caseApplication
-     * @return
-     */
-    @GetMapping("/logistics")
-//    @PreAuthorize("@ss.hasPermi('delivery:detail')")
-    public AjaxResult  getLogisticsInfo(CaseApplication caseApplication){
-        List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
-        return AjaxResult.success(logisticsInfo);
-    }
-
-    /**
-     * 签名(暂时只改案件状态)
-     * @param caseApplication
-     * @return
-     */
-    @PostMapping("/signature")
-//    @PreAuthorize("@ss.hasPermi('awardManagement:list:sign')")
-    public AjaxResult signature(@Validated @RequestBody CaseApplication caseApplication){
-        return adjudicationService.signature(caseApplication);
-    }
-
-
-    /**
-     * 归档(暂时只改案件状态)
-     * @param batchCaseApplication
-     * @return
-     */
-    @PostMapping("/caseFile")
-//    @PreAuthorize("@ss.hasPermi('awardManagement:list:file')")
-    public AjaxResult caseFile(@RequestBody BatchCaseApplication batchCaseApplication){
-        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){
-            return error("参数校验失败");
-        }
-        return adjudicationService.caseFile(batchCaseApplication.getIds());
-    }
-
-    /**
-     * 送达(不包含发送电子邮件)
-     * @param bookSendVO
-     * @return
-     */
-    @PostMapping("/service")
-//    @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());
-    }
-    /**
-     * 用印(暂时只改案件状态)
-     * @param caseApplication
-     * @return
-     */
-    @PostMapping("/stamp")
-//    @PreAuthorize("@ss.hasPermi('awardManagement:list:signprint')")
-    public AjaxResult stamp(@Validated @RequestBody CaseApplication caseApplication){
-        return adjudicationService.stamp(caseApplication);
-    }
-
-    /**
-     * 档案详情查询
-     * @param id 案件id
-     * @return
-     */
-    @GetMapping("/archives")
-    public AjaxResult getArchivesDetail(Long id){
-
-        return adjudicationService.getArchivesDetail(id);
-    }
-    /**
-     * 根据案件id获取邮箱
-     * @param id 案件id
-     * @return
-     */
-    @GetMapping("/emailByCaseId")
-    public AjaxResult emailByCaseId(@RequestParam("id") Long id){
-
-        return adjudicationService.emailByCaseId(id);
-    }
-
-}

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

@@ -1,44 +0,0 @@
-package com.ruoyi.web.controller.wisdomarbitrate;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
-import com.ruoyi.wisdomarbitrate.service.IArbitratorService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/arbitrator")
-public class ArbitratorController   extends BaseController {
-    @Autowired
-    private ISysUserService sysUserService;
-
-    /**
-     * 查询仲裁员信息
-     */
-//    @PreAuthorize("@ss.hasPermi('arbitrator:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(Arbitrator arbitrator)
-    {
-        startPage();
-        List<SysUser> list = sysUserService.selectUserListByAdRole(arbitrator);
-        return getDataTable(list);
-    }
-
-
-
-
-
-
-
-
-
-}

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

@@ -1,588 +0,0 @@
-package com.ruoyi.web.controller.wisdomarbitrate;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alipay.api.internal.util.file.IOUtils;
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.FileTransformation;
-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.exception.EsignDemoException;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.WxAppletNotifyUtils;
-import com.ruoyi.util.FileUtil;
-import com.ruoyi.wisdomarbitrate.StringIdsReq;
-import com.ruoyi.wisdomarbitrate.domain.*;
-import com.ruoyi.wisdomarbitrate.domain.vo.ReservedConferenceVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
-import com.ruoyi.wisdomarbitrate.service.IAdjudicationService;
-import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
-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 com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.List;
-
-
-@RestController
-@RequestMapping("/caseApplication")
-public class CaseApplicationController extends BaseController {
-    @Autowired
-    private ICaseApplicationService caseApplicationService;
-    @Autowired
-    private IAdjudicationService adjudicationService;
-
-
-    /**
-     * 查询立案数据
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(CaseApplication caseApplication) {
-        if(StrUtil.isEmpty(caseApplication.getSelectCaseStatus())){
-          caseApplication.setSelectCaseStatus("0");
-        }
-        startPage();
-        List<CaseApplication> list = caseApplicationService.selectCaseApplicationListByRole(caseApplication);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询批量管理案件列表
-     */
-    @GetMapping("/listBatch")
-    public TableDataInfo listBatch(CaseApplication caseApplication) {
-        startPage();
-        List<CaseApplication> list = caseApplicationService.selectCaseApplicationListBatchByRole(caseApplication);
-        return getDataTable(list);
-    }
-
-    /**
-     * 根据角色查询待办数量
-     * @return
-     */
-
-    @GetMapping("/toDoCount")
-    public AjaxResult toDoCount() {
-        ToDoCount toDoCount = caseApplicationService.selectToDoCount();
-//        List<CaseApplication> list = caseApplicationService.selectCaseApplicationList(caseApplication);
-        return success(toDoCount);
-    }
-
-    /**
-     * 新增立案数据
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:add')")
-    @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
-    @PostMapping("/addCaseApplication")
-    public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
-    {
-
-        caseApplication.setCreateBy(getUsername());
-        return toAjax(caseApplicationService.insertcaseApplication(caseApplication));
-    }
-
-    /**
-     * 修改立案数据
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:update')")
-    @Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
-    @PostMapping("/editCaseApplication")
-    public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
-
-        caseApplication.setUpdateBy(getUsername());
-        return caseApplicationService.editCaseApplication(caseApplication);
-    }
-
-    /**
-     * 修改立案数据自定义字段
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:update')")
-    @Log(title = "修改立案数据自定义字段", businessType = BusinessType.UPDATE)
-    @PostMapping("/editCaseApplicationDefineval")
-    public AjaxResult editCaseApplicationDefineval(@Validated @RequestBody CaseApplication caseApplication) {
-        return caseApplicationService.editCaseApplicationDefineval(caseApplication);
-    }
-
-    /**
-     * 提交立案申请
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:submit')")
-    @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
-    @PostMapping("/submitCaseApplication")
-    public AjaxResult submitCaseApplication(@RequestBody  BatchCaseApplication batchCaseApplication) {
-        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){
-            return error("参数校验失败");
-        }
-        return toAjax(caseApplicationService.submitCaseApplication(batchCaseApplication.getIds()));
-    }
-
-    /**
-     * 批量提交立案申请
-     */
-    @Log(title = "批量提交立案申请", businessType = BusinessType.UPDATE)
-    @PostMapping("/submitCaseApplicationBatch")
-    public AjaxResult submitCaseApplicationBatch(@RequestBody  BatchCaseApplication batchCaseApplication) {
-        if(StringUtils.isEmpty(batchCaseApplication.getBatchNumber())){
-            return error("参数校验失败");
-        }
-        return toAjax(caseApplicationService.submitCaseApplicationBatch(batchCaseApplication.getBatchNumber()));
-    }
-
-
-
-
-    /**
-     * 删除立案数据
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:delete')")
-    @Log(title = "删除立案数据", businessType = BusinessType.DELETE)
-    @PostMapping("/removeCaseApplication")
-    public AjaxResult removeCaseApplication(@RequestBody  BatchCaseApplication batchCaseApplication) {
-        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){
-            return error("参数校验失败");
-        }
-        return success(caseApplicationService.deletecaseApplicationByIds(batchCaseApplication.getIds()));
-    }
-
-    /**
-     * 查询立案信息
-     */
-//     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
-    @PostMapping("/selectCaseApplication")
-    public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
-
-        CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication);
-        return success(caseApplicationselect);
-    }
-
-    /**
-     * 查询已签署裁决书URL
-     */
-    @PostMapping("/selectSignSealUrl")
-    public AjaxResult selectSignSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
-        CaseApplication caseApplicationselect = caseApplicationService.selectSignSealUrl(caseApplication);
-        return success(caseApplicationselect);
-    }
-
-    /**
-     * 查询案件进度
-     */
-    @PostMapping("/selectCaseProgress")
-    public AjaxResult selectCaseProgress(@Validated @RequestBody CaseApplication caseApplication) {
-        AjaxResult caseApplicationselect = caseApplicationService.selectCaseProgress(caseApplication);
-        return success(caseApplicationselect);
-    }
-
-
-    /**
-     * 查询签名链接
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSignUrl')")
-    @PostMapping("/selectSignUrl")
-    public AjaxResult selectSignUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
-        SealSignRecord sealSignRecordselect = caseApplicationService.selectSignUrl(caseApplication);
-        return success(sealSignRecordselect);
-    }
-
-
-    /**
-     * 查询用印链接
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:selectSealUrl')")
-    @PostMapping("/selectSealUrl")
-    public AjaxResult selectSealUrl(@Validated @RequestBody CaseApplication caseApplication) throws EsignDemoException {
-        SealSignRecord sealUrlRecordselect = caseApplicationService.selectSealUrl(caseApplication);
-        return success(sealUrlRecordselect);
-    }
-
-
-    /**
-     * 案件证据材料压缩包上传
-     *
-     * @param file      附件
-     * @param id        案件申请id
-     * @return
-     */
-    @PostMapping("/uploadZipFile")
-    public AjaxResult uploadZipFile(@RequestParam("file") MultipartFile file, Long id) {
-        String username = this.getUsername();
-        Long userId = this.getUserId();
-        return caseApplicationService.uploadZipFile(file, id, username, userId);
-    }
-
-    /**
-     * 立案申请导入模板下载
-     */
-    @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response) {
-        // 读取文件
-        try {
-            InputStream fileInputStream = new URL("http://121.40.189.20:8000/API/uploadPath/template/案件导入模板.xlsx").openStream();
-            response.setHeader("content-type", "application/octet-stream");
-            response.setContentType("application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("案件导入模板.xlsx","UTF-8"));
-                        byte[] buffer = new byte[1024];
-            int length;
-            while ((length = fileInputStream.read(buffer)) > 0) {
-                response.getOutputStream().write(buffer, 0, length);
-            }
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-    @Log(title = "立案信息导入", businessType = BusinessType.IMPORT)
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:import')")
-    @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file) throws Exception {
-        if(file==null){
-            return warn("请上传文件");
-        }
-        ExcelUtil<CaseApplication> util = new ExcelUtil<CaseApplication>(CaseApplication.class);
-        List<CaseApplication> caseApplicationList = util.importExcel(file.getInputStream());
-        String operName = getUsername();
-        String message = caseApplicationService.importCaseApplication(caseApplicationList, operName);
-        return success(message);
-    }
-
-    /**
-     * 组庭
-     */
-//    @PreAuthorize("@ss.hasPermi('caseApplication:pendTral')")
-    @Log(title = "组庭", businessType = BusinessType.UPDATE)
-    @PostMapping("/pendTral")
-    public AjaxResult pendTral(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.pendTral(caseApplication));
-    }
-
-    /**
-     * 组庭审核
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkgroup')")
-    @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
-    @PostMapping("/pendTralCheck")
-    public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.pendTralCheck(caseApplication));
-    }
-
-    /**
-     * 组庭确认
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:confirmgroup')")
-    @Log(title = "组庭确认", businessType = BusinessType.UPDATE)
-    @PostMapping("/pendTralSure")
-    public AjaxResult pendTralSure(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.pendTralSure(caseApplication));
-    }
-
-    /**
-     * 批量组庭审核
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkgroup')")
-    @Log(title = "批量组庭审核", businessType = BusinessType.UPDATE)
-    @PostMapping("/pendTralCheckBatch")
-    public AjaxResult pendTralCheckBatch(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.pendTralCheckBatch(caseApplication));
-    }
-
-    /**
-     * 批量组庭确认
-     */
-    @Log(title = "批量组庭确认", businessType = BusinessType.UPDATE)
-    @PostMapping("/pendTralSureBatch")
-    public AjaxResult pendTralSureBatch(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.pendTralSureBatch(caseApplication));
-    }
-
-    /**
-     * 修改开庭时间
-     */
-    @Log(title = "修改开庭时间", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateHeardate")
-    public AjaxResult updateHeardate(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.updateHeardate(caseApplication));
-    }
-
-    /**
-     * 核验裁决书
-     */
-//    @PreAuthorize("@ss.hasPermi('caseApplication:verificationArbitrateRecord')")
-    @Log(title = "核验裁决书", businessType = BusinessType.UPDATE)
-    @PostMapping("/verificationArbitrateRecord")
-    public AjaxResult verificationArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.verificationArbitrateRecord(caseApplication));
-    }
-
-    /**
-     * 部门长审核裁决书
-     */
-//    @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')")
-    @Log(title = "部门长审核裁决书", businessType = BusinessType.UPDATE)
-    @PostMapping("/checkArbitrateRecord")
-    public AjaxResult checkArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
-
-        return caseApplicationService.checkArbitrateRecord(caseApplication);
-    }
-    /**
-     * 仲裁员审核裁决书
-     */
-//    @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')")
-    @Log(title = "仲裁员审核裁决书", businessType = BusinessType.UPDATE)
-    @PostMapping("/arbitrator/checkArbitrateRecord")
-    public AjaxResult arbitratorCheckArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
-
-        return caseApplicationService.arbitratorCheckArbitrateRecord(caseApplication);
-    }
-
-    /**
-     * 批量操作仲裁员审核裁决书
-     */
-    @Log(title = "批量操作仲裁员审核裁决书", businessType = BusinessType.UPDATE)
-    @PostMapping("/arbitrator/checkArbitrateRecordBatch")
-    public AjaxResult arbitratorCheckArbitrateRecordBatch(@Validated @RequestBody CaseApplication caseApplication) {
-
-        return caseApplicationService.arbitratorCheckArbitrateRecordBatch(caseApplication);
-    }
-
-    /**
-     * 批量部门长审核裁决书
-     */
-    @Log(title = "批量部门长审核裁决书", businessType = BusinessType.UPDATE)
-    @PostMapping("/checkArbitrateRecordBatch")
-    public AjaxResult checkArbitrateRecordBatch(@Validated @RequestBody CaseApplication caseApplication) {
-
-        return caseApplicationService.checkArbitrateRecordBatch(caseApplication);
-    }
-
-    /**
-     * 批量核验裁决书
-     */
-    @Log(title = "批量核验裁决书", businessType = BusinessType.UPDATE)
-    @PostMapping("/verificationArbitrateRecordBatch")
-    public AjaxResult verificationArbitrateRecordBatch(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.verificationArbitrateRecordBatch(caseApplication));
-    }
-
-
-    /**
-     * 是否指派仲裁员
-     */
-//    @PreAuthorize("@ss.hasPermi('caseApplication:pendingAppointArbotrar')")
-    @Log(title = "是否指派仲裁员", businessType = BusinessType.UPDATE)
-    @PostMapping("/pendingAppointArbotrar")
-    public AjaxResult pendingAppointArbotrar(@Validated @RequestBody CaseApplication caseApplication) {
-        return toAjax(caseApplicationService.pendingAppointArbotrar(caseApplication));
-    }
-
-    /**
-     * 提交立案审查
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:check')")
-    @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
-    @PostMapping("/submitCaseApplicationCheck")
-    public AjaxResult submitCaseApplicationCheck(@RequestBody BatchCaseApplication batchCaseApplication) {
-        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getAgreeOrNotCheck()==null){
-            return error("参数校验失败");
-        }
-        return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getCaseCheckReject()));
-    }
-
-    /**
-     * 确认缴费查询立案信息
-     */
-//    @PreAuthorize("@ss.hasPermi('paymentManagement:list:detail')")
-    @PostMapping("/selectCaseApplicationConfirm")
-    public AjaxResult selectCaseApplicationConfirm(@Validated @RequestBody CaseApplication caseApplication) {
-        CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplicationConfirm(caseApplication);
-        return success(caseApplicationselect);
-    }
-
-    /**
-     * 批量提交立案审查
-     */
-    @Log(title = "批量提交立案审查", businessType = BusinessType.UPDATE)
-    @PostMapping("/submitCaseApplicationCheckBatch")
-    public AjaxResult submitCaseApplicationCheckBatch(@RequestBody BatchCaseApplication batchCaseApplication) {
-        if(StringUtils.isEmpty(batchCaseApplication.getBatchNumber()) || batchCaseApplication.getAgreeOrNotCheck()==null){
-            return error("参数校验失败");
-        }
-        return success(caseApplicationService.submitCaseApplicationCheckBatch(batchCaseApplication.getBatchNumber(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getCaseCheckReject()));
-    }
-
-    /**
-     * 下载案件压缩包
-     */
-    @PostMapping("/downloadCaseZipFile")
-    public AjaxResult downloadCaseZipFile(@Validated @RequestBody CaseApplication caseApplication) {
-
-        CaseAttach caseAttach = caseApplicationService.downloadCaseZipFile(caseApplication);
-        return success(caseAttach);
-    }
-
-
-
-
-
-    /**
-     * 发送房间号短信
-     */
-    @Anonymous
-    @PostMapping("/sendRoomNoMessage")
-    public AjaxResult sendRoomNoMessage(@Validated @RequestBody SendRoomNoMessageVO messageVO) {
-        String result = caseApplicationService.sendRoomNoMessage(messageVO);
-        return success(result);
-    }
-    /**
-     * 获取UrlScheme
-     */
-    @Anonymous
-    @GetMapping("/getUrlScheme")
-    public AjaxResult getUrlScheme() {
-        String schemeUrl = WxAppletNotifyUtils.jumpAppletSchemeUrl();
-        return success(schemeUrl);
-    }
-
-    /**
-     * 生成庭审笔录
-     * @param arbitrateRecord
-     * @return
-     */
-    @PostMapping("/creatTrialRecord")
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:creatTrialRecord')")
-    public AjaxResult creatTrialRecord(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
-        return caseApplicationService.creatTrialRecord(arbitrateRecord);
-    }
-
-    /**
-     * 记录庭审笔录
-     * @param arbitrateRecord
-     * @return
-     */
-    @PostMapping("/creatTrialRecordnew")
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:creatTrialRecord')")
-    public AjaxResult creatTrialRecordnew(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
-        return caseApplicationService.creatTrialRecordnew(arbitrateRecord);
-    }
-
-    /**
-     * 案件锁定或者解锁
-     * @param caseApplication
-     * @return
-     */
-    @PostMapping("/updateCaseLockStatus")
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:creatTrialRecord')")
-    public AjaxResult updateCaseLockStatus(@Validated @RequestBody CaseApplication caseApplication){
-        if(caseApplication.getId()==null || caseApplication.getLockStatus()==null){
-            return error("参数校验失败");
-        }
-        return AjaxResult.success(caseApplicationService.updateCaseLockStatus(caseApplication));
-    }
-
-    /**
-     * 查询短信发送记录
-     * @param smsSendRecord
-     * @return
-     */
-    @PostMapping("/smsRecord")
-    public TableDataInfo getSmsSendRecord(@RequestBody SmsSendRecord smsSendRecord){
-        startPage();
-        List<SmsSendRecord> list = caseApplicationService.getSmsSendRecord(smsSendRecord);
-        return getDataTable(list);
-    }
-    /**
-     * 获取userSign
-     * @param userId
-     * @return
-     */
-    @Anonymous
-    @GetMapping("/generateUserSign")
-    public AjaxResult generateUserSign(@RequestParam(required = true) String userId){
-        if(StrUtil.isEmpty(userId)){
-            error("参数校验失败");
-        }
-        return AjaxResult.success(caseApplicationService.generateUserSign(userId));
-    }
-    /**
-     * 预约会议
-     * @param reservedConferenceVO
-     * @return
-     */
-    @PostMapping("/reservedConference")
-    public AjaxResult reservedConference(@Validated @RequestBody ReservedConferenceVO reservedConferenceVO) throws Exception {
-
-        return caseApplicationService.reservedConference(reservedConferenceVO);
-    }
-
-    /**
-     * 生成房间号
-     * @return
-     */
-    @Anonymous
-    @GetMapping("/createRoomId")
-    public AjaxResult createRoomId(@RequestParam("caseId") Long caseId) {
-
-        return  success(caseApplicationService.createRoomId(caseId));
-    }
-    /**
-     * 删除房间号
-     * @return
-     */
-    @Anonymous
-    @PostMapping("/deleteRoom")
-    public AjaxResult deleteRoom(@RequestParam("roomId") String roomId) {
-
-        return  caseApplicationService.deleteRoom(roomId);
-    }
-    /**
-     * 根据案件id查询已预约的会议
-     * @param caseId
-     * @return
-     */
-    @Anonymous
-    @GetMapping("/reserveConferenceList")
-    public AjaxResult reserveConferenceList(  @RequestParam("caseId") Long caseId) {
-
-        return  success(caseApplicationService.reserveConferenceList(caseId));
-    }
-
-    /**
-     * 案件压缩包导入
-     * @param file
-     * @return
-     * @throws IOException
-     */
-    @PostMapping("/uploadCaseZipFile")
-    public AjaxResult uploadCaseZipFile(@RequestParam("file") MultipartFile file,@RequestParam("templateId")  Long templateId) throws IOException {
-        return caseApplicationService.uploadCaseZipFile(file,templateId);
-    }
-
-    /**
-     * 根据附件id修改案件id
-     * @param caseAttach
-     * @return
-     */
-    @PostMapping("/updateCaseIdByAnnexId")
-    public AjaxResult updateCaseIdByAnnexId(@RequestBody CaseAttach caseAttach)  {
-        if(caseAttach.getAnnexId()==null || caseAttach.getCaseAppliId()==null){
-            return error("参数校验失败");
-        }
-        return caseApplicationService.updateCaseIdByAnnexId(caseAttach);
-    }
-}

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

@@ -1,107 +0,0 @@
-package com.ruoyi.web.controller.wisdomarbitrate;
-
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.vo.UpdateSubmitVO;
-import com.ruoyi.wisdomarbitrate.service.CaseApplicationLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import static com.ruoyi.common.core.domain.AjaxResult.success;
-
-/**
- * @author wangqiong
- * @description 案件日志
- * @date 2023-11-17 13:58
- */
-@RestController
-@RequestMapping (value = "/caseApplicationLog")
-public class CaseApplicationLogController {
-
-    @Autowired
-    private CaseApplicationLogService caseApplicationLogService;
-
-    /**
-     * 新增
-     * @author wangqiong
-     * @date 2023/11/17
-     **/
-    @PostMapping("/insert")
-    public AjaxResult insert(@RequestBody CaseApplication caseApplicationLog){
-        return success(caseApplicationLogService.insert(caseApplicationLog));
-    }
-
-    /**
-     * 刪除
-     * @author wangqiong
-     * @date 2023/11/17
-     **/
-    @PostMapping("/delete")
-    public AjaxResult delete(Long id){
-        return success(caseApplicationLogService.delete(id));
-    }
-    /**
-     * 修改的案件提交到秘书
-     * @author wangqiong
-     * @date 2023/11/17
-     **/
-    @PostMapping("/submit")
-    public AjaxResult submit(@RequestBody UpdateSubmitVO vo){
-        if(vo.getCaseId()==null || vo.getVersion()==null){
-            return AjaxResult.error("参数校验错误");
-        }
-        return caseApplicationLogService.submit(vo);
-    }
-
-    /**
-     * 修改撤销申请
-     * @author wangqiong
-     * @date 2023/11/17
-     **/
-    @PostMapping("/revoke")
-    public AjaxResult revoke(@RequestBody UpdateSubmitVO vo){
-        if(vo.getCaseId()==null || vo.getVersion()==null){
-            return AjaxResult.error("参数校验错误");
-        }
-        // todo 需确定
-        return caseApplicationLogService.revoke(vo);
-    }
-
-    /**
-     * 查询 根据主键 id 查询
-     * @author wangqiong
-     * @date 2023/11/17
-     **/
-    @GetMapping("/selectByCaseIdAndVersion")
-    public AjaxResult selectByCaseIdAndVersion(@RequestParam(value = "caseId") Long caseId,@RequestParam(value = "version")Integer version ){
-        return success(caseApplicationLogService.selectByCaseIdAndVersion(caseId,version));
-    }
-    /**
-     * 秘书审核修改的案件
-     * @author wangqiong
-     * @date 2023/11/17
-     **/
-    @PostMapping("/updateAudit")
-    public AjaxResult updateAudit(@RequestBody UpdateSubmitVO vo){
-        if(vo.getCaseId()==null || vo.getVersion()==null || vo.getIsAgree()==null || vo.getUpdateSubmitStatus()==null){
-            return AjaxResult.error("参数校验错误");
-        }
-        return caseApplicationLogService.updateAudit(vo);
-    }
-    /**
-     * 查询该版本及之前版本案件进行对比
-     * @author wangqiong
-     * @date 2023/11/17
-     **/
-    @Anonymous
-    @PostMapping("/selectCompareCase")
-    public AjaxResult selectCompareCase(@RequestBody UpdateSubmitVO vo){
-        if(vo.getCaseId()==null || vo.getVersion()==null ){
-            return AjaxResult.error("参数校验错误");
-        }
-        return caseApplicationLogService.selectCompareCase(vo);
-    }
-  
-}

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

@@ -1,47 +0,0 @@
-package com.ruoyi.web.controller.wisdomarbitrate;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.wisdomarbitrate.domain.ArbitrateRecord;
-import com.ruoyi.wisdomarbitrate.domain.BatchCaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.CaseIds;
-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.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/arbitrate")
-public class CaseArbitrateController extends BaseController {
-    @Autowired
-    private ICaseArbitrateService caseArbitrateService;
-
-    /**
-     * 审核仲裁方式
-     * @param caseApplication
-     * @param opinion   1同意，0拒绝
-     * @return
-     */
-    @PutMapping("/method")
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
-    public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
-            , Integer opinion, Integer arbitratMethod){
-        return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion,arbitratMethod);
-    }
-
-    /**
-     * 书面审理
-     * @param
-     * @return
-     */
-    @PostMapping("/writtenHear")
-    public AjaxResult writtenHear(@RequestBody CaseIds caseIds){
-        return  caseArbitrateService.writtenHear(caseIds);
-
-    }
-}

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

@@ -1,160 +0,0 @@
-package com.ruoyi.web.controller.wisdomarbitrate;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.CaseEvidenceDirectory;
-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;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 案件证据
- */
-@RestController
-@RequestMapping("/evidence")
-public class CaseEvidenceController extends BaseController {
-    private final ICaseEvidenceService caseEvidenceService;
-
-    @Autowired
-    public CaseEvidenceController(ICaseEvidenceService caseEvidenceService) {
-        this.caseEvidenceService = caseEvidenceService;
-    }
-
-    /**
-     * 根据案件id查询案件详情
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/{id}")
-    public AjaxResult getCaseDetailsById(@PathVariable Long id) {
-        String username = this.getUsername();
-        return caseEvidenceService.getCaseDetailsById(id, username);
-    }
-
-    /**
-     * 案件证据上传
-     *
-     * @param file      附件
-     * @param annexType 附件类型,立案申请书(1)、证据材料(2)、仲裁文书(3)、案件视频(4)、身份证件(5)
-     * @param id        案件申请id
-     * @return
-     */
-    @PostMapping("/upload")
-    public AjaxResult uploadEvidence(@RequestParam("file") MultipartFile file, Integer annexType, Long id) {
-        String username = this.getUsername();
-        Long userId = this.getUserId();
-        return caseEvidenceService.uploadEvidence(file, annexType, id, username, userId);
-    }
-
-    /**
-     * 上传庭审笔录
-     *
-     * @param file      附件
-     * @param annexType 附件类型,庭审笔录(7)
-     * @param id        案件申请id
-     * @return
-     */
-    @PostMapping("/uploadRecord")
-    public AjaxResult uploadRecord(@RequestParam("file") MultipartFile file, Integer annexType, Long id) {
-        String username = this.getUsername();
-        Long userId = this.getUserId();
-        return caseEvidenceService.uploadRecord(file, annexType, id, username, userId);
-    }
-
-    @PostMapping("/batchUpload")
-    public AjaxResult batchUpload(@RequestParam("file") MultipartFile[] file, Integer annexType, Long id) {
-        if(file==null){
-            return error("请选择要上传的文件");
-        }
-        String username = this.getUsername();
-        Long userId = this.getUserId();
-        return caseEvidenceService.batchUpload(file, annexType, id, username, userId);
-    }
-
-    /**
-     * 获取附件
-     * @param caseAppliId
-     * @param annexTypeList
-     * @param
-     * @return
-     */
-    @GetMapping("/fileList")
-    public AjaxResult fileList(Long caseAppliId, @RequestParam("annexTypeList") List<Integer> annexTypeList){
-        if(caseAppliId==null){
-            return error("案件id不能为空");
-        }
-        return caseEvidenceService.fileList(caseAppliId, annexTypeList);
-    }
-
-    /**
-     * 删除附件
-     * @param fileIds
-     * @return
-     */
-    @PostMapping("/deleteFile")
-    public AjaxResult deleteFile( @RequestParam("fileIds") List<Integer> fileIds){
-
-        if(CollectionUtil.isEmpty(fileIds)){
-            return error("附件id不能为空");
-        }
-        return toAjax(caseEvidenceService.deleteFile( fileIds));
-    }
-
-
-    /**
-     * 查询当前用户案件列表
-     *
-     * @param caseStatus
-     * @return
-     */
-    @GetMapping("/all")
-    public AjaxResult getCaseListAll(@RequestParam("caseStatus") Integer caseStatus) {
-
-       return success(caseEvidenceService.getCaseListAll(caseStatus));
-
-    }
-
-    /**
-     * 证据确认
-     *
-     * @param caseApplication 案件对象
-     * @return 统一返回结果
-     */
-    @PutMapping("/confirm")
-    public AjaxResult evidenceConfirmation(@Validated @RequestBody CaseApplication caseApplication) {
-        return caseEvidenceService.evidenceConfirmation(caseApplication);
-    }
-
-    /**
-     * 案件质证
-     *
-     * @param caseEvidenceDTO
-     * @return
-     */
-    @PostMapping("/crossexami")
-    public AjaxResult caseCrossexamination(@Validated @RequestBody CaseEvidenceDTO caseEvidenceDTO) {
-        return caseEvidenceService.caseCrossexamination(caseEvidenceDTO);
-    }
-    /**
-     * 获取证据目录树列表
-     */
-    @GetMapping("/evidenceTree")
-    public AjaxResult evidenceTree(CaseEvidenceDirectory caseEvidenceDirectory)
-    {
-        return success(caseEvidenceService.selectEvidenceTreeList(caseEvidenceDirectory)) ;
-    }
-
-}

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

@@ -2,8 +2,6 @@ package com.ruoyi.web.controller.wisdomarbitrate;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
 import com.ruoyi.wisdomarbitrate.service.ICaseLogRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +21,7 @@ public class CaseLogRecordController   extends BaseController {
     /**
      * 查询案件日志列表
      */
-//    @PreAuthorize("@ss.hasPermi('caseLog:list')")
+    @PreAuthorize("@ss.hasPermi('caseLog:list')")
     @GetMapping("/list")
     public AjaxResult list(CaseLogRecord caseLogRecord)
     {

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

@@ -1,110 +0,0 @@
-package com.ruoyi.web.controller.wisdomarbitrate;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.wisdomarbitrate.domain.BatchCaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.dto.CaseConfirmPayDTO;
-import com.ruoyi.wisdomarbitrate.service.ICasePaymentService;
-import com.ruoyi.wisdomarbitrate.domain.dto.CasePayDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 缴费支付
- */
-@RestController
-@RequestMapping("/pay")
-public class CasePaymentController {
-    private final ICasePaymentService paymentService;
-    @Autowired
-    public CasePaymentController(ICasePaymentService paymentService){
-       this.paymentService=paymentService;
-    }
-    /**
-     * 案件缴费
-     * @param casePayDTO 缴费传入参数
-     * @return 统一响应结果
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:pay')")
-    @PostMapping("/casePay")
-    public AjaxResult casePay(@Validated @RequestBody CasePayDTO casePayDTO) {
-        return paymentService.casePay(casePayDTO);
-    }
-    /**
-     * 确认缴费
-     * @param payDTO 缴费传入参数
-     * @return 统一响应结果
-     */
-//    @PreAuthorize("@ss.hasPermi('caseManagement:list:pay')")
-    @PostMapping("/confirmPay")
-    public AjaxResult confirmPay(@Validated @RequestBody CaseConfirmPayDTO payDTO) {
-        return paymentService.confirmPay(payDTO);
-    }
-
-    /**
-     * 批量缴费
-     * @param casePayDTO 缴费传入参数
-     * @return 统一响应结果
-     */
-    @PostMapping("/casePayBatch")
-    public AjaxResult casePayBatch(@Validated @RequestBody CasePayDTO casePayDTO) {
-        return paymentService.casePayBatch(casePayDTO);
-    }
-
-    /**
-     * 批量缴费
-     * @param payDTO 缴费传入参数
-     * @return 统一响应结果
-     */
-    @PostMapping("/confirmPayBatch")
-    public AjaxResult confirmPayBatch(@Validated @RequestBody CasePayDTO payDTO) {
-        return paymentService.confirmPayBatch(payDTO);
-    }
-
-    /**
-     * 缴费确认
-     * @param batchCaseApplication
-     * @return
-     */
-//    @PreAuthorize("@ss.hasPermi('paymentManagement:list:payconfirm')")
-    @PutMapping("/confirm")
-    public AjaxResult confirmPayment(@Validated @RequestBody BatchCaseApplication batchCaseApplication) {
-        if(CollectionUtil.isEmpty(batchCaseApplication.getIds())){
-            return AjaxResult.error("参数校验失败");
-        }
-            return paymentService.confirmPayment(batchCaseApplication.getIds());
-    }
-    /**
-     * 缴费列表查询
-     * @param casePayDTO
-     * @return
-     */
-    @GetMapping("/list")
-    public AjaxResult casePayList(CasePayDTO casePayDTO) {
-        return paymentService.casePayList(casePayDTO);
-    }
-
-    @PostMapping("/listBatch")
-    public AjaxResult casePayListBatch(@Validated @RequestBody CasePayDTO casePayDTO) {
-        return paymentService.casePayListBatch(casePayDTO);
-    }
-
-    /**
-     * 批量缴费确认
-     * @param batchCaseApplication
-     * @return
-     */
-    @PostMapping("/confirmBatch")
-    public AjaxResult confirmPaymentBatch(@Validated @RequestBody BatchCaseApplication batchCaseApplication) {
-        if(StringUtils.isEmpty(batchCaseApplication.getBatchNumber())){
-            return AjaxResult.error("参数校验失败");
-        }
-        return paymentService.confirmPaymentBatch(batchCaseApplication.getBatchNumber());
-    }
-}

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

@@ -30,19 +30,5 @@ public class SendMailRecordController  extends BaseController {
     }
 
 
-//    /**
-//     * 新增立案数据
-//     */
-//    @Log(title = "新增立案数据", businessType = BusinessType.INSERT)
-//    @PostMapping("/addSendMailRecord")
-//    public AjaxResult addSendMailRecord(@Validated @RequestBody SendMailRecord sendMailRecord)
-//    {
-//
-//        return toAjax(sendMailRecordService.addSendMailRecord(sendMailRecord));
-//    }
-
-
-
-
 
 }

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

@@ -1,149 +0,0 @@
-package com.ruoyi.web.controller.wisdomarbitrate;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
-import com.ruoyi.wisdomarbitrate.domain.vo.ReservedConferenceVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO;
-import com.ruoyi.wisdomarbitrate.service.VideoService;
-import com.ruoyi.wisdomarbitrate.service.WeChatUserService;
-import com.tencentcloudapi.common.Credential;
-import com.tencentcloudapi.common.exception.TencentCloudSDKException;
-import com.tencentcloudapi.common.profile.ClientProfile;
-import com.tencentcloudapi.common.profile.HttpProfile;
-import com.tencentcloudapi.trtc.v20190722.TrtcClient;
-import com.tencentcloudapi.trtc.v20190722.models.*;
-import com.tencentyun.TLSSigAPIv2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.io.IOException;
-
-/**
- * @author wangqiong
- * @description trtc实时音视频
- * @date 2023-10-26 11:25
- */
-@RestController
-@RequestMapping("/video")
-public class VideoController extends BaseController {
-    @Autowired
-    private VideoService videoService;
-
-    /**
-     * 从腾讯云下载文件到本地
-     * @param
-     * @return
-     */
-    @Anonymous
-    @PostMapping("/videoRollBack")
-    public AjaxResult videoRollBack(  @RequestBody String body, HttpServletRequest request) {
-        videoService.videoRollBack(body,request);
-       return success();
-    }
-    /**
-     * 根据房间号绑定案件ID
-     * @param
-     * @return
-     */
-    @Anonymous
-    @PostMapping("/bindCaseId")
-    public AjaxResult bindCaseId(@Valid @RequestBody SendRoomNoMessageVO vo) {
-
-        return videoService.bindCaseId(vo.getId(),vo.getRoomNo());
-    }
-    /**
-     * 根据案件ID查询视频
-     * @param caseId 案件id
-     * @return
-     */
-    @GetMapping("/videoList")
-    public AjaxResult videoList(  @RequestParam Long caseId) {
-
-        return videoService.videoList(caseId);
-    }
-    /**
-     * 开启腾讯云录制
-     * @param vo
-     * @return
-     * @throws Exception
-     */
-    @Anonymous
-    @PostMapping("/openCloudRecording")
-    private AjaxResult openCloudRecording( @RequestBody ReservedConferenceVO vo)  {
-        if(vo.getCaseId()==null || vo.getRoomId()==null){
-            return AjaxResult.error("参数错误");
-        }
-        return videoService.openCloudRecording(vo.getCaseId(),vo.getRoomId());
-    }
-    /**
-     * 关闭腾讯云录制
-     * @param taskId 任务ID
-     * @return
-     */
-    @Anonymous
-    @PostMapping("/closeDeleteCloudRecording")
-    public AjaxResult closeDeleteCloudRecording(@RequestParam("taskId") String taskId){
-        return videoService.closeDeleteCloudRecording(taskId);
-    }
-    /**
-     * 解散房间
-     * @param reservedConferenceVO
-     * @return
-     */
-    @Anonymous
-    @PostMapping("/dissolveRoom")
-    public AjaxResult dissolveRoom(   @RequestBody ReservedConferenceVO reservedConferenceVO) {
-        if( reservedConferenceVO.getRoomId()==null){
-            return error("参数校验失败");
-        }
-
-        return  videoService.dissolveRoom(reservedConferenceVO.getRoomId());
-    }
-    /**
-     * 根据userId查询该用户是否是秘书
-     * @param userId
-     * @return
-     */
-    @Anonymous
-    @GetMapping("secretaryRoleByUserId")
-    public AjaxResult secretaryRoleByUserId(   @RequestParam(value = "userId",required = true) Long userId) {
-
-        return  videoService.secretaryRoleByUserId(userId);
-    }
-    /**
-     * 根据html字符串转pdf并和案件关联
-     * @param reservedConferenceVO
-     * @return
-     */
-    @Anonymous
-    @PostMapping("htmlToPDF")
-    public AjaxResult secretaryRoleByUserId( @RequestBody ReservedConferenceVO reservedConferenceVO) {
-        if( reservedConferenceVO.getCaseId()==null || StrUtil.isEmpty(reservedConferenceVO.getHtmlContent())){
-            return success();
-        }
-
-        return  videoService.htmlToPDF(reservedConferenceVO);
-    }
-    /**
-     * 根据案件id和类型查询附件
-     * @param caseAppliId
-     * @param annexType
-     * @return
-     */
-
-    @GetMapping("attachListByCaseId")
-    public AjaxResult attachListByCaseId( @RequestParam("caseAppliId") Long caseAppliId,@RequestParam("annexType") Integer annexType) {
-
-        return  videoService.attachListByCaseId(caseAppliId,annexType);
-    }
-
-
-}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://121.40.189.20:3306/test_smart_arbitration?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
+                url: jdbc:mysql://121.40.189.20:3306/mediation_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
                 username: root
                 password: YMzc157#
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml

@@ -143,7 +143,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping:
 
 # 防止XSS攻击
 xss:

ruoyi-admin/src/main/resources/generator/config.properties

@@ -1,7 +1,7 @@
 jdbc.driverClass=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://158.58.50.21:3306/knslm?serverTimezone=Asia/Shanghai&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&nullCatalogMeansCurrent=true
-jdbc.user=knslm
-jdbc.password=knslm2022
+jdbc.url=jdbc:mysql://158.58.50.21:3306/mediation_system?serverTimezone=Asia/Shanghai&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&nullCatalogMeansCurrent=true
+jdbc.user=root
+jdbc.password=YMzc157#
 #模块名称
 
 moduleName=diagnosis

ruoyi-admin/src/main/resources/generator/generatorConfig.xml

@@ -21,13 +21,13 @@
                         password="${jdbc.password}">
         </jdbcConnection>
         <!--实体-->
-        <javaModelGenerator targetPackage="com.njkn.knslm.domain.entity.${moduleName}"
+        <javaModelGenerator targetPackage="com.ruoyi.wisdomarbitrate.domain.${moduleName}"
                             targetProject="src/main/java"/>
         <!--mapper.xml-->
-        <sqlMapGenerator targetPackage="com.njkn.knslm.dao.${moduleName}"
+        <sqlMapGenerator targetPackage="mapper.**.${moduleName}"
                          targetProject="src/main/resources"/>
         <!--mapper接口-->
-        <javaClientGenerator targetPackage="com.njkn.knslm.dao.${moduleName}"
+        <javaClientGenerator targetPackage="com.ruoyi.**.mapper.${moduleName}"
                              targetProject="src/main/java"
                              type="XMLMAPPER"/>
         <!--需要生成的数据库表-->