From 512733908ae4f3a851f40f0551724d2186ce56ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 11:20:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/MyFileAction.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/MyFileAction.java b/gx_tieta/src/com/fgkj/actions/MyFileAction.java
index daf7162..8e6bd5f 100644
--- a/gx_tieta/src/com/fgkj/actions/MyFileAction.java
+++ b/gx_tieta/src/com/fgkj/actions/MyFileAction.java
@@ -183,7 +183,7 @@
boolean isSuccess = false;
String loadpath = ActionUtil.getSession().getServletContext().getRealPath("/");
String str = new File(loadpath).getParentFile().getAbsolutePath(); //鑾峰彇鏈嶅姟鍣ㄦ墍鍦ㄧ殑缁濆璺緞
- String root = str+"/"+fileRoot+"/"+binf.getStationId()+"/video/"; // 涓婁紶璺緞
+ String root = str+"/"+fileRoot+"/"+binf.getStationId()+"/"+binf.getVideoOrImage()+"/"; // 涓婁紶璺緞
for(int i=0;i<file.length && binf != null;i++){
String filePath = root+fileFileName[i];
createFilefolderIFNotExist(filePath);
@@ -211,8 +211,8 @@
ServiceModel model = new ServiceModel();
String loadpath = ActionUtil.getSession().getServletContext().getRealPath("/");
String str = new File(loadpath).getParentFile().getAbsolutePath();
- if(binf != null && binf.getStationId() != null && binf.getStationName() != null){
- String filesource = str+File.separator+fileRoot+File.separator+binf.getStationId()+File.separator+binf.getStationName()+File.separator; //褰撳墠璇锋眰鐨勬満鎴挎墍鍦ㄧ殑璧勬簮鏂囦欢澶�
+ if(binf != null && binf.getStationId() != null && binf.getVideoOrImage() != null){
+ String filesource = str+File.separator+fileRoot+File.separator+binf.getStationId()+File.separator+binf.getVideoOrImage()+File.separator; //褰撳墠璇锋眰鐨勬満鎴挎墍鍦ㄧ殑璧勬簮鏂囦欢澶�
//System.out.println(filesource);
File source = new File(filesource);
File[] files = source.listFiles();
--
Gitblit v1.9.1