From 17d054803583cd870dc15dc16551563ff619c658 Mon Sep 17 00:00:00 2001
From: jpy <812110275@qq.com>
Date: Sat, 27 May 2023 16:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-manage/src/main/java/com/moral/api/controller/TestController.java |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 66 insertions(+), 5 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 a3e07fc..35bd368 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,9 +1,21 @@
 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.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;
+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;
@@ -16,12 +28,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
@@ -35,6 +56,10 @@
 
     @Resource
     private TestService testService;
+
+    @Autowired
+    RedisTemplate redisTemplate;
+
 
     /**
      * name   ������
@@ -66,7 +91,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);
         //������������������������
@@ -101,15 +126,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")
@@ -165,4 +206,24 @@
         writer.close();
         fis.close();
     }
+
+    @Autowired
+    private SensorService sensorService;
+    @Autowired
+    SysDictDataMapper sysDictDataMapper;
+
+    @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);
+        }
+    }
+
 }

--
Gitblit v1.8.0