From 73bb5617e6aeb4ee8f7dfd4ad54b61d477969d86 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 10 六月 2025 20:22:06 +0800
Subject: [PATCH] 自动充放电自动化流程
---
src/main/java/com/whyc/service/DevA200TestParamService.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/service/DevA200TestParamService.java b/src/main/java/com/whyc/service/DevA200TestParamService.java
index 9e512c9..57fbb25 100644
--- a/src/main/java/com/whyc/service/DevA200TestParamService.java
+++ b/src/main/java/com/whyc/service/DevA200TestParamService.java
@@ -7,12 +7,12 @@
import com.whyc.dto.ResultA200Dto;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.DevA200TestParamMapper;
-import com.whyc.mapper.DevInfMapper;
+import com.whyc.mapper.DevLithiumInfMapper;
import com.whyc.pojo.db_lithium_ram_db.DevA200TestParam;
-import com.whyc.pojo.db_lithium_ram_db.DevInf;
+import com.whyc.pojo.db_lithium_ram_db.DevLithiumInf;
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;
@@ -33,7 +33,7 @@
private DevA200TestParamMapper mapper;
@Autowired(required = false)
- private DevInfMapper dinfMapper;
+ private DevLithiumInfMapper devLithiumInfMapper;
private final RestTemplate restTemplate;
@@ -64,7 +64,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
ResultA200Dto dto= getA200Dto(url);
if(dto.getCode().equals("200")){
@@ -85,14 +85,14 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",param.getDevId());
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/setTestParameter";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
//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;
}
@@ -137,12 +137,12 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/startTest";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
- paramMap.add("testType",type);//1 鏀剧數,2 鍏呯數
- ResultA200Dto dto= (ResultA200Dto) TestparamHttpUtil.postforform_dataA200(restTemplate,url,paramMap);
+ paramMap.add("testType",type);
+ ResultA200Dto dto= (ResultA200Dto) TestParamHttpUtil.postForFormDataA200(restTemplate,url,paramMap);
return dto;
}
//a200涓�浣撴満鏆傚仠/缁х画
@@ -150,12 +150,12 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/pauseTest";
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
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涓�浣撴満鏀剧數/鍏呯數
@@ -163,7 +163,7 @@
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
- DevInf dinf=dinfMapper.selectOne(wrapper);
+ DevLithiumInf dinf= devLithiumInfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/stopTest";
ResultA200Dto dto= getA200Dto(url);
return dto;
@@ -197,7 +197,7 @@
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("dev_id",devId);
wrapper.set("batch_state",1);
- dinfMapper.update(null,wrapper);
+ devLithiumInfMapper.update(null,wrapper);
map.put(devId,dto);
}
return new Response().setII(1,true,map,"鎵归噺鎺у埗a200涓�浣撴満");
@@ -240,7 +240,7 @@
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("dev_id",devId);
wrapper.set("batch_state",1);
- dinfMapper.update(null,wrapper);
+ devLithiumInfMapper.update(null,wrapper);
map.put(devId,dto);
}
return new Response().setII(1,true,map,"鎵归噺鎺у埗a200涓�浣撴満");
--
Gitblit v1.9.1