From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改
---
src/main/java/com/whyc/controller/FGCDFileDownloadController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/FGCDFileDownloadController.java b/src/main/java/com/whyc/controller/FGCDFileDownloadController.java
index 30f4460..009c0ab 100644
--- a/src/main/java/com/whyc/controller/FGCDFileDownloadController.java
+++ b/src/main/java/com/whyc/controller/FGCDFileDownloadController.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
+import org.springframework.core.env.Environment;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -21,6 +22,8 @@
@Autowired
private FGCDFileDownloadService service;
+ @Autowired
+ private Environment environment;
@GetMapping("listByDeviceId")
@ApiOperation(value = "鏁版嵁瀵煎叆")
@@ -67,12 +70,17 @@
File jarFile = applicationHome.getDir();
//瀛樺偍A059鍥剧墖鐨勬枃浠跺す
//璋冭瘯鐗�
- String fileDirName = jarFile.getParentFile().toString()+File.separator+"A059"+File.separator+"images"+File.separator+devId;
- //鎵撳寘鐗�
- //String fileDirName = jarFile.toString()+File.separator+"A059"+File.separator+"images"+File.separator+devId;
+ //D:\GitWorkSpace\fg_v2.0\target\classes
+ int configType = Integer.parseInt(environment.getProperty("configFile.type"));
+ String fileDirName = "";
+ //娴嬭瘯鐗�
+ if(configType==1){
+ fileDirName = jarFile.getParentFile().toString()+File.separator+"A059"+File.separator+"images"+File.separator+devId;
+ }else{
+ //鎵撳寘鐗�
+ fileDirName = jarFile.toString()+File.separator+"A059"+File.separator+"images"+File.separator+devId;
+ }
- //System.out.println("jarFile:"+jarFile+" parentfile:"+jarFile.getParentFile().toString());
- //System.out.println("############:"+fileDirName);
//鍥剧墖鐨刄rl
File file = new File(fileDirName);
if(file.exists()){
--
Gitblit v1.9.1