From 96d3ae20a572460e3dc226204398c44b4d0c8484 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 16:54:05 +0800
Subject: [PATCH] screen-api 增加编辑组织型号因子的显示单位以及报警等级接口
---
screen-manage/src/main/java/com/moral/api/controller/TestController.java | 88 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 14 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 d011719..12d9db2 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
@@ -6,6 +6,9 @@
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;
@@ -13,12 +16,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+
+import java.io.*;
@Slf4j
@@ -32,6 +34,7 @@
@Resource
private TestService testService;
+
/**
* name ������
* email ������
@@ -39,9 +42,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 +52,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 +83,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,7 +93,7 @@
*/
@ApiOperation(value = "������������", notes = "������������")
@RequestMapping(value = "saveTest", method = RequestMethod.GET)
- public ResultMessage saveTest() throws Exception{
+ public ResultMessage saveTest() throws Exception {
testService.saveTest();
return ResultMessage.ok();
@@ -99,9 +103,65 @@
* kafka������
*/
@ApiOperation(value = "kafka������", notes = "kafka������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
@RequestMapping(value = "kafkaTest", method = RequestMethod.GET)
public void kafkaTest() {
- kafkaTemplate.send("test_topic","test111111111111111");
+ kafkaTemplate.send("test_topic", "{'mac': 'p5dnd1234567','DataTime':1623058244104,'e1':10,'e2':20,'ver':2}");
}
+ @GetMapping("testToken")
+ public void testToken() {
+ String decoded = TokenEncryptUtils.decoded("5b53480d4e570b54565f555775");
+ String decoded2 = TokenEncryptUtils.decoded("584f560a49510f5453515453");
+ System.out.println(decoded);
+ System.out.println(decoded2);
+ }
+
+ public static void main(String[] args) throws IOException {
+ String path = "C:\\Users\\cdl\\Desktop\\province.txt";
+ 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) {
+ //������code
+ StringBuilder str = new StringBuilder(line);
+ String code = str.substring(31, 37);
+
+ //������������
+ char[] chars = line.toCharArray();
+ int i = 0;
+ StringBuilder buffered = new StringBuilder();
+ for (char aChar : chars) {
+ if (aChar == '\'')
+ i++;
+ if (i == 1) {
+ buffered.append(aChar);
+ }
+ }
+ buffered.append('\'');
+ String name = buffered.toString();
+
+ //������������code
+ line.trim();
+ char[] chars1 = line.toCharArray();
+ int j = 0;
+ StringBuilder buffered2 = new StringBuilder();
+ for (char c : chars1) {
+ if (j == 6) {
+ buffered2.append(c);
+ }
+ if (c == ',')
+ j++;
+ }
+ StringBuilder parentCode = buffered2.deleteCharAt(buffered2.length() - 1);
+ //������
+ writer.write("INSERT INTO `sys_area` VALUES (" + code + "," + name + "," + parentCode + ");");
+ writer.newLine();
+ }
+
+ writer.close();
+ fis.close();
+ }
}
--
Gitblit v1.8.0