From ff35af8957b36ca638c6e8155db2303104515ff7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 23 Aug 2023 13:55:17 +0800
Subject: [PATCH] Merge branch 'cjl' into qa
---
screen-manage/src/main/java/com/moral/api/controller/TestController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/TestController.java b/screen-manage/src/main/java/com/moral/api/controller/TestController.java
index 35bd368..6f45837 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/TestController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/TestController.java
@@ -12,7 +12,9 @@
import com.moral.api.service.SysDictDataService;
import com.moral.api.service.TestService;
import com.moral.api.service.impl.SensorServiceImpl;
+import com.moral.api.util.AdjustDataUtils;
import com.moral.api.util.CacheUtils;
+import com.moral.api.util.CompareFieldUtils;
import com.moral.constant.Constants;
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
@@ -211,6 +213,8 @@
private SensorService sensorService;
@Autowired
SysDictDataMapper sysDictDataMapper;
+ @Autowired
+ private AdjustDataUtils adjustDataUtils;
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@@ -218,6 +222,12 @@
})
@RequestMapping(value = "getSensor", method = RequestMethod.GET)
public void getSensor() {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("time","1692364996898");
+ map.put("mac","p5dnd7a0391986");
+ HashMap<String, Object> map1 = new HashMap<>();
+ HashMap<String, Object> map2 = new HashMap<>();
+ Map<String, Object> adjust = adjustDataUtils.adjust(map, map1, map2, "2");
QueryWrapper<Sensor> queryWrapper = new QueryWrapper<>();
queryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);
List<Object> list = sensorService.listObjs(queryWrapper);
--
Gitblit v1.8.0