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

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

 package com.ruoyi.web.controller.system;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-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.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
+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 javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 数据字典信息
         }
         return success(data);
     }
+    /**
+     * 根据字典类型查询字典数据信息,跳过token
+     */
+    @Anonymous
+    @GetMapping(value = "/type/skipToken/{dictType}")
+    public AjaxResult skipToken(@PathVariable String dictType)
+    {
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+        if (StringUtils.isNull(data))
+        {
+            data = new ArrayList<SysDictData>();
+        }
+        return success(data);
+    }
 
     /**
      * 新增字典类型

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

     /**
      * 新增案件
      */
+    // todo 重复提交校验
     @PostMapping("/insert")
     public AjaxResult insert(@RequestBody MsCaseApplicationVO caseApplication )
     {

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

 # 开发环境配置
 server:
   # 测试环境6001，开发环境7001
-  port: 6001
+  port: 7001
   servlet:
     # 应用的访问路径
     context-path: /
   url: http://121.40.189.20:9001/callArbitrateCaseApplication/generateCaseApplication
 # 回调通知
 signSealCallbackConfig:
-  url: http://121.40.189.20:6001/mssignSeal/signSeaalCaseApplicaCallback
+  url: http://121.40.189.20:7001/mssignSeal/signSeaalCaseApplicaCallback
 #  onlyOffice系统url配置
 onlyOfficeConfig:
 #  url: http://172.16.0.254:9090/files/upload

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java

         // 申请人预约
         if (vo.getMiniProgressFlag() == null || vo.getMiniProgressFlag().equals( YesOrNoEnum.NO.getCode())) {
             // 新增日志
-            CaseLogUtils.insertCaseLog(vo.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "申请人选择调解员");
+            CaseLogUtils.insertCaseLog(vo.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), null);
 
             if (StrUtil.isEmpty(msCaseAffiliate.getRespondentIdentityNum())) {
                 return AjaxResult.error("被申请人身份证为空");
         } else {
             // 被申请人预约
             // 新增日志
-            CaseLogUtils.insertCaseLog(vo.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "被申请人选择调解员");
+            CaseLogUtils.insertCaseLog(vo.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), null);
             // 判断申请人是否预约
             caseApplicationService. isReservation( vo,userIds);
 
         if (currentFlow == null) {
             throw new ServiceException("未找到当前流程节点");
         }
+        Integer mediaResult = req.getMediaResult();
         MsCaseAffiliate caseAffiliate = msCaseAffiliateMapper.selectByPrimaryKey(req.getId());
         if (application.getMediationMethod().equals("1")) {
             // 线上调解
                     msCaseAttachMapper.updateCaseAttach(attach);
                 }
             }
-            Integer mediaResult = req.getMediaResult();
-            if(mediaResult!=null){
-                if(mediaResult.intValue()==1){
+                if(mediaResult ==1){
                     //达成调解
                         List<MsCaseAttach> caseAttachList = msCaseAttachMapper.queryAnnexPathByCaseId(req.getId());
                         if (caseAttachList != null && caseAttachList.size() > 0) {
                         }
                 }
 
-            }
+
         } else {
             // 线下调解
             List<MsCaseAttach> attachList = req.getAttachList();
                 attach.setCaseAppliId(req.getId());
                 msCaseAttachMapper.updateCaseAttach(attach);
             }
-           // msCaseAttachMapper.batchSave(attachList);
             // 修改案件状态为待送达
             Example flowExample = new Example(MsCaseFlow.class);
-            flowExample.createCriteria().andEqualTo("caseStatusName", "待送达");
+            if(mediaResult ==1 || mediaResult == 5){
+                // 达成调解，达成和解，案件状态改为待送达
+                flowExample.createCriteria().andEqualTo("caseStatusName", "待送达");
+            } else if(mediaResult == 2 || mediaResult == 3){
+                // 未达成调解，未达成调解但不在争议改为结束状态
+                flowExample.createCriteria().andEqualTo("caseStatusName", "结束");
+            }
+            else if(mediaResult == 4){
+                //  未达成调解但同意引入仲裁系统，改为结束状态，并调仲裁新增接口
+                flowExample.createCriteria().andEqualTo("caseStatusName", "结束");
+                String accessSec = "mCFMA6ffe938v79m";
+                MsCaseApplicationVO applicationVO = new MsCaseApplicationVO();
+                BeanUtils.copyProperties(application,applicationVO);
+
+                CaseApplicationVO caseApplicationVO = new CaseApplicationVO();
+                BeanUtils.copyProperties(applicationVO,caseApplicationVO);
+                boolean importFlag = applicationVO.isImportFlag();
+                if(importFlag==true){
+                    caseApplicationVO.setImportFlag(1);
+                }else {
+                    caseApplicationVO.setImportFlag(0);
+                }
+                String paramsbody = JSONUtil.toJsonStr(caseApplicationVO);
+                long timestamp = System.currentTimeMillis();
+                String signStr = SignCheckUtils.getSign(paramsbody, accessSec, timestamp);
+                String urlstr = arbitrateUrl;
+                HttpResponse httpResponse = HttpRequest.post(urlstr)
+                        .header("timestampstr", String.valueOf(timestamp))
+                        .header("signstr", signStr)
+                        .body(paramsbody)
+                        .execute();
+            }
             MsCaseFlow caseFlow = caseFlowMapper.selectOneByExample(flowExample);
             if(caseFlow != null){
                 application.setCaseFlowId(caseFlow.getId());
                 application.setCaseStatusName(caseFlow.getCaseStatusName());
+                application.setMediaResult(mediaResult);
                 msCaseApplicationMapper.updateByPrimaryKey(application);
                 // 新增日志
                 CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"");
         }
 
 
-        return AjaxResult.error();
+        return AjaxResult.success();
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCasePaymentServiceImpl.java

         }
         // 新增日志
         if (dto.getYesOrNo().equals(YesOrNoEnum.YES.getCode())) {
-            CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "确认已缴费");
+            CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), null);
         }else {
             CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "拒绝确认缴费，拒绝原因为："+dto.getReason());
         }
         application.setCaseFlowId(nextFlow.getId());
         application.setCaseStatusName(nextFlow.getCaseStatusName());
         caseApplicationMapper.updateByPrimaryKeySelective(application);
-        CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"确认缴费");
+        CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),null);
     }
 
 

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java

                 application.setCaseFlowId(nextFlow.getId());
                 application.setCaseStatusName(nextFlow.getCaseStatusName());
                 caseApplicationMapper.updateByPrimaryKeySelective(application);
-                CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"用印申请");
+                CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),null);
             }
         } else {
             // 单独
             application.setCaseFlowId(nextFlow.getId());
             application.setCaseStatusName(nextFlow.getCaseStatusName());
             caseApplicationMapper.updateByPrimaryKeySelective(application);
-            CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"用印申请");
+            CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),null);
         }
         return AjaxResult.success("用印申请成功");
 
             caseApplicationselect.setCaseFlowId(nextFlow.getId());
             caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName());
             caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect);
-            CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"签收");
+            CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),null);
         }
 //        if (dto.getIsSignRespon() != null && dto.getIsSignRespon().intValue() == 1) {
 //            caseAffiliate.setIsSignRespon(1);
             caseApplicationselect.setCaseFlowId(nextFlow.getId());
             caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName());
             caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect);
-            CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"签收");
+            CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),null);
         }
 
         return AjaxResult.success("签收成功");

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

 #模块名称
 moduleName=mscase
 #表名
-tableName=ms_case_affiliate
+tableName=ms_case_audit
 #主键
 premaryId=id