From 5688e9adb709a253e1ce69b510457b9c88a645a9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Sep 2021 16:39:18 +0800
Subject: [PATCH] screnn_api特殊设备实体类修改，走航车实时websocket,manage设备补偿
---
screen-manage/src/main/java/com/moral/api/controller/TestController.java | 111 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 90 insertions(+), 21 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 f15c064..35bd368 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,24 +1,48 @@
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.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;
import com.moral.util.TokenEncryptUtils;
import com.moral.util.TokenUtils;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
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
@@ -32,6 +56,11 @@
@Resource
private TestService testService;
+
+ @Autowired
+ RedisTemplate redisTemplate;
+
+
/**
* name ������
* email ������
@@ -39,9 +68,9 @@
*/
@ApiOperation(value = "������������", notes = "������������")
@RequestMapping(value = "/saveTest", method = RequestMethod.POST)
- public ResultMessage save() {
+ public ResultMessage save() {
- Test test=new Test();
+ Test test = new Test();
test.setEmail("test@qq.com");
test.setName("name");
test.setMobile("13965898745");
@@ -49,27 +78,28 @@
return ResultMessage.ok();
}
+
/**
* page ���������
* size ������������
*/
@ApiOperation(value = "������", notes = "������")
@ApiImplicitParams({
- @ApiImplicitParam(name="page",value="������������",required=true,paramType="path",dataType="Int"),
- @ApiImplicitParam(name="size",value="������������",required=true,paramType="path",dataType="Int")
+ @ApiImplicitParam(name = "page", value = "������������", required = true, paramType = "path", dataType = "Int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "path", dataType = "Int")
})
@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);
//������������������������
PageResult<Test> pageResult = new PageResult<>(
- userPage.getTotal(), userPage.getPages(),userPage.getRecords()
+ userPage.getTotal(), userPage.getPages(), userPage.getRecords()
);
//������������
- return ResultMessage.ok(pageResult);
+ return ResultMessage.ok(pageResult);
}
@@ -79,7 +109,7 @@
@ApiOperation(value = "redis������", notes = "redis������")
@RequestMapping(value = "redis", method = RequestMethod.GET)
public ResultMessage testRedis() {
- RedisUtil.set("redistest","test");
+ RedisUtil.set("redistest", "test");
return ResultMessage.ok(RedisUtil.get("redistest"));
}
@@ -89,23 +119,42 @@
*/
@ApiOperation(value = "������������", notes = "������������")
@RequestMapping(value = "saveTest", method = RequestMethod.GET)
- public ResultMessage saveTest() throws Exception{
+ public ResultMessage saveTest() throws Exception {
testService.saveTest();
return ResultMessage.ok();
}
/**
- * kafka������
+ * ������������kafka������
*/
@ApiOperation(value = "kafka������", notes = "kafka������")
- @RequestMapping(value = "kafkaTest", method = RequestMethod.GET)
- public void kafkaTest() {
- kafkaTemplate.send("test_topic","test111111111111111");
+ @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 = "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")
- public void testToken(){
+ public void testToken() {
String decoded = TokenEncryptUtils.decoded("5b53480d4e570b54565f555775");
String decoded2 = TokenEncryptUtils.decoded("584f560a49510f5453515453");
System.out.println(decoded);
@@ -117,7 +166,7 @@
BufferedReader fis = new BufferedReader(new FileReader(path));
BufferedWriter writer = new BufferedWriter(new FileWriter("C:\\Users\\cdl\\Desktop\\provin1ce.txt"));
String line = "";
- while((line = fis.readLine())!=null){
+ while ((line = fis.readLine()) != null) {
//������code
StringBuilder str = new StringBuilder(line);
String code = str.substring(31, 37);
@@ -127,9 +176,9 @@
int i = 0;
StringBuilder buffered = new StringBuilder();
for (char aChar : chars) {
- if(aChar=='\'')
- i ++;
- if(i==1){
+ if (aChar == '\'')
+ i++;
+ if (i == 1) {
buffered.append(aChar);
}
}
@@ -142,19 +191,39 @@
int j = 0;
StringBuilder buffered2 = new StringBuilder();
for (char c : chars1) {
- if(j==6){
+ if (j == 6) {
buffered2.append(c);
}
- if(c==',')
+ if (c == ',')
j++;
}
StringBuilder parentCode = buffered2.deleteCharAt(buffered2.length() - 1);
//������
- writer.write("INSERT INTO `sys_area` VALUES ("+code+","+name+","+parentCode+");");
+ writer.write("INSERT INTO `sys_area` VALUES (" + code + "," + name + "," + parentCode + ");");
writer.newLine();
}
writer.close();
fis.close();
}
+
+ @Autowired
+ private SensorService sensorService;
+ @Autowired
+ SysDictDataMapper sysDictDataMapper;
+
+ @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);
+ }
+ }
+
}
--
Gitblit v1.8.0