From d5080e501682d0325d0b965aa6d5e7aa7e0af9e1 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 31 Mar 2021 16:44:38 +0800 Subject: [PATCH] =?UTF-8?q?20210331=E6=9F=A5=E8=AF=A2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/tall/bean/vo/InputDocVo.java | 19 +++--- .../ccsens/tall/service/InputDocService.java | 67 ++++++++++++++----- 2 files changed, 60 insertions(+), 26 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java index 2db98de8..89d5ffb1 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java @@ -25,18 +25,17 @@ public class InputDocVo { private String docName; @ApiModelProperty("是否上传 0否 1是") private Byte isUpload; -// @ApiModelProperty("文档中的文件id") @ApiModelProperty("文档中的文件") private List records = new ArrayList<>(); } - @Data - @ApiModel("该记录中的文件") - public static class File{ - @ApiModelProperty("文件名称") - private String fileName; - @ApiModelProperty("文件访问路径") - private String fileUrl; - } +// @Data +// @ApiModel("该记录中的文件") +// public static class File{ +// @ApiModelProperty("文件名称") +// private String fileName; +// @ApiModelProperty("文件访问路径") +// private String fileUrl; +// } @Data @ApiModel("该文档下的记录列表") @@ -49,7 +48,7 @@ public class InputDocVo { @ApiModelProperty("备注") private String remark; @ApiModelProperty("文件列表") - private List fileList = new ArrayList<>(); + private List fileList = new ArrayList<>(); } @Data diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index 7cf8822c..37e99a99 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -6,11 +6,14 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; import com.ccsens.tall.bean.dto.InputDocDto; import com.ccsens.tall.bean.dto.LwbsDto; import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.FileVo; import com.ccsens.tall.bean.vo.InputDocVo; import com.ccsens.tall.bean.vo.LwbsVo; import com.ccsens.tall.bean.vo.TaskVo; @@ -20,13 +23,21 @@ import com.ccsens.tall.persist.mapper.*; import com.ccsens.tall.util.TaskUtil; import com.ccsens.util.CodeEnum; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.PropUtil; +import com.ccsens.util.RestTemplateUtil; import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +@Slf4j @Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) public class InputDocService implements IInputDocService { @Resource public ProMemberMapper proMemberMapper; @@ -165,24 +176,48 @@ public class InputDocService implements IInputDocService { List docByTasks = iInputDocDao.findDocByTask(param.getTaskId()); for (InputDocVo.DocOfTask docs:docByTasks){ for (InputDocVo.Record record:docs.getRecords()){ - if (record.getFileIds().contains(",")){ - String[] split = record.getFileIds().split(","); - for (int i = 0; i < split.length; i++) { - File file = fileMapper.selectByPrimaryKey(Long.valueOf(split[i])); - InputDocVo.File nowFile = new InputDocVo.File(); - nowFile.setFileName(file.getFileName()); - nowFile.setFileUrl(file.getVisitLocation()); - record.getFileList().add(nowFile); - } - }else{ - if (StrUtil.isNotBlank(record.getFileIds())){ - File file = fileMapper.selectByPrimaryKey(Long.valueOf(record.getFileIds())); - InputDocVo.File nowFile = new InputDocVo.File(); - nowFile.setFileName(file.getFileName()); - nowFile.setFileUrl(file.getVisitLocation()); - record.getFileList().add(nowFile); + if(ObjectUtil.isNotNull(record.getFileIds())) { + try { + //拆分文件id + String[] split = record.getFileIds().split(","); + List splits =new ArrayList<>(Arrays.asList(split)); + if(split.length != 0){ + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,splits); + JsonResponse> a = JSONObject.parseObject(c,JsonResponse.class); + if(ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())){ + List fileList = a.getData(); + record.setFileList(fileList); + } + } + }catch (Exception e){ + log.info("查询文件信息失败:{}", e); } + } + +// if (record.getFileIds().contains(",")){ +// String[] split = record.getFileIds().split(","); +// for (int i = 0; i < split.length; i++) { +// +// +//// File file = fileMapper.selectByPrimaryKey(Long.valueOf(split[i])); +//// InputDocVo.File nowFile = new InputDocVo.File(); +//// nowFile.setFileName(file.getFileName()); +//// nowFile.setFileUrl(file.getVisitLocation()); +//// record.getFileList().add(nowFile); +// } +// }else{ +// if (StrUtil.isNotBlank(record.getFileIds())){ +//// File file = fileMapper.selectByPrimaryKey(Long.valueOf(record.getFileIds())); +//// InputDocVo.File nowFile = new InputDocVo.File(); +//// nowFile.setFileName(file.getFileName()); +//// nowFile.setFileUrl(file.getVisitLocation()); +//// record.getFileList().add(nowFile); +// } +// } } } return docByTasks;