From 055021561b6f9b391592115e1c5aab8d2bb22083 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 16:53:02 +0800
Subject: [PATCH] fix:补偿提交
---
screen-manage/src/main/java/com/moral/api/controller/TestController.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 93 insertions(+), 8 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 3cb3911..6222d6d 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,25 @@
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.pojo.dto.account.AccountDTO;
+import com.moral.api.pojo.dto.accountRole.AccountRoleDTO;
+import com.moral.api.pojo.dto.adjust.AdjustDTO;
+import com.moral.api.service.DeviceService;
+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 +32,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 +60,10 @@
@Resource
private TestService testService;
+
+ @Autowired
+ RedisTemplate redisTemplate;
+
/**
* name ������
@@ -66,7 +95,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 +130,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")
@@ -166,8 +211,48 @@
fis.close();
}
- @GetMapping("testCacheUtils")
- public void testCacheUtils(){
- CacheUtils.flushDeviceAlarmUnit();
+ @Autowired
+ private SensorService sensorService;
+ @Autowired
+ SysDictDataMapper sysDictDataMapper;
+
+ @Autowired
+ private DeviceService deviceService;
+
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
+ @RequestMapping(value = "getSensor", method = RequestMethod.GET)
+ public void getSensor() {
+ HashMap<String, Object> deviceData = new HashMap<>();
+ deviceData.put("time","1691996716839");
+ deviceData.put("DataTime","20230814150000");
+ deviceData.put("mac","p5dnd7a0245362");
+ deviceData.put("a00e12","11479.2");
+ deviceData.put("a00e13","44.0");
+ deviceData.put("a21005","0.0264");
+ deviceData.put("a21004","20.0");
+ deviceData.put("a21026","30.5");
+ deviceData.put("a01001","38.1");
+ deviceData.put("a05024","279.6");
+ deviceData.put("a01002","54.2");
+ deviceData.put("a01007","2.45");
+ deviceData.put("a01006","805.834");
+ deviceData.put("a01008","102.0");
+ deviceData.put("a34002","4.9");
+ deviceData.put("a34004","4.9");
+ deviceData.put("a00e03","798.5");
+ deviceData.put("a00e04","2.9");
+ deviceData.put("a99054","0.0348");
+ deviceData.put("a31001","0.1");
+ Map<String, Object> map = deviceService.adjustDeviceData(deviceData, "2");
+// 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