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/pojo/InterfaceBDeviceConfig.java | 94 +++++++
src/main/java/com/whyc/injector/CustomSqlInjector.java | 24 +
src/main/resources/mapper/0Mapper.xml | 6
src/main/java/com/whyc/dto/interfaceB/DataB.java | 15
pom.xml | 29 ++
src/main/java/com/whyc/mapper/InterfaceBPointMapper.java | 6
src/main/java/com/whyc/pojo/InterfaceBPoint.java | 72 +++++
src/main/java/com/whyc/service/ConfigService.java | 48 +++
src/main/resources/mapper/InterfaceCDataMapper.xml | 20 +
src/main/java/com/whyc/config/KafkaConfig.java | 2
src/main/java/com/whyc/pojo/InterfaceCPoint.java | 72 +++++
src/main/java/com/whyc/mapper/ConfigMapper.java | 4
src/main/java/com/whyc/pojo/InterfaceBMode.java | 47 +++
src/main/java/com/whyc/config/MybatisPlusConfig.java | 22 +
src/main/java/com/whyc/mapper/InterfaceCDataMapper.java | 11
src/main/java/com/whyc/controller/DcimNorthController.java | 92 ++-----
src/main/java/com/whyc/pojo/InterfaceCData.java | 67 +++++
src/main/java/com/whyc/mapper/InterfaceBDeviceConfigMapper.java | 6
src/main/resources/application-dev.yml | 34 ++
src/main/java/com/whyc/mapper/InterfaceBModeMapper.java | 7
src/main/java/com/whyc/mapper/InterfaceCPointMapper.java | 6
src/main/java/com/whyc/mapper/CustomMapper.java | 17 +
src/main/java/com/whyc/service/DataService.java | 40 +++
23 files changed, 664 insertions(+), 77 deletions(-)
diff --git a/pom.xml b/pom.xml
index dc13043..657a8ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,35 @@
<version>2.0.29</version>
</dependency>
+ <!-- 寮曞叆mongodb-->
+ <!--<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-mongodb</artifactId>
+ </dependency>-->
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>6.0.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid</artifactId>
+ <version>1.1.10</version>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>2.0.0</version>
+ </dependency>-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.1.2</version>
+ </dependency>
+
+
</dependencies>
<build>
diff --git a/src/main/java/com/whyc/config/KafkaConfig.java b/src/main/java/com/whyc/config/KafkaConfig.java
index a04fe3e..6663719 100644
--- a/src/main/java/com/whyc/config/KafkaConfig.java
+++ b/src/main/java/com/whyc/config/KafkaConfig.java
@@ -14,7 +14,7 @@
@Bean
public NewTopic batchTopic() {
//return new NewTopic("topic_device_data",3,(short)3);
- return new NewTopic("topic_device_data2",1,(short)1);
+ return new NewTopic("topic_device_data2",3,(short)1);
}
//@KafkaListener(topics = "topic_device_data")
diff --git a/src/main/java/com/whyc/config/MybatisPlusConfig.java b/src/main/java/com/whyc/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..2bb8cb9
--- /dev/null
+++ b/src/main/java/com/whyc/config/MybatisPlusConfig.java
@@ -0,0 +1,22 @@
+package com.whyc.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.whyc.injector.CustomSqlInjector;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("com.whyc.mapper")
+public class MybatisPlusConfig {
+
+ @Bean
+ public CustomSqlInjector customSqlInjector(){
+ return new CustomSqlInjector();
+ }
+
+ @Bean
+ public PaginationInterceptor paginationInterceptor(){
+ return new PaginationInterceptor();
+ }
+}
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,"鎺ㄩ�佸畬鎴�");
- }
}
diff --git a/src/main/java/com/whyc/dto/interfaceB/DataB.java b/src/main/java/com/whyc/dto/interfaceB/DataB.java
index 90a9aee..a2f5dfd 100644
--- a/src/main/java/com/whyc/dto/interfaceB/DataB.java
+++ b/src/main/java/com/whyc/dto/interfaceB/DataB.java
@@ -1,24 +1,27 @@
package com.whyc.dto.interfaceB;
+import com.whyc.pojo.InterfaceBDeviceConfig;
+import com.whyc.pojo.InterfaceBMode;
+
import java.util.List;
public class DataB {
- private Mode mode;
- private List<Device> devices;
+ private InterfaceBMode mode;
+ private List<InterfaceBDeviceConfig> devices;
- public Mode getMode() {
+ public InterfaceBMode getMode() {
return mode;
}
- public void setMode(Mode mode) {
+ public void setMode(InterfaceBMode mode) {
this.mode = mode;
}
- public List<Device> getDevices() {
+ public List<InterfaceBDeviceConfig> getDevices() {
return devices;
}
- public void setDevices(List<Device> devices) {
+ public void setDevices(List<InterfaceBDeviceConfig> devices) {
this.devices = devices;
}
}
diff --git a/src/main/java/com/whyc/injector/CustomSqlInjector.java b/src/main/java/com/whyc/injector/CustomSqlInjector.java
new file mode 100644
index 0000000..fae5f15
--- /dev/null
+++ b/src/main/java/com/whyc/injector/CustomSqlInjector.java
@@ -0,0 +1,24 @@
+package com.whyc.injector;
+
+import com.baomidou.mybatisplus.core.injector.AbstractMethod;
+import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
+import com.baomidou.mybatisplus.extension.injector.methods.additional.AlwaysUpdateSomeColumnById;
+import com.baomidou.mybatisplus.extension.injector.methods.additional.InsertBatchSomeColumn;
+
+import java.util.List;
+
+/**
+ * 鑷畾涔塻ql娉ㄥ叆鍣�,浣垮緱mybatis-plus鑳借嚜鍔ㄨ瘑鍒墽琛�
+ */
+public class CustomSqlInjector extends DefaultSqlInjector {
+
+ @Override
+ public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
+ //杩欐槸榛樿鐨勭埗绫绘柟娉曞垪琛�
+ List<AbstractMethod> methodList = super.getMethodList(mapperClass);
+ //鏂板鎵归噺鎻掑叆鏂规硶
+ methodList.add(new InsertBatchSomeColumn());
+ methodList.add(new AlwaysUpdateSomeColumnById());
+ return methodList;
+ }
+}
diff --git a/src/main/java/com/whyc/mapper/ConfigMapper.java b/src/main/java/com/whyc/mapper/ConfigMapper.java
new file mode 100644
index 0000000..64c4d04
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/ConfigMapper.java
@@ -0,0 +1,4 @@
+package com.whyc.mapper;
+
+public interface ConfigMapper {
+}
diff --git a/src/main/java/com/whyc/mapper/CustomMapper.java b/src/main/java/com/whyc/mapper/CustomMapper.java
new file mode 100644
index 0000000..da8016c
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/CustomMapper.java
@@ -0,0 +1,17 @@
+package com.whyc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.Collection;
+
+@SuppressWarnings("all")
+public interface CustomMapper<T> extends BaseMapper<T> {
+
+ /**
+ * 鎵归噺鎻掑叆
+ * @param entityList
+ * @return
+ */
+ Integer insertBatchSomeColumn(Collection<T> entityList);
+
+}
diff --git a/src/main/java/com/whyc/mapper/InterfaceBDeviceConfigMapper.java b/src/main/java/com/whyc/mapper/InterfaceBDeviceConfigMapper.java
new file mode 100644
index 0000000..cd3f0ba
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/InterfaceBDeviceConfigMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.InterfaceBDeviceConfig;
+
+public interface InterfaceBDeviceConfigMapper extends CustomMapper<InterfaceBDeviceConfig>{
+}
diff --git a/src/main/java/com/whyc/mapper/InterfaceBModeMapper.java b/src/main/java/com/whyc/mapper/InterfaceBModeMapper.java
new file mode 100644
index 0000000..4627a79
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/InterfaceBModeMapper.java
@@ -0,0 +1,7 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.InterfaceBMode;
+
+public interface InterfaceBModeMapper extends CustomMapper<InterfaceBMode>{
+
+}
diff --git a/src/main/java/com/whyc/mapper/InterfaceBPointMapper.java b/src/main/java/com/whyc/mapper/InterfaceBPointMapper.java
new file mode 100644
index 0000000..d98a71e
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/InterfaceBPointMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.InterfaceBPoint;
+
+public interface InterfaceBPointMapper extends CustomMapper<InterfaceBPoint>{
+}
diff --git a/src/main/java/com/whyc/mapper/InterfaceCDataMapper.java b/src/main/java/com/whyc/mapper/InterfaceCDataMapper.java
new file mode 100644
index 0000000..19366f8
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/InterfaceCDataMapper.java
@@ -0,0 +1,11 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.InterfaceCData;
+
+import java.util.List;
+
+public interface InterfaceCDataMapper extends CustomMapper<InterfaceCData> {
+
+ List<InterfaceCData> getDataList();
+
+}
diff --git a/src/main/java/com/whyc/mapper/InterfaceCPointMapper.java b/src/main/java/com/whyc/mapper/InterfaceCPointMapper.java
new file mode 100644
index 0000000..90ce1ee
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/InterfaceCPointMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.InterfaceCPoint;
+
+public interface InterfaceCPointMapper extends CustomMapper<InterfaceCPoint> {
+}
diff --git a/src/main/java/com/whyc/pojo/InterfaceBDeviceConfig.java b/src/main/java/com/whyc/pojo/InterfaceBDeviceConfig.java
new file mode 100644
index 0000000..6ad959b
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/InterfaceBDeviceConfig.java
@@ -0,0 +1,94 @@
+package com.whyc.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+import java.util.List;
+
+@TableName(schema = "db_dh",value = "interface_b_device_config")
+public class InterfaceBDeviceConfig {
+ private Long id;
+ private String guid;
+ private String tag;
+ private String name;
+ private String device_type;
+ private String path;
+ private Long mode_id;
+ private Date create_time;
+
+ @TableField(exist = false)
+ private List<InterfaceBPoint> points;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public void setGuid(String guid) {
+ this.guid = guid;
+ }
+
+ public String getTag() {
+ return tag;
+ }
+
+ public void setTag(String tag) {
+ this.tag = tag;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDevice_type() {
+ return device_type;
+ }
+
+ public void setDevice_type(String device_type) {
+ this.device_type = device_type;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public Long getMode_id() {
+ return mode_id;
+ }
+
+ public void setMode_id(Long mode_id) {
+ this.mode_id = mode_id;
+ }
+
+ public List<InterfaceBPoint> getPoints() {
+ return points;
+ }
+
+ public void setPoints(List<InterfaceBPoint> points) {
+ this.points = points;
+ }
+
+ public Date getCreate_time() {
+ return create_time;
+ }
+
+ public void setCreate_time(Date create_time) {
+ this.create_time = create_time;
+ }
+}
diff --git a/src/main/java/com/whyc/pojo/InterfaceBMode.java b/src/main/java/com/whyc/pojo/InterfaceBMode.java
new file mode 100644
index 0000000..8856429
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/InterfaceBMode.java
@@ -0,0 +1,47 @@
+package com.whyc.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName(schema = "db_dh",value = "interface_b_mode")
+public class InterfaceBMode {
+ private Long id;
+ private String transfer_mode;
+ @TableField("interval_time")
+ private Integer interval;
+ private Date create_time;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getTransfer_mode() {
+ return transfer_mode;
+ }
+
+ public void setTransfer_mode(String transfer_mode) {
+ this.transfer_mode = transfer_mode;
+ }
+
+ public Integer getInterval() {
+ return interval;
+ }
+
+ public void setInterval(Integer interval) {
+ this.interval = interval;
+ }
+
+ public Date getCreate_time() {
+ return create_time;
+ }
+
+ public void setCreate_time(Date create_time) {
+ this.create_time = create_time;
+ }
+}
diff --git a/src/main/java/com/whyc/pojo/InterfaceBPoint.java b/src/main/java/com/whyc/pojo/InterfaceBPoint.java
new file mode 100644
index 0000000..690e937
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/InterfaceBPoint.java
@@ -0,0 +1,72 @@
+package com.whyc.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName(schema = "db_dh",value = "interface_b_point")
+public class InterfaceBPoint {
+ private Long id;
+ private String tag;
+ private String name;
+ private Integer point_type;
+ private String unit;
+ private Long device_config_id;
+ private Date create_time;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getTag() {
+ return tag;
+ }
+
+ public void setTag(String tag) {
+ this.tag = tag;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getPoint_type() {
+ return point_type;
+ }
+
+ public void setPoint_type(Integer point_type) {
+ this.point_type = point_type;
+ }
+
+ public String getUnit() {
+ return unit;
+ }
+
+ public void setUnit(String unit) {
+ this.unit = unit;
+ }
+
+ public Long getDevice_config_id() {
+ return device_config_id;
+ }
+
+ public void setDevice_config_id(Long device_config_id) {
+ this.device_config_id = device_config_id;
+ }
+
+ public Date getCreate_time() {
+ return create_time;
+ }
+
+ public void setCreate_time(Date create_time) {
+ this.create_time = create_time;
+ }
+}
diff --git a/src/main/java/com/whyc/pojo/InterfaceCData.java b/src/main/java/com/whyc/pojo/InterfaceCData.java
new file mode 100644
index 0000000..cfb2db3
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/InterfaceCData.java
@@ -0,0 +1,67 @@
+package com.whyc.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+import java.util.List;
+
+@TableName(schema = "db_dh",value = "interface_c_data")
+public class InterfaceCData {
+ private Long id;
+ private String device_id;
+ private String idc;
+ private String device_type;
+ private Date create_time;
+
+ @TableField(exist = false)
+ private List<InterfaceCPoint> points;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Date getCreate_time() {
+ return create_time;
+ }
+
+ public void setCreate_time(Date create_time) {
+ this.create_time = create_time;
+ }
+
+ public String getDevice_id() {
+ return device_id;
+ }
+
+ public void setDevice_id(String device_id) {
+ this.device_id = device_id;
+ }
+
+ public String getIdc() {
+ return idc;
+ }
+
+ public void setIdc(String idc) {
+ this.idc = idc;
+ }
+
+ public String getDevice_type() {
+ return device_type;
+ }
+
+ public void setDevice_type(String device_type) {
+ this.device_type = device_type;
+ }
+
+ public List<InterfaceCPoint> getPoints() {
+ return points;
+ }
+
+ public void setPoints(List<InterfaceCPoint> points) {
+ this.points = points;
+ }
+}
diff --git a/src/main/java/com/whyc/pojo/InterfaceCPoint.java b/src/main/java/com/whyc/pojo/InterfaceCPoint.java
new file mode 100644
index 0000000..6de44d0
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/InterfaceCPoint.java
@@ -0,0 +1,72 @@
+package com.whyc.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName(schema = "db_dh",value = "interface_c_point")
+public class InterfaceCPoint {
+ private Long id;
+ private Integer point_code;
+ private String tag;
+ private Double value;
+ private Long timestamp;
+ private Long data_id;
+ private Date create_time;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Integer getPoint_code() {
+ return point_code;
+ }
+
+ public void setPoint_code(Integer point_code) {
+ this.point_code = point_code;
+ }
+
+ public String getTag() {
+ return tag;
+ }
+
+ public void setTag(String tag) {
+ this.tag = tag;
+ }
+
+ public Double getValue() {
+ return value;
+ }
+
+ public void setValue(Double value) {
+ this.value = value;
+ }
+
+ public Long getTimestamp() {
+ return timestamp;
+ }
+
+ public void setTimestamp(Long timestamp) {
+ this.timestamp = timestamp;
+ }
+
+ public Long getData_id() {
+ return data_id;
+ }
+
+ public void setData_id(Long data_id) {
+ this.data_id = data_id;
+ }
+
+ public Date getCreate_time() {
+ return create_time;
+ }
+
+ public void setCreate_time(Date create_time) {
+ this.create_time = create_time;
+ }
+}
diff --git a/src/main/java/com/whyc/service/ConfigService.java b/src/main/java/com/whyc/service/ConfigService.java
new file mode 100644
index 0000000..dcfd1cb
--- /dev/null
+++ b/src/main/java/com/whyc/service/ConfigService.java
@@ -0,0 +1,48 @@
+package com.whyc.service;
+
+import com.whyc.dto.interfaceB.DataB;
+import com.whyc.mapper.ConfigMapper;
+import com.whyc.mapper.InterfaceBDeviceConfigMapper;
+import com.whyc.mapper.InterfaceBModeMapper;
+import com.whyc.mapper.InterfaceBPointMapper;
+import com.whyc.pojo.InterfaceBDeviceConfig;
+import com.whyc.pojo.InterfaceBMode;
+import com.whyc.pojo.InterfaceBPoint;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class ConfigService {
+
+ @Resource
+ private ConfigMapper mapper;
+
+ @Resource
+ private InterfaceBModeMapper interfaceBModeMapper;
+
+ @Resource
+ private InterfaceBDeviceConfigMapper interfaceBDeviceConfigMapper;
+
+ @Resource
+ private InterfaceBPointMapper interfaceBPointMapper;
+
+ public void add(DataB dataB) {
+ Date now = new Date();
+ InterfaceBMode mode = dataB.getMode();
+ mode.setCreate_time(now);
+ interfaceBModeMapper.insert(mode);
+
+ List<InterfaceBDeviceConfig> devices = dataB.getDevices();
+ devices.stream().forEach(device->{device.setMode_id(mode.getId());device.setCreate_time(now);});
+ for (InterfaceBDeviceConfig device : devices) {
+ interfaceBDeviceConfigMapper.insert(device);
+ List<InterfaceBPoint> points = device.getPoints();
+ points.stream().forEach(point->{point.setDevice_config_id(device.getId());point.setCreate_time(now);});
+ interfaceBPointMapper.insertBatchSomeColumn(points);
+ }
+
+ }
+}
diff --git a/src/main/java/com/whyc/service/DataService.java b/src/main/java/com/whyc/service/DataService.java
new file mode 100644
index 0000000..045cde9
--- /dev/null
+++ b/src/main/java/com/whyc/service/DataService.java
@@ -0,0 +1,40 @@
+package com.whyc.service;
+
+import com.whyc.dto.Response;
+import com.whyc.dto.interfaceC.DataC;
+import com.whyc.dto.interfaceC.PointC;
+import com.whyc.mapper.InterfaceCDataMapper;
+import com.whyc.mapper.InterfaceCPointMapper;
+import com.whyc.pojo.InterfaceCData;
+import com.whyc.pojo.InterfaceCPoint;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class DataService {
+
+ @Resource
+ private InterfaceCDataMapper interfaceCDataMapper;
+
+ @Resource
+ private InterfaceCPointMapper interfaceCPointMapper;
+
+ public void add(InterfaceCData data) {
+ Date now = new Date();
+ data.setCreate_time(now);
+ interfaceCDataMapper.insert(data);
+ List<InterfaceCPoint> points = data.getPoints();
+ points.stream().forEach(point->{point.setCreate_time(now);point.setData_id(data.getId());});
+ interfaceCPointMapper.insertBatchSomeColumn(points);
+
+ }
+
+ public Response getDataList() {
+ List<InterfaceCData> dataList = interfaceCDataMapper.getDataList();
+ return new Response().set(1,dataList);
+ }
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 0ba6843..0881d4a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,12 +12,24 @@
max-http-form-post-size: 102400000
message.max.bytes: 156466826
spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.10.79:3360/db_dh?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+ # url: jdbc:mysql://192.168.10.80:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+ # url: jdbc:mysql://118.89.139.230:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+ username: root
+ password: lmx8688139
+ maxIdel: 60
+ initialPoolSize: 2
+ minPoolSize: 2
+ maxPoolSize: 500
kafka:
# 鎸囧畾kafka server鐨勫湴鍧�锛岄泦缇ら厤澶氫釜锛屼腑闂达紝閫楀彿闅斿紑
- bootstrap-servers: broker-2:9092
-# broker-1:9092
-# broker-2:9092
-# broker-3:9092
+ bootstrap-servers:
+ - broker-1:9092
+ - broker-2:9092
+ - broker-3:9092
# - 192.168.10.143:9092
# - 192.168.10.144:9092
# - 192.168.10.145:9092
@@ -62,4 +74,16 @@
auto-offset-reset: earliest #latest 鏈�鏂扮殑浣嶇疆 , earliest鏈�鏃╃殑浣嶇疆
auto-commit-interval: 100 #鑷姩鎻愪氦offset棰戠巼 100姣
knife:
- enable: true
\ No newline at end of file
+ enable: true
+mybatis-plus:
+ typeAliasesPackage: com.whyc.pojo,com.whyc.dto
+ mapper-locations: classpath:mapper/*.xml
+ global-config:
+ db-config:
+ #涓婚敭绫诲瀷 0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
+ id-type: AUTO
+ #椹煎嘲涓嬪垝绾胯浆鎹�
+ table-underline: true
+ configuration:
+ #閰嶇疆杩斿洖鏁版嵁搴�(column涓嬪垝绾垮懡鍚�&&杩斿洖java瀹炰綋鏄┘宄板懡鍚�)锛岃嚜鍔ㄥ尮閰嶆棤闇�as锛堟病寮�鍚繖涓紝SQL闇�瑕佸啓as锛� select user_id as userId锛�
+ map-underscore-to-camel-case: true
\ No newline at end of file
diff --git a/src/main/resources/mapper/0Mapper.xml b/src/main/resources/mapper/0Mapper.xml
new file mode 100644
index 0000000..d4274b8
--- /dev/null
+++ b/src/main/resources/mapper/0Mapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.whyc.mapper" >
+
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/InterfaceCDataMapper.xml b/src/main/resources/mapper/InterfaceCDataMapper.xml
new file mode 100644
index 0000000..55330ad
--- /dev/null
+++ b/src/main/resources/mapper/InterfaceCDataMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.whyc.mapper.InterfaceCDataMapper" >
+
+ <resultMap id="Map_InterfaceCData" type="com.whyc.pojo.InterfaceCData">
+ <result property="device_id" column="device_id"/>
+ <result property="idc" column="idc"/>
+ <result property="device_type" column="device_type"/>
+ <collection property="points" ofType="com.whyc.pojo.InterfaceCPoint">
+ <result property="point_code" column="point_code"/>
+ <result property="tag" column="tag"/>
+ <result property="value" column="value"/>
+ <result property="timestamp" column="timestamp"/>
+ </collection>
+ </resultMap>
+
+ <select id="getDataList" resultMap="Map_InterfaceCData">
+ SELECT * FROM db_dh.interface_c_data d,db_dh.interface_c_point p where d.id = p.data_id
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1