文件下载次数修改

efs-ftp/src/main/java/com/zjty/efs/ftp/entity/FileSave.java

@@ -20,7 +20,7 @@ import javax.persistence.Id;
 @ApiModel(value = "FileSave",description = "将文件信息存储在数据库中")
 public class FileSave {
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(name = "id",value = "文件id",notes = "文件id",example = "1")
     private Integer id;//文件id
     @ApiModelProperty(name = "realName",value = "文件真正存储名称",notes = "文件真正存储名称",example = "1(1).zip")

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

@@ -18,23 +18,27 @@ public class DownLoadServiceImpl implements DownLoadService {
 
     @Override
     public List<DownLoadCount> findCount(DownLoadRequest downLoadRequest) {
-        List<Integer> fileIdList = downLoadRequest.getFileIds();//请求的id集合
         List<DownLoadCount> loadCounts = new ArrayList<>();
-        if(fileIdList != null && fileIdList.size() != 0){
-            loadCounts = downLoadCountDao.findCount(downLoadRequest.getUserId(),fileIdList);
-            if(loadCounts.size() != fileIdList.size()){
-                //没有文件id
-                List<Integer> idList = new ArrayList<>();//数据库id集合
-                for(DownLoadCount downLoadCount:loadCounts){
-                    idList.add(downLoadCount.getFileId());
-                }
-                for(Integer i:fileIdList){
-                    if(!idList.contains(i)){
-                        DownLoadCount downLoadCount = new DownLoadCount();
-                        downLoadCount.setUserId(downLoadRequest.getUserId());
-                        downLoadCount.setFileId(i);
-                        downLoadCount.setCount(0);
-                        loadCounts.add(downLoadCount);
+        if(!downLoadRequest.getUserId().isEmpty()){
+            List<Integer> fileIdList = downLoadRequest.getFileIds();//请求的id集合
+            if(fileIdList != null && fileIdList.size() != 0){
+                loadCounts = downLoadCountDao.findCount(downLoadRequest.getUserId(),fileIdList);
+                //如果传入的文件id不存在，视为没有下载过的查询，下载过的次数为0
+                if(loadCounts.size() != fileIdList.size()){
+                    //没有文件id
+                    List<Integer> idList = new ArrayList<>();//数据库id集合
+                    for(DownLoadCount downLoadCount:loadCounts){
+                        idList.add(downLoadCount.getFileId());
+                    }
+                    //将不存在的文件下载次数设置为0
+                    for(Integer i:fileIdList){
+                        if(!idList.contains(i)){
+                            DownLoadCount downLoadCount = new DownLoadCount();
+                            downLoadCount.setUserId(downLoadRequest.getUserId());
+                            downLoadCount.setFileId(i);
+                            downLoadCount.setCount(0);
+                            loadCounts.add(downLoadCount);
+                        }
                     }
                 }
             }

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

@@ -71,7 +71,8 @@ public class FileDownLoadServiceImpl implements FileDownLoadService {
                     log.error(file.getAbsolutePath() + "文件不存在");
                     e.printStackTrace();
                 } catch (IOException e) {
-                    log.error(file.getAbsolutePath() + "文件读取异常");
+                    //log.error(file.getAbsolutePath() + "文件读取异常");
+                    log.error(file.getAbsolutePath() + "文件用户终止下载");
                     e.printStackTrace();
                 } finally {
                     try {