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

@@ -1,11 +1,19 @@
 package com.ruoyi;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 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;
 
+import java.util.List;
+
 /**
  * 启动程序
  * 
@@ -30,5 +38,14 @@ public class RuoYiApplication
                 " |  | \\ `'   /|   `-'  /           \n" +
                 " |  |  \\    /  \\      /           \n" +
                 " ''-'   `'-'    `-..-'              ");
+        // 启动成功后，查询用户表，将用户信息存到redis
+        RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
+        SysUserMapper userMapper = SpringUtils.getBean(SysUserMapper.class);
+        List<SysUser> sysUsers = userMapper.selectUserListByIds(null);
+        if(CollectionUtil.isNotEmpty(sysUsers)){
+            for (SysUser sysUser : sysUsers) {
+                redisCache.setCacheObject(CacheConstants.USER_KEY+sysUser.getUserId(),sysUser);
+            }
+        }
     }
 }

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

@@ -417,7 +417,7 @@ public class MsCaseApplicationController extends BaseController {
      * @param
      * @return
      */
-    @GetMapping("/saveOnlyOfficeFile")
+    @PostMapping("/saveOnlyOfficeFile")
     public AjaxResult saveOnlyOfficeFile(  @RequestBody MsCaseAttach caseAttach) {
         if(caseAttach.getCaseAppliId()==null||StrUtil.isEmpty(caseAttach.getOnlyOfficeFileId())||StrUtil.isEmpty(caseAttach.getAnnexPath())){
             return error("参数校验失败");

ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java

@@ -46,4 +46,8 @@ public class CacheConstants
      * 案件 redis key
      */
     public static final String CASE_KEY = "case_codes:";
+    /**
+     * 所有用户 redis key
+     */
+    public static final String USER_KEY = "user_key:";
 }

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

@@ -224,7 +224,7 @@ public interface MsCaseApplicationService {
      * 调解书上传到onlyoffice服务器
      * @param annexPath
      */
-     JSONArray uploadOnlyOffice(String annexPath);
+     JSONArray uploadOnlyOffice(String annexPath,Long id);
     /**
      * 案件受理
      * @param application

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

@@ -2163,15 +2163,16 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
     @Transactional
     @Override
     public AjaxResult saveOnlyOfficeFile(MsCaseAttach caseAttach) {
-        if(StrUtil.isEmpty(caseAttach.getAnnexName())){
+        if(StrUtil.isEmpty(caseAttach.getAnnexName())) {
             caseAttach.setAnnexName("调解书");
+        }
             caseAttach.setAnnexType(AnnexTypeEnum.MEDIATE_BOOK.getCode());
             caseAttach.setUseId(getUserInfo().getUserId());
             caseAttach.setUseAccount(getUserInfo().getUserName());
             // 先删除之前的在新增
             msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseAttach.getCaseAppliId(), caseAttach.getAnnexType());
             msCaseAttachMapper.save(caseAttach);
-        }
+
         return AjaxResult.success();
     }
 
@@ -3755,7 +3756,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
        String annexPath=resultFilePath.replace(RuoYiConfig.getProfile(),Constants.RESOURCE_PREFIX);
        // 如果是调解书或者调解协议上传到onlyoffice服务器
         if(annexType != null   && annexType.equals(AnnexTypeEnum.MEDIATE_BOOK.getCode())){
-            JSONArray jsonArray = caseApplicationService.uploadOnlyOffice(annexPath);
+            JSONArray jsonArray = caseApplicationService.uploadOnlyOffice(annexPath,application.getId());
             if(jsonArray!=null && jsonArray.size() > 0){
                     for (Object obj : jsonArray) {
                         JSONObject jsonObject = (JSONObject) obj;
@@ -3784,13 +3785,13 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
      */
     @Override
     @Transactional
-    public JSONArray uploadOnlyOffice(String annexPath) {
+    public JSONArray uploadOnlyOffice(String annexPath,Long caseId) {
         annexPath=annexPath.replace("/profile","/home/ruoyi/uploadPath");
         File file = new File(annexPath);
         if (file.exists()) {
            // 调用onlyoffice
-//            String url = "http://121.40.189.20:9090/files/upload";
             try {
+                onlyOfficeUrl=  onlyOfficeUrl+ "?caseId="+caseId;
                 Map<String, Object> params = new HashMap<>();
                 params.put("file", file);
                 String postResult = HttpUtil.post(onlyOfficeUrl, params);
@@ -3806,7 +3807,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
         }else {
             throw new ServiceException("文件不存在");
         }
-return null;
+        return null;
     }
 
     /**

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

@@ -1033,6 +1033,11 @@ public class MsSignSealServiceImpl implements MsSignSealService {
             String orgnNamePsnAcc = sealSignRecordsel.getOrgnNamePsnAcc();
             String pensonAccountRes = sealSignRecordsel.getPensonAccountRes();
             String pensonAccountMedi = sealSignRecordsel.getPensonAccountMedi();
+            String pensonName = sealSignRecordsel.getPensonName();
+            String orgnNamePsnName = sealSignRecordsel.getOrgnNamePsnName();
+            String pensonNameRes = sealSignRecordsel.getPensonNameRes();
+            String pensonNameMedi = sealSignRecordsel.getPensonNameMedi();
+            Date dateOperate = new Date(operateTime);
 
             Integer signStatusApply = sealSignRecordsel.getSignStatusApply();
             Integer signStatusResponse = sealSignRecordsel.getSignStatusResponse();
@@ -1042,6 +1047,10 @@ public class MsSignSealServiceImpl implements MsSignSealService {
             Long caseAppliId = sealSignRecordsel.getCaseAppliId();
             MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseAppliId);
             Integer mediaResult = caseApplicationselect.getMediaResult();
+            MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(caseApplicationselect.getCaseFlowId());
+            Integer caseNode = currentFlow.getNodeId();
+            String caseStatusName = currentFlow.getCaseStatusName();
+
 
             if("SIGN_MISSON_COMPLETE".equals(action) && signResult==2){
                 if(mediaResult.intValue()==1){
@@ -1050,6 +1059,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                         //申请人签名
                         sealSignRecordsel.setSignStatusApply(1);
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
+                        operLog.setCreateNickName(pensonName);
+                        operLog.setCaseStatusName(caseStatusName);
+                        operLog.setCaseAppliId(caseAppliId);
+                        operLog.setCaseNode(caseNode);
+                        operLog.setCreateTime(dateOperate);
+                        caseLogRecordMapper.insert(operLog);
                         if(signStatusResponse!=null&&signStatusResponse.intValue()==1&&
                                 signStatusMediator!=null&&signStatusMediator.intValue()==1){
                             // 根据流程id查找下一个流程节点
@@ -1068,6 +1084,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                         //被申请人签名
                         sealSignRecordsel.setSignStatusResponse(1);
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
+                        operLog.setCreateNickName(pensonNameRes);
+                        operLog.setCaseStatusName(caseStatusName);
+                        operLog.setCaseAppliId(caseAppliId);
+                        operLog.setCaseNode(caseNode);
+                        operLog.setCreateTime(dateOperate);
+                        caseLogRecordMapper.insert(operLog);
                         if(signStatusApply!=null&&signStatusApply.intValue()==1&&
                                 signStatusMediator!=null&&signStatusMediator.intValue()==1){
                             // 根据流程id查找下一个流程节点
@@ -1086,6 +1109,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                         //调解员签名
                         sealSignRecordsel.setSignStatusMediator(1);
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
+                        operLog.setCreateNickName(pensonNameMedi);
+                        operLog.setCaseStatusName(caseStatusName);
+                        operLog.setCaseAppliId(caseAppliId);
+                        operLog.setCaseNode(caseNode);
+                        operLog.setCreateTime(dateOperate);
+                        caseLogRecordMapper.insert(operLog);
                         if(signStatusApply!=null&&signStatusApply.intValue()==1&&
                                 signStatusResponse!=null&&signStatusResponse.intValue()==1){
                             // 根据流程id查找下一个流程节点
@@ -1104,6 +1134,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                         sealSignRecordsel.setSealStatus(1);
                         sealSignRecordsel.setSignFlowStatus(3);
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
+                        operLog.setCreateNickName(orgnNamePsnName);
+                        operLog.setCaseStatusName(caseStatusName);
+                        operLog.setCaseAppliId(caseAppliId);
+                        operLog.setCaseNode(caseNode);
+                        operLog.setCreateTime(dateOperate);
+                        caseLogRecordMapper.insert(operLog);
 
                         // 根据流程id查找下一个流程节点
                         MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue());
@@ -1163,6 +1200,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                         //申请人签名
                         sealSignRecordsel.setSignStatusApply(1);
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
+                        operLog.setCreateNickName(pensonName);
+                        operLog.setCaseStatusName(caseStatusName);
+                        operLog.setCaseAppliId(caseAppliId);
+                        operLog.setCaseNode(caseNode);
+                        operLog.setCreateTime(dateOperate);
+                        caseLogRecordMapper.insert(operLog);
                         if(signStatusResponse!=null&&signStatusResponse.intValue()==1){
                             MsCaseFlow nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue());
                             MsCaseApplication application = new MsCaseApplication();
@@ -1222,6 +1266,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                         //被申请人签名
                         sealSignRecordsel.setSignStatusResponse(1);
                         sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel);
+                        MsCaseLogRecord operLog = new MsCaseLogRecord();
+                        operLog.setCreateNickName(pensonNameRes);
+                        operLog.setCaseStatusName(caseStatusName);
+                        operLog.setCaseAppliId(caseAppliId);
+                        operLog.setCaseNode(caseNode);
+                        operLog.setCreateTime(dateOperate);
+                        caseLogRecordMapper.insert(operLog);
                         if(signStatusApply!=null&&signStatusApply.intValue()==1){
                             MsCaseFlow nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue());
                             MsCaseApplication application = new MsCaseApplication();

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java

@@ -355,7 +355,7 @@ public class SignAward {
                 "       \"signConfig\": {\n" +
                 "           \"availableSignClientTypes\":  \"1\"\n" +
                 "       },\n" +
-                "        \"notifyUrl\": \"" + signSealCallbackUrl + "\",\n" +
+//                "        \"notifyUrl\": \"" + signSealCallbackUrl + "\",\n" +
                 "        \"autoFinish\": true\n" +
                 "    },\n" +