20210331v1.0

pom.xml

@@ -55,7 +55,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.1.0.Final</version>
+        </dependency>
         <!-- spring MyBatis -->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>

src/main/java/com/ccsens/filedeal/FileDealApplication.java

@@ -15,9 +15,6 @@ public class FileDealApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(FileDealApplication.class, args);
-
-
-
     }
 
 }

src/main/java/com/ccsens/filedeal/api/DebugController.java

@@ -1,8 +1,16 @@
 package com.ccsens.filedeal.api;
 
+import com.ccsens.filedeal.util.JsonResponse;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * @description:
  * @author: whj
@@ -16,4 +24,12 @@ public class DebugController {
     public String index(){
         return "hello world";
     }
+
+    @ApiOperation(value = "/测试",notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="cs",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"})
+    public JsonResponse getSmsCode(@RequestBody List<Long> files) throws Exception {
+        return JsonResponse.newInstance().ok("测试");
+    }
 }

src/main/java/com/ccsens/filedeal/api/FileController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
@@ -94,6 +95,19 @@ public class FileController {
         return JsonResponse.newInstance().ok(vos);
     }
 
+    @ApiOperation(value = "通过id批量查询文件信息")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<FileVo.FilePosition>> queryById(@RequestBody List<Long> files) throws IOException {
+        log.info("通过id批量查询文件信息：{}", files);
+        List<FileVo.FilePosition> filePosition = fileService.queryById(files);
+        log.info("通过id批量查询文件信息成功");
+        return JsonResponse.newInstance().ok(filePosition);
+    }
+
+
+
     private Long getUserId(HttpServletRequest request) {
         String userIdStr = request.getParameter("userId");
         return StrUtil.isEmpty(userIdStr) ? null : Long.parseLong(userIdStr);
@@ -133,6 +147,8 @@ public class FileController {
         return JsonResponse.newInstance().ok(content);
     }
 
+
+
 //    @GetMapping(value = "test/{id}")
 //    public void test(@PathVariable("id")long id) throws IOException {
 //        ResponseEntity<JSONObject> entity = restTemplate.getForEntity("http://localhost:8001/file/read/" + id + "?start=0&end=-1", JSONObject.class);

src/main/java/com/ccsens/filedeal/bean/dto/FileDto.java

@@ -1,11 +1,12 @@
 package com.ccsens.filedeal.bean.dto;
 
-import com.sun.istack.internal.NotNull;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @description:
  * @author: whj
@@ -25,6 +26,7 @@ public class FileDto {
         @NotNull
         @ApiModelProperty("文件名")
         private String fileName;
+        @NotNull
         @ApiModelProperty("文件传输任务ID")
         private String taskId;
         @ApiModelProperty("分片总数")

src/main/java/com/ccsens/filedeal/bean/vo/FileVo.java

@@ -46,7 +46,7 @@ public class FileVo {
         private String name;
         @ApiModelProperty("存储路径")
         private String path;
-        @ApiModelProperty("存储路径")
+        @ApiModelProperty("查看路径")
         private String visitUrl;
     }
 

src/main/java/com/ccsens/filedeal/persist/dao/FileDao.java

@@ -5,6 +5,8 @@ import com.ccsens.filedeal.bean.vo.FileVo;
 import com.ccsens.filedeal.persist.mapper.FileCommitMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author whj
  */
@@ -49,4 +51,11 @@ public interface FileDao extends FileCommitMapper {
      * @param resultId resultId
      */
     void updateCommitStatus(@Param("resultId") long resultId);
+
+    /**
+     * 根据文件id查询文件（批量查询）
+     * @param files 文件id集合
+     * @return 返回文件信息
+     */
+    List<FileVo.FilePosition> queryById(@Param("files")List<Long> files);
 }

src/main/java/com/ccsens/filedeal/service/FileService.java

@@ -603,4 +603,9 @@ public class FileService extends AbstractRedisService implements IFileService {
         }
         return null;
     }
+
+    @Override
+    public List<FileVo.FilePosition> queryById(List<Long> files) {
+        return fileDao.queryById(files);
+    }
 }

src/main/java/com/ccsens/filedeal/service/IFileService.java

@@ -66,4 +66,11 @@ public interface IFileService {
      * @return
      */
     FileVo.BigFileCheck bigFileCheck(FileDto.BigFileCheck fileCheck, long userId) throws IOException;
+
+    /**
+     * 通过id批量查询文件信息
+     * @param files 文件id集合
+     * @return 返回文件信息集合
+     */
+    List<FileVo.FilePosition> queryById(List<Long> files);
 }

src/main/resources/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8000
+  port: 8001
 spring:
   snowflake:
     datacenterId: 1

src/main/resources/druid-test.yml

@@ -28,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://test.tall.wiki/filedeal?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://test.tall.wiki/common?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

src/main/resources/mapper_dao/FileDao.xml

@@ -82,4 +82,22 @@
             AND c.rec_status = 0
             AND r.id = #{resultId}
     </select>
+    <select id="queryById" resultType="com.ccsens.filedeal.bean.vo.FileVo$FilePosition">
+        SELECT
+            l.id,
+            l.name,
+            c.path,
+            c.visit_path as visitUrl
+        FROM
+            t_file_link l,
+            t_file_commit c
+        WHERE
+            l.commit_id = c.id
+            AND l.id in
+            <foreach collection="files" open="(" close=")" separator="," item="item">
+                #{item}
+            </foreach>
+            AND l.rec_status = 0
+            AND c.rec_status = 0
+    </select>
 </mapper>