From 422ffa1f326574ba42564afd1c1091437f8b03ca Mon Sep 17 00:00:00 2001
From: lijiayao <13831655+xiao-yao-charge-forward@user.noreply.gitee.com>
Date: Tue, 2 Apr 2024 16:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../couplet-incident-remote/pom.xml           | 26 ++++++++++++++++
 .../couplet-incident-server/pom.xml           | 20 ++++++++++++
 .../server/controller/IncidentController.java | 19 ++++++++++++
 .../server/service/IncidentService.java       | 13 ++++++++
 .../service/impl/BreakdownServiceImpl.java    | 13 ++++++++
 .../impl/ElectronicFenceServiceImpl.java      | 17 ++++++++++
 .../service/impl/RealTimeDataServiceImpl.java | 13 ++++++++
 .../service/impl/StoredEventServiceImpl.java  | 13 ++++++++
 .../src/main/resources/bootstrap.yml          | 31 +++++++++++++++++++
 .../couplet-analyze-incident/pom.xml          |  5 +++
 couplet-modules/couplet-analyze/pom.xml       |  1 +
 .../src/main/resources/bootstrap.yml          |  2 --
 .../src/main/resources/bootstrap.yml          |  3 +-
 pom.xml                                       | 19 ++++++++++++
 14 files changed, 191 insertions(+), 4 deletions(-)
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-remote/pom.xml
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/pom.xml
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/controller/IncidentController.java
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/IncidentService.java
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/BreakdownServiceImpl.java
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/ElectronicFenceServiceImpl.java
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/RealTimeDataServiceImpl.java
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/StoredEventServiceImpl.java
 create mode 100644 couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/resources/bootstrap.yml

diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-remote/pom.xml b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-remote/pom.xml
new file mode 100644
index 0000000..4089671
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-remote/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.couplet</groupId>
+        <artifactId>couplet-analyze-incident</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>couplet-incident-remote</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-incident-remote</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/pom.xml b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/pom.xml
new file mode 100644
index 0000000..663459d
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.couplet</groupId>
+        <artifactId>couplet-analyze-incident</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>couplet-incident-server</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/controller/IncidentController.java b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/controller/IncidentController.java
new file mode 100644
index 0000000..7aa3042
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/controller/IncidentController.java
@@ -0,0 +1,19 @@
+package com.couplet.analyze.incident.server.controller;
+
+import com.couplet.common.core.web.controller.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/2
+ * 事件控制器
+ */
+@RestController
+@RequestMapping("/incident")
+public class IncidentController extends BaseController {
+
+
+
+
+}
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/IncidentService.java b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/IncidentService.java
new file mode 100644
index 0000000..1d1c259
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/IncidentService.java
@@ -0,0 +1,13 @@
+package com.couplet.analyze.incident.server.service;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/2
+ * @Description: 事件系统接口
+ */
+public interface IncidentService {
+
+
+
+
+}
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/BreakdownServiceImpl.java b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/BreakdownServiceImpl.java
new file mode 100644
index 0000000..ad8d5f5
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/BreakdownServiceImpl.java
@@ -0,0 +1,13 @@
+package com.couplet.analyze.incident.server.service.impl;
+
+import com.couplet.analyze.incident.server.service.IncidentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/2
+ * @Description: 故障事件
+ */
+@Service("breakdown")
+public class BreakdownServiceImpl implements IncidentService {
+}
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/ElectronicFenceServiceImpl.java b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/ElectronicFenceServiceImpl.java
new file mode 100644
index 0000000..af26ba3
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/ElectronicFenceServiceImpl.java
@@ -0,0 +1,17 @@
+package com.couplet.analyze.incident.server.service.impl;
+
+import com.couplet.analyze.incident.server.service.IncidentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/2
+ * @Description: 电子围栏事件服务实现类
+ */
+@Service("electronic-fence")
+public class ElectronicFenceServiceImpl implements IncidentService {
+
+
+
+
+}
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/RealTimeDataServiceImpl.java b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/RealTimeDataServiceImpl.java
new file mode 100644
index 0000000..ac1ca51
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/RealTimeDataServiceImpl.java
@@ -0,0 +1,13 @@
+package com.couplet.analyze.incident.server.service.impl;
+
+import com.couplet.analyze.incident.server.service.IncidentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/2
+ * @Description: 实时数据事件
+ */
+@Service("real-time-data")
+public class RealTimeDataServiceImpl implements IncidentService {
+}
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/StoredEventServiceImpl.java b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/StoredEventServiceImpl.java
new file mode 100644
index 0000000..34d72f9
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/java/com/couplet/analyze/incident/server/service/impl/StoredEventServiceImpl.java
@@ -0,0 +1,13 @@
+package com.couplet.analyze.incident.server.service.impl;
+
+import com.couplet.analyze.incident.server.service.IncidentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/2
+ * @Description: 事件存储服务
+ */
+@Service("stored-event")
+public class StoredEventServiceImpl implements IncidentService {
+}
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/resources/bootstrap.yml b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..a7f679a
--- /dev/null
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/couplet-incident-server/src/main/resources/bootstrap.yml
@@ -0,0 +1,31 @@
+# Tomcat
+server:
+  port: 9999
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: couplet-incident
+
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 121.89.211.230:8848
+      config:
+        # 配置中心地址
+        server-addr: 121.89.211.230:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  main:
+    allow-bean-definition-overriding: true
+logging:
+  level:
+    com.couplet.trouble.mapper: DEBUG
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-incident/pom.xml b/couplet-modules/couplet-analyze/couplet-analyze-incident/pom.xml
index cc43d1a..2401ce5 100644
--- a/couplet-modules/couplet-analyze/couplet-analyze-incident/pom.xml
+++ b/couplet-modules/couplet-analyze/couplet-analyze-incident/pom.xml
@@ -10,6 +10,11 @@
     </parent>
 
     <artifactId>couplet-analyze-incident</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>couplet-incident-remote</module>
+        <module>couplet-incident-server</module>
+    </modules>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/couplet-modules/couplet-analyze/pom.xml b/couplet-modules/couplet-analyze/pom.xml
index 1e3d70e..0af3095 100644
--- a/couplet-modules/couplet-analyze/pom.xml
+++ b/couplet-modules/couplet-analyze/pom.xml
@@ -14,6 +14,7 @@
     <modules>
         <module>couplet-analyze-incident</module>
         <module>couplet-analyze-msg</module>
+        <module>couplet-analyze-incident/couplet-incident-server</module>
     </modules>
 
     <properties>
diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml
index 470080e..770cb7e 100644
--- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml
@@ -16,11 +16,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
index 714bdef..aeddeaa 100644
--- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
@@ -4,8 +4,7 @@ server:
 
 # Spring
 spring:
-  main:
-    allow-bean-definition-overriding: true
+
   application:
     # 应用名称
     name: couplet-system
diff --git a/pom.xml b/pom.xml
index 5cbe281..5f6d4c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,6 +260,25 @@
                 <version>${couplet.version}</version>
             </dependency>
 
+            <!-- 事件系统远程调用 -->
+            <dependency>
+                <groupId>com.couplet</groupId>
+                <artifactId>couplet-incident-remote</artifactId>
+                <version>${couplet.version}</version>
+            </dependency>
+             <!-- 事件系统公共依赖 -->
+            <dependency>
+                <groupId>com.couplet</groupId>
+                <artifactId>couplet-incident-common</artifactId>
+                <version>${couplet.version}</version>
+            </dependency>
+            <!-- 事件系统核心模块 -->
+            <dependency>
+                <groupId>com.couplet</groupId>
+                <artifactId>couplet-incident-server</artifactId>
+                <version>${couplet.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>