From ecc9404a48249519b0ce512cd6f7b22f7e6ca839 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 16 九月 2022 10:07:35 +0800
Subject: [PATCH] 台站下添加文件将文件存入数据库

---
 src/main/java/com/whyc/service/StationInfoService.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/whyc/service/StationInfoService.java b/src/main/java/com/whyc/service/StationInfoService.java
index 7e8207d..73e8638 100644
--- a/src/main/java/com/whyc/service/StationInfoService.java
+++ b/src/main/java/com/whyc/service/StationInfoService.java
@@ -12,6 +12,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -76,48 +77,53 @@
         //1.鏌ヨ鍑烘渶澶х殑鍙扮珯id(鍙湁鏈烘埧涓嬫坊鍔犱簡鏂囦欢鎵嶄細鐢熸垚鏈烘埧id)鍜屾渶澶ф枃浠秈d
         int stationIdMax=mapper.selectMaxId();
         int fileIdMax=infoMapper.selectMaxId();
+        List list=new ArrayList();
         if(file.exists()){
-            if(!filePath.contains(".xml")){
-                return new Response().set(1,false,"鍙扮珯涓嬫坊鍔犳枃浠跺け璐�,鏂囦欢涓嶆槸鎸囧畾鐨剎ml鏂囦欢");
-            }
             if(file.isFile()){
+                if(!filePath.contains(".xml")){
+                    return new Response().set(1,false,"鍙扮珯涓嬫坊鍔犳枃浠跺け璐�,鏂囦欢涓嶆槸鎸囧畾鐨剎ml鏂囦欢");
+                }
                 //2.瑙f瀽鏂囦欢骞惰ˉ鍏ㄦ枃浠秈d
                 FileInfo fileInfo=XmlFileOpreate.readXml(filePath);
                 fileInfo.setFileUrl(file.getPath());
                 fileInfo.setFileName(file.getName());
                 //4.灏嗗崟鏂囦欢鐨勬暟鎹瓨鍏ユ暟鎹簱
-                insertFileInDataBase(stationName,stationIdMax,fileIdMax,fileInfo);
+                FileInfo returnFileInfo=insertFileInDataBase(stationName,stationIdMax,fileIdMax,fileInfo);
+                list.add(returnFileInfo);
             }else{
                 //3.濡傛灉鏄枃浠跺す锛氳幏鍙栨枃浠跺す涓嬫墍鏈夌殑鏂囦欢
                 List<File> allFile= FileOpreate.getAllFile(filePath);
                 //4.灏嗘枃浠惰矾寰勪笅鐨勬墍鏈夋枃浠惰В鏋愬苟瀛樺叆鏁版嵁搴�
-                insertAllFileInDataBase(stationName,stationIdMax,fileIdMax,allFile);
+                list=insertAllFileInDataBase(stationName,stationIdMax,fileIdMax,allFile);
             }
         }else{
             flag=false;
         }
-        return new Response().set(1,flag,flag?"鍙扮珯涓嬫坊鍔犳枃浠舵垚鍔�":"鍙扮珯涓嬫坊鍔犳枃浠跺け璐�");
+        return new Response().setII(1,flag,list,flag?"鍙扮珯涓嬫坊鍔犳枃浠舵垚鍔�":"鍙扮珯涓嬫坊鍔犳枃浠跺け璐�");
     }
     //4.灏嗘枃浠惰矾寰勪笅鐨勬墍鏈夋枃浠惰В鏋愬苟瀛樺叆鏁版嵁搴�
-    private void insertAllFileInDataBase(String stationName, int stationIdMax, int fileIdMax, List<File> allFile) {
+    private List insertAllFileInDataBase(String stationName, int stationIdMax, int fileIdMax, List<File> allFile) {
+        List list=new ArrayList();
         if(allFile!=null&&allFile.size()>0){
             for (int i=0;i< allFile.size();i++){
                 File file=allFile.get(i);
                 if(!file.getName().contains(".xml")){
-
+                    continue;
                 }
                 //2.瑙f瀽鏂囦欢骞惰ˉ鍏ㄦ枃浠秈d
                 FileInfo fileInfo=XmlFileOpreate.readXml(file.getPath());
                 fileInfo.setFileUrl(file.getPath());
                 fileInfo.setFileName(file.getName());
                 //4.灏嗗崟鏂囦欢鐨勬暟鎹瓨鍏ユ暟鎹簱
-                insertFileInDataBase(stationName,stationIdMax,fileIdMax+i,fileInfo);
+                FileInfo returnFileInfo=insertFileInDataBase(stationName,stationIdMax,fileIdMax+i,fileInfo);
+                list.add(returnFileInfo);
             }
         }
+        return list;
     }
 
     //4.灏嗗崟鏂囦欢鐨勬暟鎹瓨鍏ユ暟鎹簱
-    private void insertFileInDataBase(String stationName,int stationIdMax,int fileIdMax, FileInfo fileInfo) {
+    private FileInfo insertFileInDataBase(String stationName,int stationIdMax,int fileIdMax, FileInfo fileInfo) {
         int count=0;
         int stationId=0;
         //鏌ヨ鏈�澶х殑鐢垫睜缁勫彿
@@ -172,5 +178,6 @@
                 mapper.update(null,uwrapper);
             }
         }
+        return  fileInfo;
     }
 }

--
Gitblit v1.9.1