bug修复

ruoyi-system/src/main/java/com/ruoyi/system/service/BeiMingInterface.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.enums.AttachmentOperateTypeEnum;
+import com.ruoyi.common.enums.DocumentTypeEnum;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseFileInfo;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseStatusInfo;
 
@@ -70,7 +71,7 @@ public interface BeiMingInterface {
      * @param caseNo     案件编号
      * @return
      */
-    MsCaseFileInfo pushAttachmentInfo(String username, String password, File file, String syncSource, String caseNo, AttachmentOperateTypeEnum operateTypeEnum);
+    MsCaseFileInfo pushAttachmentInfo(String username, String password, File file, String syncSource, String caseNo, AttachmentOperateTypeEnum operateTypeEnum, DocumentTypeEnum documentTypeEnum);
 
     /**
      * 删除附件

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -1,10 +1,10 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
-import java.util.Set;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.system.domain.SysUserRole;
 
+import java.util.List;
+
 /**
  * 角色业务层
  * 
@@ -34,7 +34,7 @@ public interface ISysRoleService
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectRolePermissionByUserId(Long userId);
+    public List<SysRole>  selectRolePermissionByUserId(Long userId);
 
     /**
      * 查询所有角色

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BeiMingInterfaceService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.ruoyi.common.enums.AttachmentOperateTypeEnum;
+import com.ruoyi.common.enums.DocumentTypeEnum;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.domain.entity.log.MsRequestLog;
 import com.ruoyi.system.service.BeiMingInterface;
@@ -335,7 +336,7 @@ public class BeiMingInterfaceService implements BeiMingInterface {
      */
     @Transactional
     @Override
-    public MsCaseFileInfo pushAttachmentInfo(String username, String password, File file,  String syncSource, String caseNo,AttachmentOperateTypeEnum operateTypeEnum) {
+    public MsCaseFileInfo pushAttachmentInfo(String username, String password, File file, String syncSource, String caseNo, AttachmentOperateTypeEnum operateTypeEnum, DocumentTypeEnum documentTypeEnum) {
         JSONObject result = new JSONObject();
         MsCaseFileInfo fileInfo=null;
         //1.获取token
@@ -354,7 +355,7 @@ public class BeiMingInterfaceService implements BeiMingInterface {
                         System.out.println("fileId====:" + fileId);
                         if (fileId != null) {
                             //3.同步附件更新信息
-                             fileInfo = MsCaseFileInfo.builder().fileId(fileId).fileName(file.getName()).abutmentId(fileId).abutmentCaseId(caseNo).documentSubject("EVEDENT").documentType("EVEDENT_METERIAL").build();
+                             fileInfo = MsCaseFileInfo.builder().fileId(fileId).fileName(file.getName()).abutmentId(fileId).abutmentCaseId(caseNo).documentSubject("EVEDENT").documentType(documentTypeEnum.getCode()).build();
                             result = syncAttachmentInfo(token, username, operateTypeEnum.getCode(), caseNo, fileInfo);
                             // 更新到附件表将fileId
 //                            result = syncAttachmentInfo(token, username, AttachmentOperateTypeEnum.UPD.getCode(), caseNo, fileInfo);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MsRequestLogServiceImpl.java

@@ -5,6 +5,8 @@ import com.ruoyi.system.mapper.log.MsRequestLogMapper;
 import com.ruoyi.system.service.MsRequestLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Classname MsRequestLogServiceImpl
@@ -17,6 +19,7 @@ import org.springframework.stereotype.Service;
 public class MsRequestLogServiceImpl implements MsRequestLogService {
     @Autowired
     private MsRequestLogMapper logMapper;
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Override
     public void insert(MsRequestLog requestLog) {
         logMapper.insert(requestLog);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -93,18 +93,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
+    public  List<SysRole> selectRolePermissionByUserId(Long userId)
     {
         List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
-        Set<String> permsSet = new HashSet<>();
-        for (SysRole perm : perms)
-        {
-            if (StringUtils.isNotNull(perm))
-            {
-                permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
-            }
-        }
-        return permsSet;
+
+        return perms;
     }
 
     /**