From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 10:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/controller/TestController.java | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 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 43b908a..6222d6d 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
@@ -1,11 +1,19 @@
package com.moral.api.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Sensor;
+import com.moral.api.entity.SysDictData;
import com.moral.api.entity.Test;
import com.moral.api.entity.UnitConversion;
+import com.moral.api.mapper.SysDictDataMapper;
+import com.moral.api.pojo.dto.account.AccountDTO;
+import com.moral.api.pojo.dto.accountRole.AccountRoleDTO;
+import com.moral.api.pojo.dto.adjust.AdjustDTO;
+import com.moral.api.service.DeviceService;
import com.moral.api.service.SensorService;
+import com.moral.api.service.SysDictDataService;
import com.moral.api.service.TestService;
import com.moral.api.service.impl.SensorServiceImpl;
import com.moral.api.util.CacheUtils;
@@ -24,14 +32,21 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.*;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
@Slf4j
@@ -48,6 +63,7 @@
@Autowired
RedisTemplate redisTemplate;
+
/**
* name ������
@@ -79,7 +95,7 @@
@RequestMapping(value = "search/{page}/{size}", method = RequestMethod.GET)
public ResultMessage findBypage(@PathVariable("page") Integer page, @PathVariable("size") Integer size) {
- log.info("page is:" + page + " size is:" + size);
+ //log.info("page is:" + page + " size is:" + size);
//������������������������
Page<Test> userPage = testService.selectByPage(null, page, size);
//������������������������
@@ -197,6 +213,11 @@
@Autowired
private SensorService sensorService;
+ @Autowired
+ SysDictDataMapper sysDictDataMapper;
+
+ @Autowired
+ private DeviceService deviceService;
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@@ -204,18 +225,34 @@
})
@RequestMapping(value = "getSensor", method = RequestMethod.GET)
public void getSensor() {
- 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(){
- List<UnitConversion> range = redisTemplate.opsForList().range(RedisConstants.UNIT_CONVERSION, 0, -1);
- System.out.println(range);
+ HashMap<String, Object> deviceData = new HashMap<>();
+ deviceData.put("time","1691996716839");
+ deviceData.put("DataTime","20230814150000");
+ deviceData.put("mac","p5dnd7a0245362");
+ deviceData.put("a00e12","11479.2");
+ deviceData.put("a00e13","44.0");
+ deviceData.put("a21005","0.0264");
+ deviceData.put("a21004","20.0");
+ deviceData.put("a21026","30.5");
+ deviceData.put("a01001","38.1");
+ deviceData.put("a05024","279.6");
+ deviceData.put("a01002","54.2");
+ deviceData.put("a01007","2.45");
+ deviceData.put("a01006","805.834");
+ deviceData.put("a01008","102.0");
+ deviceData.put("a34002","4.9");
+ deviceData.put("a34004","4.9");
+ deviceData.put("a00e03","798.5");
+ deviceData.put("a00e04","2.9");
+ deviceData.put("a99054","0.0348");
+ deviceData.put("a31001","0.1");
+ Map<String, Object> map = deviceService.adjustDeviceData(deviceData, "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);
+// }
}
}
--
Gitblit v1.8.0