From a07b4b6ff1c98dcf81338bb45d59308db7c058a9 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 03 十一月 2023 17:18:56 +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 | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 28a3317..86dc3df 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
@@ -1,7 +1,9 @@
package com.thhy.materials.modules.biz.helmet.controller;
+import com.alibaba.fastjson.JSONObject;
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;
@@ -43,10 +45,10 @@
- //接数据
- @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);
}
/**
@@ -70,6 +72,27 @@
public BasicResult helmetReportUser(@RequestBody Map<String,Object> values){
return helmetService.helmetReportUser(values);
}
+ //烟尘数据
+ @PostMapping("/dataSmockList")
+ public BasicResult dataSmockList(@RequestBody Map<String,Object> values){
+ return helmetService.dataSmockList(values);
+ }
+
+ //环境监测
+ @PostMapping("/dataValuesList")
+ public BasicResult dataValuesList(@RequestBody Map<String,Object> values){
+ return helmetService.dataValuesList(values);
+ }
+ //AI边缘盒子 数据接收
+ @PostMapping("/dataBox")
+ public BasicResult dataBox(@RequestBody String message){
+ /** 将String转换为JSON **/
+ JSONObject result= JSONObject.parseObject(message);
+ System.out.println("--------接收的参数为 ：---------------"+result);
+ Integer type = Integer.valueOf(result.get("type").toString());
+ return helmetService.dataBox(result);
+ }
+
}
--
Gitblit v1.9.3