From be5e72f7f7b7edf047ea26c04e1fcf19052eeee8 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 31 Aug 2024 17:14:44 +0800
Subject: [PATCH] 1、附件管理模块修改
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java | 6 ++-
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/FileInfoBaseDTO.java | 4 ++
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java | 9 +++-
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileInfo.java | 7 +++
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java | 9 +++-
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileRelate.java | 6 +++
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileRelateMapper.xml | 6 +++
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java | 22 +++++-----
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileRelateService.java | 3 +
9 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
index f70e518..08f6165 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/FileOwnerTypeBaseEnum.java
@@ -20,9 +20,9 @@
*/
OWNER_CAT_1("22_00014-1", "申请材料"),
OWNER_CAT_2("22_00014-2", "证据材料"),
+ OWNER_CAT_7("22_00014-7", "办理材料"),
+ OWNER_CAT_5("22_00014-5", "结案材料"),
OWNER_CAT_3("22_00014-3", "身份证明材料"),
- OWNER_CAT_7("22_00014-7", "任务处理附件"),
- OWNER_CAT_5("22_00014-5", "调解结果材料"),
OWNER_CAT_6("22_00014-6", "司法确认结果材料"),
OWNER_CAT_8("22_00014-8", "模板附件"),
OWNER_CAT_4("22_00014-4", "其他材料"),
@@ -180,23 +180,23 @@
return OWNER_CAT_4.getIndex();
case "22_00018-201":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-202":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-203":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-204":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-205":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-206":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-207":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-208":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-299":
- return OWNER_CAT_3.getIndex();
+ return OWNER_CAT_1.getIndex();
case "22_00018-301":
return OWNER_CAT_5.getIndex();
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/FileInfoBaseDTO.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/FileInfoBaseDTO.java
index 262daf2..33e0c73 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/FileInfoBaseDTO.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/FileInfoBaseDTO.java
@@ -110,6 +110,10 @@
* 创建时间
*/
private Date createTime;
+ /**
+ * 所属业务主体编号，如纠纷信息编号
+ */
+ private String mainId;
/**
* 所属业务编号
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java
index 340bf13..1d1ab60 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java
@@ -66,14 +66,17 @@
/**
* 页面附件上传-文件流方式
- * @url {ctx}/api/web/fileInfo/upload/{ownerId}/{ownerType}
+ * @url {ctx}/api/web/fileInfo/upload/{mainId}/{ownerId}/{ownerType}
+ * @param mainId 所属业务主体编号
* @param ownerId 所属业务编号
* @param ownerType 所属业务类型
* @param request 请求头
* @return Object
*/
@PostMapping("/upload/{ownerId}/{ownerType}")
- public Object upload(@PathVariable(value = "ownerId") String ownerId, @PathVariable(value = "ownerType") String ownerType,
+ public Object upload(@PathVariable(value = "mainId") String mainId,
+ @PathVariable(value = "ownerId") String ownerId,
+ @PathVariable(value = "ownerType") String ownerType,
@CurrentUser String userId, MultipartHttpServletRequest request) {
try{
CtUserDTO loginUser = custClient.clientGetUser(userId);
@@ -92,7 +95,7 @@
if (StringUtils.isEmpty(ownerType)) {
ownerType = FileOwnerTypeBaseEnum.OWNER_TYPE_000.getIndex();
}
- FileInfo fileInfo = service.webPploadFile(file, ownerId, ownerType, fileCount, uploaderDTO);
+ FileInfo fileInfo = service.webUploadFile(file, mainId, ownerId, ownerType, fileCount, uploaderDTO);
FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO);
files.add(fileInfoBaseDTO);
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java
index 09a62b1..f077943 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/wechat/FileInfoWechatController.java
@@ -59,14 +59,17 @@
/**
* 页面附件上传-文件流方式
- * @url {ctx}/api/wechat/fileInfo/upload/{ownerId}/{ownerType}
+ * @url {ctx}/api/wechat/fileInfo/upload/{mainId}/{ownerId}/{ownerType}
+ * @param mainId 所属业务主体编号
* @param ownerId 所属业务编号
* @param ownerType 所属业务类型
* @param request 请求头
* @return Object
*/
@PostMapping("/upload/{ownerId}/{ownerType}")
- public Object upload(@PathVariable(value = "ownerId") String ownerId, @PathVariable(value = "ownerType") String ownerType,
+ public Object upload(@PathVariable(value = "mainId") String mainId,
+ @PathVariable(value = "ownerId") String ownerId,
+ @PathVariable(value = "ownerType") String ownerType,
@CurrentUser String userId, MultipartHttpServletRequest request) {
try{
CtUserDTO loginUser = custClient.clientGetUser(userId);
@@ -85,7 +88,7 @@
if (StringUtils.isEmpty(ownerType)) {
ownerType = FileOwnerTypeBaseEnum.OWNER_TYPE_000.getIndex();
}
- FileInfo fileInfo = service.webPploadFile(file, ownerId, ownerType, fileCount, uploaderDTO);
+ FileInfo fileInfo = service.webUploadFile(file, mainId, ownerId, ownerType, fileCount, uploaderDTO);
FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();
BeanUtils.copyProperties(fileInfo, fileInfoBaseDTO);
files.add(fileInfoBaseDTO);
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileRelateMapper.xml b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileRelateMapper.xml
index bb7588a..67c56be 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileRelateMapper.xml
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileRelateMapper.xml
@@ -13,6 +13,7 @@
<resultMap id="dataResult" type="cn.huge.module.file.domain.po.FileRelate">
<result property="id" column="id"/>
<result property="fileId" column="file_id"/>
+ <result property="mainId" column="main_id"/>
<result property="ownerId" column="owner_id"/>
<result property="ownerCat" column="owner_cat"/>
<result property="ownerType" column="owner_type"/>
@@ -29,6 +30,7 @@
<sql id="column-part">
id,
file_id,
+ main_id,
owner_id,
owner_cat,
owner_type,
@@ -42,6 +44,7 @@
<!-- 更新实体字段 -->
<sql id="set-part">
<if test="entity.fileId != null">file_id = #{entity.fileId},</if>
+ <if test="entity.mainId != null">main_id = #{entity.mainId},</if>
<if test="entity.ownerId != null">owner_id = #{entity.ownerId},</if>
<if test="entity.ownerCat != null">owner_cat = #{entity.ownerCat},</if>
<if test="entity.ownerType != null">owner_type = #{entity.ownerType},</if>
@@ -62,6 +65,9 @@
<if test="terms.fileId != null and terms.fileId !=''">
and file_id = #{terms.fileId}
</if>
+ <if test="terms.mainId != null and terms.mainId !=''">
+ and main_id = #{terms.mainId}
+ </if>
<if test="terms.ownerId != null and terms.ownerId !=''">
and owner_id = #{terms.ownerId}
</if>
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileInfo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileInfo.java
index 49f1040..1526533 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileInfo.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileInfo.java
@@ -134,6 +134,13 @@
*/
@TableField(value = "create_time")
private Date createTime;
+
+ /**
+ * 所属业务主体编号，如纠纷信息编号
+ */
+ @TableField(exist = false)
+ private String mainId;
+
/**
* 所属业务编号
*/
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileRelate.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileRelate.java
index 3fb96cd..36a5362 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileRelate.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/domain/po/FileRelate.java
@@ -33,6 +33,12 @@
private String fileId;
/**
+ * 所属业务主体编号，如纠纷信息编号
+ */
+ @TableField(value = "main_id")
+ private String mainId;
+
+ /**
* 所属业务编号
*/
@TableField(value = "owner_id")
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java
index 0271ecd..0381aa8 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java
@@ -145,7 +145,7 @@
* @param uploaderDTO 上传人信息
* @return
*/
- public FileInfo webPploadFile(MultipartFile file, String ownerId, String ownerType, int fileCount, UploaderDTO uploaderDTO) {
+ public FileInfo webUploadFile(MultipartFile file, String mainId, String ownerId, String ownerType, int fileCount, UploaderDTO uploaderDTO) {
try {
String fileId = utilsClient.getNewTimeId();
// 创建附件信息
@@ -155,6 +155,7 @@
ftpUtils.upload(fileInfo.getPath(), fileInfo.getFileName(), file.getInputStream());
// 保存附件信息
fileInfo.setName(FileOwnerTypeBaseEnum.getDes(ownerType) + BaseConsts.UNDER + fileCount);
+ fileInfo.setMainId(mainId);
fileInfo.setOwnerId(ownerId);
fileInfo.setOwnerCat(FileOwnerTypeBaseEnum.getCat(ownerType));
fileInfo.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat()));
@@ -183,7 +184,7 @@
* @param uploaderDTO 上传人信息
* @return
*/
- public FileInfo wechatPploadFile(MultipartFile file, String ownerId, String ownerType, int fileCount, UploaderDTO uploaderDTO) {
+ public FileInfo wechatUploadFile(MultipartFile file, String mainId, String ownerId, String ownerType, int fileCount, UploaderDTO uploaderDTO) {
try {
String fileId = utilsClient.getNewTimeId();
// 创建附件信息
@@ -193,6 +194,7 @@
ftpUtils.upload(fileInfo.getPath(), fileInfo.getFileName(), file.getInputStream());
// 保存附件信息
fileInfo.setName(FileOwnerTypeBaseEnum.getDes(ownerType) + BaseConsts.UNDER + fileCount);
+ fileInfo.setMainId(mainId);
fileInfo.setOwnerId(ownerId);
fileInfo.setOwnerCat(FileOwnerTypeBaseEnum.getCat(ownerType));
fileInfo.setOwnerCatName(FileOwnerTypeBaseEnum.getDes(fileInfo.getOwnerCat()));
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileRelateService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileRelateService.java
index 50aea52..1e9f06d 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileRelateService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileRelateService.java
@@ -155,6 +155,7 @@
FileRelate fileRelate = new FileRelate();
fileRelate.setId(utilsClient.getNewTimeId());
fileRelate.setFileId(fileInfo.getId());
+ fileRelate.setMainId(fileInfo.getMainId());
fileRelate.setOwnerId(fileInfo.getOwnerId());
fileRelate.setOwnerCat(fileInfo.getOwnerCat());
fileRelate.setOwnerType(fileInfo.getOwnerType());
@@ -167,7 +168,7 @@
fileRelate.setUpdateTime(nowDate);
mapper.insert(fileRelate);
} catch (Exception e) {
- log.error("service方法[FileRelateService.uploadFile]调用异常："+e, e);
+ log.error("service方法[FileRelateService.uploadFile]调用失败，异常信息："+e, e);
throw new ServiceException("FileRelateService.uploadFile", e);
}
}
--
Gitblit v1.8.0