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 | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/FGCDFileDownloadController.java b/src/main/java/com/whyc/controller/FGCDFileDownloadController.java
index 868bcd3..009c0ab 100644
--- a/src/main/java/com/whyc/controller/FGCDFileDownloadController.java
+++ b/src/main/java/com/whyc/controller/FGCDFileDownloadController.java
@@ -6,8 +6,13 @@
import io.swagger.annotations.Api;
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;
+import java.io.File;
+import java.util.ArrayList;
import java.util.List;
@RestController
@@ -17,6 +22,8 @@
@Autowired
private FGCDFileDownloadService service;
+ @Autowired
+ private Environment environment;
@GetMapping("listByDeviceId")
@ApiOperation(value = "鏁版嵁瀵煎叆")
@@ -28,9 +35,60 @@
@PostMapping("sendCmdToA059")
@ApiOperation(value = "缁堟")
public Response sendCmdToA059(@RequestParam Integer deviceId){
- service.sendCmdToA059(deviceId);
- return new Response().setII(1,"鎸囦护鍙戦�佹垚鍔�");
+ boolean cmdCheck = service.sendCmdToA059(deviceId);
+ if(cmdCheck){
+ return new Response().setII(1, true,null,"鍋滄鏂囦欢涓嬭浇鎴愬姛");
+ }
+ return new Response().setII(1, false,null,"璇诲彇鏂囦欢澶辫触");
}
+ @PutMapping("sendCmdToA059_readFile")
+ @ApiOperation(value = "璇诲彇璁惧鏂囦欢鐨刢md鍜宎ck鏍￠獙 file_index椤电爜鏁�")
+ public Response sendCmdToA059ReadFile(@RequestParam Integer deviceId,@RequestParam Integer fileIndex){
+ List cmdCheck = service.sendCmdToA059ReadFile(deviceId, fileIndex);
+ if((boolean)cmdCheck.get(0)){
+ return new Response().setII(1, true,cmdCheck.get(1),"璇诲彇鏂囦欢鎴愬姛");
+ }
+ return new Response().setII(1, false,null,"璇诲彇鏂囦欢瓒呮椂");
+ }
+
+ @PutMapping("sendCmdToA059_downloadFile")
+ @ApiOperation(value = "瀵煎叆璁惧鏂囦欢鐨刢md鍜宎ck鏍￠獙 BattGroupId 鐢垫睜缁刬d锛宖ile_index鏂囦欢瀵瑰簲鐨勭储寮曞彿")
+ public Response sendCmdToA059DownloadFile(@RequestBody FGCDFileDownload download){
+ boolean cmdCheck = service.sendCmdToA059DownloadFile(download);
+ if(cmdCheck){
+ return new Response().setII(1, true,null,"鏂囦欢寮�濮嬩笅杞芥垚鍔�");
+ }
+ return new Response().setII(1, false,null,"鏂囦欢寮�濮嬩笅杞藉け璐�");
+ }
+
+ @GetMapping("readA059Pictrue")
+ @ApiOperation(tags = "鍦ㄧ嚎鐩戞祴-瀹炴椂鐩戞帶",value = "璇诲彇A059鍐呯闀滃浘鐗�")
+ public Response readA059Pictrue(HttpServletRequest request,@RequestParam String devId){
+ /*=========鍥剧墖淇濆瓨===========*/
+ ApplicationHome applicationHome = new ApplicationHome(getClass());
+ File jarFile = applicationHome.getDir();
+ //瀛樺偍A059鍥剧墖鐨勬枃浠跺す
+ //璋冭瘯鐗�
+ //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;
+ }
+
+ //鍥剧墖鐨刄rl
+ File file = new File(fileDirName);
+ if(file.exists()){
+ File[] files = file.listFiles();
+ return new Response().set(1,files);
+ }else{
+ return new Response().set(1,new ArrayList<>());
+ }
+ }
}
--
Gitblit v1.9.1