From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/controller/TestController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 47dfffb..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,10 +1,13 @@
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;
@@ -15,8 +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
@@ -30,6 +36,9 @@
@Autowired
private TestService testService;
+
+ @Autowired
+ private SensorMapper sensorMapper;
@Autowired
private HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
@@ -107,8 +116,8 @@
@GetMapping("test")
public void test(){
- QueryWrapper<HistoryFiveMinutely> queryWrapper = new QueryWrapper<>();
- List<HistoryFiveMinutely> historyFiveMinutelies = historyFiveMinutelyMapper.selectList(queryWrapper);
- System.out.println(1111);
+
}
+
+
}
--
Gitblit v1.8.0