From d8714a679116680a423f2a0159603986c124be1a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 21 Jul 2021 10:34:24 +0800
Subject: [PATCH] 分钟,小时数据格式更改

---
 screen-manage/src/main/java/com/moral/api/controller/TestController.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 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 81bb874..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,10 +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;
@@ -17,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
@@ -36,6 +45,9 @@
 
     @Resource
     private TestService testService;
+
+    @Autowired
+    RedisTemplate redisTemplate;
 
     /**
      * name   ������
@@ -183,8 +195,27 @@
         fis.close();
     }
 
-    @GetMapping("testCacheUtils")
-    public void testCacheUtils(){
-        CacheUtils.flushDeviceAlarmUnit();
+    @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