From ac892b6a175b752374986810f4d8aa7fdc30c0c8 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 03 九月 2024 14:24:12 +0800
Subject: [PATCH] 修改http请求
---
src/main/java/com/whyc/service/DevActmTestparamService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/DevActmTestparamService.java b/src/main/java/com/whyc/service/DevActmTestparamService.java
index 7d9c81d..fda4925 100644
--- a/src/main/java/com/whyc/service/DevActmTestparamService.java
+++ b/src/main/java/com/whyc/service/DevActmTestparamService.java
@@ -38,14 +38,16 @@
private RestTemplate restTemplate;
//璇诲彇Actm涓�浣撴満鍙傛暟
- public Object getActmParam(int devId) {
+ public Object getActmParam(int devId,int index) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
DevInf dinf=dinfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
- String results = restTemplate.postForObject(url, null, String.class);
- ResultActmDto dto= ActionUtil.getGson().fromJson(results, ResultActmDto.class);
+ //灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
+ MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
+ paramMap.add("batteryStorageIndex",index);
+ ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_dataActm(restTemplate,url,paramMap);
if(dto.getCode().equals("200")){
DevActmTestparam actmParam=new DevActmTestparam();
copyActmDTO(dto.getData(),actmParam);
@@ -69,7 +71,7 @@
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
String paramJson= JSONObject.toJSONString(param);
paramMap.add("testParameter",paramJson);
- ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_data(restTemplate,url,paramMap);
+ ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_dataActm(restTemplate,url,paramMap);
return dto;
}
@@ -112,7 +114,7 @@
case 4:url=url+"/stopTest";break; //鍋滄
}
paramMap.add("batteryStorageIndex",index);
- ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_data(restTemplate,url,paramMap);
+ ResultActmDto dto= (ResultActmDto) TestparamHttpUtil.postforform_dataActm(restTemplate,url,paramMap);
return dto;
}
--
Gitblit v1.9.1