From 93e01fa050330ead95041ed11cc85e9765c19fc1 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 09 十一月 2023 12:06:52 +0800
Subject: [PATCH] 手动测试
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 55c6cf2..cd59c8f 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -13,7 +13,7 @@
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
-import com.fzzy.gateway.data.BaseResp;
+import com.fzzy.gateway.entity.GateWayTestParam;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
@@ -24,10 +24,8 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.RandomUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;
@@ -61,7 +59,20 @@
Sort sort = new Sort(Sort.Direction.ASC, "deviceId");
return gatewayDeviceRep.findAll(sort);
}
-
+ /**
+ * gatewayDeviceService#getQuery
+ * @return
+ */
+ @DataProvider
+ public GateWayTestParam getQuery() {
+ GateWayTestParam param = new GateWayTestParam();
+ param.setDayTime(new Date());
+ param.setCarNumber("宸滱12345");
+ param.setEnd(new Date());
+ param.setStart(new Date());
+ param.setWeight(25000.00);
+ return param;
+ }
/**
* gatewayDeviceService#updateSave
*
@@ -124,9 +135,9 @@
* @return
*/
@Expose
- public String ajaxTestWeight() {
- //double weigh = (double) parameter.getWeight();
- double weigh = Math.random() * (35000 - 16000 + 1) + 16000;
+ public String ajaxTestWeight(Map<String ,Object> parameter) {
+ double weigh = (double) parameter.get("weight");
+ //sdouble weigh = Math.random() * (35000 - 16000 + 1) + 16000;
List<GatewayDevice> devices = listAll();
if (devices == null || devices.size() <= 0) {
return "娌℃湁璁惧";
@@ -176,9 +187,9 @@
* @return
*/
@Expose
- public String ajaxTestLpr() {
- //String carNumber = parameter.getCarNumber();
- String carNumber = "宸滱12345";
+ public String ajaxTestLpr(Map<String ,Object> parameter) {
+ String carNumber = (String) parameter.get("carNumber");
+ //String carNumber = "宸滱12345";
List<GatewayDevice> devices = listAll();
if (devices == null || devices.size() <= 0) {
return "娌℃湁璁惧";
@@ -227,7 +238,7 @@
* @return
*/
@Expose
- public String ajaxTestGrain(GateWayTestParam parameter) {
+ public String ajaxTestGrain(Map<String ,Object> parameter) {
//鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
@@ -237,7 +248,7 @@
return "ERROR锛氫负鑾峰彇鍒扮郴缁熶腑璁惧閰嶇疆锛屽彇娑堟墽琛�";
}
- Date dayTime = (Date) parameter.getDayTime();
+ Date dayTime = (Date) parameter.get("dayTime");
if (null == dayTime) dayTime = new Date();
Date start = DateUtil.getCurZero(dayTime);
--
Gitblit v1.9.3