From b9fd2657a3d528881e4d1f7cae12ca8e2d63951a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 30 Aug 2023 09:33:31 +0800
Subject: [PATCH] fix:补充提交
---
screen-manage/src/main/java/com/moral/api/controller/TestController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 8178082..6f45837 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,15 +1,23 @@
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.AdjustDataUtils;
import com.moral.api.util.CacheUtils;
+import com.moral.api.util.CompareFieldUtils;
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;
@@ -22,13 +30,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
@@ -42,6 +58,10 @@
@Resource
private TestService testService;
+
+ @Autowired
+ RedisTemplate redisTemplate;
+
/**
* name ������
@@ -73,7 +93,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);
//������������������������
@@ -191,6 +211,10 @@
@Autowired
private SensorService sensorService;
+ @Autowired
+ SysDictDataMapper sysDictDataMapper;
+ @Autowired
+ private AdjustDataUtils adjustDataUtils;
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@@ -198,6 +222,12 @@
})
@RequestMapping(value = "getSensor", method = RequestMethod.GET)
public void getSensor() {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("time","1692364996898");
+ map.put("mac","p5dnd7a0391986");
+ HashMap<String, Object> map1 = new HashMap<>();
+ HashMap<String, Object> map2 = new HashMap<>();
+ Map<String, Object> adjust = adjustDataUtils.adjust(map, map1, map2, "2");
QueryWrapper<Sensor> queryWrapper = new QueryWrapper<>();
queryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);
List<Object> list = sensorService.listObjs(queryWrapper);
--
Gitblit v1.8.0