From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/TestController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/TestController.java b/screen-api/src/main/java/com/moral/api/controller/TestController.java
index 9c5d2ab..1981134 100644
--- a/screen-api/src/main/java/com/moral/api/controller/TestController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/TestController.java
@@ -1,8 +1,15 @@
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.HistoryFiveMinutely;
+import com.moral.api.entity.Sensor;
import com.moral.api.entity.Test;
+import com.moral.api.mapper.HistoryFiveMinutelyMapper;
+import com.moral.api.mapper.SensorMapper;
import com.moral.api.service.TestService;
+import com.moral.constant.Constants;
import com.moral.constant.ResultMessage;
import com.moral.redis.RedisUtil;
import com.moral.util.PageResult;
@@ -11,6 +18,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.handler.WebRequestHandlerInterceptorAdapter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Slf4j
@@ -24,6 +36,12 @@
@Autowired
private TestService testService;
+
+ @Autowired
+ private SensorMapper sensorMapper;
+
+ @Autowired
+ private HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
/**
* name ������
* email ������
@@ -96,4 +114,10 @@
kafkaTemplate.send("test_topic","test111111111111111");
}
+ @GetMapping("test")
+ public void test(){
+
+ }
+
+
}
--
Gitblit v1.8.0