From ba6ac5b76d3f5679d11e6947a562940d12900c29 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Sun, 29 Sep 2024 20:33:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud-breakdown-client/pom.xml | 27 --- .../cloud-breakdown-common/pom.xml | 26 --- .../com/muyu/breakdown/DTO/MessageDTO.java | 93 ----------- .../cloud-breakdown-remote/pom.xml | 27 --- ...ot.autoconfigure.AutoConfiguration.imports | 1 - .../java/com/muyu/BreakDownApplication.java | 23 --- .../breakdown/config/MybatisPlusConfig.java | 37 ----- .../muyu/breakdown/config/RabbitMQConfig.java | 56 ------- .../config/RabbitMQDirectConfig.java | 62 ------- .../breakdown/config/RabbitMQTopicConfig.java | 59 ------- .../controller/SysCarMessageController.java | 20 --- .../breakdown/mapper/SysCarMessageMapper.java | 17 -- .../impl/SysCarMessageServiceImpl.java | 19 --- .../src/main/resources/bootstrap.yml | 60 ------- cloud-modules/cloud-modules-car/pom.xml | 97 ----------- .../muyu/carrail/CloudCarRailApplication.java | 23 --- .../mapper/carrail/SysFenceMapper.xml | 54 ------ .../mapper/carrail/SyscarRailMapper.xml | 16 -- .../com/muyu/car/domain/SysMessageType.java | 2 - .../cloud-modules-enterprise-common/pom.xml | 131 +++++++++++++++ .../muyu/enterprise}/domain/BreakDown.java | 2 +- .../com/muyu/enterprise}/domain/FaultLog.java | 13 +- .../muyu/enterprise}/domain/MessageMap.java | 2 +- .../com/muyu/enterprise}/domain/Messages.java | 2 +- .../com/muyu/enterprise/domain/SysCar.java | 38 +++++ .../enterprise}/domain/SysCarMessage.java | 6 +- .../muyu/enterprise}/domain/SysCorpuscle.java | 9 +- .../com/muyu/enterprise}/domain/SysFence.java | 10 +- .../enterprise/domain/SysMessageType.java | 26 +++ .../com/muyu/enterprise/domain/WarnLogs.java | 91 ++++++++++ .../com/muyu/enterprise/domain/WarnRule.java | 76 +++++++++ .../muyu/enterprise/domain/WarnStrategy.java | 56 +++++++ .../muyu/enterprise/resp/SysMessageResp.java | 22 +++ .../com/muyu/enterprise/wx/AccessToken.java | 20 +++ .../java/com/muyu/enterprise/wx/Message.java | 27 +++ .../cloud-modules-enterprise-server}/pom.xml | 25 ++- .../enterprise/EnterpriseApplication.java | 18 ++ .../controller/BreakDownController.java | 8 +- .../controller/FaultLogController.java | 33 ++-- .../controller/StationMessageController.java | 12 +- .../controller/SysCarController.java | 123 ++++++++++++++ .../controller/SysCarMessageController.java | 148 +++++++++++++++++ .../controller/SysCorpuscleController.java | 20 +-- .../controller/SysFenceController.java | 31 ++-- .../controller/SysMessageTypeController.java | 108 ++++++++++++ .../controller/WarnLogsController.java | 104 ++++++++++++ .../controller/WarnRuleController.java | 98 +++++++++++ .../controller/WarnStrategyController.java | 104 ++++++++++++ .../controller/WxTestController.java | 155 ++++++++++++++++++ .../enterprise}/mapper/BreakDownMapper.java | 5 +- .../enterprise}/mapper/FaultLogMapper.java | 5 +- .../mapper/StationMessageMapper.java | 6 +- .../muyu/enterprise/mapper/SysCarMapper.java | 15 ++ .../mapper/SysCarMessageMapper.java | 20 +++ .../mapper/SysCorpuscleMapper.java | 9 +- .../enterprise}/mapper/SysFenceMapper.java | 6 +- .../mapper/SysMessageTypeMapper.java | 16 ++ .../enterprise/mapper/WarnLogsMapper.java | 16 ++ .../enterprise/mapper/WarnRuleMapper.java | 17 ++ .../enterprise/mapper/WarnStrategyMapper.java | 16 ++ .../com/muyu/enterprise/message/Article.java | 28 ++++ .../muyu/enterprise/message/NewMessage.java | 34 ++++ .../enterprise}/service/BreakDownService.java | 7 +- .../enterprise}/service/IFaultLogService.java | 8 +- .../service/ISysCarMessageService.java | 44 +++++ .../enterprise/service/ISysCarService.java | 38 +++++ .../service/ISysCorpuscleService.java | 7 +- .../enterprise}/service/ISysFenceService.java | 9 +- .../service/ISysMessageTypeService.java | 41 +++++ .../enterprise/service/IWarnLogsService.java | 39 +++++ .../enterprise/service/IWarnRuleService.java | 39 +++++ .../service/IWarnStrategyService.java | 39 +++++ .../service/StationMessageService.java | 4 +- .../service/SysCarMessageService.java | 6 +- .../service/impl/BreakDownServiceImpl.java | 17 +- .../service/impl/FaultLogServiceImpl.java | 8 +- .../impl/StationMessageServiceImpl.java | 9 +- .../impl/SysCarMessageServiceImpl.java | 89 ++++++++++ .../service/impl/SysCarServiceImpl.java | 91 ++++++++++ .../service/impl/SysCorpuscleServiceImpl.java | 15 +- .../service/impl/SysFenceServiceImpl.java | 14 +- .../impl/SysMessageTypeServiceImpl.java | 73 +++++++++ .../service/impl/WarnLogsServiceImpl.java | 94 +++++++++++ .../service/impl/WarnRuleServiceImpl.java | 88 ++++++++++ .../service/impl/WarnStrategyServiceImpl.java | 75 +++++++++ .../com/muyu/enterprise/util/OkHttpUtils.java | 36 ++++ .../com/muyu/enterprise/util/TokenUtil.java | 36 ++++ .../src/main/resources/banner.txt | 0 .../src/main/resources/bootstrap.yml | 26 +-- .../src/main/resources/logback/dev.xml | 2 +- .../src/main/resources/logback/prod.xml | 2 +- .../src/main/resources/logback/test.xml | 2 +- .../pom.xml | 17 +- .../main/java/com/muyu/parsing/mqtt/Demo.java | 61 ------- .../mapper/platform/WarnLogsMapper.xml | 96 ----------- .../mapper/platform/WarnRuleMapper.xml | 86 ---------- .../mapper/platform/WarnStrategyMapper.xml | 66 -------- cloud-modules/pom.xml | 3 +- 98 files changed, 2500 insertions(+), 1217 deletions(-) delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQConfig.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQDirectConfig.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQTopicConfig.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/SysCarMessageController.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/SysCarMessageMapper.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml delete mode 100644 cloud-modules/cloud-modules-car/pom.xml delete mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java delete mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml delete mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise}/domain/BreakDown.java (97%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise}/domain/FaultLog.java (89%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise}/domain/MessageMap.java (91%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise}/domain/Messages.java (96%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise}/domain/SysCarMessage.java (89%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise}/domain/SysCorpuscle.java (95%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise}/domain/SysFence.java (95%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysMessageType.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/resp/SysMessageResp.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/AccessToken.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/Message.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-server => cloud-modules-enterprise/cloud-modules-enterprise-server}/pom.xml (78%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/EnterpriseApplication.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/controller/BreakDownController.java (94%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/controller/FaultLogController.java (83%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/controller/StationMessageController.java (73%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/controller/SysCorpuscleController.java (89%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/controller/SysFenceController.java (80%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysMessageTypeController.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WxTestController.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/mapper/BreakDownMapper.java (80%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/mapper/FaultLogMapper.java (71%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/mapper/StationMessageMapper.java (71%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/mapper/SysCorpuscleMapper.java (73%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/mapper/SysFenceMapper.java (62%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysMessageTypeMapper.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/Article.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/NewMessage.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/BreakDownService.java (87%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/IFaultLogService.java (90%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarMessageService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarService.java rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/ISysCorpuscleService.java (85%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/ISysFenceService.java (89%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysMessageTypeService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/StationMessageService.java (81%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/SysCarMessageService.java (76%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/impl/BreakDownServiceImpl.java (83%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/impl/FaultLogServiceImpl.java (91%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/impl/StationMessageServiceImpl.java (72%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarMessageServiceImpl.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/impl/SysCorpuscleServiceImpl.java (75%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise}/service/impl/SysFenceServiceImpl.java (88%) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysMessageTypeServiceImpl.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnLogsServiceImpl.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/OkHttpUtils.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/TokenUtil.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-server => cloud-modules-enterprise/cloud-modules-enterprise-server}/src/main/resources/banner.txt (100%) rename cloud-modules/{cloud-modules-car => cloud-modules-enterprise/cloud-modules-enterprise-server}/src/main/resources/bootstrap.yml (68%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server => cloud-modules-enterprise/cloud-modules-enterprise-server}/src/main/resources/logback/dev.xml (97%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server => cloud-modules-enterprise/cloud-modules-enterprise-server}/src/main/resources/logback/prod.xml (98%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server => cloud-modules-enterprise/cloud-modules-enterprise-server}/src/main/resources/logback/test.xml (98%) rename cloud-modules/{cloud-breakdown => cloud-modules-enterprise}/pom.xml (74%) delete mode 100644 cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mqtt/Demo.java delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnLogsMapper.xml delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRuleMapper.xml delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml deleted file mode 100644 index 603eba0..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-breakdown - 3.6.3 - - - cloud-breakdown-client - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-breakdown-common - 3.6.3 - - - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml deleted file mode 100644 index fc96ca7..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-breakdown - 3.6.3 - - - cloud-breakdown-common - - - 17 - 17 - UTF-8 - - - - com.muyu - cloud-common-core - - - - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java b/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java deleted file mode 100644 index 5e933f7..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java +++ /dev/null @@ -1,93 +0,0 @@ -//package com.muyu.breakdown.DTO; -// -// -//import com.muyu.breakdown.domain.Messages; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; -// -//import java.sql.*; -//import java.util.*; -// -///** -// * @ Tool：IntelliJ IDEA -// * @ Author：CHX -// * @ Date：2024-09-18-15:00 -// * @ Version：1.0 -// * @ Description：数据库连接层 -// * @author Lenovo -// */ -//@Component -//public class MessageDTO { -// private static final String DB_URL = "jdbc:mysql://106.54.193.225:3306/one"; -// private static final String USER = "root"; -// private static final String PASSWORD = "bawei2112A"; -// -// // 2. 建立数据库连接 -// Connection connection; -// // 构造函数，初始化数据库连接 -// // 保存消息到数据库 -// public void saveMessage(Messages message) { -// String sql = "INSERT INTO sys_messages (sender_id, receiver_id, content) VALUES (?, ?, ?)"; -// try { -// Class.forName("com.mysql.cj.jdbc.Driver"); -// } catch (ClassNotFoundException e) { -// throw new RuntimeException(e); -// } -// try { -// connection = DriverManager.getConnection(DB_URL, USER, PASSWORD); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { -// preparedStatement.setInt(1, message.getSenderId()); -// preparedStatement.setInt(2, message.getReceiverId()); -// preparedStatement.setString(3, message.getContent()); -// // 执行添加操作 -// preparedStatement.executeUpdate(); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// try { -// connection.close(); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// } -// -// // 获取所有消息 -// public List getAllMessages(int receiverId){ -// String sql = "SELECT * FROM sys_messages WHERE receiver_id = ?"; -// try { -// Class.forName("com.mysql.cj.jdbc.Driver"); -// } catch (ClassNotFoundException e) { -// throw new RuntimeException(e); -// } -// List messages = new ArrayList<>(); -// try { -// connection = DriverManager.getConnection(DB_URL, USER, PASSWORD); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { -// preparedStatement.setInt(1, receiverId); -// // 执行查询操作 -// ResultSet rs = preparedStatement.executeQuery(); -// while (rs.next()) { -// Messages message = new Messages(rs.getInt("sender_id"), receiverId, rs.getString("content")); -// -// // 添加到消息列表 -// messages.add(message); -// } -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// try { -// connection.close(); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// // 返回消息列表 -// return messages; -// } -// -//} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml deleted file mode 100644 index c3b50cc..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-breakdown - 3.6.3 - - - cloud-breakdown-remote - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-breakdown-common - 3.6.3 - - - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8b13789..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java deleted file mode 100644 index 3d4869c..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-17-15:00 - * @ Version：1.0 - * @ Description：故障启动类 - * @author Lenovo - */ -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication -public class BreakDownApplication { - public static void main(String[] args) { - SpringApplication.run(BreakDownApplication.class, args); - } -} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java deleted file mode 100644 index 5a1131d..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.breakdown.config; - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.core.MybatisConfiguration; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-17-15:41 - * @ Version：1.0 - * @ Description：mybatisplus配置类 - * @author Lenovo - */ -//@Configuration -//public class MybatisPlusConfig { -// /** -// * 添加分页插件 -// */ -// @Bean -// public MybatisPlusInterceptor mybatisPlusInterceptor() { -// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); -// // 如果配置多个插件, 切记分页最后添加 -// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); -// // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType -// return interceptor; -// } -// @Bean -// public MybatisConfiguration mybatisConfiguration(){ -// MybatisConfiguration configuration = new MybatisConfiguration(); -// return configuration; -// } -// -//} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQConfig.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQConfig.java deleted file mode 100644 index a735a6e..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.muyu.breakdown.config; - -import org.springframework.amqp.core.Binding; -import org.springframework.amqp.core.BindingBuilder; -import org.springframework.amqp.core.FanoutExchange; -import org.springframework.amqp.core.Queue; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -/** - * 绑定交换机与队列 - * */ -@Configuration -public class RabbitMQConfig { - - // 1.生命注册fanout模式的交换机 - @Bean - public FanoutExchange fanoutExchange(){ - //1.fanout模式的路由名称 2.是否持久化 3. 是否自动删除 - return new FanoutExchange("fanout",true,false); - } - // 2.生命队列 sms.fanout.queue email.fanout.queue,duanxin.fanout.queue - @Bean - public Queue duanxinQueue(){ - return new Queue("duanxin",true); - } - - - @Bean - public Queue emailQueue(){ - return new Queue("email",false); - } - - @Bean - public Queue smsQueue(){ - return new Queue("sms",false); - } - - // 3.完成绑定关系(队列和交换机完成绑定关系 - @Bean - public Binding duanxinExchange(){ - return BindingBuilder.bind(duanxinQueue()).to(fanoutExchange()); - } - - - @Bean - public Binding emailExchange(){ - return BindingBuilder.bind(emailQueue()).to(fanoutExchange()); - } - - @Bean - public Binding smsExchange(){ - return BindingBuilder.bind(smsQueue()).to(fanoutExchange()); - } - - // 4.生命注册fanout模式的交换机 -} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQDirectConfig.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQDirectConfig.java deleted file mode 100644 index e0b2f8b..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQDirectConfig.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.muyu.breakdown.config; - -import org.springframework.amqp.core.*; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.util.HashMap; - -/** - * 绑定交换机与队列 - * */ -@Configuration -public class RabbitMQDirectConfig { - /** - * 与fanout发布订阅模式不同的是 Direct 需要在Binding规定对应的 路由名称 - * */ - // 1.生命注册fanout模式的交换机 - @Bean - public DirectExchange directExchange(){ - //1.fanout模式的路由名称 2.是否持久化 3. 是否自动删除 - return new DirectExchange("direct",true,false); - } - // 2.生命队列 sms.fanout.queue email.fanout.queue,duanxin.fanout.queue - @Bean - public Queue directduanxinQueue(){ - HashMap map = new HashMap<>(); - map.put("x-delayed-letter-exchange","direct"); - map.put("x-delayed-routing-key","directduanxin"); - map.put("x-message-ttl",10000); - return QueueBuilder.durable("directduanxin").withArguments(map).build(); - } - - - @Bean - public Queue directemailQueue(){ - return new Queue("directemail",false); - } - - @Bean - public Queue directsmsQueue(){ - return new Queue("directsms",false); - } - - // 3.完成绑定关系(队列和交换机完成绑定关系 - @Bean - public Binding directduanxinExchange(){ - return BindingBuilder.bind(directduanxinQueue()).to(directExchange()).with("directduanxin"); - } - - - @Bean - public Binding directemailExchange(){ - return BindingBuilder.bind(directemailQueue()).to(directExchange()).with("directemail"); - } - - @Bean - public Binding directsmsExchange(){ - return BindingBuilder.bind(directsmsQueue()).to(directExchange()).with("directsms"); - } - - // 4.生命注册fanout模式的交换机 -} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQTopicConfig.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQTopicConfig.java deleted file mode 100644 index 58630e5..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQTopicConfig.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.muyu.breakdown.config; - -import org.springframework.amqp.core.Binding; -import org.springframework.amqp.core.BindingBuilder; -import org.springframework.amqp.core.Queue; -import org.springframework.amqp.core.TopicExchange; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 绑定交换机与队列 - * */ -@Configuration -public class RabbitMQTopicConfig { - /** - * 与fanout发布订阅模式不同的是 Direct 需要在Binding规定对应的 路由名称 - * */ - // 1.生命注册fanout模式的交换机 - @Bean - public TopicExchange topicExchange(){ - //1.fanout模式的路由名称 2.是否持久化 3. 是否自动删除 - return new TopicExchange("topic",true,false); - } - // 2.生命队列 sms.fanout.queue email.fanout.queue,duanxin.fanout.queue - @Bean - public Queue topicduanxinQueue(){ - return new Queue("topicduanxin.test.one",true); - } - - - @Bean - public Queue topicemailQueue(){ - return new Queue("topicemail.test.two",false); - } - - @Bean - public Queue topicsmsQueue(){ - return new Queue("topicsms.test.three",false); - } - - // 3.完成绑定关系(队列和交换机完成绑定关系 - @Bean - public Binding topicduanxinExchange(){ - return BindingBuilder.bind(topicduanxinQueue()).to(topicExchange()).with("topic.#"); - } - - - @Bean - public Binding topicemailExchange(){ - return BindingBuilder.bind(topicemailQueue()).to(topicExchange()).with("topic.*"); - } - - @Bean - public Binding topicsmsExchange(){ - return BindingBuilder.bind(topicsmsQueue()).to(topicExchange()).with("topic.test.#"); - } - - // 4.生命注册fanout模式的交换机 -} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/SysCarMessageController.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/SysCarMessageController.java deleted file mode 100644 index 11bba59..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/SysCarMessageController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.breakdown.controller; - -import com.muyu.breakdown.service.SysCarMessageService; -import com.muyu.common.core.web.controller.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-20-15:41 - * @ Version：1.0 - * @ Description：报文模版控制层 - * @author Lenovo - */ -@RestController -public class SysCarMessageController extends BaseController { - @Autowired - private SysCarMessageService sysCarMessageService; -} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/SysCarMessageMapper.java deleted file mode 100644 index 5629f33..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/SysCarMessageMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.breakdown.mapper; - -import com.github.yulichang.base.MPJBaseMapper; -import com.muyu.breakdown.domain.SysCarMessage; -import org.apache.ibatis.annotations.Mapper; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-20-15:54 - * @ Version：1.0 - * @ Description： - * @author Lenovo - */ -@Mapper -public interface SysCarMessageMapper extends MPJBaseMapper { -} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java deleted file mode 100644 index 754fc9b..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.breakdown.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.breakdown.domain.SysCarMessage; -import com.muyu.breakdown.mapper.SysCarMessageMapper; -import com.muyu.breakdown.service.SysCarMessageService; -import org.springframework.stereotype.Service; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-20-15:42 - * @ Version：1.0 - * @ Description： - * @author Lenovo - */ -@Service -public class SysCarMessageServiceImpl extends ServiceImpl implements SysCarMessageService { -} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml deleted file mode 100644 index 1edc717..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Tomcat -server: - port: 9702 - -# nacos线上地址 -nacos: - addr: 47.116.173.119:8848 - user-name: nacos - password: nacos - namespace: one-saas -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-breakdown - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.breakdown.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml deleted file mode 100644 index d2e4afd..0000000 --- a/cloud-modules/cloud-modules-car/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-car - - cloud-modules-car 电子围栏 - - - 17 - 17 - UTF-8 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - com.muyu - cloud-common-core - - - - com.muyu - cloud-common-api-doc - - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - - diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java deleted file mode 100644 index 98d9546..0000000 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.carrail; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -@EnableCustomConfig -@EnableMyFeignClients -@MapperScan("com.muyu.carrail.mapper") -@SpringBootApplication -public class CloudCarRailApplication { - public static void main(String[] args) { -// try { -// -// } catch (Exception e) { -// e.printStackTrace(); -// } - SpringApplication.run(CloudCarRailApplication.class, args); - } -} diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml deleted file mode 100644 index 26be2dc..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, group_code, group_name, group_type, state, create_by, create_time, update_by, update_time, remark from sys_fence_group - - - - - - - - - - - delete from sys_fence_group where id = #{id} - - - - delete from sys_fence_group where id in - - #{id} - - - diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml deleted file mode 100644 index c9f9205..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - insert into sys_corpuscle_fence(fence_code,fence_name,fence_type,fence_position,state) - values(#{fenceCode},#{fenceName},#{fenceType},#{fencePosition},#{state}) - - - - - diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java index c2f3e04..813f095 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java +++ b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java @@ -18,8 +18,6 @@ import com.baomidou.mybatisplus.annotation.IdType; */ @Data -@Setter -@Getter @SuperBuilder @NoArgsConstructor @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml new file mode 100644 index 0000000..31e5868 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml @@ -0,0 +1,131 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + cloud-modules-enterprise-common + + + 17 + 17 + UTF-8 + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + com.muyu + cloud-common-api-doc + + + + + com.muyu + cloud-common-xxl + + + + com.muyu + cloud-common-rabbit + + + + com.muyu + cloud-common-core + 3.6.3 + + + + + + com.squareup.okhttp3 + okhttp + 4.9.3 + + + com.thoughtworks.xstream + xstream + 1.4.20 + + + org.projectlombok + lombok + 1.18.34 + + + org.springframework.boot + spring-boot-starter + 3.3.2 + + + org.springframework.boot + spring-boot-starter-web + 3.3.2 + + + + org.dom4j + dom4j + 2.1.3 + + + com.alibaba.fastjson2 + fastjson2 + 2.0.43 + + + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/BreakDown.java similarity index 97% rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/BreakDown.java index 208c12b..4a803fe 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/BreakDown.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java similarity index 89% rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/FaultLog.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java index 3dd3a01..b3e2ac6 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java @@ -1,16 +1,15 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterprise.domain; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; + +import java.util.Date; /** * 故障日志对象 fault_log diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/MessageMap.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/MessageMap.java similarity index 91% rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/MessageMap.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/MessageMap.java index c75401f..265e473 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/MessageMap.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/MessageMap.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterprise.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/Messages.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Messages.java similarity index 96% rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/Messages.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Messages.java index 4e430fb..d3f813b 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/Messages.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Messages.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java new file mode 100644 index 0000000..2b09b2e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java @@ -0,0 +1,38 @@ +package com.muyu.enterprise.domain; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @ClassName SysCar + * @Description 描述 + * @Author Chen + * @Date 2024/9/29 16:31 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "sys_car") +public class SysCar { + + private Long id; + private String carVin; + private String carPlate; + private String carBrand; + private String carModel; + private String carType; + private Date carLastJoinTime; + private String carLastOfflineTime; + private String state; + private String createBy; + private String createTime; + private String updateBy; + private String updateTime; + private String remark; +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/SysCarMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarMessage.java similarity index 89% rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/SysCarMessage.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarMessage.java index 7cadf9c..87e8af3 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/SysCarMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarMessage.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; @@ -40,4 +40,8 @@ public class SysCarMessage { * 结束位下标 */ private String messageEndIndex; + /** + * + */ + private String messageType; } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCorpuscle.java similarity index 95% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCorpuscle.java index 2f85c6e..e00a4d2 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCorpuscle.java @@ -1,14 +1,13 @@ -package com.muyu.carrail.domain; +package com.muyu.enterprise.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; /** * 电子围栏对象 sys_corpuscle_fence diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysFence.java similarity index 95% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysFence.java index b7d068b..3a76ce9 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysFence.java @@ -1,15 +1,13 @@ -package com.muyu.carrail.domain; +package com.muyu.enterprise.domain; -import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; import java.util.Date; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysMessageType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysMessageType.java new file mode 100644 index 0000000..4f34f9d --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysMessageType.java @@ -0,0 +1,26 @@ +package com.muyu.enterprise.domain; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName SysMessageType + * @Description 描述 + * @Author Chen + * @Date 2024/9/29 16:40 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "sys_message_type") +public class SysMessageType { + private String id; + private String messageCode; + private String messageName; + private String messageType; + private String messageClass; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java new file mode 100644 index 0000000..3b0163d --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java @@ -0,0 +1,91 @@ +package com.muyu.enterprise.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import lombok.*; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 预警日志对象 warn_logs + * + * @author muyu + * @date 2024-09-20 + */ + +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("warn_logs") +public class WarnLogs { + private static final long serialVersionUID = 1L; + + /** 预警日志id */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 车辆vin码 */ + @Excel(name = "车辆vin码") + private String vin; + + /** 规则id */ + @Excel(name = "规则id") + private Long warnRuleId; + + /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date startTime; + + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date endTime; + + /** 最大值 */ + @Excel(name = "最大值") + private Long maxValue; + + /** 最小值 */ + @Excel(name = "最小值") + private Long minValue; + + /** 平均值 */ + @Excel(name = "平均值") + private Long avgValue; + + /** 中位数 */ + @Excel(name = "中位数") + private Long medianValue; + + /** 是否发送预警 */ + @Excel(name = "是否发送预警") + private Long status; + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("vin", getVin()) + .append("warnRuleId", getWarnRuleId()) + .append("startTime", getStartTime()) + .append("endTime", getEndTime()) + .append("maxValue", getMaxValue()) + .append("minValue", getMinValue()) + .append("avgValue", getAvgValue()) + .append("medianValue", getMedianValue()) + .append("status", getStatus()) + .toString(); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java new file mode 100644 index 0000000..f345225 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java @@ -0,0 +1,76 @@ +package com.muyu.enterprise.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import lombok.*; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 预警规则对象 warn_rule + * + * @author muyu + * @date 2024-09-20 + */ + +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("warn_rule") +public class WarnRule{ + private static final long serialVersionUID = 1L; + + /** 规则id */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 规则名称 */ + @Excel(name = "规则名称") + private String ruleName; + + /** 策略id */ + @Excel(name = "策略id") + private Long strategyId; + + /** 报文数据类型id */ + @Excel(name = "报文数据类型id") + private Long msgTypeId; + + /** 滑窗时间 */ + @Excel(name = "滑窗时间") + private Long slideTime; + + /** 滑窗频率 */ + @Excel(name = "滑窗频率") + private Long slideFrequency; + + /** 最大值 */ + @Excel(name = "最大值") + private Long maxValue; + + /** 最小值 */ + @Excel(name = "最小值") + private Long minValue; + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("ruleName", getRuleName()) + .append("strategyId", getStrategyId()) + .append("msgTypeId", getMsgTypeId()) + .append("slideTime", getSlideTime()) + .append("slideFrequency", getSlideFrequency()) + .append("maxValue", getMaxValue()) + .append("minValue", getMinValue()) + .toString(); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java new file mode 100644 index 0000000..ff2a87a --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java @@ -0,0 +1,56 @@ +package com.muyu.enterprise.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import lombok.*; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 预警策略对象 warn_strategy + * + * @author muyu + * @date 2024-09-20 + */ + +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("warn_strategy") +public class WarnStrategy{ + private static final long serialVersionUID = 1L; + + /** 策略id */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 车辆类型id */ + @Excel(name = "车辆类型id") + private Long carTypeId; + + /** 策略名称 */ + @Excel(name = "策略名称") + private String strategyName; + + /** 报文模版id */ + @Excel(name = "报文模版id") + private Long msgId; + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("carTypeId", getCarTypeId()) + .append("strategyName", getStrategyName()) + .append("msgId", getMsgId()) + .toString(); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/resp/SysMessageResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/resp/SysMessageResp.java new file mode 100644 index 0000000..bfd00d6 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/resp/SysMessageResp.java @@ -0,0 +1,22 @@ +package com.muyu.enterprise.resp; + +import lombok.*; + +/** + * 车辆报文类型对象 sys_message_type + * + * @author muyu + * @date 2024-09-18 + */ + +@Data +public class SysMessageResp { + private static final long serialVersionUID = 1L; + private Long id; + private String modelCode; + private String messageTypeCode; + private String messageStartIndex; + private String messageEndIndex; + private String messageType; + private String messageName; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/AccessToken.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/AccessToken.java new file mode 100644 index 0000000..9989dc3 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/AccessToken.java @@ -0,0 +1,20 @@ +package com.muyu.enterprise.wx; + +import lombok.Data; + +/** + * @author 24415 + */ +@Data +public class AccessToken { + + + private String access_token; + + private Long expires_in; + + public void setExpiresTime(Long expiresIn) { + this.expires_in = System.currentTimeMillis() + expiresIn * 1000; + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/Message.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/Message.java new file mode 100644 index 0000000..70d60a1 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/Message.java @@ -0,0 +1,27 @@ +package com.muyu.enterprise.wx; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +/** + * @Author： Chen + * @name：Message + */ +@Data +@XStreamAlias("xml") +public class Message { + @XStreamAlias("ToUserName") + private String toUserName; + + @XStreamAlias("FromUserName") + private String fromUserName; + + @XStreamAlias("CreateTime") + private Long createTime; + + @XStreamAlias("MsgType") + private String msgType; + + @XStreamAlias("Content") + private String content; +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml similarity index 78% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index a208436..799d475 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - cloud-breakdown + cloud-modules-enterprise 3.6.3 - cloud-breakdown-server + cloud-modules-enterprise-server 17 @@ -17,7 +17,6 @@ UTF-8 - com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery @@ -82,11 +81,27 @@ cloud-common-rabbit + + org.bouncycastle + bcpkix-jdk15on + 1.70 + com.muyu - cloud-breakdown-common + cloud-modules-enterprise-common 3.6.3 - + + + org.dom4j + dom4j + 2.1.3 + + + com.alibaba.fastjson2 + fastjson2 + 2.0.43 + + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/EnterpriseApplication.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/EnterpriseApplication.java new file mode 100644 index 0000000..755d4dc --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/EnterpriseApplication.java @@ -0,0 +1,18 @@ +package com.muyu.enterprise; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @ClassName EnterpriseApplication + * @Description 描述 + * @Author Chen + * @Date 2024/9/29 16:08 + */ +@EnableCustomConfig +//@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class EnterpriseApplication { +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/BreakDownController.java similarity index 94% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/BreakDownController.java index 1e8dea0..8db01e0 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/BreakDownController.java @@ -1,14 +1,14 @@ -package com.muyu.breakdown.controller; +package com.muyu.enterprise.controller; -import com.muyu.breakdown.domain.BreakDown; -import com.muyu.breakdown.domain.MessageMap; -import com.muyu.breakdown.service.BreakDownService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.enterprise.domain.BreakDown; +import com.muyu.enterprise.domain.MessageMap; +import com.muyu.enterprise.service.BreakDownService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java similarity index 83% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/FaultLogController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java index d66c519..27e8a00 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java @@ -1,27 +1,20 @@ -package com.muyu.breakdown.controller; +package com.muyu.enterprise.controller; -import java.util.Arrays; -import java.util.List; - -import com.muyu.breakdown.domain.FaultLog; -import com.muyu.breakdown.service.IFaultLogService; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; -import org.springframework.validation.annotation.Validated; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.enterprise.domain.FaultLog; +import com.muyu.enterprise.service.IFaultLogService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; /** * 故障日志Controller diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/StationMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/StationMessageController.java similarity index 73% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/StationMessageController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/StationMessageController.java index 2e2fdf9..9ac6713 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/StationMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/StationMessageController.java @@ -1,13 +1,15 @@ -package com.muyu.breakdown.controller; +package com.muyu.enterprise.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.muyu.breakdown.domain.Messages; -import com.muyu.breakdown.service.BreakDownService; -import com.muyu.breakdown.service.StationMessageService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.enterprise.domain.Messages; +import com.muyu.enterprise.service.StationMessageService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java new file mode 100644 index 0000000..e206d28 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java @@ -0,0 +1,123 @@ +package com.muyu.enterprise.controller; + + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.enterprise.domain.SysCar; +import com.muyu.enterprise.service.ISysCarService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * 车辆基础信息Controller + * + * @author muyu + * @date 2024-09-17 + */ +@RestController +@RequestMapping("/car") +public class SysCarController extends BaseController +{ + @Autowired + private ISysCarService sysCarService; + + + /** + * 查询车辆基础信息列表 + */ + @RequiresPermissions("car:car:list") + @GetMapping("/list") + public Result> list(SysCar sysCar) + { + startPage(); + List list = sysCarService.selectSysCarList(sysCar); + return getDataTable(list); + } + + /** + * 导出车辆基础信息列表 + */ + @RequiresPermissions("car:car:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysCar sysCar) + { + List list = sysCarService.selectSysCarList(sysCar); + ExcelUtil util = new ExcelUtil(SysCar.class); + util.exportExcel(response, list, "车辆基础信息数据"); + } + + /** + * 获取车辆基础信息详细信息 + */ + @RequiresPermissions("car:car:query") + @GetMapping(value = "/{id}") + public Result> getInfo(@PathVariable("id") Long id) + { + return success(sysCarService.selectSysCarById(id)); + } + + /** + * 新增车辆基础信息 + */ + @RequiresPermissions("car:car:add") + @PostMapping + public Result add( + @Validated @RequestBody SysCar sysCar) + { + // 获取当前时间（没有时区） + LocalDateTime now = LocalDateTime.now(); + // 假设我们使用系统默认时区 + ZoneId zoneId = ZoneId.systemDefault(); + // 将LocalDateTime转换为ZonedDateTime（添加了时区信息） + ZonedDateTime zdt = now.atZone(zoneId); + // 将ZonedDateTime转换为Instant（UTC时间线上的点） + Instant instant = zdt.toInstant(); + // 将Instant转换为Date + Date date = Date.from(instant); + sysCar.setCarLastJoinTime(date); + if (sysCarService.checkIdUnique(sysCar)) { + return error("新增 车辆基础信息 '" + sysCar + "'失败，车辆基础信息已存在"); + } + + return toAjax(sysCarService.save(sysCar)); + } + + /** + * 修改车辆基础信息 + */ + @RequiresPermissions("car:car:edit") + @PutMapping + public Result edit( + @Validated @RequestBody SysCar sysCar) + { + if (!sysCarService.checkIdUnique(sysCar)) { + return error("修改 车辆基础信息 '" + sysCar + "'失败，车辆基础信息不存在"); + } + + return toAjax(sysCarService.updateById(sysCar)); + } + + /** + * 删除车辆基础信息 + */ + @RequiresPermissions("car:car:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) + { + sysCarService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java new file mode 100644 index 0000000..ffa0ea5 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java @@ -0,0 +1,148 @@ +package com.muyu.enterprise.controller; + +import com.alibaba.fastjson2.JSONObject; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.enterprise.domain.SysCarMessage; +import com.muyu.enterprise.resp.SysMessageResp; +import com.muyu.enterprise.service.ISysCarMessageService; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; + +/** + * 车辆报文记录Controller + * + * @author muyu + * @date 2024-09-18 + */ +@Slf4j +@RestController +@RequestMapping("/messageInfo") +public class SysCarMessageController extends BaseController { + @Resource + private ISysCarMessageService sysCarMessageService; + @Autowired + private HttpSession session; + static String TEST = "56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56"; + + + /** + * 查询车辆报文记录列表 + */ +// @RequiresPermissions("message:message:list") + @Transactional + @GetMapping("/list") + public Result> list(SysCarMessage sysCarMessage) throws ExecutionException, InterruptedException { + List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); + if (list == null || list.isEmpty()) { + return Result.error(); //为空返回错误信息 + } + String[] test = TEST.split(" "); + String[] results = new String[list.size()]; + List> futures = new ArrayList<>(); + + for (SysCarMessage carMessage : list) { + futures.add(CompletableFuture.supplyAsync(() -> { + int start = Integer.parseInt(carMessage.getMessageStartIndex()) - 1; + int end = Integer.parseInt(carMessage.getMessageEndIndex()); + StringBuilder hexBuilder = new StringBuilder(); + for (int i = start; i < end; i++) { + hexBuilder.append(test[i]); + } + String hex = hexBuilder.toString(); + char[] result = new char[hex.length() / 2]; + for (int x = 0; x < hex.length(); x += 2) { + int high = Character.digit(hex.charAt(x), 16); + int low = Character.digit(hex.charAt(x + 1), 16); + result[x / 2] = (char) ((high << 4) + low); + } + return new String(result); + })); + } + for (int i = 0; i < futures.size(); i++) { + results[i] = futures.get(i).get(); + } + String jsonString = JSONObject.toJSONString(results); + + log.info("消息发送成功：{}", jsonString); + return Result.success(list); + } + + @RequiresPermissions("message:message:dobList") + @GetMapping("/dobList") + public Result> dobList(SysMessageResp sysMessageResp) { + List list = sysCarMessageService.dobList(sysMessageResp); + return Result.success(list); + } + + + /** + * 导出车辆报文记录列表 + */ + @RequiresPermissions("message:message:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysCarMessage sysCarMessage) { + List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); + ExcelUtil util = new ExcelUtil(SysCarMessage.class); + util.exportExcel(response, list, "车辆报文记录数据"); + } + + /** + * 获取车辆报文记录详细信息 + */ + @RequiresPermissions("message:message:query") + @GetMapping(value = "/{id}") + public Result> getInfo(@PathVariable("id") Long id) { + return success(sysCarMessageService.selectSysCarMessageById(id)); + } + + /** + * 新增车辆报文记录 + */ + @RequiresPermissions("message:message:add") + @PostMapping + public Result add( + @Validated @RequestBody SysCarMessage sysCarMessage) { + if (sysCarMessageService.checkIdUnique(sysCarMessage)) { + return error("新增 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录已存在"); + } + return toAjax(sysCarMessageService.save(sysCarMessage)); + } + + /** + * 修改车辆报文记录 + */ + @RequiresPermissions("message:message:edit") + @PutMapping + public Result edit( + @Validated @RequestBody SysCarMessage sysCarMessage) { + if (!sysCarMessageService.checkIdUnique(sysCarMessage)) { + return error("修改 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录不存在"); + } + return toAjax(sysCarMessageService.updateById(sysCarMessage)); + } + + /** + * 删除车辆报文记录 + */ + @RequiresPermissions("message:message:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) { + sysCarMessageService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCorpuscleController.java similarity index 89% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCorpuscleController.java index 15e083c..7b2563f 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCorpuscleController.java @@ -1,22 +1,18 @@ -package com.muyu.carrail.controller; +package com.muyu.enterprise.controller; -import java.util.Arrays; -import java.util.List; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import jakarta.annotation.Resource; - +import com.muyu.enterprise.domain.SysCorpuscle; +import com.muyu.enterprise.service.ISysCorpuscleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.muyu.carrail.domain.SysCorpuscle; -import com.muyu.carrail.service.ISysCorpuscleService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; - -import com.muyu.common.core.web.page.TableDataInfo; +import java.util.Arrays; +import java.util.List; /** * 电子围栏Controller diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysFenceController.java similarity index 80% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysFenceController.java index a3ff506..92d7b25 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysFenceController.java @@ -1,26 +1,19 @@ -package com.muyu.carrail.controller; +package com.muyu.enterprise.controller; -import java.util.Arrays; -import java.util.List; - -import com.muyu.carrail.domain.SysFence; -import com.muyu.carrail.service.ISysFenceService; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; -import org.springframework.validation.annotation.Validated; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.enterprise.domain.SysFence; +import com.muyu.enterprise.service.ISysFenceService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; /** * 围栏组Controller diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysMessageTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysMessageTypeController.java new file mode 100644 index 0000000..78eaa41 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysMessageTypeController.java @@ -0,0 +1,108 @@ +package com.muyu.enterprise.controller; + + + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.enterprise.domain.SysMessageType; +import com.muyu.enterprise.service.ISysMessageTypeService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * 车辆报文类型Controller + * + * @author muyu + * @date 2024-09-18 + */ +@RestController +@RequestMapping("/messageType") +public class SysMessageTypeController extends BaseController { + @Resource + private ISysMessageTypeService sysMessageTypeService; + + /** + * 查询车辆报文类型列表 + */ + @RequiresPermissions("message:messageType:list") + @GetMapping("/list") + public Result> list(SysMessageType sysMessageType) + { + List list = sysMessageTypeService.selectSysMessageTypeList(sysMessageType); + return Result.success(list); + } + + /** + * 导出车辆报文类型列表 + */ + @RequiresPermissions("message:messageType:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysMessageType sysMessageType) + { + List list = sysMessageTypeService.selectSysMessageTypeList(sysMessageType); + ExcelUtil util = new ExcelUtil(SysMessageType.class); + util.exportExcel(response, list, "车辆报文类型数据"); + } + + /** + * 获取车辆报文类型详细信息 + */ + @RequiresPermissions("message:messageType:query") + @GetMapping(value = "/{messageCode}") + public Result> getInfo(@PathVariable("messageCode") String[] messageCodes) + { + SysMessageType[] list = new SysMessageType[messageCodes.length]; // 确保数组大小 + for (int i = 0; i < messageCodes.length; i++) { + list[i] = sysMessageTypeService.selectSysMessageTypeByMessageCode(messageCodes[i]); + } + return success(list); + } + + /** + * 新增车辆报文类型 + */ + @RequiresPermissions("message:messageType:add") + @PostMapping + public Result add( + @Validated @RequestBody SysMessageType sysMessageType) + { + if (sysMessageTypeService.checkIdUnique(sysMessageType)) { + return error("新增 车辆报文类型 '" + sysMessageType + "'失败，车辆报文类型已存在"); + } + + return toAjax(sysMessageTypeService.save(sysMessageType)); + } + + /** + * 修改车辆报文类型 + */ + @RequiresPermissions("message:messageType:edit") + @PutMapping + public Result edit( + @Validated @RequestBody SysMessageType sysMessageType) + { + if (!sysMessageTypeService.checkIdUnique(sysMessageType)) { + return error("修改 车辆报文类型 '" + sysMessageType + "'失败，车辆报文类型不存在"); + } + + return toAjax(sysMessageTypeService.updateById(sysMessageType)); + } + + /** + * 删除车辆报文类型 + */ + @RequiresPermissions("message:messageType:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) + { + sysMessageTypeService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java new file mode 100644 index 0000000..3f1c72c --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java @@ -0,0 +1,104 @@ +package com.muyu.enterprise.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; + +import com.muyu.enterprise.domain.WarnLogs; +import com.muyu.enterprise.service.IWarnLogsService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * 预警日志Controller + * + * @author muyu + * @date 2024-09-20 + */ +@RestController +@RequestMapping("/logs") +public class WarnLogsController extends BaseController +{ + @Resource + private IWarnLogsService warnLogsService; + + /** + * 查询预警日志列表 + */ + @RequiresPermissions("warning:logs:list") + @GetMapping("/list") + public Result> list(WarnLogs warnLogs) + { + startPage(); + List list = warnLogsService.selectWarnLogsList(warnLogs); + return getDataTable(list); + } + + /** + * 导出预警日志列表 + */ + @RequiresPermissions("warning:logs:export") + @PostMapping("/export") + public void export(HttpServletResponse response, WarnLogs warnLogs) + { + List list = warnLogsService.selectWarnLogsList(warnLogs); + ExcelUtil util = new ExcelUtil(WarnLogs.class); + util.exportExcel(response, list, "预警日志数据"); + } + + /** + * 获取预警日志详细信息 + */ + @RequiresPermissions("warning:logs:query") + @GetMapping(value = "/{id}") + public Result> getInfo(@PathVariable("id") Long id) + { + return success(warnLogsService.selectWarnLogsById(id)); + } + + /** + * 新增预警日志 + */ + @RequiresPermissions("warning:logs:add") + @PostMapping + public Result add( + @Validated @RequestBody WarnLogs warnLogs) + { + if (warnLogsService.checkIdUnique(warnLogs)) { + return error("新增 预警日志 '" + warnLogs + "'失败，预警日志已存在"); + } + return toAjax(warnLogsService.save(warnLogs)); + } + + /** + * 修改预警日志 + */ + @RequiresPermissions("warning:logs:edit") + @PutMapping + public Result edit( + @Validated @RequestBody WarnLogs warnLogs) + { + if (!warnLogsService.checkIdUnique(warnLogs)) { + return error("修改 预警日志 '" + warnLogs + "'失败，预警日志不存在"); + } + return toAjax(warnLogsService.updateById(warnLogs)); + } + + /** + * 删除预警日志 + */ + @RequiresPermissions("warning:logs:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) + { + warnLogsService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java new file mode 100644 index 0000000..035f2d4 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java @@ -0,0 +1,98 @@ +package com.muyu.enterprise.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; + +import com.muyu.enterprise.domain.WarnRule; +import com.muyu.enterprise.service.IWarnRuleService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * 预警规则Controller + * + * @author muyu + * @date 2024-09-20 + */ +@RestController +@RequestMapping("/rule") +public class WarnRuleController extends BaseController { + @Resource + private IWarnRuleService warnRuleService; + + /** + * 查询预警规则列表 + */ + @RequiresPermissions("warning:list") + @GetMapping("/list") + public Result> list(WarnRule warnRule) { + startPage(); + List list = warnRuleService.selectWarnRuleList(warnRule); + return getDataTable(list); + } + + /** + * 导出预警规则列表 + */ + @RequiresPermissions("warning:export") + @PostMapping("/export") + public void export(HttpServletResponse response, WarnRule warnRule) { + List list = warnRuleService.selectWarnRuleList(warnRule); + ExcelUtil util = new ExcelUtil(WarnRule.class); + util.exportExcel(response, list, "预警规则数据"); + } + + /** + * 获取预警规则详细信息 + */ + @RequiresPermissions("warning:query") + @GetMapping(value = "/{id}") + public Result> getInfo(@PathVariable("id") Long id) { + return success(warnRuleService.selectWarnRuleById(id)); + } + + /** + * 新增预警规则 + */ + @RequiresPermissions("warning:add") + @PostMapping + public Result add( + @Validated @RequestBody WarnRule warnRule) { + if (warnRuleService.checkIdUnique(warnRule)) { + return error("新增 预警规则 '" + warnRule + "'失败，预警规则已存在"); + } + return toAjax(warnRuleService.save(warnRule)); + } + + /** + * 修改预警规则 + */ + @RequiresPermissions("warning:edit") + @PutMapping + public Result edit( + @Validated @RequestBody WarnRule warnRule) { + if (!warnRuleService.checkIdUnique(warnRule)) { + return error("修改 预警规则 '" + warnRule + "'失败，预警规则不存在"); + } + return toAjax(warnRuleService.updateById(warnRule)); + } + + /** + * 删除预警规则 + */ + @RequiresPermissions("warning:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) { + warnRuleService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java new file mode 100644 index 0000000..0147dd5 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java @@ -0,0 +1,104 @@ +package com.muyu.enterprise.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; + +import com.muyu.enterprise.domain.WarnStrategy; +import com.muyu.enterprise.service.IWarnStrategyService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; + +/** + * 预警策略Controller + * + * @author muyu + * @date 2024-09-20 + */ +@RestController +@RequestMapping("/strategy") +public class WarnStrategyController extends BaseController +{ + @Resource + private IWarnStrategyService warnStrategyService; + + /** + * 查询预警策略列表 + */ + @RequiresPermissions("warning:strategy:list") + @GetMapping("/list") + public Result> list(WarnStrategy warnStrategy) + { + startPage(); + List list = warnStrategyService.selectWarnStrategyList(warnStrategy); + return getDataTable(list); + } + + /** + * 导出预警策略列表 + */ + @RequiresPermissions("warning:strategy:export") + @PostMapping("/export") + public void export(HttpServletResponse response, WarnStrategy warnStrategy) + { + List list = warnStrategyService.selectWarnStrategyList(warnStrategy); + ExcelUtil util = new ExcelUtil(WarnStrategy.class); + util.exportExcel(response, list, "预警策略数据"); + } + + /** + * 获取预警策略详细信息 + */ + @RequiresPermissions("warning:strategy:query") + @GetMapping(value = "/{id}") + public Result> getInfo(@PathVariable("id") Long id) + { + return success(warnStrategyService.selectWarnStrategyById(id)); + } + + /** + * 新增预警策略 + */ + @RequiresPermissions("warning:strategy:add") + @PostMapping + public Result add( + @Validated @RequestBody WarnStrategy warnStrategy) + { + if (warnStrategyService.checkIdUnique(warnStrategy)) { + return error("新增 预警策略 '" + warnStrategy + "'失败，预警策略已存在"); + } + return toAjax(warnStrategyService.save(warnStrategy)); + } + + /** + * 修改预警策略 + */ + @RequiresPermissions("warning:strategy:edit") + @PutMapping + public Result edit( + @Validated @RequestBody WarnStrategy warnStrategy) + { + if (!warnStrategyService.checkIdUnique(warnStrategy)) { + return error("修改 预警策略 '" + warnStrategy + "'失败，预警策略不存在"); + } + return toAjax(warnStrategyService.updateById(warnStrategy)); + } + + /** + * 删除预警策略 + */ + @RequiresPermissions("warning:strategy:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) + { + warnStrategyService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WxTestController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WxTestController.java new file mode 100644 index 0000000..96c49f4 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WxTestController.java @@ -0,0 +1,155 @@ +package com.muyu.enterprise.controller; + + + +import com.muyu.enterprise.message.Article; +import com.muyu.enterprise.message.NewMessage; +import com.muyu.enterprise.util.TokenUtil; +import com.muyu.enterprise.wx.Message; +import com.thoughtworks.xstream.XStream; +import io.micrometer.common.util.StringUtils; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.*; + +/** + * 微信公众号 + * @Author： Chen + * @name：GetWxController + */ +@RestController +public class WxTestController { + + + @PostMapping("/") + public String receiveMessage(HttpServletRequest request) { + ServletInputStream inputStream = null; + HashMap map = new HashMap<>(); + try { + inputStream = request.getInputStream(); + SAXReader saxReader = new SAXReader(); + //读取request输入流，获得Document对象 + Document document = saxReader.read(inputStream); + //获得root结点 + Element rootElement = document.getRootElement(); + //获取所有的子节点 + List elements = rootElement.elements(); + for (Element element : elements) { + map.put(element.getName(), element.getStringValue()); + } + + + } catch (IOException e) { + throw new RuntimeException(e); + } catch (DocumentException e) { + throw new RuntimeException(e); + } + System.out.println(map); + //回复消息 + String message = ""; + if ("图文".equals(map.get("Content"))) { + message = getReplyNewsMessage(map); + } else { + message = getReplyMessage(map); + + } + return message; + } + + /** + * 获得回复的消息内容 + * + * @param map + * @return + */ + private String getReplyMessage(HashMap map) { + Message message = new Message(); + message.setToUserName(map.get("FromUserName")); + message.setFromUserName(map.get("ToUserName")); +// message.setMsgType(map.get("MsgType")); + message.setMsgType("text"); + message.setCreateTime(System.currentTimeMillis() / 1000); + message.setContent("自动回复:您好"); + //XStream将java对象转换为xml字符串 + XStream xStream = new XStream(); + xStream.processAnnotations(Message.class); + String xml = xStream.toXML(message); + return xml; + } + + + @GetMapping("/") + public String check(@RequestParam("signature") String signature, @RequestParam("timestamp") String timestamp, + @RequestParam("nonce") String nonce, @RequestParam("echostr") String echostr) { + + //1.将token、timestamp、nonce三个参数进行字典排序 + String token = "asdasd"; + List list = Arrays.asList(token, timestamp, nonce); + //排序 + Collections.sort(list); + //2.将三个参数字符串拼接成一个字符串进行sha1加密 + StringBuilder stringBuilder = new StringBuilder(); + for (String s : list) { + stringBuilder.append(s); + } + //加密 + try { + MessageDigest instance = MessageDigest.getInstance("sha1"); + //使用sha1进行加密,获得byte数组 + byte[] digest = instance.digest(stringBuilder.toString().getBytes()); + StringBuilder sum = new StringBuilder(); + for (byte b : digest) { + sum.append(Integer.toHexString((b >> 4) & 15)); + sum.append(Integer.toHexString(b & 15)); + } + //3.开发者获得加密后的字符串可与signature对比，标识该请求来源于微信 + if (!StringUtils.isEmpty(signature) && signature.equals(sum.toString())) { + return echostr; + } + + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + return null; + } + + @PostMapping("/test") + public void test() { + String accessToken = TokenUtil.getAccessToken(); + System.out.println(accessToken); + } + + private String getReplyNewsMessage(Map map) { + NewMessage newsMessage = new NewMessage(); + newsMessage.setToUserName(map.get("FromUserName")); + newsMessage.setFromUserName(map.get("ToUserName")); + newsMessage.setMsgType("news"); + newsMessage.setCreateTime(System.currentTimeMillis() / 1000); + newsMessage.setArticleCount(1); + List
articles = new ArrayList<>(); + Article article = new Article(); + article.setTitle("oneone哦恩恩"); + article.setDescription("详细描述--------------信息"); + article.setUrl("https://www.baidu.com"); + article.setPicUrl("http://mmbiz.qpic.cn/mmbiz_jpg/RiaWwmABEMmkFKQMeQZLLYaxknlzE9CxSozVSH42iaXiaQcia5hPPUicuNYbS8dG99zsMZ1ic266ialM42Mbn8SkN54kA/0"); + articles.add(article); + newsMessage.setArticles(articles); + //XStream将java对象转换为xml字符串 + XStream xStream = new XStream(); + xStream.processAnnotations(NewMessage.class); + String xml = xStream.toXML(newsMessage); + return xml; + } +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/BreakDownMapper.java similarity index 80% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/BreakDownMapper.java index 8f93626..f420a25 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/BreakDownMapper.java @@ -1,7 +1,8 @@ -package com.muyu.breakdown.mapper; +package com.muyu.enterprise.mapper; import com.github.yulichang.base.MPJBaseMapper; -import com.muyu.breakdown.domain.BreakDown; + +import com.muyu.enterprise.domain.BreakDown; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java similarity index 71% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/FaultLogMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java index d5f1d7e..735569a 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java @@ -1,8 +1,7 @@ -package com.muyu.breakdown.mapper; +package com.muyu.enterprise.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.breakdown.domain.FaultLog; +import com.muyu.enterprise.domain.FaultLog; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/StationMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/StationMessageMapper.java similarity index 71% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/StationMessageMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/StationMessageMapper.java index 450ebb4..24f7478 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/StationMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/StationMessageMapper.java @@ -1,8 +1,8 @@ -package com.muyu.breakdown.mapper; +package com.muyu.enterprise.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; -import com.muyu.breakdown.domain.Messages; + +import com.muyu.enterprise.domain.Messages; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java new file mode 100644 index 0000000..4854a8b --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java @@ -0,0 +1,15 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.enterprise.domain.SysCar; + + +/** + * 车辆基础信息Mapper接口 + * + * @author muyu + * @date 2024-09-17 + */ +public interface SysCarMapper extends BaseMapper{ + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java new file mode 100644 index 0000000..4f8b51a --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java @@ -0,0 +1,20 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import com.muyu.enterprise.domain.SysCarMessage; +import com.muyu.enterprise.resp.SysMessageResp; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 车辆报文记录Mapper接口 + * + * @author muyu + * @date 2024-09-18 + */ +@Mapper +public interface SysCarMessageMapper extends BaseMapper{ + ListdobList(SysMessageResp sysMessageResp); +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCorpuscleMapper.java similarity index 73% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCorpuscleMapper.java index b2cb32e..f38373d 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCorpuscleMapper.java @@ -1,9 +1,10 @@ -package com.muyu.carrail.mapper; +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.enterprise.domain.SysCorpuscle; + import java.util.List; -import com.muyu.carrail.domain.SysCorpuscle; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; /** * 电子围栏Mapper接口 diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysFenceMapper.java similarity index 62% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysFenceMapper.java index 725c176..b5dde69 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysFenceMapper.java @@ -1,9 +1,9 @@ -package com.muyu.carrail.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.carrail.domain.SysFence; -import org.apache.ibatis.annotations.Mapper; +import com.muyu.enterprise.domain.SysFence; + /** * 围栏组Mapper接口 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysMessageTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysMessageTypeMapper.java new file mode 100644 index 0000000..12a9dff --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysMessageTypeMapper.java @@ -0,0 +1,16 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.enterprise.domain.SysMessageType; +import org.apache.ibatis.annotations.Mapper; + +/** + * 车辆报文类型Mapper接口 + * + * @author muyu + * @date 2024-09-18 + */ +@Mapper +public interface SysMessageTypeMapper extends BaseMapper { + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java new file mode 100644 index 0000000..88ddc3f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java @@ -0,0 +1,16 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.enterprise.domain.WarnLogs; +import org.apache.ibatis.annotations.Mapper; + +/** + * 预警日志Mapper接口 + * + * @author muyu + * @date 2024-09-20 + */ +@Mapper +public interface WarnLogsMapper extends BaseMapper{ + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java new file mode 100644 index 0000000..cb89432 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java @@ -0,0 +1,17 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import com.muyu.enterprise.domain.WarnRule; +import org.apache.ibatis.annotations.Mapper; + +/** + * 预警规则Mapper接口 + * + * @author muyu + * @date 2024-09-20 + */ +@Mapper +public interface WarnRuleMapper extends BaseMapper { + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java new file mode 100644 index 0000000..2606073 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java @@ -0,0 +1,16 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.enterprise.domain.WarnStrategy; +import org.apache.ibatis.annotations.Mapper; + +/** + * 预警策略Mapper接口 + * + * @author muyu + * @date 2024-09-20 + */ +@Mapper +public interface WarnStrategyMapper extends BaseMapper{ + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/Article.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/Article.java new file mode 100644 index 0000000..b9ae685 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/Article.java @@ -0,0 +1,28 @@ +package com.muyu.enterprise.message; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName Article + * @Description 描述 + * @Author Chen + * @Date 2024/9/18 19:13 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@XStreamAlias("item") +public class Article { + @XStreamAlias("Title") + private String title; + @XStreamAlias("Description") + private String description; + @XStreamAlias("PicUrl") + private String picUrl; + @XStreamAlias("Url") + private String url; + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/NewMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/NewMessage.java new file mode 100644 index 0000000..5052cff --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/NewMessage.java @@ -0,0 +1,34 @@ +package com.muyu.enterprise.message; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @ClassName NewMessage + * @Description 描述 + * @Author Chen + * @Date 2024/9/18 19:08 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@XStreamAlias("xml") +public class NewMessage { + @XStreamAlias("ToUserName") + private String toUserName; + @XStreamAlias("FromUserName") + private String fromUserName; + @XStreamAlias("CreateTime") + private long createTime; + @XStreamAlias("MsgType") + private String msgType; + @XStreamAlias("ArticleCount") + private int articleCount; + @XStreamAlias("Articles") + private List
articles; + +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/BreakDownService.java similarity index 87% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/BreakDownService.java index 325424c..2868b91 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/BreakDownService.java @@ -1,8 +1,9 @@ -package com.muyu.breakdown.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.breakdown.domain.BreakDown; -import com.muyu.breakdown.domain.MessageMap; +import com.muyu.enterprise.domain.BreakDown; +import com.muyu.enterprise.domain.MessageMap; + import java.util.List; import java.util.Map; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/IFaultLogService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFaultLogService.java similarity index 90% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/IFaultLogService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFaultLogService.java index e6ef523..400d2e7 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/IFaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFaultLogService.java @@ -1,8 +1,10 @@ -package com.muyu.breakdown.service; +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.FaultLog; + import java.util.List; -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.breakdown.domain.FaultLog; /** * 故障日志Service接口 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarMessageService.java new file mode 100644 index 0000000..f9e981e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarMessageService.java @@ -0,0 +1,44 @@ +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.SysCarMessage; +import com.muyu.enterprise.resp.SysMessageResp; + + +import java.util.List; + +/** + * 车辆报文记录Service接口 + * + * @author muyu + * @date 2024-09-18 + */ +public interface ISysCarMessageService extends IService { + + ListdobList(SysMessageResp sysMessageResp); + /** + * 精确查询车辆报文记录 + * + * @param id 车辆报文记录主键 + * @return 车辆报文记录 + */ + public SysCarMessage selectSysCarMessageById(Long id); + + /** + * 查询车辆报文记录列表 + * + * @param sysCarMessage 车辆报文记录 + * @return 车辆报文记录集合 + */ + public List selectSysCarMessageList(SysCarMessage sysCarMessage); + + /** + * 判断 车辆报文记录 id是否唯一 + * @param sysCarMessage 车辆报文记录 + * @return 结果 + */ + Boolean checkIdUnique(SysCarMessage sysCarMessage); + +// Boolean checkById(SysCarMessage sysCarMessage); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarService.java new file mode 100644 index 0000000..8ccfcb7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarService.java @@ -0,0 +1,38 @@ +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.SysCar; + +import java.util.List; + +/** + * 车辆基础信息Service接口 + * + * @author muyu + * @date 2024-09-17 + */ +public interface ISysCarService extends IService { + /** + * 精确查询车辆基础信息 + * + * @param id 车辆基础信息主键 + * @return 车辆基础信息 + */ + public SysCar selectSysCarById(Long id); + + /** + * 查询车辆基础信息列表 + * + * @param sysCar 车辆基础信息 + * @return 车辆基础信息集合 + */ + public List selectSysCarList(SysCar sysCar); + + /** + * 判断 车辆基础信息 id是否唯一 + * @param sysCar 车辆基础信息 + * @return 结果 + */ + Boolean checkIdUnique(SysCar sysCar); + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCorpuscleService.java similarity index 85% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCorpuscleService.java index 276b2d4..1201c55 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCorpuscleService.java @@ -1,8 +1,9 @@ -package com.muyu.carrail.service; +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.SysCorpuscle; import java.util.List; -import com.muyu.carrail.domain.SysCorpuscle; -import com.baomidou.mybatisplus.extension.service.IService; /** * 电子围栏Service接口 diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysFenceService.java similarity index 89% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysFenceService.java index 7ba33a8..9c50e54 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysFenceService.java @@ -1,9 +1,10 @@ -package com.muyu.carrail.service; - -import java.util.List; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.carrail.domain.SysFence; +import com.muyu.enterprise.domain.SysFence; + + +import java.util.List; /** * 围栏组Service接口 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysMessageTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysMessageTypeService.java new file mode 100644 index 0000000..67d339c --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysMessageTypeService.java @@ -0,0 +1,41 @@ +package com.muyu.enterprise.service; + + + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.SysMessageType; + +import java.util.List; + +/** + * 车辆报文类型Service接口 + * + * @author muyu + * @date 2024-09-18 + */ +public interface ISysMessageTypeService extends IService { + /** + * 精确查询车辆报文类型 + * + * @param messageCode 车辆报文类型主键 + * @return 车辆报文类型 + */ + public SysMessageType selectSysMessageTypeByMessageCode(String messageCode); + + /** + * 查询车辆报文类型列表 + * + * @param sysMessageType 车辆报文类型 + * @return 车辆报文类型集合 + */ + public List selectSysMessageTypeList(SysMessageType sysMessageType); + + /** + * 判断 车辆报文类型 id是否唯一 + * @param sysMessageType 车辆报文类型 + * @return 结果 + */ + Boolean checkIdUnique(SysMessageType sysMessageType); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java new file mode 100644 index 0000000..4a4ad6f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java @@ -0,0 +1,39 @@ +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.WarnLogs; + + +import java.util.List; + +/** + * 预警日志Service接口 + * + * @author muyu + * @date 2024-09-20 + */ +public interface IWarnLogsService extends IService { + /** + * 精确查询预警日志 + * + * @param id 预警日志主键 + * @return 预警日志 + */ + public WarnLogs selectWarnLogsById(Long id); + + /** + * 查询预警日志列表 + * + * @param warnLogs 预警日志 + * @return 预警日志集合 + */ + public List selectWarnLogsList(WarnLogs warnLogs); + + /** + * 判断 预警日志 id是否唯一 + * @param warnLogs 预警日志 + * @return 结果 + */ + Boolean checkIdUnique(WarnLogs warnLogs); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java new file mode 100644 index 0000000..c22f98e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java @@ -0,0 +1,39 @@ +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.WarnRule; + + +import java.util.List; + +/** + * 预警规则Service接口 + * + * @author muyu + * @date 2024-09-20 + */ +public interface IWarnRuleService extends IService { + /** + * 精确查询预警规则 + * + * @param id 预警规则主键 + * @return 预警规则 + */ + public WarnRule selectWarnRuleById(Long id); + + /** + * 查询预警规则列表 + * + * @param warnRule 预警规则 + * @return 预警规则集合 + */ + public List selectWarnRuleList(WarnRule warnRule); + + /** + * 判断 预警规则 id是否唯一 + * @param warnRule 预警规则 + * @return 结果 + */ + Boolean checkIdUnique(WarnRule warnRule); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java new file mode 100644 index 0000000..93d1b0c --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java @@ -0,0 +1,39 @@ +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.WarnStrategy; + + +import java.util.List; + +/** + * 预警策略Service接口 + * + * @author muyu + * @date 2024-09-20 + */ +public interface IWarnStrategyService extends IService { + /** + * 精确查询预警策略 + * + * @param id 预警策略主键 + * @return 预警策略 + */ + public WarnStrategy selectWarnStrategyById(Long id); + + /** + * 查询预警策略列表 + * + * @param warnStrategy 预警策略 + * @return 预警策略集合 + */ + public List selectWarnStrategyList(WarnStrategy warnStrategy); + + /** + * 判断 预警策略 id是否唯一 + * @param warnStrategy 预警策略 + * @return 结果 + */ + Boolean checkIdUnique(WarnStrategy warnStrategy); + +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/StationMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/StationMessageService.java similarity index 81% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/StationMessageService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/StationMessageService.java index 5af194c..9f2030e 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/StationMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/StationMessageService.java @@ -1,7 +1,7 @@ -package com.muyu.breakdown.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.breakdown.domain.Messages; +import com.muyu.enterprise.domain.Messages; import java.util.List; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java similarity index 76% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java index f0103b6..a41b4ef 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java @@ -1,15 +1,15 @@ -package com.muyu.breakdown.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.breakdown.domain.SysCarMessage; +import com.muyu.enterprise.domain.SysCarMessage; /** + * @author Lenovo * @ Tool：IntelliJ IDEA * @ Author：CHX * @ Date：2024-09-20-15:42 * @ Version：1.0 * @ Description： - * @author Lenovo */ public interface SysCarMessageService extends IService { } diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/BreakDownServiceImpl.java similarity index 83% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/BreakDownServiceImpl.java index 62c0085..8e958c5 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/BreakDownServiceImpl.java @@ -1,22 +1,19 @@ -package com.muyu.breakdown.service.impl; +package com.muyu.enterprise.service.impl; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.muyu.breakdown.domain.BreakDown; -import com.muyu.breakdown.domain.MessageMap; -import com.muyu.breakdown.domain.SysCarMessage; -import com.muyu.breakdown.mapper.BreakDownMapper; -import com.muyu.breakdown.service.BreakDownService; -import com.muyu.breakdown.service.SysCarMessageService; + import com.muyu.common.core.utils.StringUtils; -import org.springframework.amqp.rabbit.annotation.RabbitListener; +import com.muyu.enterprise.domain.BreakDown; +import com.muyu.enterprise.domain.MessageMap; +import com.muyu.enterprise.mapper.BreakDownMapper; +import com.muyu.enterprise.service.BreakDownService; +import com.muyu.enterprise.service.SysCarMessageService; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java similarity index 91% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/FaultLogServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java index 7124779..397099f 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.breakdown.service.impl; +package com.muyu.enterprise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.breakdown.domain.FaultLog; -import com.muyu.breakdown.mapper.FaultLogMapper; -import com.muyu.breakdown.service.IFaultLogService; import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterprise.domain.FaultLog; +import com.muyu.enterprise.mapper.FaultLogMapper; +import com.muyu.enterprise.service.IFaultLogService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/StationMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/StationMessageServiceImpl.java similarity index 72% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/StationMessageServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/StationMessageServiceImpl.java index 462db1f..918cb68 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/StationMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/StationMessageServiceImpl.java @@ -1,10 +1,9 @@ -package com.muyu.breakdown.service.impl; +package com.muyu.enterprise.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.breakdown.domain.Messages; -import com.muyu.breakdown.mapper.StationMessageMapper; -import com.muyu.breakdown.service.StationMessageService; +import com.muyu.enterprise.domain.Messages; +import com.muyu.enterprise.mapper.StationMessageMapper; +import com.muyu.enterprise.service.StationMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarMessageServiceImpl.java new file mode 100644 index 0000000..7000b06 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarMessageServiceImpl.java @@ -0,0 +1,89 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterprise.domain.SysCarMessage; +import com.muyu.enterprise.mapper.SysCarMessageMapper; +import com.muyu.enterprise.resp.SysMessageResp; +import com.muyu.enterprise.service.ISysCarMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.List; + +/** + * 车辆报文记录Service业务层处理 + * + * @author muyu + * @date 2024-09-18 + */ +@Service +public class SysCarMessageServiceImpl + extends ServiceImpl + implements ISysCarMessageService { + @Autowired + private SysCarMessageMapper mapper; + + @Override + public List dobList(SysMessageResp sysMessageResp) { + return mapper.dobList(sysMessageResp); + } + + /** + * 精确查询车辆报文记录 + * + * @param id 车辆报文记录主键 + * @return 车辆报文记录 + */ + @Override + public SysCarMessage selectSysCarMessageById(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(SysCarMessage::getId, id); + return this.getOne(queryWrapper); + } + + + /** + * 查询车辆报文记录列表 + * + * @param sysCarMessage 车辆报文记录 + * @return 车辆报文记录 + */ + @Override + public List selectSysCarMessageList(SysCarMessage sysCarMessage) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarMessage.getModelCode())) { + queryWrapper.eq(SysCarMessage::getModelCode, sysCarMessage.getModelCode()); + } + if (StringUtils.isNotEmpty(sysCarMessage.getMessageType())) { + queryWrapper.eq(SysCarMessage::getMessageType, sysCarMessage.getMessageType()); + } + return this.list(queryWrapper); + } + + /** + * 唯一 判断 + * + * @param sysCarMessage 车辆报文记录 + * @return 车辆报文记录 + */ + @Override + public Boolean checkIdUnique(SysCarMessage sysCarMessage) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysCarMessage::getId, sysCarMessage.getId()); + return this.count(queryWrapper) > 0; + } +// +// @Override +// public Boolean checkById(SysMessageType sysMessageType) { +// LambdaQueryWrapper sysCarMessageLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::getMessageType, sysMessageType); +//// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::getMessageType, sysMessageType); +// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::get, sysMessageType); +//// return this.count(sysCarMessageLambdaQueryWrapper) > 0; +// } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java new file mode 100644 index 0000000..44ec671 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java @@ -0,0 +1,91 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterprise.domain.SysCar; +import com.muyu.enterprise.mapper.SysCarMapper; +import com.muyu.enterprise.service.ISysCarService; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.List; + +/** + * 车辆基础信息Service业务层处理 + * + * @author muyu + * @date 2024-09-17 + */ +@Service +public class SysCarServiceImpl + extends ServiceImpl + implements ISysCarService { + + /** + * 精确查询车辆基础信息 + * + * @param id 车辆基础信息主键 + * @return 车辆基础信息 + */ + @Override + public SysCar selectSysCarById(Long id) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(SysCar::getId, id); + return this.getOne(queryWrapper); + } + + + /** + * 查询车辆基础信息列表 + * + * @param sysCar 车辆基础信息 + * @return 车辆基础信息 + */ + @Override + public List selectSysCarList(SysCar sysCar) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCar.getCarVin())){ + queryWrapper.eq(SysCar::getCarVin, sysCar.getCarVin()); + } + if (StringUtils.isNotEmpty(sysCar.getCarPlate())){ + queryWrapper.eq(SysCar::getCarPlate, sysCar.getCarPlate()); + } + if (StringUtils.isNotEmpty(sysCar.getCarBrand())){ + queryWrapper.eq(SysCar::getCarBrand, sysCar.getCarBrand()); + } + if (StringUtils.isNotEmpty(sysCar.getCarModel())){ + queryWrapper.eq(SysCar::getCarModel, sysCar.getCarModel()); + } + if (StringUtils.isNotEmpty(sysCar.getCarType())){ + queryWrapper.eq(SysCar::getCarType, sysCar.getCarType()); + } + if (sysCar.getCarLastJoinTime()!= null){ + queryWrapper.eq(SysCar::getCarLastJoinTime, sysCar.getCarLastJoinTime()); + } + if (sysCar.getCarLastOfflineTime()!= null){ + queryWrapper.eq(SysCar::getCarLastOfflineTime, sysCar.getCarLastOfflineTime()); + } + if (StringUtils.isNotEmpty(sysCar.getState())){ + queryWrapper.eq(SysCar::getState, sysCar.getState()); + } + return this.list(queryWrapper); + } + + /** + * 唯一 判断 + * @param sysCar 车辆基础信息 + * @return 车辆基础信息 + */ + @Override + public Boolean checkIdUnique(SysCar sysCar) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysCar::getId, sysCar.getId()); + return this.count(queryWrapper) > 0; + } + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysCorpuscleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCorpuscleServiceImpl.java similarity index 75% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysCorpuscleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCorpuscleServiceImpl.java index 61024fe..3328085 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysCorpuscleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCorpuscleServiceImpl.java @@ -1,15 +1,14 @@ -package com.muyu.carrail.service.impl; +package com.muyu.enterprise.service.impl; -import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.enterprise.domain.SysCorpuscle; +import com.muyu.enterprise.mapper.SysCorpuscleMapper; +import com.muyu.enterprise.service.ISysCorpuscleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.muyu.carrail.mapper.SysCorpuscleMapper; -import com.muyu.carrail.domain.SysCorpuscle; -import com.muyu.carrail.service.ISysCorpuscleService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.util.Assert; + +import java.util.List; /** * 电子围栏Service业务层处理 diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysFenceServiceImpl.java similarity index 88% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysFenceServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysFenceServiceImpl.java index 5ebffcc..1a46301 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysFenceServiceImpl.java @@ -1,18 +1,16 @@ -package com.muyu.carrail.service.impl; - -import java.util.List; +package com.muyu.enterprise.service.impl; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.muyu.carrail.domain.SysCorpuscle; -import com.muyu.carrail.domain.SysFence; -import com.muyu.carrail.mapper.SysFenceMapper; -import com.muyu.carrail.service.ISysFenceService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.enterprise.domain.SysFence; +import com.muyu.enterprise.mapper.SysFenceMapper; +import com.muyu.enterprise.service.ISysFenceService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysMessageTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysMessageTypeServiceImpl.java new file mode 100644 index 0000000..60b8bab --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysMessageTypeServiceImpl.java @@ -0,0 +1,73 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterprise.domain.SysMessageType; +import com.muyu.enterprise.mapper.SysMessageTypeMapper; +import com.muyu.enterprise.service.ISysMessageTypeService; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.List; + +/** + * 车辆报文类型Service业务层处理 + * + * @author muyu + * @date 2024-09-18 + */ +@Service +public class SysMessageTypeServiceImpl + extends ServiceImpl + implements ISysMessageTypeService { + + /** + * 精确查询车辆报文类型 + * + * @param + * @return 车辆报文类型 + */ + @Override + public SysMessageType selectSysMessageTypeByMessageCode(String messageCode) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(messageCode, "messageCode不可为空"); + queryWrapper.eq(SysMessageType::getMessageCode, messageCode); + return this.getOne(queryWrapper); + } + + + /** + * 查询车辆报文类型列表 + * + * @param sysMessageType 车辆报文类型 + * @return 车辆报文类型 + */ + @Override + public List selectSysMessageTypeList(SysMessageType sysMessageType) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysMessageType.getMessageName())){ + queryWrapper.like(SysMessageType::getMessageName, sysMessageType.getMessageName()); + } + if (StringUtils.isNotEmpty(sysMessageType.getMessageType())){ + queryWrapper.eq(SysMessageType::getMessageType, sysMessageType.getMessageType()); + } + return this.list(queryWrapper); + } + + /** + * 唯一 判断 + * @param sysMessageType 车辆报文类型 + * @return 车辆报文类型 + */ + @Override + public Boolean checkIdUnique(SysMessageType sysMessageType) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysMessageType::getId, sysMessageType.getId()); + return this.count(queryWrapper) > 0; + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnLogsServiceImpl.java new file mode 100644 index 0000000..5604e55 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnLogsServiceImpl.java @@ -0,0 +1,94 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; + +import com.muyu.enterprise.domain.WarnLogs; +import com.muyu.enterprise.mapper.WarnLogsMapper; +import com.muyu.enterprise.service.IWarnLogsService; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.List; + +/** + * 预警日志Service业务层处理 + * + * @author muyu + * @date 2024-09-20 + */ +@Service +public class WarnLogsServiceImpl + extends ServiceImpl + implements IWarnLogsService { + + /** + * 精确查询预警日志 + * + * @param id 预警日志主键 + * @return 预警日志 + */ + @Override + public WarnLogs selectWarnLogsById(Long id) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(WarnLogs::getId, id); + return this.getOne(queryWrapper); + } + + + /** + * 查询预警日志列表 + * + * @param warnLogs 预警日志 + * @return 预警日志 + */ + @Override + public List selectWarnLogsList(WarnLogs warnLogs) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(warnLogs.getVin())){ + queryWrapper.eq(WarnLogs::getVin, warnLogs.getVin()); + } + if (StringUtils.isNotNull(warnLogs.getWarnRuleId())){ + queryWrapper.eq(WarnLogs::getWarnRuleId, warnLogs.getWarnRuleId()); + } + if (StringUtils.isNotNull(warnLogs.getStartTime())){ + queryWrapper.eq(WarnLogs::getStartTime, warnLogs.getStartTime()); + } + if (StringUtils.isNotNull(warnLogs.getEndTime())){ + queryWrapper.eq(WarnLogs::getEndTime, warnLogs.getEndTime()); + } + if (StringUtils.isNotNull(warnLogs.getMaxValue())){ + queryWrapper.eq(WarnLogs::getMaxValue, warnLogs.getMaxValue()); + } + if (StringUtils.isNotNull(warnLogs.getMinValue())){ + queryWrapper.eq(WarnLogs::getMinValue, warnLogs.getMinValue()); + } + if (StringUtils.isNotNull(warnLogs.getAvgValue())){ + queryWrapper.eq(WarnLogs::getAvgValue, warnLogs.getAvgValue()); + } + if (StringUtils.isNotNull(warnLogs.getMedianValue())){ + queryWrapper.eq(WarnLogs::getMedianValue, warnLogs.getMedianValue()); + } + if (StringUtils.isNotNull(warnLogs.getStatus())){ + queryWrapper.eq(WarnLogs::getStatus, warnLogs.getStatus()); + } + return this.list(queryWrapper); + } + + /** + * 唯一 判断 + * @param warnLogs 预警日志 + * @return 预警日志 + */ + @Override + public Boolean checkIdUnique(WarnLogs warnLogs) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(WarnLogs::getId, warnLogs.getId()); + return this.count(queryWrapper) > 0; + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java new file mode 100644 index 0000000..15bd720 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java @@ -0,0 +1,88 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; + +import com.muyu.enterprise.domain.WarnRule; +import com.muyu.enterprise.mapper.WarnRuleMapper; +import com.muyu.enterprise.service.IWarnRuleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.List; + +/** + * 预警规则Service业务层处理 + * + * @author muyu + * @date 2024-09-20 + */ +@Service +public class WarnRuleServiceImpl + extends ServiceImpl + implements IWarnRuleService { + @Autowired + private WarnRuleMapper warnRuleMapper; + + /** + * 精确查询预警规则 + * + * @param id 预警规则主键 + * @return 预警规则 + */ + @Override + public WarnRule selectWarnRuleById(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(WarnRule::getId, id); + return this.getOne(queryWrapper); + } + + + /** + * 查询预警规则列表 + * + * @param warnRule 预警规则 + * @return 预警规则 + */ + @Override + public List selectWarnRuleList(WarnRule warnRule) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(warnRule.getRuleName())) { + queryWrapper.like(WarnRule::getRuleName, warnRule.getRuleName()); + } + if (StringUtils.isNotNull(warnRule.getMsgTypeId())) { + queryWrapper.eq(WarnRule::getMsgTypeId, warnRule.getMsgTypeId()); + } + if (StringUtils.isNotNull(warnRule.getSlideTime())) { + queryWrapper.eq(WarnRule::getSlideTime, warnRule.getSlideTime()); + } + if (StringUtils.isNotNull(warnRule.getSlideFrequency())) { + queryWrapper.eq(WarnRule::getSlideFrequency, warnRule.getSlideFrequency()); + } + if (StringUtils.isNotNull(warnRule.getMaxValue())) { + queryWrapper.eq(WarnRule::getMaxValue, warnRule.getMaxValue()); + } + if (StringUtils.isNotNull(warnRule.getMinValue())) { + queryWrapper.eq(WarnRule::getMinValue, warnRule.getMinValue()); + } + return this.list(queryWrapper); + } + + /** + * 唯一 判断 + * + * @param warnRule 预警规则 + * @return 预警规则 + */ + @Override + public Boolean checkIdUnique(WarnRule warnRule) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(WarnRule::getId, warnRule.getId()); + return this.count(queryWrapper) > 0; + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java new file mode 100644 index 0000000..40008c0 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java @@ -0,0 +1,75 @@ +package com.muyu.enterprise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterprise.domain.WarnStrategy; +import com.muyu.enterprise.mapper.WarnStrategyMapper; +import com.muyu.enterprise.service.IWarnStrategyService; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.List; + +/** + * 预警策略Service业务层处理 + * + * @author muyu + * @date 2024-09-20 + */ +@Service +public class WarnStrategyServiceImpl + extends ServiceImpl + implements IWarnStrategyService { + + /** + * 精确查询预警策略 + * + * @param id 预警策略主键 + * @return 预警策略 + */ + @Override + public WarnStrategy selectWarnStrategyById(Long id) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(WarnStrategy::getId, id); + return this.getOne(queryWrapper); + } + + + /** + * 查询预警策略列表 + * + * @param warnStrategy 预警策略 + * @return 预警策略 + */ + @Override + public List selectWarnStrategyList(WarnStrategy warnStrategy) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotNull(warnStrategy.getCarTypeId())){ + queryWrapper.eq(WarnStrategy::getCarTypeId, warnStrategy.getCarTypeId()); + } + if (StringUtils.isNotNull(warnStrategy.getStrategyName())){ + queryWrapper.like(WarnStrategy::getStrategyName, warnStrategy.getStrategyName()); + } + if (StringUtils.isNotNull(warnStrategy.getMsgId())){ + queryWrapper.eq(WarnStrategy::getMsgId, warnStrategy.getMsgId()); + } + return this.list(queryWrapper); + } + + /** + * 唯一 判断 + * @param warnStrategy 预警策略 + * @return 预警策略 + */ + @Override + public Boolean checkIdUnique(WarnStrategy warnStrategy) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(WarnStrategy::getId, warnStrategy.getId()); + return this.count(queryWrapper) > 0; + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/OkHttpUtils.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/OkHttpUtils.java new file mode 100644 index 0000000..1683f1d --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/OkHttpUtils.java @@ -0,0 +1,36 @@ +package com.muyu.enterprise.util; + +import okhttp3.*; + +import java.io.IOException; + +public class OkHttpUtils { + + private static final OkHttpClient client = new OkHttpClient(); + + public static String sendGetRequest(String urlString) { + Request request = new Request.Builder() + .url(urlString) + .build(); + try (Response response = client.newCall(request).execute()) { + return response.body().string(); + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } + + public static String sendPostRequest(String urlString, String params) { + RequestBody requestBody = RequestBody.create(params, MediaType.parse("application/json; charset=utf-8")); + Request request = new Request.Builder() + .url(urlString) + .post(requestBody) + .build(); + try (Response response = client.newCall(request).execute()) { + return response.body().string(); + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/TokenUtil.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/TokenUtil.java new file mode 100644 index 0000000..899056b --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/TokenUtil.java @@ -0,0 +1,36 @@ +package com.muyu.enterprise.util; + +import com.alibaba.fastjson2.JSON; + +import com.muyu.enterprise.wx.AccessToken; +import org.springframework.stereotype.Component; + +/** + * @Author： Chen //redisService.setCacheObject("WECHAT_TOKEN",wechatToken.getAccessToken(),wechatToken.getExpiresIn(), TimeUnit.SECONDS); + * @name：TokenUtil + */ +@Component +public class TokenUtil { + private final static String APP_ID = "wx591e88abd208c297"; + + private final static String APP_SECRET = "64d92a751ef24acc8d37b2e6d7672491"; + + private static AccessToken accessToken = new AccessToken(); + + + public static void getToken() { + String url = String.format("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", APP_ID, APP_SECRET); + String request = OkHttpUtils.sendGetRequest(url); + AccessToken wechatToken = JSON.parseObject(request, AccessToken.class); + if (wechatToken != null) { + accessToken.setExpiresTime(wechatToken.getExpires_in()); + accessToken.setAccess_token(wechatToken.getAccess_token()); + } + } + + public static String getAccessToken() { + getToken(); + return accessToken.getAccess_token(); + } + +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/banner.txt similarity index 100% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml similarity index 68% rename from cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml index 3ecd9c4..ed94f02 100644 --- a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 10011 + port: 10003 # nacos线上地址 nacos: @@ -8,18 +8,14 @@ nacos: user-name: nacos password: nacos namespace: one-saas -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all + # Spring spring: - amqp: - deserialization: - trust: - all: true main: allow-bean-definition-overriding: true application: # 应用名称 - name: cloud-car + name: cloud-warn profiles: # 环境配置 active: dev @@ -28,19 +24,11 @@ spring: discovery: # 服务注册地址 server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} config: # 服务注册地址 server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} # 配置文件格式 @@ -51,8 +39,10 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - + # xxl-job 配置文件 + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # engine配置 + - engine-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: - com.muyu.carrail.mapper: DEBUG - + com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/dev.xml similarity index 97% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/dev.xml index 34cd186..8b99495 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/dev.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/prod.xml similarity index 98% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/prod.xml index 1193d09..0fe8654 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/prod.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/test.xml similarity index 98% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/test.xml index 1193d09..0fe8654 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/test.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-breakdown/pom.xml b/cloud-modules/cloud-modules-enterprise/pom.xml similarity index 74% rename from cloud-modules/cloud-breakdown/pom.xml rename to cloud-modules/cloud-modules-enterprise/pom.xml index 4b8728c..78e4f69 100644 --- a/cloud-modules/cloud-breakdown/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/pom.xml @@ -9,20 +9,15 @@ 3.6.3 - cloud-breakdown - - - cloud-breakdown 故障 - - + cloud-modules-enterprise pom + + cloud-modules-enterprise 企业 + - cloud-breakdown-common - cloud-breakdown-server - cloud-breakdown-remote - cloud-breakdown-client + cloud-modules-enterprise-common + cloud-modules-enterprise-server - 17 17 diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mqtt/Demo.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mqtt/Demo.java deleted file mode 100644 index af89588..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mqtt/Demo.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.muyu.parsing.mqtt; - -import org.eclipse.paho.client.mqttv3.*; -import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; - -/** - * 测试MQTT - * - * @ClassName demo - * @Description 描述 - * @Author YiBo.Liu - * @Date 2024/9/27 22:27 - */ -public class Demo { - - public static void main(String[] args) { - - String topic = "vehicle"; - String content = "Message from MqttPublishSample"; - int qos = 2; - String broker = "tcp://106.54.193.225:1883"; - String clientId = "JavaSample"; - - try { - // 第三个参数为空，默认持久化策略 - MqttClient sampleClient = new MqttClient(broker, clientId); - MqttConnectOptions connOpts = new MqttConnectOptions(); - connOpts.setCleanSession(true); - System.out.println("Connecting to broker: " + broker); - sampleClient.connect(connOpts); - sampleClient.subscribe(topic, 0); - sampleClient.setCallback(new MqttCallback() { - // 连接丢失 - @Override - public void connectionLost(Throwable throwable) { - - } - - // 连接成功 - @Override - public void messageArrived(String s, MqttMessage mqttMessage) throws Exception { - System.out.println(new String(mqttMessage.getPayload())); - } - - // 接收信息 - @Override - public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { - - } - }); - } catch (MqttException me) { - System.out.println("reason " + me.getReasonCode()); - System.out.println("msg " + me.getMessage()); - System.out.println("loc " + me.getLocalizedMessage()); - System.out.println("cause " + me.getCause()); - System.out.println("excep " + me); - me.printStackTrace(); - } - } - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnLogsMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnLogsMapper.xml deleted file mode 100644 index 6d23e91..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnLogsMapper.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - select id, vin, warn_rule_id, start_time, end_time, max_value, min_value, avg_value, median_value, status from warn_logs - - - - - - - - insert into warn_logs - - vin, - warn_rule_id, - start_time, - end_time, - max_value, - min_value, - avg_value, - median_value, - status, - - - #{vin}, - #{warnRuleId}, - #{startTime}, - #{endTime}, - #{maxValue}, - #{minValue}, - #{avgValue}, - #{medianValue}, - #{status}, - - - - - update warn_logs - - vin = #{vin}, - warn_rule_id = #{warnRuleId}, - start_time = #{startTime}, - end_time = #{endTime}, - max_value = #{maxValue}, - min_value = #{minValue}, - avg_value = #{avgValue}, - median_value = #{medianValue}, - status = #{status}, - - where id = #{id} - - - - delete from warn_logs where id = #{id} - - - - delete from warn_logs where id in - - #{id} - - - diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRuleMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRuleMapper.xml deleted file mode 100644 index 290906f..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRuleMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - select id, rule_name, strategy_id, msg_type_id, slide_time, slide_frequency, max_value, min_value from warn_rule - - - - - - - - insert into warn_rule - - rule_name, - strategy_id, - msg_type_id, - slide_time, - slide_frequency, - max_value, - min_value, - - - #{ruleName}, - #{strategyId}, - #{msgTypeId}, - #{slideTime}, - #{slideFrequency}, - #{maxValue}, - #{minValue}, - - - - - update warn_rule - - rule_name = #{ruleName}, - strategy_id = #{strategyId}, - msg_type_id = #{msgTypeId}, - slide_time = #{slideTime}, - slide_frequency = #{slideFrequency}, - max_value = #{maxValue}, - min_value = #{minValue}, - - where id = #{id} - - - - delete from warn_rule where id = #{id} - - - - delete from warn_rule where id in - - #{id} - - - diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml deleted file mode 100644 index 6959c4a..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - select id, car_type_id, strategy_name, msg_id from warn_strategy - - - - - - - - insert into warn_strategy - - car_type_id, - strategy_name, - msg_id, - - - #{carTypeId}, - #{strategyName}, - #{msgId}, - - - - - update warn_strategy - - car_type_id = #{carTypeId}, - strategy_name = #{strategyName}, - msg_id = #{msgId}, - - where id = #{id} - - - - delete from warn_strategy where id = #{id} - - - - delete from warn_strategy where id in - - #{id} - - - diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index ca4da81..8fba134 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -13,11 +13,10 @@ cloud-modules-gen cloud-modules-file cloud-modules-system-saas - cloud-breakdown - cloud-modules-car cloud-modules-warn cloud-modules-carmanage cloud-modules-parsing + cloud-modules-enterprise cloud-modules