From ca46c59e66ab37c12d4770f46aff8c631743f28c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 03 九月 2024 09:44:38 +0800
Subject: [PATCH] actm
---
src/main/java/com/whyc/service/DevA200TestparamService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/service/DevA200TestparamService.java b/src/main/java/com/whyc/service/DevA200TestparamService.java
index 1abe51f..f575358 100644
--- a/src/main/java/com/whyc/service/DevA200TestparamService.java
+++ b/src/main/java/com/whyc/service/DevA200TestparamService.java
@@ -5,19 +5,24 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.whyc.dto.A200ResDto;
import com.whyc.dto.Response;
-import com.whyc.dto.ResultDto;
+import com.whyc.dto.ResultA200Dto;
import com.whyc.mapper.DevA200TestparamMapper;
import com.whyc.mapper.DevInfMapper;
import com.whyc.pojo.db_lithium_ram_db.DevA200Testparam;
-import com.whyc.pojo.db_lithium_ram_db.DevActmTestparam;
import com.whyc.pojo.db_lithium_ram_db.DevInf;
import com.whyc.util.ActionUtil;
+import com.whyc.util.TestparamHttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Service
public class DevA200TestparamService {
@@ -38,7 +43,7 @@
DevInf dinf=dinfMapper.selectOne(wrapper);
String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter";
String results = restTemplate.postForObject(url, null, String.class);
- ResultDto dto= ActionUtil.getGson().fromJson(results,ResultDto.class);
+ ResultA200Dto dto= ActionUtil.getGson().fromJson(results, ResultA200Dto.class);
if(dto.getCode().equals("200")){
DevA200Testparam a200Param=new DevA200Testparam();
copyA200DTO(dto.getData(),a200Param);
@@ -48,23 +53,50 @@
updateWrapper.eq("dev_id",devId);
mapper.update(a200Param,updateWrapper);
}
- //System.out.println(results);
- /*ResultDto dto= JSONObject.parseObject(results,ResultDto.class);
- A200ResDto a200= JSONObject.parseObject(dto.getData().toString(),A200ResDto.class);*/
- //System.out.println(dto.toString());
return dto;
}
//璁剧疆a200鍧囪 浠弬鏁�
- public Response setA200Param(DevActmTestparam param) {
- return new Response().set(1,true,"璁剧疆a200鍧囪 浠弬鏁�");
+ public Object setA200Param(A200ResDto param,int devId) {
+ 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/setTestParameter";
+ //灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
+ MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
+ String paramJson=JSONObject.toJSONString(param);
+ paramMap.add("testParameter",paramJson);
+ ResultA200Dto dto= (ResultA200Dto) TestparamHttpUtil.postforform_data(restTemplate,url,paramMap);
+ return dto;
}
- //鎺у埗a200鍧囪 浠�
- public Response controllA200Param(int devId) {
- return new Response().set(1,true,"鎺у埗a200鍧囪 浠�");
+ //鍚姩a200鍧囪 浠斁鐢�/鍏呯數
+ public Object startA200Param(int devId,int type) {
+ 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/startTest";
+ //灏嗚姹傚ご閮ㄥ拰鍙傛暟鍚堟垚涓�涓姹�
+ MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
+ paramMap.add("testType",type);
+ ResultA200Dto dto= (ResultA200Dto) TestparamHttpUtil.postforform_data(restTemplate,url,paramMap);
+ return dto;
}
+ //鍋滄a200鍧囪 浠斁鐢�/鍏呯數
+ public Object stopA200Param(int devId) {
+ 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/stopTest";
+ String results = restTemplate.postForObject(url, null, String.class);
+ ResultA200Dto dto= ActionUtil.getGson().fromJson(results, ResultA200Dto.class);
+ return dto;
+ }
+
//鎵归噺鎺у埗a200鍧囪 浠�
public Response controllA200ParamPl(List<Integer> devIds) {
return new Response().set(1,true,"鎵归噺鎺у埗a200鍧囪 浠�");
@@ -114,4 +146,6 @@
a200Param.setChargePower(dto.getChargePower());
a200Param.setBatteryTemperatureProtect(dto.getBatteryTemperatureProtect());
}
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1