oss代码调整

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/controller/OssFileController.java

@@ -2,6 +2,7 @@ package com.jeeplus.pubmodules.oss.controller;
 
 import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
 import com.jeeplus.pubmodules.oss.service.OssService;
+import com.jeeplus.pubmodules.oss.service.dto.AttachmentDTO;
 import com.jeeplus.pubmodules.oss.service.dto.FileDetailDTO;
 import com.jeeplus.pubmodules.oss.service.dto.FileUrlDto;
 import io.swagger.annotations.Api;
@@ -61,8 +62,8 @@ public class OssFileController {
 
     @GetMapping("/findFileList")
     @ApiOperation(value = "查询数据")
-    public ResponseEntity<List<WorkAttachment>> findFileList(@RequestParam("attachmentId") String attachmentId) {
-        List<WorkAttachment> list = ossService.findFileList(attachmentId);
+    public ResponseEntity<List<AttachmentDTO>> findFileList(@RequestParam("attachmentId") String attachmentId) {
+        List<AttachmentDTO> list = ossService.findFileList(attachmentId);
         return ResponseEntity.ok(list);
     }
 

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/domain/WorkAttachment.java

@@ -8,7 +8,7 @@ import lombok.Data;
 
 @Data
 @TableName("work_attachment")
-public class WorkAttachment extends BaseDTO {
+public class WorkAttachment extends BaseEntity {
 
     /**
      * 附件地址

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/mapper/OssServiceMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
+import com.jeeplus.pubmodules.oss.service.dto.AttachmentDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,7 +17,7 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
 
     void updateProjectRecord(String id);
 
-    List<WorkAttachment> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+    List<AttachmentDTO> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
     void insertWorkAttachment (@Param("workAttachment") WorkAttachment workAttachment, @Param("userDto") UserDTO userDto);
 
@@ -25,5 +26,5 @@ public interface OssServiceMapper extends BaseMapper<WorkAttachment> {
      * @param workAttachment
      * @return
      */
-    List<WorkAttachment> getByAttachmentIdAndUrlAndAttachmentFlag(WorkAttachment workAttachment);
+    List<AttachmentDTO> getByAttachmentIdAndUrlAndAttachmentFlag(WorkAttachment workAttachment);
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/mapper/xml/OssServiceMapper.xml

@@ -31,12 +31,12 @@
         id = #{id})
   </update>
 
-    <select id="findList" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+    <select id="findList" resultType="com.jeeplus.pubmodules.oss.service.dto.AttachmentDTO">
         SELECT a.id, a.url, a.type, a.attachment_id, a.attachment_name, a.attachment_flag,
         a.module_type, a.attachment_type, a.file_size, a.sort, a.description,
-        a.create_date, a.create_by as "create_by.id", su.name as "createBy.name" , a.update_date, a.update_by as "updateBy.id", a.del_flag
+        a.create_time, a.create_by_id as "create_by.id", su.name as "createBy.name" , a.update_time, a.update_by_id as "updateBy.id", a.del_flag
          FROM work_attachment a
-         left join sys_user su on su.id = a.create_by
+         left join sys_user su on su.id = a.create_by_id
          ${ew.customSqlSegment}
          ORDER BY a.sort ASC;
     </select>
@@ -44,10 +44,10 @@
     <insert id="insertWorkAttachment">
         INSERT INTO work_attachment (
             id,
-            create_by,
-            create_date,
-            update_by,
-            update_date,
+            create_by_id,
+            create_time,
+            update_by_id,
+            update_time,
             del_flag,
             url,
             type,
@@ -60,9 +60,9 @@
         VALUES(
             #{workAttachment.id},
             #{userDto.id},
-            #{workAttachment.createDate},
+            #{workAttachment.createTime},
             #{userDto.id},
-            #{workAttachment.updateDate},
+            #{workAttachment.updateTime},
             #{workAttachment.delFlag},
             #{workAttachment.url},
             #{workAttachment.type},
@@ -74,12 +74,12 @@
             )
     </insert>
 
-    <select id="getByAttachmentIdAndUrlAndAttachmentFlag" resultType="com.jeeplus.pubmodules.oss.domain.WorkAttachment">
+    <select id="getByAttachmentIdAndUrlAndAttachmentFlag" resultType="com.jeeplus.pubmodules.oss.service.dto.AttachmentDTO">
         SELECT a.id, a.url, a.type, a.attachment_id, a.attachment_name, a.attachment_flag,
         a.module_type, a.attachment_type, a.file_size, a.sort, a.description,
-        a.create_date, a.create_by as "create_by.id", su.name as "createBy.name" , a.update_date, a.update_by as "updateBy.id", a.del_flag
+        a.create_time, a.create_by_id as "create_by.id", su.name as "createBy.name" , a.update_time, a.update_by_id as "updateBy.id", a.del_flag
          FROM work_attachment a
-         left join sys_user su on su.id = a.create_by
+         left join sys_user su on su.id = a.create_by_id
          <where>
              a.del_flag = 0
              <if test="attachmentId != null and attachmentId != ''">

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/service/OssService.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.pubmodules.oss.domain.WorkAttachment;
 import com.jeeplus.pubmodules.oss.mapper.OssServiceMapper;
+import com.jeeplus.pubmodules.oss.service.dto.AttachmentDTO;
 import com.jeeplus.pubmodules.oss.service.dto.FileDetailDTO;
 import com.jeeplus.pubmodules.oss.service.dto.FileUrlDto;
 import com.jeeplus.pubmodules.oss.service.dto.WorkAttachmentDto;
@@ -142,12 +143,13 @@ public class OssService extends ServiceImpl<OssServiceMapper, WorkAttachment> {
      * @param attachmentId
      * @return
      */
-    public List<WorkAttachment> findFileList(String attachmentId) {
+    public List<AttachmentDTO> findFileList(String attachmentId) {
 
         log.info("文件查询开始，入参：{}" , attachmentId);
         QueryWrapper<WorkAttachment> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq ("a.attachment_id", attachmentId );
-        List<WorkAttachment> list = ossServiceMapper.findList(queryWrapper);
+        queryWrapper.eq ("a.del_flag", "0" );
+        List<AttachmentDTO> list = ossServiceMapper.findList(queryWrapper);
         //创建人和文件名称处理
         if (CollectionUtil.isNotEmpty(list)) {
             temporaryUrl(list);
@@ -161,7 +163,7 @@ public class OssService extends ServiceImpl<OssServiceMapper, WorkAttachment> {
      * @param list
      * @return
      */
-    public List<WorkAttachment> temporaryUrl(List<WorkAttachment> list) {
+    public List<AttachmentDTO> temporaryUrl(List<AttachmentDTO> list) {
         list.stream().forEach(work -> {
             String url = null;
             if (StringUtils.isNotEmpty(work.getUrl())) {

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/service/dto/AttachmentDTO.java

@@ -0,0 +1,67 @@
+package com.jeeplus.pubmodules.oss.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+
+@Data
+public class AttachmentDTO extends BaseDTO {
+
+    /**
+     * 附件地址
+     */
+    private String url;
+
+    /**
+     * 文件类型（文件后缀名）
+     */
+    private String type;
+
+    /**
+     * 附件对应父节点id(记录是谁的id)
+     */
+    private String attachmentId;
+
+    /**
+     * 文件名
+     */
+    private String attachmentName;
+
+    /**
+     * 文件所属业务模块（数据字典配置）
+     */
+    private String attachmentFlag;
+
+    /**
+     * 所属模块子模块
+     */
+    private String moduleType;
+
+    /**
+     * 附件类型
+     */
+    private String attachmentType;
+
+    /**
+     * 附件大小
+     */
+    private String fileSize;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 文件描述
+     */
+    private String description;
+
+    /**
+     * 附件临时地址
+     *该属性不是实体字段
+     */
+    private String temporaryUrl;
+}