Merge branch 'develop' of 192.168.1.249:LJJ/encrypted-file-system

efs-ftp/src/main/java/com/zjty/efs/ftp/controller/DownLoadCountController.java

 package com.zjty.efs.ftp.controller;
 
 import com.zjty.efs.ftp.base.response.ServerResponse;
+import com.zjty.efs.ftp.entity.DownLoadCount;
 import com.zjty.efs.ftp.entity.DownLoadRequest;
 import com.zjty.efs.ftp.service.DownLoadService;
 import com.zjty.efs.misc.config.AutoDocument;
@@ -10,6 +11,8 @@ import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @AutoDocument
 @RestController
 @RequestMapping("/count")
@@ -22,7 +25,7 @@ public class DownLoadCountController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "DownLoadRequest",value = "看下面model",paramType = "query",required = true)
     })
-    public ServerResponse findCount(@RequestBody DownLoadRequest downLoadRequest){
+    public List<DownLoadCount> findCount(@RequestBody DownLoadRequest downLoadRequest){
         return downLoadService.findCount(downLoadRequest);
     }
 }

efs-ftp/src/main/java/com/zjty/efs/ftp/service/DownLoadService.java

 package com.zjty.efs.ftp.service;
 
 import com.zjty.efs.ftp.base.response.ServerResponse;
+import com.zjty.efs.ftp.entity.DownLoadCount;
 import com.zjty.efs.ftp.entity.DownLoadRequest;
 
+import java.util.List;
+
 public interface DownLoadService {
 
     /**
@@ -10,5 +13,5 @@ public interface DownLoadService {
      * @param downLoadRequest
      * @return
      */
-    ServerResponse findCount(DownLoadRequest downLoadRequest);
+    List<DownLoadCount> findCount(DownLoadRequest downLoadRequest);
 }

efs-ftp/src/main/java/com/zjty/efs/ftp/service/impl/DownLoadServiceImpl.java

@@ -17,7 +17,7 @@ public class DownLoadServiceImpl implements DownLoadService {
     private DownLoadCountDao downLoadCountDao;
 
     @Override
-    public ServerResponse findCount(DownLoadRequest downLoadRequest) {
+    public List<DownLoadCount> findCount(DownLoadRequest downLoadRequest) {
         List<Integer> fileIdList = downLoadRequest.getFileIds();//请求的id集合
         List<DownLoadCount> loadCounts = new ArrayList<>();
         if(fileIdList != null && fileIdList.size() != 0){
@@ -39,6 +39,7 @@ public class DownLoadServiceImpl implements DownLoadService {
                 }
             }
         }
-        return ServerResponse.success(loadCounts);
+        return loadCounts;
     }
+
 }