From 3fb93c6ca8bd5487ac900c3434824f421e024986 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 25 Aug 2021 11:57:55 +0800
Subject: [PATCH] screen-common 修复日志工具类BUG
---
screen-manage/src/main/java/com/moral/api/controller/TestController.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 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 12d9db2..43b908a 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,8 +1,17 @@
package com.moral.api.controller;
+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.Test;
+import com.moral.api.entity.UnitConversion;
+import com.moral.api.service.SensorService;
import com.moral.api.service.TestService;
+import com.moral.api.service.impl.SensorServiceImpl;
+import com.moral.api.util.CacheUtils;
+import com.moral.constant.Constants;
+import com.moral.constant.KafkaConstants;
+import com.moral.constant.RedisConstants;
import com.moral.constant.ResultMessage;
import com.moral.redis.RedisUtil;
import com.moral.util.PageResult;
@@ -15,12 +24,14 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.*;
+import java.util.List;
@Slf4j
@@ -34,6 +45,9 @@
@Resource
private TestService testService;
+
+ @Autowired
+ RedisTemplate redisTemplate;
/**
* name ������
@@ -100,15 +114,31 @@
}
/**
- * kafka������
+ * ������������kafka������
*/
@ApiOperation(value = "kafka������", notes = "kafka������")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "data", value = "data", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
- @RequestMapping(value = "kafkaTest", method = RequestMethod.GET)
- public void kafkaTest() {
- kafkaTemplate.send("test_topic", "{'mac': 'p5dnd1234567','DataTime':1623058244104,'e1':10,'e2':20,'ver':2}");
+ @RequestMapping(value = "minuteKafkaTest", method = RequestMethod.GET)
+ public void minuteKafkaTest(String data) {
+ System.out.println(data);
+ kafkaTemplate.send(KafkaConstants.TOPIC_MINUTE, data);
+ }
+
+ /**
+ * ������������kafka������
+ */
+ @ApiOperation(value = "kafka������", notes = "kafka������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "data", value = "data", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "hourKafkaTest", method = RequestMethod.GET)
+ public void hourKafkaTest(String data) {
+ System.out.println(data);
+ kafkaTemplate.send(KafkaConstants.TOPIC_HOUR, data);
}
@GetMapping("testToken")
@@ -164,4 +194,28 @@
writer.close();
fis.close();
}
+
+ @Autowired
+ private SensorService sensorService;
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @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);
+ }
+
}
--
Gitblit v1.8.0