From b9fd2657a3d528881e4d1f7cae12ca8e2d63951a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 30 Aug 2023 09:33:31 +0800
Subject: [PATCH] fix:补充提交
---
screen-manage/src/main/java/com/moral/api/controller/TestController.java | 51 ++++++++++-----------------------------------------
1 files changed, 10 insertions(+), 41 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 ae87dd1..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,53 +222,18 @@
})
@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);
for (Object o : list) {
System.out.println(o);
}
- }
-
- @GetMapping("test")
- public void test() throws IOException {
- BufferedReader br = new BufferedReader(new FileReader(new File("C:\\Users\\cdl\\Desktop\\alarmLevels.json")));
- StringBuilder sb = new StringBuilder();
- String line = br.readLine();
- while (line != null) {
- sb.append(line + "\r\n");
- line = br.readLine();
- }
-
- Map map = JSON.parseObject(sb.toString(), Map.class);
- System.out.println(map);
-
- Map<String,Object> sensorMap = (Map<String, Object>) map.get("alarmLevels");
-
- Set<String> sets = sensorMap.keySet();
-
- Map<String,String> alarmLevels = new HashMap<>();
- for (String set : sets) {
- Map<String,Object> map2 = (Map<String, Object>) sensorMap.get(set);
- String increment = map2.get("increment").toString();
- alarmLevels.put(set,increment);
- }
- alarmLevels.remove("AQI");
- Map<String,Object> resultMap = new HashMap<>();
- Map<String, String> ecodeMap = testService.getMap();
-
- alarmLevels.forEach((key,value)->{
- resultMap.put(ecodeMap.get(key),value);
- });
-
- resultMap.forEach((key,value)->{
- SysDictData sysDictData = new SysDictData();
- sysDictData.setDataKey(key);
- sysDictData.setDataValue(value.toString());
- sysDictData.setDictTypeId(25);
- sysDictDataMapper.insert(sysDictData);
- });
-
}
}
--
Gitblit v1.8.0