diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysOperation.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysOperation.java index 3fcceaee..955f1643 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysOperation.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysOperation.java @@ -22,6 +22,8 @@ public class SysOperation implements Serializable { private Long taskDetailId; + private Byte doType; + private static final long serialVersionUID = 1L; public Long getId() { @@ -96,6 +98,14 @@ public class SysOperation implements Serializable { this.taskDetailId = taskDetailId; } + public Byte getDoType() { + return doType; + } + + public void setDoType(Byte doType) { + this.doType = doType; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -111,6 +121,7 @@ public class SysOperation implements Serializable { sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); sb.append(", taskDetailId=").append(taskDetailId); + sb.append(", doType=").append(doType); sb.append("]"); return sb.toString(); } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysOperationExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysOperationExample.java index fe396c2d..80844380 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysOperationExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysOperationExample.java @@ -644,6 +644,66 @@ public class SysOperationExample { addCriterion("task_detail_id not between", value1, value2, "taskDetailId"); return (Criteria) this; } + + public Criteria andDoTypeIsNull() { + addCriterion("do_type is null"); + return (Criteria) this; + } + + public Criteria andDoTypeIsNotNull() { + addCriterion("do_type is not null"); + return (Criteria) this; + } + + public Criteria andDoTypeEqualTo(Byte value) { + addCriterion("do_type =", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeNotEqualTo(Byte value) { + addCriterion("do_type <>", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeGreaterThan(Byte value) { + addCriterion("do_type >", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("do_type >=", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeLessThan(Byte value) { + addCriterion("do_type <", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeLessThanOrEqualTo(Byte value) { + addCriterion("do_type <=", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeIn(List values) { + addCriterion("do_type in", values, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeNotIn(List values) { + addCriterion("do_type not in", values, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeBetween(Byte value1, Byte value2) { + addCriterion("do_type between", value1, value2, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeNotBetween(Byte value1, Byte value2) { + addCriterion("do_type not between", value1, value2, "doType"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java index 2f9569f7..794ed709 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java @@ -41,6 +41,8 @@ public class DeliverVo { private Long deleteTime; @ApiModelProperty("交付物访问路径") private String url; + @ApiModelProperty("交付物文件名称") + private String fileName; @ApiModelProperty("WPS文件信息") private List wpsFilePaths; @ApiModelProperty("是否是历史交付物 1是 0不是") diff --git a/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java b/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java index 0c2110f4..80e76cc5 100644 --- a/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java @@ -105,37 +105,45 @@ public class SysPluginService implements ISysPluginService{ if (plugin.getFileIdList().contains(",")){ String[] split = plugin.getFileIdList().split(","); List splits =new ArrayList<>(Arrays.asList(split)); - //获取文件项目的路径 - String requestUrl = PropUtil.filedeal; - //通过文件id查询文件信息 - String c = RestTemplateUtil.postBody1(requestUrl,splits); - JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); - //遍历区分是图标还是预览图 - List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); - if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions)){ - for (int i = 0; i < filePositions.size(); i++) { - if (filePositions.get(i).getId().equals(plugin.getPluginIcon())){ - plugin.setIconUrl(filePositions.get(i)); - filePositions.remove(filePositions.get(i)); + try{ + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,splits); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + //遍历区分是图标还是预览图 + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions)){ + for (int i = 0; i < filePositions.size(); i++) { + if (filePositions.get(i).getId().equals(plugin.getPluginIcon())){ + plugin.setIconUrl(filePositions.get(i)); + filePositions.remove(filePositions.get(i)); + } } + plugin.setPreviewImgs(filePositions); } - plugin.setPreviewImgs(filePositions); + }catch (Exception e){ + log.info("查询文件信息失败:{}", e); } + }else{ //不包含逗号说明没有预览图,只有图标 List id = new ArrayList<>(); id.add(plugin.getFileIdList()); - //获取文件项目的路径 - String requestUrl = PropUtil.filedeal; - //通过文件id查询文件信息 - String c = RestTemplateUtil.postBody1(requestUrl,id); - JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + try { + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,id); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); - List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); - if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions) && !filePositions.isEmpty()){ - plugin.setIconUrl(filePositions.get(0)); + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions) && !filePositions.isEmpty()){ + plugin.setIconUrl(filePositions.get(0)); + } + }catch (Exception e){ + log.info("查询文件信息失败:{}",e); } - } }); return plugins; @@ -160,37 +168,45 @@ public class SysPluginService implements ISysPluginService{ if (plugin.getFileIdList().contains(",")){ String[] split = plugin.getFileIdList().split(","); List splits =new ArrayList<>(Arrays.asList(split)); - //获取文件项目的路径 - String requestUrl = PropUtil.filedeal; - //通过文件id查询文件信息 - String c = RestTemplateUtil.postBody1(requestUrl,splits); - JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); - //遍历区分是图标还是预览图 - List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); - if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions)){ - for (int i = 0; i < filePositions.size(); i++) { - if (filePositions.get(i).getId().equals(plugin.getPluginIcon())){ - plugin.setIconUrl(filePositions.get(i)); - filePositions.remove(filePositions.get(i)); + try { + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,splits); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + //遍历区分是图标还是预览图 + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions)){ + for (int i = 0; i < filePositions.size(); i++) { + if (filePositions.get(i).getId().equals(plugin.getPluginIcon())){ + plugin.setIconUrl(filePositions.get(i)); + filePositions.remove(filePositions.get(i)); + } } + plugin.setPreviewImgs(filePositions); } - plugin.setPreviewImgs(filePositions); + }catch (Exception e){ + log.info("获取文件信息失败",e); } + }else{ //不包含逗号说明没有预览图,只有图标 List id = new ArrayList<>(); id.add(plugin.getFileIdList()); - //获取文件项目的路径 - String requestUrl = PropUtil.filedeal; - //通过文件id查询文件信息 - String c = RestTemplateUtil.postBody1(requestUrl,id); - JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + try { + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,id); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); - List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); - if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions) && !filePositions.isEmpty()){ - plugin.setIconUrl(filePositions.get(0)); + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions) && !filePositions.isEmpty()){ + plugin.setIconUrl(filePositions.get(0)); + } + }catch (Exception e){ + log.info("获取文件信息失败"); } - } }); return new PageInfo<>(plugins); diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index 71745605..56bee546 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.ccsens.tall.bean.dto.DeliverDto; import com.ccsens.tall.bean.dto.WpsDto; import com.ccsens.tall.bean.dto.message.BaseMessageDto; @@ -12,6 +14,7 @@ import com.ccsens.tall.bean.dto.message.DeliverMessageWithDeleteDto; import com.ccsens.tall.bean.dto.message.DeliverMessageWithUploadDto; import com.ccsens.tall.bean.po.*; import com.ccsens.tall.bean.vo.DeliverVo; +import com.ccsens.tall.bean.vo.FileVo; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.persist.dao.*; @@ -469,13 +472,26 @@ public class TaskDeliverService implements ITaskDeliverService { if("1".equalsIgnoreCase(filePath.getIsHistory())){ filePath.setDeleteTime(filePath.getUpdateTime().getTime()); } - // TODO 修改文件路径为可下载路径 - List a = new ArrayList<>(); - a.add(filePath.getFileId().toString()); - + try { + // TODO 修改文件路径为可下载路径 + List id = new ArrayList<>(); + id.add(filePath.getFileId().toString()); + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,id); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + for (FileVo.FilePosition filePosition : filePositions) { + filePath.setUrl(filePosition.getVisitUrl()); + filePath.setFileName(filePosition.getName()); + } + }catch (Exception e){ + log.info("查询文件信息失败:{}", e); + } // if(StrUtil.isNotEmpty(filePath.getUrl())) { -//// filePath.setUrl(WebConstant.TEST_URL_BASE + filePath.getUrl()); +// filePath.setUrl(WebConstant.TEST_URL_BASE + filePath.getUrl()); // filePath.setUrl(PropUtil.imgDomain + "/" + filePath.getUrl()); // } if (ObjectUtil.isNotNull(filePath.getUploaderId())) { diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index f48fb9ba..162cf7f7 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -46,4 +46,5 @@ project: # redis是否需要加载 0:否 1 是 redisUpdate: 0 redisUpdateUrl: http://localhost:8001/constant/updateAll/ - filedeal: https://test.tall.wiki/file/query \ No newline at end of file + filedeal: https://test.tall.wiki/filedeal/file/query + diff --git a/tall/src/main/resources/mapper_dao/DeliverDao.xml b/tall/src/main/resources/mapper_dao/DeliverDao.xml index 3b2d40e5..144997ab 100644 --- a/tall/src/main/resources/mapper_dao/DeliverDao.xml +++ b/tall/src/main/resources/mapper_dao/DeliverDao.xml @@ -140,10 +140,9 @@ resultMap="resultMap_FilePath"> SELECT l.id as deliverLogId, - f.id as fileId, + l.file_id as fileId, l.updated_at as updateTime, l.description as description, - f.path as url, l.time as uploadTime, l.is_history as history, l.user_id as userId diff --git a/tall/src/main/resources/mapper_raw/SysOperationMapper.xml b/tall/src/main/resources/mapper_raw/SysOperationMapper.xml index 2f541658..d438d432 100644 --- a/tall/src/main/resources/mapper_raw/SysOperationMapper.xml +++ b/tall/src/main/resources/mapper_raw/SysOperationMapper.xml @@ -11,6 +11,7 @@ + @@ -72,7 +73,7 @@ id, operator_id, project_id, operate_type, operation_time, created_at, updated_at, - rec_status, task_detail_id + rec_status, task_detail_id, do_type @@ -211,6 +218,9 @@ task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + do_type = #{record.doType,jdbcType=TINYINT}, + @@ -226,7 +236,8 @@ created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT}, - task_detail_id = #{record.taskDetailId,jdbcType=BIGINT} + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + do_type = #{record.doType,jdbcType=TINYINT} @@ -258,6 +269,9 @@ task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + do_type = #{doType,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} @@ -270,7 +284,8 @@ created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT}, - task_detail_id = #{taskDetailId,jdbcType=BIGINT} + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + do_type = #{doType,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file