From b8327edbe066671efba657c0f78598400c6d99c0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 10:22:45 +0800
Subject: [PATCH] screen-api 增加设备时维护组织型号关系表
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java | 1 -
screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java | 2 +-
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 4 +++-
myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java | 2 +-
pom.xml | 4 ++++
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java b/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java
index 4e724b7..23d5672 100644
--- a/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java
+++ b/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java
@@ -67,7 +67,7 @@
// ���������������
DataSourceConfig dsc = new DataSourceConfig();
- dsc.setUrl("jdbc:mysql://vp9l57dtd2vng7oxft1t.rwlb.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC");
+ dsc.setUrl("jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("moral_123456");
diff --git a/pom.xml b/pom.xml
index b1e7a37..247deb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,10 @@
<version>${spring.kafka.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${spring.kafka.version}</version>
diff --git a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java
index 8c31f54..710e4a9 100644
--- a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java
@@ -10,7 +10,6 @@
import org.springframework.stereotype.Component;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
/**
diff --git a/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java b/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java
index 0993446..6ac8cc3 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java
@@ -43,7 +43,7 @@
/**
* ������code
*/
- private Integer sensorCode;
+ private String sensorCode;
/**
* ���������������������
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 76d4e8f..63f5415 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -138,7 +138,9 @@
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
organizationUnitAlarm.setOrganizationId(orgId);
organizationUnitAlarm.setVersionId(device.getDeviceVersionId());
-
+ organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
+ organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarmMapper.insert(organizationUnitAlarm);
}
}
}
--
Gitblit v1.8.0