仲裁系统bug修复
This commit is contained in:
18792927508
@@ -1,10 +1,20 @@
|
||||
package com.ruoyi;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.ruoyi.common.constant.CacheConstants;
|
||||
import com.ruoyi.common.core.domain.entity.SysRole;
|
||||
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.SysRoleMapper;
|
||||
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 java.util.List;
|
||||
|
||||
/**
|
||||
* 启动程序
|
||||
*
|
||||
@@ -24,5 +34,22 @@ 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);
|
||||
}
|
||||
}
|
||||
// 初始化角色redis
|
||||
SysRoleMapper roleMapper = SpringUtils.getBean(SysRoleMapper.class);
|
||||
List<SysRole> roles = roleMapper.selectRoleList(new SysRole());
|
||||
if(CollectionUtil.isNotEmpty(roles)){
|
||||
for (SysRole role : roles) {
|
||||
redisCache.setCacheObject(CacheConstants.ROLE_KEY+role.getRoleName(),role.getRoleId());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+13
@@ -585,4 +585,17 @@ public class CaseApplicationController extends BaseController {
|
||||
}
|
||||
return caseApplicationService.updateCaseIdByAnnexId(caseAttach);
|
||||
}
|
||||
/**
|
||||
* 保存onlyOffice在线编辑的文件
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/saveOnlyOfficeFile")
|
||||
public AjaxResult saveOnlyOfficeFile( @RequestBody CaseAttach caseAttach) {
|
||||
if(caseAttach.getCaseAppliId()==null||StrUtil.isEmpty(caseAttach.getOnlyOfficeFileId())||StrUtil.isEmpty(caseAttach.getAnnexPath())){
|
||||
return error("参数校验失败");
|
||||
}
|
||||
|
||||
return caseApplicationService.saveOnlyOfficeFile(caseAttach);
|
||||
}
|
||||
}
|
||||
|
||||
+5
-4
@@ -6,6 +6,7 @@ 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.CaseAttach;
|
||||
import com.ruoyi.wisdomarbitrate.domain.CaseEvidenceDirectory;
|
||||
import com.ruoyi.wisdomarbitrate.domain.dto.CaseEvidenceDTO;
|
||||
import com.ruoyi.wisdomarbitrate.domain.vo.CaseEvidenceVO;
|
||||
@@ -101,16 +102,16 @@ public class CaseEvidenceController extends BaseController {
|
||||
|
||||
/**
|
||||
* 删除附件
|
||||
* @param fileIds
|
||||
* @param caseAttach
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/deleteFile")
|
||||
public AjaxResult deleteFile( @RequestParam("fileIds") List<Integer> fileIds){
|
||||
public AjaxResult deleteFile(@RequestBody CaseAttach caseAttach){
|
||||
|
||||
if(CollectionUtil.isEmpty(fileIds)){
|
||||
if(CollectionUtil.isEmpty(caseAttach.getFileIds())){
|
||||
return error("附件id不能为空");
|
||||
}
|
||||
return toAjax(caseEvidenceService.deleteFile( fileIds));
|
||||
return success(caseEvidenceService.deleteFile( caseAttach.getFileIds()));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,8 @@ 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/test_smart_arbitration?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
|
||||
# url: jdbc:mysql://121.40.189.20:3306/smart_arbitration?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
|
||||
username: root
|
||||
password: YMzc157#
|
||||
# 从库数据源
|
||||
|
||||
@@ -17,7 +17,7 @@ ruoyi:
|
||||
|
||||
# 开发环境配置
|
||||
server:
|
||||
# 服务器的HTTP端口，默认为8080
|
||||
# 服务器的HTTP端口，默认为8001,正式9001
|
||||
port: 8001
|
||||
servlet:
|
||||
# 应用的访问路径
|
||||
@@ -58,9 +58,9 @@ spring:
|
||||
servlet:
|
||||
multipart:
|
||||
# 单个文件大小
|
||||
max-file-size: 50MB
|
||||
max-file-size: 1000MB
|
||||
# 设置总上传的文件大小
|
||||
max-request-size: 500MB
|
||||
max-request-size: 10000MB
|
||||
# 服务模块
|
||||
devtools:
|
||||
restart:
|
||||
@@ -72,8 +72,8 @@ spring:
|
||||
host: 121.40.189.20
|
||||
# 端口，默认为6379
|
||||
port: 6389
|
||||
# 数据库索引
|
||||
database: 0
|
||||
# 数据库索引,2-正式，3-测试
|
||||
database: 3
|
||||
# 密码
|
||||
password:
|
||||
# 连接超时时间
|
||||
@@ -121,7 +121,7 @@ token:
|
||||
# 令牌密钥
|
||||
secret: abcdefghijklmnopqrstuvwxyz
|
||||
# 令牌有效期（默认30分钟）
|
||||
expireTime: 30
|
||||
expireTime: 1200
|
||||
|
||||
# MyBatis配置
|
||||
mybatis:
|
||||
@@ -183,6 +183,14 @@ imConfig:
|
||||
secretId: AKID3xfHgroY4MQHvLXUXMwIQL1UjmbBX1Tv
|
||||
# 腾讯云密钥
|
||||
secretKey: INDrIXcT8YmomZBcsy0oNirnU0LTN4X7
|
||||
# onlyOffice系统url配置
|
||||
onlyOfficeConfig:
|
||||
# url: http://172.16.0.254:9090/files/upload
|
||||
url: http://121.40.189.20:9090/files/upload
|
||||
# 调解机构代码配置
|
||||
organizeConfig:
|
||||
# creditCode
|
||||
creditCode: 910000058386410044
|
||||
#jodconverter:
|
||||
# local:
|
||||
# host: 121.40.189.20
|
||||
|
||||
Reference in New Issue
Block a user