bug修复

2024-04-07 11:10:35 +08:00
parent 9537faea90
commit 666090fbe3
21 changed files with 311 additions and 118 deletions
@@ -5,9 +5,11 @@ import cn.hutool.crypto.digest.MD5;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
@@ -22,6 +24,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

@@ -83,11 +87,20 @@ public class SysLoginController {
    public AjaxResult getInfo() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        // 角色集合
-        Set<String> roles = permissionService.getRolePermission(user);
+        List<SysRole> roles = permissionService.getRolePermission(user);
+        Set<String> permsSet = new HashSet<>();
+        for (SysRole perm : roles)
+        {
+            if (StringUtils.isNotNull(perm))
+            {
+                permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
+            }
+        }
+        user.setRoles(roles);
        // 权限集合
        Set<String> permissions = permissionService.getMenuPermission(user);
        //查询用户角色关联的案件状态
-        Set<Integer> caseStatus = caseFlowService.getCaseStatusIdByRoleKey(roles);
+        Set<Integer> caseStatus = caseFlowService.getCaseStatusIdByRoleKey(permsSet);
        AjaxResult ajax = AjaxResult.success();
        ajax.put("user", user);
        ajax.put("roles", roles);
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.AttachmentOperateTypeEnum;
+import com.ruoyi.common.enums.DocumentTypeEnum;
 import com.ruoyi.common.enums.PushCaseStatusEnum;
 import com.ruoyi.system.service.impl.BeiMingInterfaceService;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseFileInfo;
@@ -62,7 +63,7 @@ public class TestApiController {
    public AjaxResult testfile() {
 //        File file = new File("D:/WorkDoc/TJ/File/证据1.png");
        File file = new File("D:/WorkDoc/TJ/File/证据3.png");
-            MsCaseFileInfo jsonObject1 = beiMingInterfaceService.pushAttachmentInfo("BWT_MEDIATION", "86251b190e3a40f3942v215d1762c663", file, "BWT_MEDIATION", "zc2024032700012", AttachmentOperateTypeEnum.ADD);
+            MsCaseFileInfo jsonObject1 = beiMingInterfaceService.pushAttachmentInfo("BWT_MEDIATION", "86251b190e3a40f3942v215d1762c663", file, "BWT_MEDIATION", "zc2024032700012", AttachmentOperateTypeEnum.ADD, DocumentTypeEnum.EVEDENT_AGREEMENT);
        System.out.println("fanhui:" + jsonObject1.toString());
        return AjaxResult.success();
    }
@@ -6,8 +6,8 @@ spring:
        druid:
            # 主库数据源
            master:
-#                url: jdbc:mysql://121.40.189.20:3306/mediation_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
-                url: jdbc:mysql://121.40.189.20:3306/mediation_system_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
+                url: jdbc:mysql://121.40.189.20:3306/mediation_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
+#                url: jdbc:mysql://121.40.189.20:3306/mediation_system_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
                username: root
                password: YMzc157#
            # 从库数据源
@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
  # 测试环境6001，开发环境7001
-  port: 7001
+  port: 6001
  servlet:
    # 应用的访问路径
    context-path: /
@@ -72,8 +72,8 @@ spring:
    host: 121.40.189.20
    # 端口，默认为6379
    port: 6389
-    # 数据库索引
-    database: 0
+    # 数据库索引，测试环境1，正式环境0
+    database: 1
    # 密码
    password:
    # 连接超时时间
@@ -198,6 +198,11 @@ signSealCallbackConfig:
 onlyOfficeConfig:
  #  url: http://172.16.0.254:9090/files/upload
  url: http://121.40.189.20:9090/files/upload
+#  北明
+BMConfig:
+  userName: BWT_MEDIATION
+  password: 86251b190e3a40f3942v215d1762c663
+  syncSource: BWT_MEDIATION
    #jodconverter:
    #  local:
    #    host: 121.40.189.20