From 2bd6a932ddab51fff3185bf38435b4508203203c Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 13:18:59 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java
index 0b5b663..55816d1 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/controller/HelmetController.java
@@ -4,12 +4,11 @@
import com.thhy.general.common.BasicResult;
import com.thhy.materials.modules.biz.helmet.service.HelmetService;
import org.apache.ibatis.annotations.Mapper;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.csource.common.MyException;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.io.IOException;
import java.util.Map;
@RestController
@@ -46,9 +45,9 @@
//接数据 环境监测 数据
- @PostMapping("/dataValueInsert")
- public BasicResult dataValueInsert(@RequestBody Map<String,Object> values){
- return helmetService.dataValueInsert(values);
+ @PostMapping("/dataValueIn")
+ public BasicResult dataValueIn(@RequestBody Map<String,Object> values){
+ return helmetService.dataValueIn(values);
}
/**
@@ -85,7 +84,7 @@
}
//AI边缘盒子 数据接收
@PostMapping("/dataBox")
- public BasicResult dataBox(@RequestBody String message){
+ public BasicResult dataBox(@RequestBody String message) throws IOException, MyException {
/** 将String转换为JSON **/
JSONObject result= JSONObject.parseObject(message);
System.out.println("--------接收的参数为 ：---------------"+result);
@@ -94,5 +93,16 @@
}
+ // 智能监控
+ @PostMapping("/dataAIList")
+ public BasicResult dataAIList(@RequestBody Map<String,Object> values){
+ return helmetService.dataAIList(values);
+ }
+
+ //智能监控类型
+ @GetMapping("dataAIType")
+ public BasicResult dataAIType(){
+ return helmetService.dataAIType();
+ }
}
--
Gitblit v1.9.3