From d3465e119e5795a3addee8e3d3ae0ecc8a99fcc4 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 12 五月 2023 16:38:38 +0800
Subject: [PATCH] 更新接口
---
src/main/java/com/whyc/controller/DcimNorthController.java | 92 +++++++++++++--------------------------------
1 files changed, 27 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DcimNorthController.java b/src/main/java/com/whyc/controller/DcimNorthController.java
index 4006f6e..d231bb6 100644
--- a/src/main/java/com/whyc/controller/DcimNorthController.java
+++ b/src/main/java/com/whyc/controller/DcimNorthController.java
@@ -5,19 +5,16 @@
import com.whyc.dto.interfaceB.DataB;
import com.whyc.dto.interfaceC.DataC;
import com.whyc.dto.interfaceC.PointC;
-import org.apache.kafka.clients.admin.KafkaAdminClient;
-import org.apache.kafka.common.KafkaFuture;
-import org.springframework.kafka.core.KafkaAdmin;
+import com.whyc.pojo.InterfaceCData;
+import com.whyc.service.ConfigService;
+import com.whyc.service.DataService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.LinkedList;
import java.util.List;
-import java.util.Set;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import static java.lang.Thread.sleep;
@@ -28,8 +25,11 @@
@Resource
private KafkaTemplate template;
- @Resource
- private KafkaTemplate<Object,List<DataC>> batchTemplate;
+ @Autowired
+ private ConfigService configService;
+
+ @Autowired
+ private DataService dataService;
/**
* 杩欎釜浠呮祴璇曚娇鐢�,姝ｅ紡鐜涓嶄娇鐢�
@@ -38,8 +38,25 @@
*/
@PostMapping("upload_config")
public Response uploadConfig(@RequestBody DataB dataB){
- //涓嶅鐞�
+ //鍙戦�佸埌鏁版嵁搴�
+ configService.add(dataB);
return new Response().set(1,"閰嶇疆涓婁紶瀹屾垚");
+ }
+
+ @PostMapping("push_data")
+ public Response pushData(@RequestBody InterfaceCData data){
+ //鍙戦�佸埌鏁版嵁搴�
+ dataService.add(data);
+ //鍙戦�佸埌kafka
+ String jsonStr = JSON.toJSONString(data);
+ template.send("topic_device_data2",jsonStr);
+ return new Response().set(1,"鎺ㄩ�佸畬鎴�");
+ }
+
+ @GetMapping("dataList")
+ public Response getDataList(){
+ //鍙戦�佸埌鏁版嵁搴�
+ return dataService.getDataList();
}
@GetMapping("benchmarkTest")
@@ -90,60 +107,5 @@
}
- @GetMapping("benchmarkTest3")
- public void benchmarkTest3(){
- long currentTimeMillis = System.currentTimeMillis();
- //鐢熶骇80涓囨潯鏁版嵁,鐒跺悗鍙戦��
- List<DataC> dataCList = new LinkedList<>();
- for (int i = 0; i < 800000; i++) {
- DataC dataC = new DataC();
- dataC.setDevice_id(i+"");
- dataC.setDevice_type("test");
- dataC.setIdc("test");
-
- List<PointC> pointCList = new LinkedList<>();
- PointC pointC = new PointC();
- pointC.setPoint_code(i);
- pointC.setTag("test");
- pointC.setTimestamp(currentTimeMillis);
- pointC.setValue(Double.parseDouble(i+""));
- pointCList.add(pointC);
- dataC.setPoints(pointCList);
-
- dataCList.add(dataC);
- }
- long startTime = System.currentTimeMillis();
- batchTemplate.send("topic_device_data2",dataCList);
- /*for (int i = 0; i < dataCList.size(); i++) {
- pool.execute(()->{
- template.send("topic_device_data2",dataCStr).addCallback(
- success->{
- //System.out.println(success);
- },
- failure->{
- //System.err.println(failure.getMessage());
- //failure.printStackTrace();
- });
- });
- }*/
- long endTime = System.currentTimeMillis();
- System.out.println("鑺辫垂鏃堕暱(姣):"+(endTime-startTime));
-
- }
-
- @PostMapping("push_data")
- public Response pushData(@RequestBody DataC dataC){
- //鐐逛綅鏁版嵁鍙戦�佸埌kafka topic_device_data
- String dataCStr = JSON.toJSONString(dataC);
- template.send("topic_device_data2",dataCStr).addCallback(
- success->{
- System.out.println(success);
- },
- failure->{
- System.err.println(failure.getMessage());
- failure.printStackTrace();
- });
- return new Response().set(1,"鎺ㄩ�佸畬鎴�");
- }
}
--
Gitblit v1.9.1