From 9cddb3bd1d0cd6a5bdbe263df73271bba6e654c5 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 17 三月 2025 14:15:26 +0800
Subject: [PATCH] A200代码优化及问题修复
---
src/main/java/com/whyc/util/TestParamHttpUtil.java | 8 ++--
src/main/java/com/whyc/service/DevActmTestParamService.java | 46 +++++++++++------------
src/main/java/com/whyc/dto/ResultActmBaseDto.java | 2
src/main/java/com/whyc/dto/ResultActmDto.java | 5 +-
4 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/whyc/dto/ResultActmDto2.java b/src/main/java/com/whyc/dto/ResultActmBaseDto.java
similarity index 83%
rename from src/main/java/com/whyc/dto/ResultActmDto2.java
rename to src/main/java/com/whyc/dto/ResultActmBaseDto.java
index feee629..24a873c 100644
--- a/src/main/java/com/whyc/dto/ResultActmDto2.java
+++ b/src/main/java/com/whyc/dto/ResultActmBaseDto.java
@@ -6,7 +6,7 @@
* 璇锋眰澶辫触鏃�,灏嗘湇鍔″櫒杩斿洖鐨勯敊璇俊鎭皝瑁呭埌璇ョ被涓�
*/
@Data
-public class ResultActmDto2 {
+public class ResultActmBaseDto {
String code;
String msg;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/ResultActmDto.java b/src/main/java/com/whyc/dto/ResultActmDto.java
index ce8a4df..270bbc1 100644
--- a/src/main/java/com/whyc/dto/ResultActmDto.java
+++ b/src/main/java/com/whyc/dto/ResultActmDto.java
@@ -3,9 +3,8 @@
import lombok.Data;
@Data
-public class ResultActmDto {
- String code;
- String msg;
+public class ResultActmDto extends ResultActmBaseDto{
+
ActmResDto data;
int count;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/DevActmTestParamService.java b/src/main/java/com/whyc/service/DevActmTestParamService.java
index e33c8d5..f9d0125 100644
--- a/src/main/java/com/whyc/service/DevActmTestParamService.java
+++ b/src/main/java/com/whyc/service/DevActmTestParamService.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.whyc.dto.ActmPlContDto;
-import com.whyc.dto.ActmResDto;
-import com.whyc.dto.Response;
-import com.whyc.dto.ResultActmDto;
+import com.whyc.dto.*;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.DevActmTestParamMapper;
import com.whyc.mapper.DevInfMapper;
@@ -51,10 +48,11 @@
//灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
paramMap.add("batteryStorageIndex",index);
- ResultActmDto dto= (ResultActmDto) TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
+ ResultActmBaseDto dto= TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
if(dto.getCode().equals("200")){
DevActmTestParam actmParam=new DevActmTestParam();
- copyActmDTO(dto.getData(),actmParam);
+ ResultActmDto ActmDto = (ResultActmDto) dto;
+ copyActmDTO(ActmDto.getData(),actmParam);
actmParam.setDevId(devId);
UpdateWrapper updateWrapper=new UpdateWrapper();
updateWrapper.eq("dev_id",devId);
@@ -65,7 +63,7 @@
//璁剧疆Actm鍧囪 浠弬鏁�
- public Object setActmParam(ActmResDto param) {
+ public ResultActmBaseDto setActmParam(ActmResDto param) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",param.getDevId());
wrapper.last("limit 1");
@@ -82,7 +80,7 @@
paramMap.add("testBatteryArray",param.getTestBatteryArray());
paramMap.add("voltage",param.getVoltage());
paramMap.add("current",param.getCurrent());
- ResultActmDto dto= (ResultActmDto) TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
+ ResultActmBaseDto dto= TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
return dto;
}
@@ -96,7 +94,7 @@
for (Integer devId:param.getDevIds()) {
poolExecutor.execute(() -> {
param.setDevId(devId);
- ResultActmDto dto= (ResultActmDto) setActmParam(param);
+ ResultActmBaseDto dto = setActmParam(param);
map.put(devId,dto);
latch.countDown();
});
@@ -113,7 +111,7 @@
Map<Integer,Object> map=new HashMap<>();
for (Integer devId:param.getDevIds()) {
param.setDevId(devId);
- ResultActmDto dto= (ResultActmDto) setActmParam(param);
+ ResultActmBaseDto dto= setActmParam(param);
map.put(devId,dto);
}
return new Response().setII(1,true,map,"鎵归噺璁剧疆Actm鍧囪 浠弬鏁�");
@@ -121,7 +119,7 @@
//鍚姩,鏆傚仠,缁х画,鍋滄actm鍧囪 浠�
- public Object controlActmParam(int devId,int index,int type) {
+ public ResultActmBaseDto controlActmParam(int devId,int index,int type) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",devId);
wrapper.last("limit 1");
@@ -136,7 +134,7 @@
case 4:url=url+"/stopTest";break; //鍋滄
}
paramMap.add("batteryStorageIndex",index);
- Object dto= TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
+ ResultActmBaseDto dto= TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
return dto;
}
@@ -149,7 +147,7 @@
CountDownLatch latch = new CountDownLatch(actmPlContDtos.size());
for (ActmPlContDto actmPlContDto:actmPlContDtos) {
poolExecutor.execute(() -> {
- ResultActmDto dto= (ResultActmDto) controlActmParam(actmPlContDto.getDevId(),actmPlContDto.getIndex(),actmPlContDto.getType());
+ ResultActmBaseDto dto= controlActmParam(actmPlContDto.getDevId(),actmPlContDto.getIndex(),actmPlContDto.getType());
map.put(actmPlContDto.getDevId(),dto);
latch.countDown();
});
@@ -165,14 +163,14 @@
public Response controlActmParamPl(List<Integer> devIds, int index, int type) {
Map<Integer,Object> map=new HashMap<>();
for (Integer devId:devIds) {
- ResultActmDto dto= (ResultActmDto) controlActmParam(devId,index,type);
- if(type==1){
- UpdateWrapper wrapper=new UpdateWrapper();
- wrapper.eq("dev_id",devId);
- wrapper.set("batch_state",1);
- devInfMapper.update(null,wrapper);
- }
- map.put(devId,dto);
+ ResultActmBaseDto dto= controlActmParam(devId,index,type);
+ if(type==1){
+ UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.eq("dev_id",devId);
+ wrapper.set("batch_state",1);
+ devInfMapper.update(null,wrapper);
+ }
+ map.put(devId,dto);
}
return new Response().setII(1,true,map,"鎵归噺鎺у埗Actm鍧囪 浠�");
}
@@ -193,7 +191,7 @@
actmParam.setMaxNtcCount(dto.getMaxNtcCount());
}
//璁剧疆鐢垫睜缁勬暟涓庣數姹犺妭鏁�
- public Object setActmBatteryStorageNumber(ActmResDto param) {
+ public ResultActmBaseDto setActmBatteryStorageNumber(ActmResDto param) {
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("dev_id",param.getDevId());
wrapper.last("limit 1");
@@ -203,7 +201,7 @@
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
paramMap.add("batteryStorageNumber",param.getBatteryStorageNumber());
paramMap.add("batteryNumber",param.getBatteryNumber());
- ResultActmDto dto= (ResultActmDto) TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
+ ResultActmBaseDto dto= TestParamHttpUtil.postForFormDataActm(restTemplate,url,paramMap);
return dto;
}
//鎵归噺璁捐缃數姹犵粍鏁颁笌鐢垫睜鑺傛暟
@@ -212,7 +210,7 @@
int size=param.getDevIds().size();
for (Integer devId:param.getDevIds()) {
param.setDevId(devId);
- ResultActmDto dto= (ResultActmDto) setActmBatteryStorageNumber(param);
+ ResultActmBaseDto dto= setActmBatteryStorageNumber(param);
map.put(devId,dto);
}
return new Response().setII(1,true,map,"鎵归噺璁捐缃數姹犵粍鏁颁笌鐢垫睜鑺傛暟");
diff --git a/src/main/java/com/whyc/util/TestParamHttpUtil.java b/src/main/java/com/whyc/util/TestParamHttpUtil.java
index 6a90afb..4bac504 100644
--- a/src/main/java/com/whyc/util/TestParamHttpUtil.java
+++ b/src/main/java/com/whyc/util/TestParamHttpUtil.java
@@ -2,7 +2,7 @@
import com.whyc.dto.ResultA200Dto;
import com.whyc.dto.ResultActmDto;
-import com.whyc.dto.ResultActmDto2;
+import com.whyc.dto.ResultActmBaseDto;
import org.springframework.http.*;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestClientException;
@@ -44,7 +44,7 @@
}
//post璇锋眰浼犲叆form-data 鏍煎紡
- public static Object postForFormDataActm( RestTemplate restTemplate,String url, MultiValueMap<String, Object> paramMap){
+ public static ResultActmBaseDto postForFormDataActm( RestTemplate restTemplate,String url, MultiValueMap<String, Object> paramMap){
HttpHeaders headers = new HttpHeaders();
HttpMethod method = HttpMethod.POST;
// 璁剧疆浠ヨ〃鍗曠殑鏂瑰紡鎻愪氦
@@ -72,11 +72,11 @@
}
//瀵箁esults瀛楃涓茶繘琛屽幓绌烘牸澶勭悊,鏌ョ湅鏄惁瀛樺湪"code":200鐨勫瓧绗︿覆
String resultsAfter = results.replaceAll("\\s*","");
- Object dto;
+ ResultActmBaseDto dto;
if(resultsAfter.contains("code\":200")){
dto= ActionUtil.getGson().fromJson(results, ResultActmDto.class);
}else{
- dto= ActionUtil.getGson().fromJson(results, ResultActmDto2.class);
+ dto= ActionUtil.getGson().fromJson(results, ResultActmBaseDto.class);
}
--
Gitblit v1.9.1