From 4994ef802b7215b6f12bade46673db7dd2e22441 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 17 三月 2025 11:34:15 +0800
Subject: [PATCH] A200代码优化及问题修复
---
src/main/java/com/whyc/util/TestParamHttpUtil.java | 18 ++++++++++++++----
src/main/java/com/whyc/service/DevA200TestParamService.java | 8 ++++----
src/main/java/com/whyc/service/DevActmTestParamService.java | 11 +++++------
src/main/java/com/whyc/controller/DevActmTestParamController.java | 7 +++++++
4 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DevActmTestParamController.java b/src/main/java/com/whyc/controller/DevActmTestParamController.java
index 50201a5..94b9a32 100644
--- a/src/main/java/com/whyc/controller/DevActmTestParamController.java
+++ b/src/main/java/com/whyc/controller/DevActmTestParamController.java
@@ -41,6 +41,13 @@
public Object setActmParamPl2(@RequestBody ActmResDto param){
return service.setActmParamPl2(param);
}
+
+ /**
+ * @param devId
+ * @param index
+ * @param type 1:鍚姩 2:鏆傚仠 3:缁х画 4:鍋滄
+ * @return
+ */
@ApiOperation(value = "鍚姩,鏆傚仠,缁х画,鍋滄actm鍧囪 浠�")
@GetMapping("controllerActmParam")
public Object controlActmParam(@RequestParam int devId,@RequestParam int index,@RequestParam int type){
diff --git a/src/main/java/com/whyc/service/DevA200TestParamService.java b/src/main/java/com/whyc/service/DevA200TestParamService.java
index 74dff00..5a2b079 100644
--- a/src/main/java/com/whyc/service/DevA200TestParamService.java
+++ b/src/main/java/com/whyc/service/DevA200TestParamService.java
@@ -12,7 +12,7 @@
import com.whyc.pojo.db_lithium_ram_db.DevInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.JsonUtil;
-import com.whyc.util.TestparamHttpUtil;
+import com.whyc.util.TestParamHttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
@@ -92,7 +92,7 @@
//param杞琷son瀛楃涓�
String paramJson = JsonUtil.getGson().toJson(param);
paramMap.add("testParameter",paramJson);
- ResultA200Dto dto= (ResultA200Dto) TestparamHttpUtil.postforform_dataA200(restTemplate,url,paramMap);
+ ResultA200Dto dto= (ResultA200Dto) TestParamHttpUtil.postForFormDataA200(restTemplate,url,paramMap);
return dto;
}
@@ -142,7 +142,7 @@
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
paramMap.add("testType",type);
- ResultA200Dto dto= (ResultA200Dto) TestparamHttpUtil.postforform_dataA200(restTemplate,url,paramMap);
+ ResultA200Dto dto= (ResultA200Dto) TestParamHttpUtil.postForFormDataA200(restTemplate,url,paramMap);
return dto;
}
//a200涓�浣撴満鏆傚仠/缁х画
@@ -155,7 +155,7 @@
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
paramMap.add("controlType",type);//1 鏆傚仠娴嬭瘯 ,2缁х画娴嬭瘯
- ResultA200Dto dto= (ResultA200Dto) TestparamHttpUtil.postforform_dataA200(restTemplate,url,paramMap);
+ ResultA200Dto dto= (ResultA200Dto) TestParamHttpUtil.postForFormDataA200(restTemplate,url,paramMap);
return dto;
}
//鍋滄a200涓�浣撴満鏀剧數/鍏呯數
diff --git a/src/main/java/com/whyc/service/DevActmTestParamService.java b/src/main/java/com/whyc/service/DevActmTestParamService.java
index 38c1eed..e33c8d5 100644
--- a/src/main/java/com/whyc/service/DevActmTestParamService.java
+++ b/src/main/java/com/whyc/service/DevActmTestParamService.java
@@ -11,7 +11,7 @@
import com.whyc.mapper.DevInfMapper;
import com.whyc.pojo.db_lithium_ram_db.DevActmTestParam;
import com.whyc.pojo.db_lithium_ram_db.DevInf;
-import com.whyc.util.TestparamHttpUtil;
+import com.whyc.util.TestParamHttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
@@ -51,7 +51,7 @@
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
paramMap.add("batteryStorageIndex",index);
- ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_dataActm(restTemplate,url,paramMap);
+ ResultActmDto dto= (ResultActmDto) TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
if(dto.getCode().equals("200")){
DevActmTestParam actmParam=new DevActmTestParam();
copyActmDTO(dto.getData(),actmParam);
@@ -82,7 +82,7 @@
paramMap.add("testBatteryArray",param.getTestBatteryArray());
paramMap.add("voltage",param.getVoltage());
paramMap.add("current",param.getCurrent());
- ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_dataActm(restTemplate,url,paramMap);
+ ResultActmDto dto= (ResultActmDto) TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
return dto;
}
@@ -111,7 +111,6 @@
//鎵归噺璁剧疆Actm鍧囪 浠弬鏁�
public Object setActmParamPl(ActmResDto param) {
Map<Integer,Object> map=new HashMap<>();
- int size=param.getDevIds().size();
for (Integer devId:param.getDevIds()) {
param.setDevId(devId);
ResultActmDto dto= (ResultActmDto) setActmParam(param);
@@ -137,7 +136,7 @@
case 4:url=url+"/stopTest";break; //鍋滄
}
paramMap.add("batteryStorageIndex",index);
- ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_dataActm(restTemplate,url,paramMap);
+ Object dto= TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
return dto;
}
@@ -204,7 +203,7 @@
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
paramMap.add("batteryStorageNumber",param.getBatteryStorageNumber());
paramMap.add("batteryNumber",param.getBatteryNumber());
- ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_dataActm(restTemplate,url,paramMap);
+ ResultActmDto dto= (ResultActmDto) TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
return dto;
}
//鎵归噺璁捐缃數姹犵粍鏁颁笌鐢垫睜鑺傛暟
diff --git a/src/main/java/com/whyc/util/TestparamHttpUtil.java b/src/main/java/com/whyc/util/TestParamHttpUtil.java
similarity index 79%
rename from src/main/java/com/whyc/util/TestparamHttpUtil.java
rename to src/main/java/com/whyc/util/TestParamHttpUtil.java
index 3a14be9..6a90afb 100644
--- a/src/main/java/com/whyc/util/TestparamHttpUtil.java
+++ b/src/main/java/com/whyc/util/TestParamHttpUtil.java
@@ -2,17 +2,18 @@
import com.whyc.dto.ResultA200Dto;
import com.whyc.dto.ResultActmDto;
+import com.whyc.dto.ResultActmDto2;
import org.springframework.http.*;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
-public class TestparamHttpUtil {
+public class TestParamHttpUtil {
//post璇锋眰浼犲叆form-data 鏍煎紡
- public static Object postforform_dataA200( RestTemplate restTemplate,String url, MultiValueMap<String, Object> paramMap){
+ public static Object postForFormDataA200( RestTemplate restTemplate,String url, MultiValueMap<String, Object> paramMap){
HttpHeaders headers = new HttpHeaders();
HttpMethod method = HttpMethod.POST;
// 璁剧疆浠ヨ〃鍗曠殑鏂瑰紡鎻愪氦
@@ -43,7 +44,7 @@
}
//post璇锋眰浼犲叆form-data 鏍煎紡
- public static Object postforform_dataActm( RestTemplate restTemplate,String url, MultiValueMap<String, Object> paramMap){
+ public static Object postForFormDataActm( RestTemplate restTemplate,String url, MultiValueMap<String, Object> paramMap){
HttpHeaders headers = new HttpHeaders();
HttpMethod method = HttpMethod.POST;
// 璁剧疆浠ヨ〃鍗曠殑鏂瑰紡鎻愪氦
@@ -69,7 +70,16 @@
" \"count\": 0\n" +
" }";
}
- Object dto= ActionUtil.getGson().fromJson(results, ResultActmDto.class);
+ //瀵箁esults瀛楃涓茶繘琛屽幓绌烘牸澶勭悊,鏌ョ湅鏄惁瀛樺湪"code":200鐨勫瓧绗︿覆
+ String resultsAfter = results.replaceAll("\\s*","");
+ Object dto;
+ if(resultsAfter.contains("code\":200")){
+ dto= ActionUtil.getGson().fromJson(results, ResultActmDto.class);
+ }else{
+ dto= ActionUtil.getGson().fromJson(results, ResultActmDto2.class);
+ }
+
+
return dto;
}
--
Gitblit v1.9.1