Merge branch 'data-zyj' of uskycloud/usky-data into server-165

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/controller/web/SendMessageController.java

@@ -6,6 +6,8 @@ import com.usky.demo.service.QueryInfluxdbDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 /**
  * @Author :
  * @CreateTime : 2024/2/29
@@ -22,9 +24,8 @@ public class SendMessageController {
      * @return
      */
     @PostMapping("/sendDeviceData")
-    public ApiResult<Void> sendDeviceData(@RequestBody DeviceDataWriteVO writeVO){
-        queryInfluxdbDataService.sendDeviceData(writeVO);
-        return ApiResult.success();
+    public ApiResult<Map<String,Object>> sendDeviceData(@RequestBody DeviceDataWriteVO writeVO){
+        return ApiResult.success(queryInfluxdbDataService.sendDeviceData(writeVO));
     }
 
 }

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/QueryInfluxdbDataService.java

@@ -4,6 +4,7 @@ import com.usky.demo.domain.*;
 import com.usky.common.mybatis.core.CrudService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -23,6 +24,6 @@ public interface QueryInfluxdbDataService extends CrudService<QueryInfluxdbData>
 
     List<HistoryResultVO> queryHistoryDeviceData(HistoryRequestVO requestVO);
 
-    void sendDeviceData(DeviceDataWriteVO writeVO);
+    Map<String,Object> sendDeviceData(DeviceDataWriteVO writeVO);
 
 }

data-tsdb-proxy/data-tsdb-proxy-biz/src/main/java/com/usky/demo/service/impl/QueryInfluxdbDataServiceImpl.java

@@ -35,7 +35,8 @@ public class QueryInfluxdbDataServiceImpl extends AbstractCrudService<QueryInflu
     private MyProducer myProducer;
 
     @Override
-    public void sendDeviceData(DeviceDataWriteVO writeVO){
+    public Map<String,Object> sendDeviceData(DeviceDataWriteVO writeVO){
+        Map<String,Object> rec_map = new HashMap<>();
         DeviceDataInfoVO dataInfo = new DeviceDataInfoVO();
         Map<String,Object> metrics = writeVO.getMetrics();
         Map<String,String> tags = writeVO.getTags();
@@ -61,6 +62,9 @@ public class QueryInfluxdbDataServiceImpl extends AbstractCrudService<QueryInflu
             myProducer.sendMessage("data-collector", JSONArray.toJSON(dataInfo).toString());
         }
 
+        rec_map.put("code",200);
+        rec_map.put("message","操作成功!");
+        return rec_map;
     }
 
     @Override