From 0f9e2f4624f77763901d362c674f2bf6534c697d Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Sun, 29 Sep 2024 09:03:00 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloud-auth/src/main/resources/bootstrap.yml   |  16 +-
 .../factory/DruidDataSourceFactory.java       |   1 +
 .../src/main/resources/bootstrap.yml          |   4 +-
 .../cloud-breakdown-client/pom.xml            |  27 ----
 .../cloud-breakdown-common/pom.xml            |  26 ----
 .../muyu/breakdown/domain/SysCarMessage.java  |  43 ------
 .../cloud-breakdown-remote/pom.xml            |  27 ----
 ...ot.autoconfigure.AutoConfiguration.imports |   1 -
 .../cloud-breakdown-server/pom.xml            |  92 ------------
 .../java/com/muyu/BreakDownApplication.java   |  23 ---
 .../controller/SysCarMessageController.java   |  20 ---
 .../service/SysCarMessageService.java         |  15 --
 .../impl/SysCarMessageServiceImpl.java        |  19 ---
 .../src/main/resources/bootstrap.yml          |  60 --------
 .../src/main/resources/logback/dev.xml        |  74 ----------
 .../src/main/resources/logback/prod.xml       |  81 ----------
 .../src/main/resources/logback/test.xml       |  81 ----------
 cloud-modules/cloud-breakdown/pom.xml         |  27 ----
 cloud-modules/cloud-modules-car/pom.xml       |  95 ------------
 .../muyu/carrail/CloudCarRailApplication.java |  23 ---
 .../src/main/resources/bootstrap.yml          |  58 --------
 .../com/muyu/car/domain/VO/SysMessageVO.java  |  26 ----
 .../muyu/car/mapper/SysCarMessageMapper.java  |  19 ---
 .../main/java/com/muyu/car/util/SSLUtils.java |  75 ----------
 .../src/main/resources/banner.txt             |   2 -
 .../src/main/resources/bootstrap.yml          |  16 +-
 .../src/main/resources/bootstrap.yml          |  16 +-
 .../.gitignore                                |   2 +-
 .../.gitignore                                |  38 +++++
 .../pom.xml                                   |  33 ++---
 .../muyu/openbusiness}/DTO/MessageDTO.java    |   4 +-
 .../muyu/openbusiness}/domain/BreakDown.java  |   2 +-
 .../muyu/openbusiness}/domain/FaultLog.java   |  13 +-
 .../muyu/openbusiness}/domain/MessageMap.java |   2 +-
 .../muyu/openbusiness}/domain/Messages.java   |   2 +-
 .../com/muyu/openbusiness}/domain/SysCar.java |   2 +-
 .../openbusiness}/domain/SysCarMessage.java   |   2 +-
 .../openbusiness}/domain/SysCorpuscle.java    |   9 +-
 .../muyu/openbusiness}/domain/SysFence.java   |  10 +-
 .../openbusiness}/domain/SysFenceRail.java    |   2 +-
 .../openbusiness}/domain/SysMessageType.java  |   2 +-
 .../openbusiness}/domain/VehicleMessage.java  |   2 +-
 .../muyu/openbusiness}/domain/WarnLogs.java   |  11 +-
 .../muyu/openbusiness}/domain/WarnRule.java   |   8 +-
 .../openbusiness}/domain/WarnRuleDTO.java     |   2 +-
 .../openbusiness}/domain/WarnStrategy.java    |   8 +-
 .../muyu/openbusiness}/wx/AccessToken.java    |   2 +-
 .../com/muyu/openbusiness}/wx/Message.java    |   3 +-
 .../.gitignore                                |  38 +++++
 .../pom.xml                                   |  18 ++-
 .../CloudOpenBusinessApplication.java}        |   6 +-
 .../config/MybatisPlusConfig.java             |   9 +-
 .../openbusiness}/config/RabbitMQConfig.java  |   2 +-
 .../config/RabbitMQDirectConfig.java          |   2 +-
 .../config/RabbitMQTopicConfig.java           |   2 +-
 .../openbusiness}/constant/RedisConstant.java |   2 +-
 .../controller/BreakDownController.java       |   8 +-
 .../controller/FaultLogController.java        |  33 ++---
 .../controller/RailController.java            |   4 +
 .../controller/StationMessageController.java  |  12 +-
 .../controller/SysCarController.java          |  35 ++---
 .../controller/SysCarMessageController.java   |  50 ++-----
 .../controller/SysCorpuscleController.java    |  21 +--
 .../controller/SysFenceController.java        |  31 ++--
 .../controller/SysMessageTypeController.java  |  31 ++--
 .../controller/WarnLogsController.java        |  30 ++--
 .../controller/WarnRuleController.java        |  39 ++---
 .../controller/WarnRulesController.java       |   8 +-
 .../controller/WarnStrategyController.java    |  33 ++---
 .../controller/WxTestController.java          |  12 +-
 .../openbusiness}/mapper/BreakDownMapper.java |   5 +-
 .../openbusiness}/mapper/FaultLogMapper.java  |   6 +-
 .../mapper/StationMessageMapper.java          |   5 +-
 .../openbusiness}/mapper/SysCarMapper.java    |   6 +-
 .../mapper/SysCarMessageMapper.java           |   8 +-
 .../mapper/SysCorpuscleMapper.java            |  11 +-
 .../openbusiness}/mapper/SysFenceMapper.java  |   5 +-
 .../mapper/SysMessageTypeMapper.java          |   6 +-
 .../openbusiness}/mapper/WarnLogsMapper.java  |   4 +-
 .../openbusiness}/mapper/WarnRuleMapper.java  |   7 +-
 .../openbusiness}/mapper/WarnRulesMapper.java |   4 +-
 .../mapper/WarnStrategyMapper.java            |   4 +-
 .../muyu/openbusiness}/message/Article.java   |   2 +-
 .../openbusiness}/message/NewMessage.java     |   2 +-
 .../openbusiness}/redis/RedisInitialize.java  |  10 +-
 .../service/BreakDownService.java             |   6 +-
 .../service/IFaultLogService.java             |   7 +-
 .../service/ISysCarMessageService.java        |  11 +-
 .../openbusiness}/service/ISysCarService.java |   7 +-
 .../service/ISysCorpuscleService.java         |   7 +-
 .../service/ISysFenceService.java             |   8 +-
 .../service/ISysMessageTypeService.java       |   8 +-
 .../service/IWarRulesService.java             |   5 +-
 .../service/IWarnLogsService.java             |   7 +-
 .../service/IWarnRuleService.java             |   5 +-
 .../service/IWarnStrategyService.java         |   7 +-
 .../service/StationMessageService.java        |   4 +-
 .../service/SysCarMessageService.java         |  15 ++
 .../service/impl/BreakDownServiceImpl.java    |  18 +--
 .../service/impl/FaultLogServiceImpl.java     |   8 +-
 .../impl/StationMessageServiceImpl.java       |   9 +-
 .../impl/SysCarMessageServiceImpl.java        |  23 +--
 .../service/impl/SysCarServiceImpl.java       |  14 +-
 .../service/impl/SysCorpuscleServiceImpl.java |  16 +-
 .../service/impl/SysFenceServiceImpl.java     |  15 +-
 .../impl/SysMessageTypeServiceImpl.java       |  14 +-
 .../service/impl/WarnLogsServiceImpl.java     |  13 +-
 .../service/impl/WarnRuleServiceImpl.java     |  10 +-
 .../service/impl/WarnRulesServiceImpl.java    |  12 +-
 .../service/impl/WarnStrategyServiceImpl.java |  13 +-
 .../muyu/openbusiness}/util/OkHttpUtils.java  |   2 +-
 .../muyu/openbusiness}/util/TokenUtil.java    |   4 +-
 .../src/main/resources/banner.txt             |   0
 .../src/main/resources/bootstrap.yml          |   0
 .../src/main/resources/logback/dev.xml        |   0
 .../src/main/resources/logback/prod.xml       |   0
 .../src/main/resources/logback/test.xml       |   2 +-
 .../mapper/openbusiness}/SysCarMapper.xml     |   2 +-
 .../openbusiness}/SysCarMessageMapper.xml     |  13 +-
 .../mapper/openbusiness}/SysFenceMapper.xml   |   6 +-
 .../openbusiness}/SysMessageTypeMapper.xml    |   2 +-
 .../mapper/openbusiness}/SyscarRailMapper.xml |   4 +-
 .../pom.xml                                   |   9 +-
 cloud-modules/cloud-modules-rail/pom.xml      |  91 ------------
 .../zhangyi/rail/CloudRailApplication.java    |   7 -
 .../rail/controller/RailController.java       |   4 -
 .../saas/controller/SysUserController.java    |   2 +
 .../src/main/resources/bootstrap.yml          |  16 +-
 .../system/controller/SysFirmController.java  | 114 ++++++++++++++-
 .../muyu/system/domain/req/SysFirmReq.java    |  18 +++
 .../service/impl/SysFirmServiceImpl.java      |  14 +-
 .../src/main/resources/bootstrap.yml          |  16 +-
 .../cloud-warn-client/pom.xml                 |  20 ---
 .../cloud-warn-common/pom.xml                 | 138 ------------------
 .../cloud-warn-remote/pom.xml                 |  20 ---
 .../com/muyu/warning/WarnApplication.java     |  21 ---
 .../src/main/resources/banner.txt             |   2 -
 .../src/main/resources/bootstrap.yml          |  48 ------
 .../src/main/resources/logback/dev.xml        |  74 ----------
 .../src/main/resources/logback/prod.xml       |  81 ----------
 .../src/main/resources/logback/test.xml       |  81 ----------
 .../mapper/platform/WarnLogsMapper.xml        |  96 ------------
 .../mapper/platform/WarnRuleMapper.xml        |  86 -----------
 .../mapper/platform/WarnRulesMapper.xml       |   9 --
 .../mapper/platform/WarnStrategyMapper.xml    |  66 ---------
 cloud-modules/pom.xml                         |   6 +-
 .../src/main/resources/bootstrap.yml          |  18 +--
 147 files changed, 664 insertions(+), 2327 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/domain/SysCarMessage.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/pom.xml
 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/controller/SysCarMessageController.java
 delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.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-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml
 delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml
 delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml
 delete mode 100644 cloud-modules/cloud-breakdown/pom.xml
 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/bootstrap.yml
 delete mode 100644 cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VO/SysMessageVO.java
 delete mode 100644 cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java
 delete mode 100644 cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/util/SSLUtils.java
 delete mode 100644 cloud-modules/cloud-modules-carmanage/src/main/resources/banner.txt
 rename cloud-modules/{cloud-modules-carmanage => cloud-modules-openbusiness}/.gitignore (97%)
 create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/.gitignore
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server => cloud-modules-openbusiness/cloud-modules-openbusiness-common}/pom.xml (65%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/DTO/MessageDTO.java (96%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/BreakDown.java (97%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/FaultLog.java (89%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/MessageMap.java (91%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/Messages.java (96%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/SysCar.java (98%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/SysCarMessage.java (97%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/SysCorpuscle.java (95%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/SysFence.java (95%)
 rename cloud-modules/{cloud-modules-rail/src/main/java/com/zhangyi/rail => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/SysFenceRail.java (95%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/SysMessageType.java (97%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/VehicleMessage.java (99%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/WarnLogs.java (98%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/WarnRule.java (97%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/WarnRuleDTO.java (97%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/domain/WarnStrategy.java (97%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/wx/AccessToken.java (89%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness}/wx/Message.java (93%)
 create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/.gitignore
 rename cloud-modules/{cloud-modules-carmanage => cloud-modules-openbusiness/cloud-modules-openbusiness-server}/pom.xml (85%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car/CloudCarApplication.java => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java} (74%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/config/MybatisPlusConfig.java (68%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/config/RabbitMQConfig.java (97%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/config/RabbitMQDirectConfig.java (97%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/config/RabbitMQTopicConfig.java (97%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/constant/RedisConstant.java (85%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/BreakDownController.java (94%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/FaultLogController.java (83%)
 create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/StationMessageController.java (72%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/SysCarController.java (83%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/SysCarMessageController.java (83%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/SysCorpuscleController.java (89%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/SysFenceController.java (80%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/SysMessageTypeController.java (82%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/WarnLogsController.java (82%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/WarnRuleController.java (78%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/WarnRulesController.java (85%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/WarnStrategyController.java (82%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/WxTestController.java (96%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/BreakDownMapper.java (79%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/FaultLogMapper.java (71%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/StationMessageMapper.java (71%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysCarMapper.java (73%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysCarMessageMapper.java (52%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysCorpuscleMapper.java (80%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysFenceMapper.java (72%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysMessageTypeMapper.java (73%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/WarnLogsMapper.java (74%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/WarnRuleMapper.java (55%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/WarnRulesMapper.java (86%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/WarnStrategyMapper.java (74%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/message/Article.java (93%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/message/NewMessage.java (95%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/redis/RedisInitialize.java (96%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/BreakDownService.java (87%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/IFaultLogService.java (89%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/ISysCarMessageService.java (83%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/ISysCarService.java (90%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/ISysCorpuscleService.java (84%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/ISysFenceService.java (89%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/ISysMessageTypeService.java (90%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/IWarRulesService.java (70%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/IWarnLogsService.java (89%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/IWarnRuleService.java (85%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/IWarnStrategyService.java (89%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/StationMessageService.java (80%)
 create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysCarMessageService.java
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/BreakDownServiceImpl.java (82%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/FaultLogServiceImpl.java (91%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/StationMessageServiceImpl.java (72%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/SysCarMessageServiceImpl.java (84%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/SysCarServiceImpl.java (93%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/SysCorpuscleServiceImpl.java (75%)
 rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/SysFenceServiceImpl.java (88%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/java/com/muyu/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/SysMessageTypeServiceImpl.java (91%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/WarnLogsServiceImpl.java (93%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/WarnRuleServiceImpl.java (92%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/WarnRulesServiceImpl.java (80%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/WarnStrategyServiceImpl.java (91%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/util/OkHttpUtils.java (96%)
 rename cloud-modules/{cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/util/TokenUtil.java (93%)
 rename cloud-modules/{cloud-breakdown/cloud-breakdown-server => cloud-modules-openbusiness/cloud-modules-openbusiness-server}/src/main/resources/banner.txt (100%)
 rename cloud-modules/{cloud-modules-carmanage => cloud-modules-openbusiness/cloud-modules-openbusiness-server}/src/main/resources/bootstrap.yml (100%)
 rename cloud-modules/{cloud-modules-carmanage => cloud-modules-openbusiness/cloud-modules-openbusiness-server}/src/main/resources/logback/dev.xml (100%)
 rename cloud-modules/{cloud-modules-carmanage => cloud-modules-openbusiness/cloud-modules-openbusiness-server}/src/main/resources/logback/prod.xml (100%)
 rename cloud-modules/{cloud-modules-carmanage => cloud-modules-openbusiness/cloud-modules-openbusiness-server}/src/main/resources/logback/test.xml (99%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/resources/mapper/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysCarMapper.xml (98%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/resources/mapper/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysCarMessageMapper.xml (82%)
 rename cloud-modules/{cloud-modules-car/src/main/resources/mapper/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysFenceMapper.xml (88%)
 rename cloud-modules/{cloud-modules-carmanage/src/main/resources/mapper/car => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysMessageTypeMapper.xml (97%)
 rename cloud-modules/{cloud-modules-car/src/main/resources/mapper/carrail => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SyscarRailMapper.xml (74%)
 rename cloud-modules/{cloud-modules-warn => cloud-modules-openbusiness}/pom.xml (77%)
 delete mode 100644 cloud-modules/cloud-modules-rail/pom.xml
 delete mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java
 delete mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java
 create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/banner.txt
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/dev.xml
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/prod.xml
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/test.xml
 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/WarnRulesMapper.xml
 delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnStrategyMapper.xml

diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml
index ce1fb2d..715bffa 100644
--- a/cloud-auth/src/main/resources/bootstrap.yml
+++ b/cloud-auth/src/main/resources/bootstrap.yml
@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 49.235.136.60:8848
   user-name: nacos
   password: nacos
-  namespace: one-saas
+  namespace: wyh
 # Spring
 spring:
   application:
@@ -22,18 +22,18 @@ spring:
         # 服务注册地址
         server-addr: ${nacos.addr}
         # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
+#        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}
+#        username: ${nacos.user-name}
+#        # nacos密码
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式
diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java
index 78f2d8a..fda3cc3 100644
--- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java
+++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java
@@ -25,6 +25,7 @@ public class DruidDataSourceFactory {
         DruidDataSource druidDataSource = new DruidDataSource();
         druidDataSource.setUrl(dataSourceInfo.getUrl());
         druidDataSource.setConnectTimeout(10000);
+        druidDataSource.setMaxWait(60000);
         druidDataSource.setUsername(dataSourceInfo.getUserName());
         druidDataSource.setPassword(dataSourceInfo.getPassword());
         druidDataSource.setBreakAfterAcquireFailure(true);
diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml
index aa98013..b0be938 100644
--- a/cloud-gateway/src/main/resources/bootstrap.yml
+++ b/cloud-gateway/src/main/resources/bootstrap.yml
@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 49.235.136.60:8848
   user-name: nacos
   password: nacos
-  namespace: one-saas
+  namespace: wyh
 
 # Spring
 spring:
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-breakdown</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-breakdown-client</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-breakdown-common</artifactId>
-            <version>3.6.3</version>
-        </dependency>
-    </dependencies>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-breakdown</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-breakdown-common</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-core</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/SysCarMessage.java b/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/SysCarMessage.java
deleted file mode 100644
index 7cadf9c..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/SysCarMessage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.muyu.breakdown.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-/**
- * @ Tool：IntelliJ IDEA
- * @ Author：CHX
- * @ Date：2024-09-20-15:35
- * @ Version：1.0
- * @ Description：报文
- * @author Lenovo
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@SuperBuilder
-@TableName("sys_car_message")
-public class SysCarMessage {
-    /**
-     * id
-     */
-    private Integer id;
-    /**
-     * 车辆型号编码
-     */
-    private String modelCode;
-    /**
-     * 车辆报文类型编码
-     */
-    private String messageTypeCode;
-    /**
-     * 开始位下标
-     */
-    private String messageStartIndex;
-    /**
-     * 结束位下标
-     */
-    private String messageEndIndex;
-}
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-breakdown</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-breakdown-remote</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-breakdown-common</artifactId>
-            <version>3.6.3</version>
-        </dependency>
-    </dependencies>
-</project>
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/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml
deleted file mode 100644
index a208436..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-breakdown</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-breakdown-server</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-        <!-- MuYu Common Log -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-log</artifactId>
-        </dependency>
-
-        <!-- 接口模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-api-doc</artifactId>
-        </dependency>
-
-        <!-- XllJob定时任务 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-xxl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-rabbit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-breakdown-common</artifactId>
-            <version>3.6.3</version>
-        </dependency>
-    </dependencies>
-
-</project>
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/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/service/SysCarMessageService.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.java
deleted file mode 100644
index f0103b6..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.muyu.breakdown.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.breakdown.domain.SysCarMessage;
-
-/**
- * @ Tool：IntelliJ IDEA
- * @ Author：CHX
- * @ Date：2024-09-20-15:42
- * @ Version：1.0
- * @ Description：
- * @author Lenovo
- */
-public interface SysCarMessageService extends IService<SysCarMessage> {
-}
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<SysCarMessageMapper, SysCarMessage> 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 f4097e8..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: 127.0.0.1:8848
-  user-name: nacos
-  password: nacos
-  namespace: one
-# 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-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml
deleted file mode 100644
index 34cd186..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/dev.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-breakdown"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml
deleted file mode 100644
index 1193d09..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/prod.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-breakdown"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.sky.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 使用gRpc将日志发送到skywalking服务端 -->
-    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${log.sky.pattern}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="GRPC_LOG"/>
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml
deleted file mode 100644
index 1193d09..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/logback/test.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-breakdown"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.sky.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 使用gRpc将日志发送到skywalking服务端 -->
-    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${log.sky.pattern}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="GRPC_LOG"/>
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/cloud-modules/cloud-breakdown/pom.xml b/cloud-modules/cloud-breakdown/pom.xml
deleted file mode 100644
index 03dc09d..0000000
--- a/cloud-modules/cloud-breakdown/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-breakdown</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>cloud-breakdown-common</module>
-        <module>cloud-breakdown-server</module>
-        <module>cloud-breakdown-remote</module>
-        <module>cloud-breakdown-client</module>
-    </modules>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-</project>
diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml
deleted file mode 100644
index c7daf6d..0000000
--- a/cloud-modules/cloud-modules-car/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-modules-car</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-core</artifactId>
-        </dependency>
-        <!-- 接口模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-api-doc</artifactId>
-        </dependency>
-
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
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/bootstrap.yml b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
deleted file mode 100644
index 00342f2..0000000
--- a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Tomcat
-server:
-  port: 10011
-
-# nacos线上地址
-nacos:
-  addr: 127.0.0.1:8848
-  user-name: nacos
-  password: nacos
-  namespace: public
-# 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
-  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}
-
-logging:
-  level:
-    com.muyu.carrail.mapper: DEBUG
-
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VO/SysMessageVO.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VO/SysMessageVO.java
deleted file mode 100644
index ea7c14a..0000000
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VO/SysMessageVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.muyu.car.domain.VO;
-
-import com.muyu.common.core.annotation.Excel;
-import lombok.*;
-
-/**
- * 车辆报文类型对象 sys_message_type
- *
- * @author muyu
- * @date 2024-09-18
- */
-
-@Data
-public class SysMessageVO {
-    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-carmanage/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java
deleted file mode 100644
index b41073c..0000000
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.muyu.car.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.car.domain.SysCarMessage;
-import com.muyu.car.domain.VO.SysMessageVO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 车辆报文记录Mapper接口
- *
- * @author muyu
- * @date 2024-09-18
- */
-@Mapper
-public interface SysCarMessageMapper extends BaseMapper<SysCarMessage>{
-    List<SysMessageVO>dobList(SysMessageVO sysMessageVO);
-}
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/util/SSLUtils.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/util/SSLUtils.java
deleted file mode 100644
index 794b2d9..0000000
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/util/SSLUtils.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.muyu.car.util;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManagerFactory;
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.security.KeyPair;
-import java.security.KeyStore;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-public class SSLUtils {
-    public static SSLSocketFactory getSocketFactory(final String caCrtFile,
-                                                    final String crtFile, final String keyFile, final String password)
-            throws Exception {
-        Security.addProvider(new BouncyCastleProvider());
-
-        // load CA certificate
-        X509Certificate caCert = null;
-
-        FileInputStream fis = new FileInputStream(caCrtFile);
-        BufferedInputStream bis = new BufferedInputStream(fis);
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        while (bis.available() > 0) {
-            caCert = (X509Certificate) cf.generateCertificate(bis);
-        }
-
-        // load client certificate
-        bis = new BufferedInputStream(new FileInputStream(crtFile));
-        X509Certificate cert = null;
-        while (bis.available() > 0) {
-            cert = (X509Certificate) cf.generateCertificate(bis);
-        }
-
-        // load client private key
-        PEMParser pemParser = new PEMParser(new FileReader(keyFile));
-        Object object = pemParser.readObject();
-        JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
-        KeyPair key = converter.getKeyPair((PEMKeyPair) object);
-        pemParser.close();
-
-        // CA certificate is used to authenticate server
-        KeyStore caKs = KeyStore.getInstance(KeyStore.getDefaultType());
-        caKs.load(null, null);
-        caKs.setCertificateEntry("ca-certificate", caCert);
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
-        tmf.init(caKs);
-
-        // client key and certificates are sent to server so it can authenticate
-        KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-        ks.load(null, null);
-        ks.setCertificateEntry("certificate", cert);
-        ks.setKeyEntry("private-key", key.getPrivate(), password.toCharArray(),
-                new java.security.cert.Certificate[]{cert});
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory
-                .getDefaultAlgorithm());
-        kmf.init(ks, password.toCharArray());
-
-        // finally, create SSL socket factory
-        SSLContext context = SSLContext.getInstance("TLSv1.2");
-        context.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-
-        return context.getSocketFactory();
-    }
-}
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/banner.txt b/cloud-modules/cloud-modules-carmanage/src/main/resources/banner.txt
deleted file mode 100644
index 0dd5eee..0000000
--- a/cloud-modules/cloud-modules-carmanage/src/main/resources/banner.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
index c21b371..5bd4c8b 100644
--- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 49.235.136.60:8848
   user-name: nacos
   password: nacos
-  namespace: one-saas
+  namespace: wyh
 
 # Spring
 spring:
@@ -23,18 +23,18 @@ spring:
         # 服务注册地址
         server-addr: ${nacos.addr}
         # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
+#        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}
+#        username: ${nacos.user-name}
+#        # nacos密码
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式
diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
index f40b3a7..a707f2e 100644
--- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 49.235.136.60:8848
   user-name: nacos
   password: nacos
-  namespace: one-saas
+  namespace: wyh
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -29,18 +29,18 @@ spring:
         # 服务注册地址
         server-addr: ${nacos.addr}
         # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
+#        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}
+#        username: ${nacos.user-name}
+#        # nacos密码
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式
diff --git a/cloud-modules/cloud-modules-carmanage/.gitignore b/cloud-modules/cloud-modules-openbusiness/.gitignore
similarity index 97%
rename from cloud-modules/cloud-modules-carmanage/.gitignore
rename to cloud-modules/cloud-modules-openbusiness/.gitignore
index af665ab..5ff6309 100644
--- a/cloud-modules/cloud-modules-carmanage/.gitignore
+++ b/cloud-modules/cloud-modules-openbusiness/.gitignore
@@ -35,4 +35,4 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
\ No newline at end of file
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/.gitignore b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/.gitignore
new file mode 100644
index 0000000..5ff6309
--- /dev/null
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/.gitignore
@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
\ No newline at end of file
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/pom.xml
similarity index 65%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/pom.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/pom.xml
index cb5da5d..3e0e540 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/pom.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/pom.xml
@@ -5,33 +5,30 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules-warn</artifactId>
+        <artifactId>cloud-modules-openbusiness</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>cloud-warn-server</artifactId>
+    <artifactId>cloud-modules-openbusiness-common</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>cloud-warn-common</artifactId>
-            <version>3.6.3</version>
+            <artifactId>cloud-common-core</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.github.yulichang</groupId>-->
-<!--            <artifactId>mybatis-plus-join</artifactId>-->
-<!--            <version>1.2.4</version>-->
-<!--        </dependency>-->
+
         <dependency>
-            <groupId>com.github.yulichang</groupId>
-            <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.11</version>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
         </dependency>
+
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
@@ -57,17 +54,5 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <version>3.3.2</version>
         </dependency>
-        <!-- DOM4J是 dom4j.org 出品的一个开源XML解析包-->
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-            <version>2.0.43</version>
-        </dependency>
     </dependencies>
-
 </project>
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/DTO/MessageDTO.java
similarity index 96%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/DTO/MessageDTO.java
index 5e933f7..3151d95 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/DTO/MessageDTO.java
@@ -1,7 +1,7 @@
-//package com.muyu.breakdown.DTO;
+package com.muyu.openbusiness.DTO;//package com.muyu.breakdown.DTO;
 //
 //
-//import com.muyu.breakdown.domain.Messages;
+//import com.muyu.openbusiness.domain.Messages;
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.stereotype.Component;
 //
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/BreakDown.java
index 208c12b..b9c82af 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/BreakDown.java
@@ -1,4 +1,4 @@
-package com.muyu.breakdown.domain;
+package com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/FaultLog.java
index 3dd3a01..6618e53 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/FaultLog.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/FaultLog.java
@@ -1,16 +1,15 @@
-package com.muyu.breakdown.domain;
+package com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/MessageMap.java
index c75401f..55bb011 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/MessageMap.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/MessageMap.java
@@ -1,4 +1,4 @@
-package com.muyu.breakdown.domain;
+package com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/Messages.java
index 4e430fb..d524fd0 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/Messages.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/Messages.java
@@ -1,4 +1,4 @@
-package com.muyu.breakdown.domain;
+package com.muyu.openbusiness.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCar.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java
similarity index 98%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCar.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java
index d7d7efd..c6152d6 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCar.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java
@@ -1,4 +1,4 @@
-package com.muyu.car.domain;
+package com.muyu.openbusiness.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCarMessage.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java
similarity index 97%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCarMessage.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java
index 0f045c9..41faff8 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCarMessage.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java
@@ -1,4 +1,4 @@
-package com.muyu.car.domain;
+package com.muyu.openbusiness.domain;
 
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCorpuscle.java
index 2f85c6e..524ff71 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCorpuscle.java
@@ -1,14 +1,13 @@
-package com.muyu.carrail.domain;
+package com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFence.java
index b7d068b..3ca12bc 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFence.java
@@ -1,15 +1,13 @@
-package com.muyu.carrail.domain;
+package com.muyu.openbusiness.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-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFenceRail.java
similarity index 95%
rename from cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFenceRail.java
index dc11dbd..4eddb74 100644
--- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFenceRail.java
@@ -1,4 +1,4 @@
-package com.zhangyi.rail.domain;
+package com.muyu.openbusiness.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysMessageType.java
similarity index 97%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysMessageType.java
index c2f3e04..f4bb4ed 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysMessageType.java
@@ -1,4 +1,4 @@
-package com.muyu.car.domain;
+package com.muyu.openbusiness.domain;
 
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VehicleMessage.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/VehicleMessage.java
similarity index 99%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VehicleMessage.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/VehicleMessage.java
index f50e817..4672740 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VehicleMessage.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/VehicleMessage.java
@@ -1,4 +1,4 @@
-package com.muyu.car.domain;
+package com.muyu.openbusiness.domain;
 
 import com.muyu.common.core.web.domain.BaseEntity;
 import lombok.AllArgsConstructor;
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnLogs.java
similarity index 98%
rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnLogs.java
index 43250f3..7aac49a 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnLogs.java
@@ -1,15 +1,16 @@
-package com.muyu.warning.domain;
+package com.muyu.openbusiness.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 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;
 
 /**
  * 预警日志对象 warn_logs
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRule.java
similarity index 97%
rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRule.java
index 7e82a98..90935ee 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRule.java
@@ -1,13 +1,13 @@
-package com.muyu.warning.domain;
+package com.muyu.openbusiness.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;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
  * 预警规则对象 warn_rule
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRuleDTO.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRuleDTO.java
similarity index 97%
rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRuleDTO.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRuleDTO.java
index 6a8d311..ab1ade1 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRuleDTO.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRuleDTO.java
@@ -1,4 +1,4 @@
-package com.muyu.warning.domain;
+package com.muyu.openbusiness.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnStrategy.java
similarity index 97%
rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnStrategy.java
index 481e6fe..cb242b0 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnStrategy.java
@@ -1,13 +1,13 @@
-package com.muyu.warning.domain;
+package com.muyu.openbusiness.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;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
  * 预警策略对象 warn_strategy
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/AccessToken.java
similarity index 89%
rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/AccessToken.java
index f844623..2b142d4 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/AccessToken.java
@@ -1,4 +1,4 @@
-package com.muyu.warning.wx;
+package com.muyu.openbusiness.wx;
 
 import lombok.Data;
 
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/Message.java
similarity index 93%
rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/Message.java
index f17130a..34e8035 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/Message.java
@@ -1,4 +1,5 @@
-package com.muyu.warning.wx;
+package com.muyu.openbusiness.wx;
+
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/.gitignore b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/.gitignore
new file mode 100644
index 0000000..5ff6309
--- /dev/null
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/.gitignore
@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
\ No newline at end of file
diff --git a/cloud-modules/cloud-modules-carmanage/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
similarity index 85%
rename from cloud-modules/cloud-modules-carmanage/pom.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
index 21532f7..c73651d 100644
--- a/cloud-modules/cloud-modules-carmanage/pom.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules</artifactId>
+        <artifactId>cloud-modules-openbusiness</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>cloud-modules-carmanage</artifactId>
+    <artifactId>cloud-modules-openbusiness-server</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -89,6 +89,20 @@
             <artifactId>bcpkix-jdk15on</artifactId>
             <version>1.70</version>
         </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-modules-carmanage</artifactId>
+            <version>3.6.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-modules-openbusiness-common</artifactId>
+            <version>3.6.3</version>
+            <scope>compile</scope>
+        </dependency>
+
+
     </dependencies>
 
     <build>
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/CloudCarApplication.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
similarity index 74%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/CloudCarApplication.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
index 662105f..4cab1e8 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/CloudCarApplication.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
@@ -1,4 +1,4 @@
-package com.muyu.car;
+package com.muyu.openbusiness;
 
 import com.muyu.common.security.annotation.EnableCustomConfig;
 import com.muyu.common.security.annotation.EnableMyFeignClients;
@@ -14,8 +14,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 //@EnableCustomSwagger2
 @EnableMyFeignClients
 @SpringBootApplication
-public class CloudCarApplication {
+public class CloudOpenBusinessApplication {
     public static void main (String[] args) {
-        SpringApplication.run(CloudCarApplication.class, args);
+            SpringApplication.run(CloudOpenBusinessApplication.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-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/MybatisPlusConfig.java
similarity index 68%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/MybatisPlusConfig.java
index 5a1131d..d3e927a 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/MybatisPlusConfig.java
@@ -1,11 +1,4 @@
-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;
+package com.muyu.openbusiness.config;
 
 /**
  * @ Tool：IntelliJ IDEA
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQConfig.java
similarity index 97%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQConfig.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQConfig.java
index a735a6e..a2519be 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQConfig.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQConfig.java
@@ -1,4 +1,4 @@
-package com.muyu.breakdown.config;
+package com.muyu.openbusiness.config;
 
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQDirectConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQDirectConfig.java
similarity index 97%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQDirectConfig.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQDirectConfig.java
index e0b2f8b..d9ae65f 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQDirectConfig.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQDirectConfig.java
@@ -1,4 +1,4 @@
-package com.muyu.breakdown.config;
+package com.muyu.openbusiness.config;
 
 import org.springframework.amqp.core.*;
 import org.springframework.context.annotation.Bean;
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQTopicConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQTopicConfig.java
similarity index 97%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQTopicConfig.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQTopicConfig.java
index 58630e5..95f79e9 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQTopicConfig.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQTopicConfig.java
@@ -1,4 +1,4 @@
-package com.muyu.breakdown.config;
+package com.muyu.openbusiness.config;
 
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/constant/RedisConstant.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/constant/RedisConstant.java
similarity index 85%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/constant/RedisConstant.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/constant/RedisConstant.java
index 521fc56..6d1a167 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/constant/RedisConstant.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/constant/RedisConstant.java
@@ -1,4 +1,4 @@
-package com.muyu.car.constant;
+package com.muyu.openbusiness.constant;
 
 public class RedisConstant {
 
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/BreakDownController.java
index 1e8dea0..6554064 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/BreakDownController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/BreakDownController.java
@@ -1,8 +1,8 @@
-package com.muyu.breakdown.controller;
+package com.muyu.openbusiness.controller;
 
-import com.muyu.breakdown.domain.BreakDown;
-import com.muyu.breakdown.domain.MessageMap;
-import com.muyu.breakdown.service.BreakDownService;
+import com.muyu.openbusiness.domain.BreakDown;
+import com.muyu.openbusiness.domain.MessageMap;
+import com.muyu.openbusiness.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;
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/FaultLogController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/FaultLogController.java
index d66c519..c5f5c9c 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/FaultLogController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/FaultLogController.java
@@ -1,27 +1,20 @@
-package com.muyu.breakdown.controller;
+package com.muyu.openbusiness.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.openbusiness.domain.FaultLog;
+import com.muyu.openbusiness.service.IFaultLogService;
 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 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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java
new file mode 100644
index 0000000..5e88e4c
--- /dev/null
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java
@@ -0,0 +1,4 @@
+package com.muyu.openbusiness.controller;
+
+public class RailController {
+}
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/StationMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/StationMessageController.java
similarity index 72%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/StationMessageController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/StationMessageController.java
index 2e2fdf9..5698517 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/StationMessageController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/StationMessageController.java
@@ -1,13 +1,15 @@
-package com.muyu.breakdown.controller;
+package com.muyu.openbusiness.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.openbusiness.domain.Messages;
+import com.muyu.openbusiness.service.StationMessageService;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.controller.BaseController;
 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-carmanage/src/main/java/com/muyu/car/controller/SysCarController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java
similarity index 83%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java
index 189e777..bcc2ae2 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java
@@ -1,4 +1,16 @@
-package com.muyu.car.controller;
+package com.muyu.openbusiness.controller;
+
+import com.muyu.openbusiness.domain.SysCar;
+import com.muyu.openbusiness.service.ISysCarService;
+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 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;
@@ -7,27 +19,6 @@ import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import javax.annotation.Resource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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.car.domain.SysCar;
-import com.muyu.car.service.ISysCarService;
-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.page.TableDataInfo;
 
 /**
  * 车辆基础信息Controller
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java
similarity index 83%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarMessageController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java
index 9617880..3a52354 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarMessageController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java
@@ -1,36 +1,25 @@
-package com.muyu.car.controller;
+package com.muyu.openbusiness.controller;
 
+import com.muyu.openbusiness.domain.SysCarMessage;
+
+import com.muyu.openbusiness.service.ISysCarMessageService;
+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 jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
 
-import com.muyu.car.domain.SysCarMessage;
-import com.muyu.car.domain.SysMessageType;
-import com.muyu.car.domain.VO.SysMessageVO;
-import com.muyu.car.service.ISysCarMessageService;
-import jakarta.servlet.http.HttpServletResponse;
-import javax.annotation.Resource;
-
-import jakarta.servlet.http.HttpSession;
-import org.springframework.beans.factory.annotation.Autowired;
-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.page.TableDataInfo;
-
 /**
  * 车辆报文记录Controller
  *
@@ -106,15 +95,6 @@ public class SysCarMessageController extends BaseController
         return Result.success(list);
     }
 
-    @RequiresPermissions("message:message:dobList")
-    @GetMapping("/dobList")
-    public Result<List<SysMessageVO>> dobList(SysMessageVO sysMessageVO)
-    {
-        List<SysMessageVO> list = sysCarMessageService.dobList(sysMessageVO);
-        return Result.success(list);
-    }
-
-
     /**
      * 导出车辆报文记录列表
      */
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java
index 15e083c..9e954be 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java
@@ -1,22 +1,17 @@
-package com.muyu.carrail.controller;
-
-import java.util.Arrays;
-import java.util.List;
+package com.muyu.openbusiness.controller;
 
+import com.muyu.openbusiness.domain.SysCorpuscle;
+import com.muyu.openbusiness.service.ISysCorpuscleService;
+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 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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysFenceController.java
index a3ff506..3da8758 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysFenceController.java
@@ -1,26 +1,19 @@
-package com.muyu.carrail.controller;
+package com.muyu.openbusiness.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.openbusiness.domain.SysFence;
+import com.muyu.openbusiness.service.ISysFenceService;
 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 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-carmanage/src/main/java/com/muyu/car/controller/SysMessageTypeController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java
similarity index 82%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysMessageTypeController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java
index c93875a..b84f0cc 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysMessageTypeController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java
@@ -1,27 +1,18 @@
-package com.muyu.car.controller;
+package com.muyu.openbusiness.controller;
 
-import java.util.Arrays;
-import java.util.List;
-
-import com.muyu.car.domain.SysMessageType;
-import com.muyu.car.service.ISysMessageTypeService;
-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.openbusiness.domain.SysMessageType;
+import com.muyu.openbusiness.service.ISysMessageTypeService;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
-import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.common.core.web.controller.BaseController;
+import com.muyu.common.security.annotation.RequiresPermissions;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;
-import com.muyu.common.core.web.page.TableDataInfo;
+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-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java
similarity index 82%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java
index 3ce89ca..d855362 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java
@@ -1,25 +1,19 @@
-package com.muyu.warning.controller;
+package com.muyu.openbusiness.controller;
 
-import java.util.Arrays;
-import java.util.List;
-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.warning.domain.WarnLogs;
-import com.muyu.warning.service.IWarnLogsService;
-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.openbusiness.domain.WarnLogs;
+import com.muyu.openbusiness.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
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java
similarity index 78%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java
index f549518..eef03a2 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java
@@ -1,33 +1,20 @@
-package com.muyu.warning.controller;
+package com.muyu.openbusiness.controller;
 
-import java.util.Arrays;
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
-import com.muyu.warning.domain.WarnRule;
-import com.muyu.warning.domain.WarnRuleDTO;
-import com.muyu.warning.domain.WarnStrategy;
-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.warning.domain.WarnRule;
-import com.muyu.warning.service.IWarnRuleService;
-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.openbusiness.domain.WarnRule;
+import com.muyu.openbusiness.domain.WarnRuleDTO;
+import com.muyu.openbusiness.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
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRulesController.java
similarity index 85%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRulesController.java
index 8a87908..5bbae15 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRulesController.java
@@ -1,10 +1,8 @@
-package com.muyu.warning.controller;
+package com.muyu.openbusiness.controller;
 
 import com.muyu.common.core.domain.Result;
-import com.muyu.warning.domain.WarnRule;
-import com.muyu.warning.domain.WarnRuleDTO;
-import com.muyu.warning.service.IWarRulesService;
-import lombok.val;
+import com.muyu.openbusiness.domain.WarnRuleDTO;
+import com.muyu.openbusiness.service.IWarRulesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java
similarity index 82%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java
index 4f1b51f..01e38aa 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java
@@ -1,28 +1,19 @@
-package com.muyu.warning.controller;
+package com.muyu.openbusiness.controller;
 
-import java.util.Arrays;
-import java.util.List;
-
-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.warning.domain.WarnStrategy;
-import com.muyu.warning.service.IWarnStrategyService;
-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.openbusiness.domain.WarnStrategy;
+import com.muyu.openbusiness.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
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WxTestController.java
similarity index 96%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WxTestController.java
index b512b94..29198d3 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WxTestController.java
@@ -1,14 +1,16 @@
-package com.muyu.warning.controller;
+package com.muyu.openbusiness.controller;
 
 
-import com.muyu.warning.wx.Message;
-import com.muyu.warning.message.Article;
-import com.muyu.warning.message.NewMessage;
-import com.muyu.warning.util.TokenUtil;
+import com.muyu.openbusiness.message.Article;
+import com.muyu.openbusiness.message.NewMessage;
+import com.muyu.openbusiness.util.TokenUtil;
+import com.muyu.openbusiness.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;
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/BreakDownMapper.java
similarity index 79%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/BreakDownMapper.java
index 8f93626..3e70636 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/BreakDownMapper.java
@@ -1,7 +1,8 @@
-package com.muyu.breakdown.mapper;
+package com.muyu.openbusiness.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.muyu.breakdown.domain.BreakDown;
+
+import com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/FaultLogMapper.java
index d5f1d7e..271fc22 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/FaultLogMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/FaultLogMapper.java
@@ -1,8 +1,8 @@
-package com.muyu.breakdown.mapper;
+package com.muyu.openbusiness.mapper;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.breakdown.domain.FaultLog;
+
+import com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/StationMessageMapper.java
index 450ebb4..3c0b311 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/StationMessageMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/StationMessageMapper.java
@@ -1,8 +1,7 @@
-package com.muyu.breakdown.mapper;
+package com.muyu.openbusiness.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.muyu.breakdown.domain.Messages;
+import com.muyu.openbusiness.domain.Messages;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMapper.java
similarity index 73%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMapper.java
index 1711c48..78b5bdf 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMapper.java
@@ -1,8 +1,7 @@
-package com.muyu.car.mapper;
+package com.muyu.openbusiness.mapper;
 
-import java.util.List;
-import com.muyu.car.domain.SysCar;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.openbusiness.domain.SysCar;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @author muyu
  * @date 2024-09-17
  */
+@Mapper
 public interface SysCarMapper extends BaseMapper<SysCar>{
 
 }
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMessageMapper.java
similarity index 52%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/SysCarMessageMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMessageMapper.java
index 5629f33..fcd3a4b 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/SysCarMessageMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMessageMapper.java
@@ -1,7 +1,8 @@
-package com.muyu.breakdown.mapper;
+package com.muyu.openbusiness.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.muyu.breakdown.domain.SysCarMessage;
+import com.muyu.openbusiness.domain.SysCarMessage;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @ Description：
  * @author Lenovo
  */
+
 @Mapper
-public interface SysCarMessageMapper extends MPJBaseMapper<SysCarMessage> {
+public interface SysCarMessageMapper extends BaseMapper<SysCarMessage> {
 }
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCorpuscleMapper.java
similarity index 80%
rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCorpuscleMapper.java
index b2cb32e..8165f38 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCorpuscleMapper.java
@@ -1,9 +1,10 @@
-package com.muyu.carrail.mapper;
+package com.muyu.openbusiness.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.openbusiness.domain.SysCorpuscle;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-import com.muyu.carrail.domain.SysCorpuscle;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 电子围栏Mapper接口
@@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @author muyu
  * @date 2024-09-17
  */
-
+@Mapper
 public interface SysCorpuscleMapper extends BaseMapper<SysCorpuscle>{
 
     List<SysCorpuscle> selectCarRail(SysCorpuscle sysCorpuscle);
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysFenceMapper.java
similarity index 72%
rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysFenceMapper.java
index 725c176..43cdd56 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysFenceMapper.java
@@ -1,8 +1,8 @@
-package com.muyu.carrail.mapper;
+package com.muyu.openbusiness.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.carrail.domain.SysFence;
+import com.muyu.openbusiness.domain.SysFence;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @author muyu
  * @date 2024-09-17
  */
+@Mapper
 public interface SysFenceMapper extends BaseMapper<SysFence>{
 
 }
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysMessageTypeMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysMessageTypeMapper.java
similarity index 73%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysMessageTypeMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysMessageTypeMapper.java
index 2fec6bb..8b23c58 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysMessageTypeMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysMessageTypeMapper.java
@@ -1,9 +1,7 @@
-package com.muyu.car.mapper;
-
-import java.util.List;
+package com.muyu.openbusiness.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.car.domain.SysMessageType;
+import com.muyu.openbusiness.domain.SysMessageType;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnLogsMapper.java
similarity index 74%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnLogsMapper.java
index 166720f..5c2899f 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnLogsMapper.java
@@ -1,7 +1,7 @@
-package com.muyu.warning.mapper;
+package com.muyu.openbusiness.mapper;
 
-import com.muyu.warning.domain.WarnLogs;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.openbusiness.domain.WarnLogs;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRuleMapper.java
similarity index 55%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRuleMapper.java
index e3d67d3..2e068fc 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRuleMapper.java
@@ -1,10 +1,7 @@
-package com.muyu.warning.mapper;
+package com.muyu.openbusiness.mapper;
 
-import com.github.yulichang.base.MPJBaseMapper;
-import com.muyu.warning.domain.WarnRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.warning.domain.WarnRule;
-import com.muyu.warning.domain.WarnRuleDTO;
+import com.muyu.openbusiness.domain.WarnRuleDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRulesMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRulesMapper.java
similarity index 86%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRulesMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRulesMapper.java
index 61a6d1a..9ae3362 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRulesMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRulesMapper.java
@@ -1,7 +1,7 @@
-package com.muyu.warning.mapper;
+package com.muyu.openbusiness.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.warning.domain.WarnRuleDTO;
+import com.muyu.openbusiness.domain.WarnRuleDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnStrategyMapper.java
similarity index 74%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnStrategyMapper.java
index e9bd988..1d3e625 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnStrategyMapper.java
@@ -1,7 +1,7 @@
-package com.muyu.warning.mapper;
+package com.muyu.openbusiness.mapper;
 
-import com.muyu.warning.domain.WarnStrategy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.openbusiness.domain.WarnStrategy;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/Article.java
similarity index 93%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/Article.java
index 9c195ce..1872201 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/Article.java
@@ -1,4 +1,4 @@
-package com.muyu.warning.message;
+package com.muyu.openbusiness.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.AllArgsConstructor;
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/NewMessage.java
similarity index 95%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/NewMessage.java
index a8b5dbf..5bac5bf 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/NewMessage.java
@@ -1,4 +1,4 @@
-package com.muyu.warning.message;
+package com.muyu.openbusiness.message;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.AllArgsConstructor;
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/redis/RedisInitialize.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/redis/RedisInitialize.java
similarity index 96%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/redis/RedisInitialize.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/redis/RedisInitialize.java
index d0798fd..4369521 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/redis/RedisInitialize.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/redis/RedisInitialize.java
@@ -1,17 +1,13 @@
-package com.muyu.car.redis;
+package com.muyu.openbusiness.redis;
 
 import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
-import com.muyu.car.constant.RedisConstant;
-import com.muyu.car.domain.VehicleMessage;
+import com.muyu.openbusiness.constant.RedisConstant;
+import com.muyu.openbusiness.domain.VehicleMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.util.Arrays;
-import java.util.List;
 
 @Component
 public class RedisInitialize {
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/BreakDownService.java
index 325424c..c1247f7 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/BreakDownService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/BreakDownService.java
@@ -1,8 +1,8 @@
-package com.muyu.breakdown.service;
+package com.muyu.openbusiness.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.breakdown.domain.BreakDown;
-import com.muyu.breakdown.domain.MessageMap;
+import com.muyu.openbusiness.domain.BreakDown;
+import com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IFaultLogService.java
similarity index 89%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/IFaultLogService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IFaultLogService.java
index e6ef523..d8399ea 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/IFaultLogService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IFaultLogService.java
@@ -1,8 +1,9 @@
-package com.muyu.breakdown.service;
+package com.muyu.openbusiness.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.openbusiness.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-carmanage/src/main/java/com/muyu/car/service/ISysCarMessageService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java
similarity index 83%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarMessageService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java
index 5c6c792..e520847 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarMessageService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java
@@ -1,10 +1,9 @@
-package com.muyu.car.service;
-
-import java.util.List;
+package com.muyu.openbusiness.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.car.domain.SysCarMessage;
-import com.muyu.car.domain.VO.SysMessageVO;
+import com.muyu.openbusiness.domain.SysCarMessage;
+
+import java.util.List;
 
 /**
  * 车辆报文记录Service接口
@@ -13,8 +12,6 @@ import com.muyu.car.domain.VO.SysMessageVO;
  * @date 2024-09-18
  */
 public interface ISysCarMessageService extends IService<SysCarMessage> {
-
-    List<SysMessageVO>dobList(SysMessageVO sysMessageVO);
     /**
      * 精确查询车辆报文记录
      *
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarService.java
similarity index 90%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarService.java
index 3b010ff..c5f39cf 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarService.java
@@ -1,8 +1,9 @@
-package com.muyu.car.service;
+package com.muyu.openbusiness.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.openbusiness.domain.SysCar;
 
 import java.util.List;
-import com.muyu.car.domain.SysCar;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * 车辆基础信息Service接口
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCorpuscleService.java
similarity index 84%
rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCorpuscleService.java
index 276b2d4..77215ad 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCorpuscleService.java
@@ -1,8 +1,9 @@
-package com.muyu.carrail.service;
+package com.muyu.openbusiness.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysFenceService.java
index 7ba33a8..626c197 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysFenceService.java
@@ -1,9 +1,9 @@
-package com.muyu.carrail.service;
-
-import java.util.List;
+package com.muyu.openbusiness.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.carrail.domain.SysFence;
+import com.muyu.openbusiness.domain.SysFence;
+
+import java.util.List;
 
 /**
  * 围栏组Service接口
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysMessageTypeService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysMessageTypeService.java
similarity index 90%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysMessageTypeService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysMessageTypeService.java
index e744241..e7a7db9 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysMessageTypeService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysMessageTypeService.java
@@ -1,9 +1,9 @@
-package com.muyu.car.service;
-
-import java.util.List;
+package com.muyu.openbusiness.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.car.domain.SysMessageType;
+import com.muyu.openbusiness.domain.SysMessageType;
+
+import java.util.List;
 
 /**
  * 车辆报文类型Service接口
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarRulesService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarRulesService.java
similarity index 70%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarRulesService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarRulesService.java
index 25f71e8..347d7b0 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarRulesService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarRulesService.java
@@ -1,8 +1,7 @@
-package com.muyu.warning.service;
+package com.muyu.openbusiness.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.warning.domain.WarnRule;
-import com.muyu.warning.domain.WarnRuleDTO;
+import com.muyu.openbusiness.domain.WarnRuleDTO;
 
 import java.util.List;
 
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnLogsService.java
similarity index 89%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnLogsService.java
index 1f61aa4..a0ba984 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnLogsService.java
@@ -1,8 +1,9 @@
-package com.muyu.warning.service;
+package com.muyu.openbusiness.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.openbusiness.domain.WarnLogs;
 
 import java.util.List;
-import com.muyu.warning.domain.WarnLogs;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * 预警日志Service接口
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnRuleService.java
similarity index 85%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnRuleService.java
index ef327d0..7be076b 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnRuleService.java
@@ -1,8 +1,7 @@
-package com.muyu.warning.service;
+package com.muyu.openbusiness.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.muyu.warning.domain.WarnRuleDTO;
+import com.muyu.openbusiness.domain.WarnRuleDTO;
 
 import java.util.List;
 
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnStrategyService.java
similarity index 89%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnStrategyService.java
index d3fec08..1307ee1 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnStrategyService.java
@@ -1,8 +1,9 @@
-package com.muyu.warning.service;
+package com.muyu.openbusiness.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.openbusiness.domain.WarnStrategy;
 
 import java.util.List;
-import com.muyu.warning.domain.WarnStrategy;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * 预警策略Service接口
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/StationMessageService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/StationMessageService.java
similarity index 80%
rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/StationMessageService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/StationMessageService.java
index 5af194c..35cbfc8 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/StationMessageService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/StationMessageService.java
@@ -1,7 +1,7 @@
-package com.muyu.breakdown.service;
+package com.muyu.openbusiness.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.breakdown.domain.Messages;
+import com.muyu.openbusiness.domain.Messages;
 
 import java.util.List;
 
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysCarMessageService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysCarMessageService.java
new file mode 100644
index 0000000..82773fb
--- /dev/null
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysCarMessageService.java
@@ -0,0 +1,15 @@
+//package com.muyu.openbusiness.service;
+//
+//import com.baomidou.mybatisplus.extension.service.IService;
+//import com.muyu.openbusiness.domain.SysCarMessage;
+//
+///**
+// * @ Tool：IntelliJ IDEA
+// * @ Author：CHX
+// * @ Date：2024-09-20-15:42
+// * @ Version：1.0
+// * @ Description：
+// * @author Lenovo
+// */
+//public interface SysCarMessageService extends IService<SysCarMessage> {
+//}
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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/BreakDownServiceImpl.java
similarity index 82%
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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/BreakDownServiceImpl.java
index 62c0085..40a550e 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/BreakDownServiceImpl.java
@@ -1,22 +1,18 @@
-package com.muyu.breakdown.service.impl;
+package com.muyu.openbusiness.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.openbusiness.domain.BreakDown;
+import com.muyu.openbusiness.domain.MessageMap;
+import com.muyu.openbusiness.mapper.BreakDownMapper;
+import com.muyu.openbusiness.service.BreakDownService;
 import com.muyu.common.core.utils.StringUtils;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import com.muyu.openbusiness.service.ISysCarMessageService;
 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;
 
@@ -32,7 +28,7 @@ import java.util.Map;
 public class BreakDownServiceImpl extends ServiceImpl<BreakDownMapper, BreakDown> implements BreakDownService {
 
     @Autowired
-    private SysCarMessageService sysCarMessageService;
+    private ISysCarMessageService sysCarMessageService;
     @Autowired
     private RabbitTemplate rabbitTemplate;
     /**
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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/FaultLogServiceImpl.java
index 7124779..f794a89 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/FaultLogServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/FaultLogServiceImpl.java
@@ -1,10 +1,10 @@
-package com.muyu.breakdown.service.impl;
+package com.muyu.openbusiness.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.openbusiness.domain.FaultLog;
+import com.muyu.openbusiness.mapper.FaultLogMapper;
+import com.muyu.openbusiness.service.IFaultLogService;
 import com.muyu.common.core.utils.StringUtils;
 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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/StationMessageServiceImpl.java
index 462db1f..155e24e 100644
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/StationMessageServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/StationMessageServiceImpl.java
@@ -1,10 +1,9 @@
-package com.muyu.breakdown.service.impl;
+package com.muyu.openbusiness.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.openbusiness.domain.Messages;
+import com.muyu.openbusiness.mapper.StationMessageMapper;
+import com.muyu.openbusiness.service.StationMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java
similarity index 84%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarMessageServiceImpl.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java
index 30568a5..ed27d9e 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarMessageServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java
@@ -1,18 +1,17 @@
-package com.muyu.car.service.impl;
+package com.muyu.openbusiness.service.impl;
 
-import java.util.List;
-
-import com.muyu.car.domain.SysCarMessage;
-import com.muyu.car.domain.VO.SysMessageVO;
-import com.muyu.car.mapper.SysCarMessageMapper;
-import com.muyu.car.service.ISysCarMessageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 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.openbusiness.domain.SysCarMessage;
+import com.muyu.openbusiness.mapper.SysCarMessageMapper;
+import com.muyu.openbusiness.service.ISysCarMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import java.util.List;
+
 /**
  * 车辆报文记录Service业务层处理
  *
@@ -23,13 +22,7 @@ import org.springframework.util.Assert;
 public class SysCarMessageServiceImpl
         extends ServiceImpl<SysCarMessageMapper, SysCarMessage>
         implements ISysCarMessageService {
-    @Autowired
-    private SysCarMessageMapper mapper;
 
-    @Override
-    public List<SysMessageVO> dobList(SysMessageVO sysMessageVO) {
-        return mapper.dobList(sysMessageVO);
-    }
 
     /**
      * 精确查询车辆报文记录
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarServiceImpl.java
similarity index 93%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarServiceImpl.java
index 309faaf..75a5e5a 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarServiceImpl.java
@@ -1,16 +1,16 @@
-package com.muyu.car.service.impl;
+package com.muyu.openbusiness.service.impl;
 
-import java.util.List;
-import com.muyu.common.core.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.muyu.car.mapper.SysCarMapper;
-import com.muyu.car.domain.SysCar;
-import com.muyu.car.service.ISysCarService;
 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.openbusiness.domain.SysCar;
+import com.muyu.openbusiness.mapper.SysCarMapper;
+import com.muyu.openbusiness.service.ISysCarService;
+import org.springframework.stereotype.Service;
 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/SysCorpuscleServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCorpuscleServiceImpl.java
index 61024fe..be24af7 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysCorpuscleServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCorpuscleServiceImpl.java
@@ -1,15 +1,13 @@
-package com.muyu.carrail.service.impl;
-
-import java.util.List;
+package com.muyu.openbusiness.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.openbusiness.domain.SysCorpuscle;
+import com.muyu.openbusiness.mapper.SysCorpuscleMapper;
+import com.muyu.openbusiness.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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/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-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysFenceServiceImpl.java
index 5ebffcc..aaf05a0 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysFenceServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysFenceServiceImpl.java
@@ -1,18 +1,15 @@
-package com.muyu.carrail.service.impl;
-
-import java.util.List;
+package com.muyu.openbusiness.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.openbusiness.domain.SysFence;
+import com.muyu.openbusiness.mapper.SysFenceMapper;
+import com.muyu.openbusiness.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-carmanage/src/main/java/com/muyu/car/service/impl/SysMessageTypeServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysMessageTypeServiceImpl.java
similarity index 91%
rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysMessageTypeServiceImpl.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysMessageTypeServiceImpl.java
index 4e428c8..6d1b49e 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysMessageTypeServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysMessageTypeServiceImpl.java
@@ -1,16 +1,16 @@
-package com.muyu.car.service.impl;
+package com.muyu.openbusiness.service.impl;
 
-import java.util.List;
-
-import com.muyu.car.domain.SysMessageType;
-import com.muyu.car.mapper.SysMessageTypeMapper;
-import com.muyu.car.service.ISysMessageTypeService;
-import org.springframework.stereotype.Service;
 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.openbusiness.domain.SysMessageType;
+import com.muyu.openbusiness.mapper.SysMessageTypeMapper;
+import com.muyu.openbusiness.service.ISysMessageTypeService;
+import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import java.util.List;
+
 /**
  * 车辆报文类型Service业务层处理
  *
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnLogsServiceImpl.java
similarity index 93%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnLogsServiceImpl.java
index 2e25a7b..968253e 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnLogsServiceImpl.java
@@ -1,15 +1,16 @@
-package com.muyu.warning.service.impl;
+package com.muyu.openbusiness.service.impl;
 
-import java.util.List;
-import org.springframework.stereotype.Service;
-import com.muyu.warning.mapper.WarnLogsMapper;
-import com.muyu.warning.domain.WarnLogs;
-import com.muyu.warning.service.IWarnLogsService;
 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.openbusiness.domain.WarnLogs;
+import com.muyu.openbusiness.mapper.WarnLogsMapper;
+import com.muyu.openbusiness.service.IWarnLogsService;
+import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import java.util.List;
+
 /**
  * 预警日志Service业务层处理
  *
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRuleServiceImpl.java
similarity index 92%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRuleServiceImpl.java
index 4fa0aab..0956aa5 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRuleServiceImpl.java
@@ -1,13 +1,11 @@
-package com.muyu.warning.service.impl;
+package com.muyu.openbusiness.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
-import com.muyu.warning.domain.WarnRuleDTO;
-import com.muyu.warning.mapper.WarnRuleMapper;
-import com.muyu.warning.service.IWarnRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.muyu.openbusiness.domain.WarnRuleDTO;
+import com.muyu.openbusiness.mapper.WarnRuleMapper;
+import com.muyu.openbusiness.service.IWarnRuleService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRulesServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRulesServiceImpl.java
similarity index 80%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRulesServiceImpl.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRulesServiceImpl.java
index 54de66e..2811ae5 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRulesServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRulesServiceImpl.java
@@ -1,12 +1,12 @@
-package com.muyu.warning.service.impl;
+package com.muyu.openbusiness.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.muyu.warning.domain.WarnRule;
-import com.muyu.warning.domain.WarnRuleDTO;
-import com.muyu.warning.domain.WarnStrategy;
-import com.muyu.warning.mapper.WarnRulesMapper;
-import com.muyu.warning.service.IWarRulesService;
+import com.muyu.openbusiness.domain.WarnRule;
+import com.muyu.openbusiness.domain.WarnRuleDTO;
+import com.muyu.openbusiness.domain.WarnStrategy;
+import com.muyu.openbusiness.mapper.WarnRulesMapper;
+import com.muyu.openbusiness.service.IWarRulesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnStrategyServiceImpl.java
similarity index 91%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnStrategyServiceImpl.java
index 505a01e..4798fed 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnStrategyServiceImpl.java
@@ -1,15 +1,16 @@
-package com.muyu.warning.service.impl;
+package com.muyu.openbusiness.service.impl;
 
-import java.util.List;
-import org.springframework.stereotype.Service;
-import com.muyu.warning.mapper.WarnStrategyMapper;
-import com.muyu.warning.domain.WarnStrategy;
-import com.muyu.warning.service.IWarnStrategyService;
 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.openbusiness.domain.WarnStrategy;
+import com.muyu.openbusiness.mapper.WarnStrategyMapper;
+import com.muyu.openbusiness.service.IWarnStrategyService;
+import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import java.util.List;
+
 /**
  * 预警策略Service业务层处理
  *
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/OkHttpUtils.java
similarity index 96%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/OkHttpUtils.java
index fc33154..c2cd45e 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/OkHttpUtils.java
@@ -1,4 +1,4 @@
-package com.muyu.warning.util;
+package com.muyu.openbusiness.util;
 
 import okhttp3.*;
 
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/TokenUtil.java
similarity index 93%
rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/TokenUtil.java
index 5587e4b..658bd5a 100644
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/TokenUtil.java
@@ -1,7 +1,7 @@
-package com.muyu.warning.util;
+package com.muyu.openbusiness.util;
 
 import com.alibaba.fastjson2.JSON;
-import com.muyu.warning.wx.AccessToken;
+import com.muyu.openbusiness.wx.AccessToken;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-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-openbusiness/cloud-modules-openbusiness-server/src/main/resources/banner.txt
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml
similarity index 100%
rename from cloud-modules/cloud-modules-carmanage/src/main/resources/bootstrap.yml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/dev.xml
similarity index 100%
rename from cloud-modules/cloud-modules-carmanage/src/main/resources/logback/dev.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/dev.xml
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/prod.xml
similarity index 100%
rename from cloud-modules/cloud-modules-carmanage/src/main/resources/logback/prod.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/prod.xml
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/test.xml
similarity index 99%
rename from cloud-modules/cloud-modules-carmanage/src/main/resources/logback/test.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/test.xml
index 76a0d8f..2cd69e4 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/test.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/test.xml
@@ -43,7 +43,7 @@
             <!-- 日志最大的历史 60天 -->
             <maxHistory>60</maxHistory>
         </rollingPolicy>
-
+        
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
             <level>ERROR</level>
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMapper.xml
similarity index 98%
rename from cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMapper.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMapper.xml
index 5113cd6..da56aa0 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMapper.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.car.mapper.SysCarMapper">
+<mapper namespace="com.muyu.openbusiness.mapper.SysCarMapper">
 
     <resultMap type="SysCar" id="SysCarResult">
         <result property="id"    column="id"    />
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMessageMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMessageMapper.xml
similarity index 82%
rename from cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMessageMapper.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMessageMapper.xml
index 3b10785..a9d0164 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMessageMapper.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMessageMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.car.mapper.SysCarMessageMapper">
+<mapper namespace="com.muyu.openbusiness.mapper.SysCarMessageMapper">
 
     <resultMap type="SysCarMessage" id="SysCarMessageResult">
         <result property="id"    column="id"    />
@@ -27,17 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSysCarMessageVo"/>
         where id = #{id}
     </select>
-    <select id="dobList" resultType="com.muyu.car.domain.VO.SysMessageVO">
-        SELECT sys_car_message.*,sys_message_type.message_name FROM sys_car_message LEFT JOIN sys_message_type ON sys_message_type.message_code=sys_car_message.message_type_code
-        <where>
-            <if test="modelCode!=null and modelCode!=''">
-                sys_car_message.model_code=#{modelCode}
-            </if>
-            <if test="messageType!=null and messageType!=''">
-                sys_car_message.message_type=#{messageType}
-            </if>
-        </where>
-    </select>
 
     <insert id="insertSysCarMessage" parameterType="SysCarMessage" useGeneratedKeys="true" keyProperty="id">
         insert into sys_car_message
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysFenceMapper.xml
similarity index 88%
rename from cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysFenceMapper.xml
index 26be2dc..241fdef 100644
--- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysFenceMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.carrail.mapper.SysFenceMapper">
+<mapper namespace="com.muyu.openbusiness.mapper.SysFenceMapper">
 
-    <resultMap type="com.muyu.carrail.domain.SysFence" id="SysFenceResult">
+    <resultMap type="com.muyu.openbusiness.domain.SysFence" id="SysFenceResult">
         <result property="id"    column="id"    />
         <result property="groupCode"    column="group_code"    />
         <result property="groupName"    column="group_name"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, group_code, group_name, group_type, state, create_by, create_time, update_by, update_time, remark from sys_fence_group
     </sql>
 
-    <select id="selectSysFenceList" parameterType="com.muyu.carrail.domain.SysFence" resultMap="SysFenceResult">
+    <select id="selectSysFenceList" parameterType="com.muyu.openbusiness.domain.SysFence" resultMap="SysFenceResult">
         <include refid="selectSysFenceVo"/>
 
         <where>
diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysMessageTypeMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysMessageTypeMapper.xml
similarity index 97%
rename from cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysMessageTypeMapper.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysMessageTypeMapper.xml
index 3d1d939..b03df06 100644
--- a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysMessageTypeMapper.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysMessageTypeMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.car.mapper.SysMessageTypeMapper">
+<mapper namespace="com.muyu.openbusiness.mapper.SysMessageTypeMapper">
 
     <resultMap type="SysMessageType" id="SysMessageTypeResult">
         <result property="id"    column="id"    />
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SyscarRailMapper.xml
similarity index 74%
rename from cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SyscarRailMapper.xml
index c9f9205..752c3cd 100644
--- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SyscarRailMapper.xml
@@ -3,14 +3,14 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.muyu.carrail.mapper.SysCorpuscleMapper">
+<mapper namespace="com.muyu.openbusiness.mapper.SysCorpuscleMapper">
     <insert id="addCarRail">
         insert into sys_corpuscle_fence(fence_code,fence_name,fence_type,fence_position,state)
         values(#{fenceCode},#{fenceName},#{fenceType},#{fencePosition},#{state})
     </insert>
 
 
-    <select id="selectCarRail" resultType="com.muyu.carrail.domain.SysCorpuscle">
+    <select id="selectCarRail" resultType="com.muyu.openbusiness.domain.SysCorpuscle">
         select * from sys_corpuscle_fence
     </select>
 </mapper>
diff --git a/cloud-modules/cloud-modules-warn/pom.xml b/cloud-modules/cloud-modules-openbusiness/pom.xml
similarity index 77%
rename from cloud-modules/cloud-modules-warn/pom.xml
rename to cloud-modules/cloud-modules-openbusiness/pom.xml
index 7e15d11..c05eb1e 100644
--- a/cloud-modules/cloud-modules-warn/pom.xml
+++ b/cloud-modules/cloud-modules-openbusiness/pom.xml
@@ -9,13 +9,11 @@
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>cloud-modules-warn</artifactId>
+    <artifactId>cloud-modules-openbusiness</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>cloud-warn-common</module>
-        <module>cloud-warn-client</module>
-        <module>cloud-warn-remote</module>
-        <module>cloud-warn-server</module>
+        <module>cloud-modules-openbusiness-server</module>
+        <module>cloud-modules-openbusiness-common</module>
     </modules>
 
     <properties>
@@ -23,4 +21,5 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
 </project>
diff --git a/cloud-modules/cloud-modules-rail/pom.xml b/cloud-modules/cloud-modules-rail/pom.xml
deleted file mode 100644
index 2353a2c..0000000
--- a/cloud-modules/cloud-modules-rail/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>cloud-modules</artifactId>
-        <groupId>com.muyu</groupId>
-        <version>3.6.3</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>cloud-modules-rail</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-    <dependencies>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-core</artifactId>
-        </dependency>
-        <!-- 接口模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-api-doc</artifactId>
-        </dependency>
-
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java
deleted file mode 100644
index f490e2a..0000000
--- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.zhangyi.rail;
-
-public class CloudRailApplication {
-    public static void main(String[] args) {
-
-    }
-}
diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java
deleted file mode 100644
index be833e0..0000000
--- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.zhangyi.rail.controller;
-
-public class RailController {
-}
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java
index 412f2cf..4cdbdc7 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java
+++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java
@@ -101,4 +101,6 @@ public class SysUserController extends BaseController {
         userService.insertUserRole(user);
         return remoteUserService.addUser(user);
     }
+
+
 }
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml
index 388015e..3504989 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml
@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 49.235.136.60:8848
   user-name: nacos
   password: nacos
-  namespace: one-saas
+  namespace: wyh
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -29,18 +29,18 @@ spring:
         # 服务注册地址
         server-addr: ${nacos.addr}
         # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
+#        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}
+#        username: ${nacos.user-name}
+#        # nacos密码
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
index e5fa720..8fc9699 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
@@ -1,20 +1,29 @@
 package com.muyu.system.controller;
 
-import com.muyu.system.service.ISysFirmService;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.utils.StringUtils;
 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.common.system.domain.SysEnt;
+import com.muyu.common.system.domain.SysRole;
 import com.muyu.system.domain.SysFirm;
+import com.muyu.system.domain.req.SysFirmReq;
+import com.muyu.system.service.ISysFirmService;
+import com.muyu.system.service.SysEntService;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.xml.stream.events.StartDocument;
+import java.sql.*;
 import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 企业基础信息Controller
@@ -28,7 +37,14 @@ public class SysFirmController extends BaseController
 {
     @Resource
     private ISysFirmService sysFirmService;
+    @Resource
+    private SysEntService sysEntService;
+    @Resource
+    private SysRoleController sysRoleController;
+    @Resource
+    private SysMenuController sysMenuController;
 
+    private static final String FIRM_CREDIT_CODE = "^[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}$";
 
     /**
      * 查询企业基础信息列表
@@ -67,18 +83,101 @@ public class SysFirmController extends BaseController
     /**
      * 新增企业基础信息
      */
-    @RequiresPermissions("firm:firmInfo:add")
+    //@RequiresPermissions("firm:firmInfo:add")
     @PostMapping
-    public Result<Integer> add(
-            @Validated @RequestBody SysFirm sysFirm)
-    {
+    public Result<Integer> add(@Validated @RequestBody SysFirmReq sysFirm) {
+        String firmName = sysFirm.getFirmName();
+        String firmCode = sysFirm.getFirmCode();
+        String firmCreditCode = sysFirm.getFirmCreditCode();
+        String tableName = sysFirm.getTableName();
+
+        // 验证企业基础信息是否为空
+        if (StringUtils.isAllBlank(firmName, firmCode, firmCreditCode,tableName)) {
+            return error("新增 企业基础信息 '" + sysFirm + "'失败，企业基础信息信息为空");
+        }
+
+        // 检查企业基础信息是否已存在
         if (sysFirmService.checkIdUnique(sysFirm)) {
             return error("新增 企业基础信息 '" + sysFirm + "'失败，企业基础信息已存在");
         }
+
+        // 验证统一社会信用代码格式
+        if (!isValidFirmCreditCode(firmCreditCode)) {
+            return error("新增 企业基础信息 '" + sysFirm + "'失败，统一社会信用代码格式不正确");
+        }
+
+        // 设置创建者和状态
         sysFirm.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(sysFirmService.save(sysFirm));
+        sysFirm.setState("Business");
+
+        // 创建数据库和表
+        try {
+            createDatabaseAndTables(tableName);
+        } catch (SQLException e) {
+            return error("数据库操作失败: " + e.getMessage());
+        }
+
+        // 保存企业信息
+        SysEnt sysEnt = new SysEnt();
+        sysEnt.setUserName("root");
+        sysEnt.setPassword("bawei2112A");
+        sysEnt.setEntCode(firmCode);
+        sysEnt.setDbName(tableName);
+        sysEnt.setIp("47.116.173.119");
+        sysEnt.setPort(3306);
+        sysEntService.save(sysEnt);
+
+        SysRole role = new SysRole();
+
+        role.setFirmCode(firmCode);
+        role.setRoleName("超级管理员");
+        role.setRoleKey("admin");
+        role.setRoleSort(1);
+        role.setDataScope("1");
+        role.setMenuCheckStrictly(true);
+        role.setDeptCheckStrictly(true);
+        role.setStatus("0");
+        role.setDelFlag("0");
+        role.setCreateBy(SecurityUtils.getUsername());
+
+        //role.setMenuIds();
+
+        sysRoleController.add(role);
+
+        return toAjax(sysFirmService.save((SysFirm) sysFirm));
     }
 
+    private boolean isValidFirmCreditCode(String firmCreditCode) {
+        Pattern pattern = Pattern.compile(FIRM_CREDIT_CODE);
+        Matcher matcher = pattern.matcher(firmCreditCode);
+        return matcher.matches();
+    }
+
+    private void createDatabaseAndTables(String tableName) throws SQLException {
+        String url = "jdbc:mysql://47.116.173.119:3306/?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
+        try (Connection connection = DriverManager.getConnection(url, "root", "bawei2112A");
+             Statement statement = connection.createStatement()) {
+
+            // 创建数据库
+            statement.executeUpdate("CREATE DATABASE IF NOT EXISTS " + tableName);
+
+            // 切换到新的数据库连接
+            url = "jdbc:mysql://47.116.173.119:3306/" + tableName + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
+            try (Connection dbConnection = DriverManager.getConnection(url, "root", "bawei2112A");
+                 Statement dbStatement = dbConnection.createStatement()) {
+
+                // 创建表
+                dbStatement.executeUpdate("CREATE TABLE IF NOT EXISTS sys_user_post(user_id BIGINT, post_id BIGINT)");
+                dbStatement.executeUpdate("CREATE TABLE IF NOT EXISTS sys_user_role(user_id BIGINT, role_id BIGINT)");
+
+                // 插入初始数据
+                dbStatement.executeUpdate("INSERT IGNORE INTO sys_user_post VALUES (1,1)");
+                dbStatement.executeUpdate("INSERT IGNORE INTO sys_user_role VALUES (1,1)");
+            }
+        }
+    }
+
+
     /**
      * 修改企业基础信息
      */
@@ -98,10 +197,11 @@ public class SysFirmController extends BaseController
      * 删除企业基础信息
      */
     @RequiresPermissions("firm:firmInfo:remove")
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     public Result<Integer> remove(@PathVariable("ids") Long[] ids)
     {
         sysFirmService.removeBatchByIds(Arrays.asList(ids));
         return success();
     }
+
 }
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
new file mode 100644
index 0000000..dea5b63
--- /dev/null
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
@@ -0,0 +1,18 @@
+package com.muyu.system.domain.req;
+
+import com.muyu.system.domain.SysFirm;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@Setter
+@Getter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysFirmReq extends SysFirm {
+
+    private String tableName;
+
+
+}
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
index fc88b1a..7006222 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
@@ -2,11 +2,13 @@ package com.muyu.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.util.StringUtil;
 import com.muyu.system.domain.SysFirm;
 import com.muyu.system.mapper.SysFirmMapper;
 import com.muyu.system.service.ISysFirmService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -49,7 +51,15 @@ public class SysFirmServiceImpl
      */
     @Override
     public List<SysFirm> selectSysFirmList(SysFirm sysFirm) {
-        return sysFirmMapper.selectSysFirmList(sysFirm);
+        LambdaQueryWrapper<SysFirm> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtil.isNotEmpty(sysFirm.getFirmCreditCode()),
+                SysFirm::getFirmCreditCode, sysFirm.getFirmCreditCode());
+        queryWrapper.eq(StringUtil.isNotEmpty(sysFirm.getFirmCode()),
+                SysFirm::getFirmCode, sysFirm.getFirmCode());
+        queryWrapper.like(StringUtil.isNotEmpty(sysFirm.getFirmName()),
+                SysFirm::getFirmName, sysFirm.getFirmName());
+        List<SysFirm> sysFirmList = sysFirmMapper.selectSysFirmList(sysFirm);
+        return sysFirmList;
     }
 
     /**
@@ -60,7 +70,7 @@ public class SysFirmServiceImpl
     @Override
     public Boolean checkIdUnique(SysFirm sysFirm) {
         LambdaQueryWrapper<SysFirm> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysFirm::getId, sysFirm.getId());
+        queryWrapper.eq(SysFirm::getFirmCreditCode, sysFirm.getFirmCreditCode());
         return this.count(queryWrapper) > 0;
     }
 
diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
index a5dd953..8d3a361 100644
--- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
@@ -4,10 +4,10 @@ server:
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 49.235.136.60:8848
   user-name: nacos
   password: nacos
-  namespace: one-saas
+  namespace: wyh
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:
@@ -29,18 +29,18 @@ spring:
         # 服务注册地址
         server-addr: ${nacos.addr}
         # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
+#        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}
+#        username: ${nacos.user-name}
+#        # nacos密码
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml b/cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml
deleted file mode 100644
index 47ec49c..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules-warn</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-warn-client</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-</project>
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml b/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml
deleted file mode 100644
index 809ecc3..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules-warn</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-warn-common</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-        <!-- MuYu Common Log -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-log</artifactId>
-        </dependency>
-
-        <!-- 接口模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-api-doc</artifactId>
-        </dependency>
-
-        <!-- XllJob定时任务 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-xxl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-rabbit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-core</artifactId>
-            <version>3.6.3</version>
-        </dependency>
-
-
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.9.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.20</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.34</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-        <!-- DOM4J是 dom4j.org 出品的一个开源XML解析包-->
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-            <version>2.0.43</version>
-        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.github.yulichang</groupId>-->
-<!--            <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
-<!--            <version>1.4.11</version>-->
-<!--        </dependency>-->
-    </dependencies>
-</project>
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml b/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml
deleted file mode 100644
index dfaa873..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules-warn</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-warn-remote</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-</project>
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java
deleted file mode 100644
index 6e3ebeb..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.muyu.warning;
-
-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;
-
-/**
- * @Author Chen
- * @name：WxApplication
- * @Date：2024/9/16 20:39
- */
-@EnableCustomConfig
-//@EnableCustomSwagger2
-@EnableMyFeignClients
-@SpringBootApplication
-public class WarnApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(WarnApplication.class);
-    }
-}
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/banner.txt b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/banner.txt
deleted file mode 100644
index 0dd5eee..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/banner.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml
deleted file mode 100644
index 756d816..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Tomcat
-server:
-  port: 10003
-
-# nacos线上地址
-nacos:
-  addr: 127.0.0.1:8848
-  user-name: nacos
-  password: nacos
-  namespace: one
-
-# Spring
-spring:
-  main:
-    allow-bean-definition-overriding: true
-  application:
-    # 应用名称
-    name: cloud-warn
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: ${nacos.addr}
-        # 命名空间
-        namespace: ${nacos.namespace}
-      config:
-        # 服务注册地址
-        server-addr: ${nacos.addr}
-        # 命名空间
-        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}
-          # engine配置
-          - engine-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-logging:
-  level:
-    com.muyu.system.mapper: DEBUG
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/dev.xml
deleted file mode 100644
index 8b99495..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/dev.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-warn"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/prod.xml
deleted file mode 100644
index 0fe8654..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/prod.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-warn"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.sky.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 使用gRpc将日志发送到skywalking服务端 -->
-    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${log.sky.pattern}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="GRPC_LOG"/>
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/test.xml
deleted file mode 100644
index 0fe8654..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/test.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-warn"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.sky.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 使用gRpc将日志发送到skywalking服务端 -->
-    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${log.sky.pattern}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="GRPC_LOG"/>
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
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 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.warning.mapper.WarnLogsMapper">
-
-    <resultMap type="WarnLogs" id="WarnLogsResult">
-        <result property="id"    column="id"    />
-        <result property="vin"    column="vin"    />
-        <result property="warnRuleId"    column="warn_rule_id"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="maxValue"    column="max_value"    />
-        <result property="minValue"    column="min_value"    />
-        <result property="avgValue"    column="avg_value"    />
-        <result property="medianValue"    column="median_value"    />
-        <result property="status"    column="status"    />
-    </resultMap>
-
-    <sql id="selectWarnLogsVo">
-        select id, vin, warn_rule_id, start_time, end_time, max_value, min_value, avg_value, median_value, status from warn_logs
-    </sql>
-
-    <select id="selectWarnLogsList" parameterType="WarnLogs" resultMap="WarnLogsResult">
-        <include refid="selectWarnLogsVo"/>
-        <where>
-            <if test="vin != null  and vin != ''"> and vin = #{vin}</if>
-            <if test="warnRuleId != null "> and warn_rule_id = #{warnRuleId}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="maxValue != null "> and max_value = #{maxValue}</if>
-            <if test="minValue != null "> and min_value = #{minValue}</if>
-            <if test="avgValue != null "> and avg_value = #{avgValue}</if>
-            <if test="medianValue != null "> and median_value = #{medianValue}</if>
-            <if test="status != null "> and status = #{status}</if>
-        </where>
-    </select>
-
-    <select id="selectWarnLogsById" parameterType="Long" resultMap="WarnLogsResult">
-        <include refid="selectWarnLogsVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertWarnLogs" parameterType="WarnLogs" useGeneratedKeys="true" keyProperty="id">
-        insert into warn_logs
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="vin != null">vin,</if>
-            <if test="warnRuleId != null">warn_rule_id,</if>
-            <if test="startTime != null">start_time,</if>
-            <if test="endTime != null">end_time,</if>
-            <if test="maxValue != null">max_value,</if>
-            <if test="minValue != null">min_value,</if>
-            <if test="avgValue != null">avg_value,</if>
-            <if test="medianValue != null">median_value,</if>
-            <if test="status != null">status,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="vin != null">#{vin},</if>
-            <if test="warnRuleId != null">#{warnRuleId},</if>
-            <if test="startTime != null">#{startTime},</if>
-            <if test="endTime != null">#{endTime},</if>
-            <if test="maxValue != null">#{maxValue},</if>
-            <if test="minValue != null">#{minValue},</if>
-            <if test="avgValue != null">#{avgValue},</if>
-            <if test="medianValue != null">#{medianValue},</if>
-            <if test="status != null">#{status},</if>
-         </trim>
-    </insert>
-
-    <update id="updateWarnLogs" parameterType="WarnLogs">
-        update warn_logs
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="vin != null">vin = #{vin},</if>
-            <if test="warnRuleId != null">warn_rule_id = #{warnRuleId},</if>
-            <if test="startTime != null">start_time = #{startTime},</if>
-            <if test="endTime != null">end_time = #{endTime},</if>
-            <if test="maxValue != null">max_value = #{maxValue},</if>
-            <if test="minValue != null">min_value = #{minValue},</if>
-            <if test="avgValue != null">avg_value = #{avgValue},</if>
-            <if test="medianValue != null">median_value = #{medianValue},</if>
-            <if test="status != null">status = #{status},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteWarnLogsById" parameterType="Long">
-        delete from warn_logs where id = #{id}
-    </delete>
-
-    <delete id="deleteWarnLogsByIds" parameterType="String">
-        delete from warn_logs where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
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 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.warning.mapper.WarnRuleMapper">
-
-    <resultMap type="WarnRule" id="WarnRuleResult">
-        <result property="id"    column="id"    />
-        <result property="ruleName"    column="rule_name"    />
-        <result property="strategyId"    column="strategy_id"    />
-        <result property="msgTypeId"    column="msg_type_id"    />
-        <result property="slideTime"    column="slide_time"    />
-        <result property="slideFrequency"    column="slide_frequency"    />
-        <result property="maxValue"    column="max_value"    />
-        <result property="minValue"    column="min_value"    />
-    </resultMap>
-
-    <sql id="selectWarnRuleVo">
-        select id, rule_name, strategy_id, msg_type_id, slide_time, slide_frequency, max_value, min_value from warn_rule
-    </sql>
-
-    <select id="selectWarnRuleList" parameterType="WarnRule" resultMap="WarnRuleResult">
-        <include refid="selectWarnRuleVo"/>
-        <where>
-            <if test="ruleName != null  and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
-            <if test="strategyId != null "> and strategy_id = #{strategyId}</if>
-            <if test="msgTypeId != null "> and msg_type_id = #{msgTypeId}</if>
-            <if test="slideTime != null "> and slide_time = #{slideTime}</if>
-            <if test="slideFrequency != null "> and slide_frequency = #{slideFrequency}</if>
-            <if test="maxValue != null "> and max_value = #{maxValue}</if>
-            <if test="minValue != null "> and min_value = #{minValue}</if>
-        </where>
-    </select>
-
-    <select id="selectWarnRuleById" parameterType="Long" resultMap="WarnRuleResult">
-        <include refid="selectWarnRuleVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertWarnRule" parameterType="WarnRule" useGeneratedKeys="true" keyProperty="id">
-        insert into warn_rule
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="ruleName != null">rule_name,</if>
-            <if test="strategyId != null">strategy_id,</if>
-            <if test="msgTypeId != null">msg_type_id,</if>
-            <if test="slideTime != null">slide_time,</if>
-            <if test="slideFrequency != null">slide_frequency,</if>
-            <if test="maxValue != null">max_value,</if>
-            <if test="minValue != null">min_value,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="ruleName != null">#{ruleName},</if>
-            <if test="strategyId != null">#{strategyId},</if>
-            <if test="msgTypeId != null">#{msgTypeId},</if>
-            <if test="slideTime != null">#{slideTime},</if>
-            <if test="slideFrequency != null">#{slideFrequency},</if>
-            <if test="maxValue != null">#{maxValue},</if>
-            <if test="minValue != null">#{minValue},</if>
-         </trim>
-    </insert>
-
-    <update id="updateWarnRule" parameterType="WarnRule">
-        update warn_rule
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="ruleName != null">rule_name = #{ruleName},</if>
-            <if test="strategyId != null">strategy_id = #{strategyId},</if>
-            <if test="msgTypeId != null">msg_type_id = #{msgTypeId},</if>
-            <if test="slideTime != null">slide_time = #{slideTime},</if>
-            <if test="slideFrequency != null">slide_frequency = #{slideFrequency},</if>
-            <if test="maxValue != null">max_value = #{maxValue},</if>
-            <if test="minValue != null">min_value = #{minValue},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteWarnRuleById" parameterType="Long">
-        delete from warn_rule where id = #{id}
-    </delete>
-
-    <delete id="deleteWarnRuleByIds" parameterType="String">
-        delete from warn_rule where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml
deleted file mode 100644
index a9ef466..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.warning.mapper.WarnRulesMapper">
-
-
-    <select id="selectWarnRulesListAll" resultType="com.muyu.warning.domain.WarnRuleDTO"></select>
-</mapper>
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 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.warning.mapper.WarnStrategyMapper">
-
-    <resultMap type="WarnStrategy" id="WarnStrategyResult">
-        <result property="id"    column="id"    />
-        <result property="carTypeId"    column="car_type_id"    />
-        <result property="strategyName"    column="strategy_name"    />
-        <result property="msgId"    column="msg_id"    />
-    </resultMap>
-
-    <sql id="selectWarnStrategyVo">
-        select id, car_type_id, strategy_name, msg_id from warn_strategy
-    </sql>
-
-    <select id="selectWarnStrategyList" parameterType="WarnStrategy" resultMap="WarnStrategyResult">
-        <include refid="selectWarnStrategyVo"/>
-        <where>
-            <if test="carTypeId != null "> and car_type_id = #{carTypeId}</if>
-            <if test="strategyName != null  and strategyName != ''"> and strategy_name like concat('%', #{strategyName}, '%')</if>
-            <if test="msgId != null "> and msg_id = #{msgId}</if>
-        </where>
-    </select>
-
-    <select id="selectWarnStrategyById" parameterType="Long" resultMap="WarnStrategyResult">
-        <include refid="selectWarnStrategyVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertWarnStrategy" parameterType="WarnStrategy" useGeneratedKeys="true" keyProperty="id">
-        insert into warn_strategy
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="carTypeId != null">car_type_id,</if>
-            <if test="strategyName != null">strategy_name,</if>
-            <if test="msgId != null">msg_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="carTypeId != null">#{carTypeId},</if>
-            <if test="strategyName != null">#{strategyName},</if>
-            <if test="msgId != null">#{msgId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateWarnStrategy" parameterType="WarnStrategy">
-        update warn_strategy
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="carTypeId != null">car_type_id = #{carTypeId},</if>
-            <if test="strategyName != null">strategy_name = #{strategyName},</if>
-            <if test="msgId != null">msg_id = #{msgId},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteWarnStrategyById" parameterType="Long">
-        delete from warn_strategy where id = #{id}
-    </delete>
-
-    <delete id="deleteWarnStrategyByIds" parameterType="String">
-        delete from warn_strategy where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>
diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml
index 1d52970..6f39aa8 100644
--- a/cloud-modules/pom.xml
+++ b/cloud-modules/pom.xml
@@ -13,11 +13,7 @@
         <module>cloud-modules-gen</module>
         <module>cloud-modules-file</module>
         <module>cloud-modules-system-saas</module>
-        <module>cloud-breakdown</module>
-        <module>cloud-modules-car</module>
-        <module>cloud-modules-rail</module>
-        <module>cloud-modules-warn</module>
-        <module>cloud-modules-carmanage</module>
+        <module>cloud-modules-openbusiness</module>
     </modules>
 
     <artifactId>cloud-modules</artifactId>
diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
index a62e359..72bc5ea 100644
--- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
+++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
 # Tomcat
 server:
-  port: 9100
+  port: 9101
 
 # nacos线上地址
 nacos:
-  addr: 127.0.0.1:8848
+  addr: 49.235.136.60:8848
   user-name: nacos
   password: nacos
-  namespace: one-saas
+  namespace: wyh
 
 # Spring
 spring:
@@ -23,18 +23,18 @@ spring:
         # 服务注册地址
         server-addr: ${nacos.addr}
         # nacos用户名
-        username: ${nacos.user-name}
-        # nacos密码
-        password: ${nacos.password}
+#        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}
+#        username: ${nacos.user-name}
+#        # nacos密码
+#        password: ${nacos.password}
         # 命名空间
         namespace: ${nacos.namespace}
         # 配置文件格式

From 56f8ce696799ecee7aac0fa18aa29353c2df2f9c Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Mon, 30 Sep 2024 09:10:01 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RailController.java            |  4 --
 .../system/controller/SysFirmController.java  | 53 +++++++++++++------
 .../system/controller/SysMenuController.java  |  5 ++
 .../muyu/system/domain/req/SysFirmReq.java    | 10 ++++
 .../muyu/system/service/SysMenuService.java   |  2 +
 .../service/impl/SysMenuServiceImpl.java      |  6 +++
 6 files changed, 59 insertions(+), 21 deletions(-)
 delete mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java

diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java
deleted file mode 100644
index 5e88e4c..0000000
--- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.muyu.openbusiness.controller;
-
-public class RailController {
-}
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
index 8fc9699..8c0aff6 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
@@ -9,7 +9,10 @@ import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.SysEnt;
 import com.muyu.common.system.domain.SysRole;
+import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.system.domain.SysFirm;
+import com.muyu.system.domain.SysMenu;
 import com.muyu.system.domain.req.SysFirmReq;
 import com.muyu.system.service.ISysFirmService;
 import com.muyu.system.service.SysEntService;
@@ -22,6 +25,7 @@ import javax.xml.stream.events.StartDocument;
 import java.sql.*;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -43,6 +47,8 @@ public class SysFirmController extends BaseController
     private SysRoleController sysRoleController;
     @Resource
     private SysMenuController sysMenuController;
+    @Resource
+    private RemoteUserService remoteUserService;
 
     private static final String FIRM_CREDIT_CODE = "^[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}$";
 
@@ -83,7 +89,7 @@ public class SysFirmController extends BaseController
     /**
      * 新增企业基础信息
      */
-    //@RequiresPermissions("firm:firmInfo:add")
+    @RequiresPermissions("firm:firmInfo:add")
     @PostMapping
     public Result<Integer> add(@Validated @RequestBody SysFirmReq sysFirm) {
         String firmName = sysFirm.getFirmName();
@@ -108,7 +114,34 @@ public class SysFirmController extends BaseController
 
         // 设置创建者和状态
         sysFirm.setCreateBy(SecurityUtils.getUsername());
-        sysFirm.setState("Business");
+
+        SysUser sysUser = new SysUser();
+        sysUser.setFirmCode(firmCode);
+        sysUser.setUserName(sysFirm.getUserName());
+        sysUser.setPassword(sysFirm.getPassword());
+
+
+//
+//        SysRole role = new SysRole();
+//
+//        role.setFirmCode(firmCode);
+//        role.setRoleName("超级管理员");
+//        role.setRoleKey("admin");
+//        role.setRoleSort(1);
+//        role.setDataScope("1");
+//        role.setMenuCheckStrictly(true);
+//        role.setDeptCheckStrictly(true);
+//        role.setStatus("0");
+//        role.setDelFlag("0");
+//        List<SysMenu> list = sysMenuController.list();
+//        Long[] menuIds = list.stream()
+//                .map(SysMenu::getMenuId)
+//                .filter(Objects::nonNull) // 过滤掉 null 值
+//                .toArray(Long[]::new);
+//        role.setCreateBy(SecurityUtils.getUsername());
+//        role.setMenuIds(menuIds);
+//
+//        sysRoleController.add(role);
 
         // 创建数据库和表
         try {
@@ -127,26 +160,12 @@ public class SysFirmController extends BaseController
         sysEnt.setPort(3306);
         sysEntService.save(sysEnt);
 
-        SysRole role = new SysRole();
 
-        role.setFirmCode(firmCode);
-        role.setRoleName("超级管理员");
-        role.setRoleKey("admin");
-        role.setRoleSort(1);
-        role.setDataScope("1");
-        role.setMenuCheckStrictly(true);
-        role.setDeptCheckStrictly(true);
-        role.setStatus("0");
-        role.setDelFlag("0");
-        role.setCreateBy(SecurityUtils.getUsername());
-
-        //role.setMenuIds();
-
-        sysRoleController.add(role);
 
         return toAjax(sysFirmService.save((SysFirm) sysFirm));
     }
 
+    //
     private boolean isValidFirmCreditCode(String firmCreditCode) {
         Pattern pattern = Pattern.compile(FIRM_CREDIT_CODE);
         Matcher matcher = pattern.matcher(firmCreditCode);
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java
index 2149ace..f4f1b36 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java
@@ -28,6 +28,11 @@ public class SysMenuController extends BaseController {
     @Resource
     private SysMenuService menuService;
 
+    public List<SysMenu> list () {
+        List<SysMenu> menus = menuService.selectMenuList();
+        return menus;
+    }
+
     /**
      * 获取菜单列表
      */
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
index dea5b63..a704185 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
@@ -1,5 +1,6 @@
 package com.muyu.system.domain.req;
 
+import com.muyu.common.core.annotation.Excel;
 import com.muyu.system.domain.SysFirm;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -13,6 +14,15 @@ import lombok.experimental.SuperBuilder;
 public class SysFirmReq extends SysFirm {
 
     private String tableName;
+    /**
+     * 用户账号
+     */
+    @Excel(name = "登录名称")
+    private String userName;
+    /**
+     * 密码
+     */
+    private String password;
 
 
 }
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java
index 29bfb07..1e06a13 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java
@@ -33,6 +33,8 @@ public interface SysMenuService extends IService<SysMenu> {
      */
     public List<SysMenu> selectMenuList (SysMenu menu, Long userId);
 
+    public List<SysMenu> selectMenuList ();
+
     /**
      * 根据用户ID查询权限
      *
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
index 0a17000..884a086 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
@@ -1,5 +1,6 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.constant.Constants;
 import com.muyu.common.core.constant.UserConstants;
@@ -71,6 +72,11 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return menuList;
     }
 
+    @Override
+    public List<SysMenu> selectMenuList() {
+        return this.list();
+    }
+
     /**
      * 根据用户ID查询权限
      *

From f1fc409573290b726886752c4ad6613a1483038b Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Mon, 30 Sep 2024 09:25:16 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/muyu/system/controller/SysFirmController.java  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
index 8c0aff6..515a312 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
@@ -115,12 +115,6 @@ public class SysFirmController extends BaseController
         // 设置创建者和状态
         sysFirm.setCreateBy(SecurityUtils.getUsername());
 
-        SysUser sysUser = new SysUser();
-        sysUser.setFirmCode(firmCode);
-        sysUser.setUserName(sysFirm.getUserName());
-        sysUser.setPassword(sysFirm.getPassword());
-
-
 //
 //        SysRole role = new SysRole();
 //

From e4e65c64483bdbe6912bfb025518882a0260af81 Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Mon, 30 Sep 2024 09:54:59 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysFirmController.java  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
index 515a312..9119dde 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
@@ -1,6 +1,10 @@
 package com.muyu.system.controller;
 
+import com.muyu.common.core.constant.Constants;
+import com.muyu.common.core.constant.SecurityConstants;
+import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
@@ -115,6 +119,29 @@ public class SysFirmController extends BaseController
         // 设置创建者和状态
         sysFirm.setCreateBy(SecurityUtils.getUsername());
 
+        if (StringUtils.isAnyBlank(sysFirm.getUserName(), sysFirm.getPassword())) {
+            throw new ServiceException("用户/密码必须填写");
+        }
+        if (sysFirm.getUserName().length() < UserConstants.USERNAME_MIN_LENGTH
+                || sysFirm.getUserName().length() > UserConstants.USERNAME_MAX_LENGTH) {
+            throw new ServiceException("账户长度必须在2到20个字符之间");
+        }
+        if (sysFirm.getPassword().length() < UserConstants.PASSWORD_MIN_LENGTH
+                || sysFirm.getPassword().length() > UserConstants.PASSWORD_MAX_LENGTH) {
+            throw new ServiceException("密码长度必须在5到20个字符之间");
+        }
+
+        // 注册用户信息
+        SysUser sysUser = new SysUser();
+        sysUser.setUserName(SecurityUtils.getUsername());
+        sysUser.setNickName(SecurityUtils.getUsername());
+        sysUser.setPassword(SecurityUtils.encryptPassword(sysFirm.getPassword()));
+        Result<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
+
+//        if (Result.FAIL == registerResult.getCode()) {
+//            throw new ServiceException(registerResult.getMsg());
+//        }
+//        recordLogService.recordLogininfor(SecurityUtils.getUsername(), Constants.REGISTER, "注册成功");
 //
 //        SysRole role = new SysRole();
 //

From 6d6f5c709c92dfe912b4c59669273c97875fe683 Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Mon, 30 Sep 2024 19:17:26 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloud-modules/cloud-modules-system/pom.xml    |   5 +
 .../system/controller/SysDeptController.java  |   6 +-
 .../system/controller/SysFirmController.java  |  99 +++----
 .../muyu/system/domain/req/SysFirmReq.java    |   1 -
 .../service/impl/SysFirmServiceImpl.java      |   1 +
 .../resources/mapper/system/SysDeptMapper.xml |   2 +-
 .../main/resources/static/saas_operation.sql  | 242 ++++++++++++++++++
 init-file/saas_operation.sql                  | 242 ++++++++++++++++++
 8 files changed, 550 insertions(+), 48 deletions(-)
 create mode 100644 cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql
 create mode 100644 init-file/saas_operation.sql

diff --git a/cloud-modules/cloud-modules-system/pom.xml b/cloud-modules/cloud-modules-system/pom.xml
index b362f24..0eb3e23 100644
--- a/cloud-modules/cloud-modules-system/pom.xml
+++ b/cloud-modules/cloud-modules-system/pom.xml
@@ -17,6 +17,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.2.20</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.muyu</groupId>-->
 <!--            <artifactId>cloud-common-saas</artifactId>-->
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
index aad1892..5a21d9d 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
@@ -72,8 +72,10 @@ public class SysDeptController extends BaseController {
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
-        SysDept sysDept = deptService.selectDeptById(dept.getParentId());
-        dept.setFirmCode(sysDept.getFirmCode());
+        if (StringUtils.isEmpty(dept.getFirmCode())){
+            SysDept sysDept = deptService.selectDeptById(dept.getParentId());
+            dept.setFirmCode(sysDept.getFirmCode());
+        }
         return toAjax(deptService.insertDept(dept));
     }
 
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
index 9119dde..fc2fd33 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
@@ -1,6 +1,5 @@
 package com.muyu.system.controller;
 
-import com.muyu.common.core.constant.Constants;
 import com.muyu.common.core.constant.SecurityConstants;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.domain.Result;
@@ -11,25 +10,29 @@ 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.common.system.domain.SysDept;
 import com.muyu.common.system.domain.SysEnt;
-import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.system.domain.SysFirm;
-import com.muyu.system.domain.SysMenu;
 import com.muyu.system.domain.req.SysFirmReq;
 import com.muyu.system.service.ISysFirmService;
 import com.muyu.system.service.SysEntService;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.jdbc.datasource.init.ScriptUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.xml.stream.events.StartDocument;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
+import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -52,7 +55,9 @@ public class SysFirmController extends BaseController
     @Resource
     private SysMenuController sysMenuController;
     @Resource
-    private RemoteUserService remoteUserService;
+    private SysUserController sysUserController;
+    @Resource
+    private SysDeptController sysDeptController;
 
     private static final String FIRM_CREDIT_CODE = "^[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}$";
 
@@ -99,10 +104,9 @@ public class SysFirmController extends BaseController
         String firmName = sysFirm.getFirmName();
         String firmCode = sysFirm.getFirmCode();
         String firmCreditCode = sysFirm.getFirmCreditCode();
-        String tableName = sysFirm.getTableName();
 
         // 验证企业基础信息是否为空
-        if (StringUtils.isAllBlank(firmName, firmCode, firmCreditCode,tableName)) {
+        if (StringUtils.isAllBlank(firmName, firmCode, firmCreditCode)) {
             return error("新增 企业基础信息 '" + sysFirm + "'失败，企业基础信息信息为空");
         }
 
@@ -116,27 +120,31 @@ public class SysFirmController extends BaseController
             return error("新增 企业基础信息 '" + sysFirm + "'失败，统一社会信用代码格式不正确");
         }
 
+        SysDept sysDept = new SysDept();
+        Result list = sysDeptController.list(sysDept);
+        List<SysDept> depts = (List<SysDept>) list.getData();
+        sysDept.setFirmCode(firmCode);
+        sysDept.setParentId(100L);
+        sysDept.setDeptName(firmName);
+        sysDept.setAncestors("0,100");
+        sysDept.setOrderNum(3);
+        sysDept.setStatus("0");
+        sysDept.setDelFlag("0");
+
+        sysDeptController.add(sysDept);
+        SysDept sysDepts = depts.get(depts.size() - 1);
+
         // 设置创建者和状态
         sysFirm.setCreateBy(SecurityUtils.getUsername());
 
-        if (StringUtils.isAnyBlank(sysFirm.getUserName(), sysFirm.getPassword())) {
-            throw new ServiceException("用户/密码必须填写");
-        }
-        if (sysFirm.getUserName().length() < UserConstants.USERNAME_MIN_LENGTH
-                || sysFirm.getUserName().length() > UserConstants.USERNAME_MAX_LENGTH) {
-            throw new ServiceException("账户长度必须在2到20个字符之间");
-        }
-        if (sysFirm.getPassword().length() < UserConstants.PASSWORD_MIN_LENGTH
-                || sysFirm.getPassword().length() > UserConstants.PASSWORD_MAX_LENGTH) {
-            throw new ServiceException("密码长度必须在5到20个字符之间");
-        }
-
-        // 注册用户信息
         SysUser sysUser = new SysUser();
-        sysUser.setUserName(SecurityUtils.getUsername());
-        sysUser.setNickName(SecurityUtils.getUsername());
-        sysUser.setPassword(SecurityUtils.encryptPassword(sysFirm.getPassword()));
-        Result<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
+        sysUser.setFirmCode(firmCode);
+        sysUser.setUserName(sysFirm.getUserName());
+        sysUser.setNickName(sysFirm.getUserName());
+        sysUser.setPassword(sysFirm.getPassword());
+        sysUser.setDeptId(sysDept.getDeptId());
+        sysUser.setDept(sysDepts);
+        sysUserController.add(sysUser);
 
 //        if (Result.FAIL == registerResult.getCode()) {
 //            throw new ServiceException(registerResult.getMsg());
@@ -166,7 +174,7 @@ public class SysFirmController extends BaseController
 
         // 创建数据库和表
         try {
-            createDatabaseAndTables(tableName);
+            createDatabaseAndTables(firmCode);
         } catch (SQLException e) {
             return error("数据库操作失败: " + e.getMessage());
         }
@@ -176,7 +184,7 @@ public class SysFirmController extends BaseController
         sysEnt.setUserName("root");
         sysEnt.setPassword("bawei2112A");
         sysEnt.setEntCode(firmCode);
-        sysEnt.setDbName(tableName);
+        sysEnt.setDbName(firmCode);
         sysEnt.setIp("47.116.173.119");
         sysEnt.setPort(3306);
         sysEntService.save(sysEnt);
@@ -193,28 +201,31 @@ public class SysFirmController extends BaseController
         return matcher.matches();
     }
 
-    private void createDatabaseAndTables(String tableName) throws SQLException {
+    private void createDatabaseAndTables(String firmCode) throws SQLException {
         String url = "jdbc:mysql://47.116.173.119:3306/?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
         try (Connection connection = DriverManager.getConnection(url, "root", "bawei2112A");
              Statement statement = connection.createStatement()) {
 
             // 创建数据库
-            statement.executeUpdate("CREATE DATABASE IF NOT EXISTS " + tableName);
-
-            // 切换到新的数据库连接
-            url = "jdbc:mysql://47.116.173.119:3306/" + tableName + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
-            try (Connection dbConnection = DriverManager.getConnection(url, "root", "bawei2112A");
-                 Statement dbStatement = dbConnection.createStatement()) {
-
-                // 创建表
-                dbStatement.executeUpdate("CREATE TABLE IF NOT EXISTS sys_user_post(user_id BIGINT, post_id BIGINT)");
-                dbStatement.executeUpdate("CREATE TABLE IF NOT EXISTS sys_user_role(user_id BIGINT, role_id BIGINT)");
-
-                // 插入初始数据
-                dbStatement.executeUpdate("INSERT IGNORE INTO sys_user_post VALUES (1,1)");
-                dbStatement.executeUpdate("INSERT IGNORE INTO sys_user_role VALUES (1,1)");
-            }
+            statement.executeUpdate("CREATE DATABASE IF NOT EXISTS " + firmCode);
         }
+
+        // 切换到新的数据库连接
+        Connection connection = null;
+        try {
+            url = "jdbc:mysql://47.116.173.119:3306/" + firmCode + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8";
+            String user = "root";
+            String pwd = "bawei2112A";
+            String driverClassName = "com.mysql.cj.jdbc.Driver";
+            Class.forName(driverClassName);
+            connection = DriverManager.getConnection(url, user, pwd);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        ClassPathResource rc = new ClassPathResource("static/saas_operation.sql");
+        EncodedResource er = new EncodedResource(rc, "utf-8");
+        ScriptUtils.executeSqlScript(connection, er);
+
     }
 
 
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
index a704185..a7bd9aa 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java
@@ -13,7 +13,6 @@ import lombok.experimental.SuperBuilder;
 @AllArgsConstructor
 public class SysFirmReq extends SysFirm {
 
-    private String tableName;
     /**
      * 用户账号
      */
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
index 7006222..639820d 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
@@ -71,6 +71,7 @@ public class SysFirmServiceImpl
     public Boolean checkIdUnique(SysFirm sysFirm) {
         LambdaQueryWrapper<SysFirm> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysFirm::getFirmCreditCode, sysFirm.getFirmCreditCode());
+        queryWrapper.eq(SysFirm::getFirmCode, sysFirm.getFirmCode());
         return this.count(queryWrapper) > 0;
     }
 
diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml
index f110ef9..3c02e7b 100644
--- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -182,7 +182,7 @@
 
     <update id="updateDeptFirmCode">
         update sys_dept
-        set firm_code = CONCAT(firm_code,'_',#{deptId})
+        set firm_code = CONCAT(firm_code)
         where dept_id = #{deptId}
     </update>
 
diff --git a/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql b/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql
new file mode 100644
index 0000000..97438ae
--- /dev/null
+++ b/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql
@@ -0,0 +1,242 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 47.116.173.119
+ Source Server Type    : MySQL
+ Source Server Version : 80401
+ Source Host           : 47.116.173.119:3306
+ Source Schema         : saas_operation
+
+ Target Server Type    : MySQL
+ Target Server Version : 80401
+ File Encoding         : 65001
+
+ Date: 30/09/2024 10:21:52
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for sys_car
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_car`;
+CREATE TABLE `sys_car`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `car_vin` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆VIN码',
+  `car_plate` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆车牌号',
+  `car_brand` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆品牌',
+  `car_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆型号',
+  `car_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆车型(如客车,卡车,公交车等)',
+  `car_last_join_time` datetime NULL DEFAULT NULL COMMENT '最后一次连线时间',
+  `car_last_offline_time` datetime NULL DEFAULT NULL COMMENT '最后一次离线时间',
+  `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '2' COMMENT '启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中',
+  `create_by` int NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` int NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆基础信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_car_details
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_car_details`;
+CREATE TABLE `sys_car_details`  (
+  `id` int NOT NULL COMMENT '车辆ID',
+  `car_vin` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆VIN码',
+  `car_motor_manufacturer` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆电机厂商',
+  `car_motor_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电机型号',
+  `car_battery_manufacturer` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆电池厂商',
+  `car_battery_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电池型号',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆详细信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_car_fault
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_car_fault`;
+CREATE TABLE `sys_car_fault`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `fault_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆故障编码',
+  `fault_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障类型',
+  `fault_label` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障标签',
+  `fault_bit` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障位',
+  `fault_value` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障值',
+  `fault_warn` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '故障等级',
+  `fault_status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报警状态（Y.是，N.否）',
+  `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆故障表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_car_message
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_car_message`;
+CREATE TABLE `sys_car_message`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `model_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆型号编码',
+  `message_type_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆报文类型编码',
+  `message_start_index` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '开始位下标',
+  `message_end_index` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '结束位下标',
+  `message_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文分类',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文记录表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_corpuscle_fence
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_corpuscle_fence`;
+CREATE TABLE `sys_corpuscle_fence`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `fence_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '围栏编码',
+  `fence_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏名称',
+  `fence_type` int NOT NULL DEFAULT 1 COMMENT '围栏类型(1.驶入 2.驶出)',
+  `fence_position` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '围栏位置',
+  `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '1' COMMENT '启用状态(1.启用 2.停用)',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '电子围栏表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_ent
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_ent`;
+CREATE TABLE `sys_ent`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `ent_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业编码',
+  `ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业数据库IP',
+  `port` int NULL DEFAULT NULL COMMENT '数据库端口',
+  `db_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '连接数据库名称',
+  `user_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户名',
+  `password` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '密码',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '企业数据库信息记录表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_fence_group
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_fence_group`;
+CREATE TABLE `sys_fence_group`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `group_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组编码',
+  `group_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组名称',
+  `group_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组类型',
+  `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '启用状态',
+  `create_by` int NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` int NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '围栏组表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_fence_group_mid
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_fence_group_mid`;
+CREATE TABLE `sys_fence_group_mid`  (
+  `group_id` int NOT NULL COMMENT '围栏组id',
+  `fence_id` int NOT NULL COMMENT '围栏id',
+  `new_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`group_id`, `fence_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '围栏组连接表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_firm
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_firm`;
+CREATE TABLE `sys_firm`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `firm_credit_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '统一社会信用代码',
+  `firm_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业编码',
+  `firm_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业名称',
+  `firm_logs` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业logs',
+  `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '启用状态(1.开业 2.停业 3.休业)',
+  `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '企业基础信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_message_type
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_message_type`;
+CREATE TABLE `sys_message_type`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `message_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文编码',
+  `message_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文名称',
+  `message_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文分类',
+  `message_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文字段类型',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文类型表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for warn_logs
+-- ----------------------------
+DROP TABLE IF EXISTS `warn_logs`;
+CREATE TABLE `warn_logs`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '预警日志id',
+  `vin` varchar(58) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆vin码',
+  `warn_rule_id` int NULL DEFAULT NULL COMMENT '规则id',
+  `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间',
+  `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间',
+  `max_value` int NULL DEFAULT NULL COMMENT '最大值',
+  `min_value` int NULL DEFAULT NULL COMMENT '最小值',
+  `avg_value` int NULL DEFAULT NULL COMMENT '平均值',
+  `median_value` int NULL DEFAULT NULL COMMENT '中位数',
+  `status` int NULL DEFAULT NULL COMMENT '是否发送预警',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for warn_rule
+-- ----------------------------
+DROP TABLE IF EXISTS `warn_rule`;
+CREATE TABLE `warn_rule`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '规则id',
+  `rule_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规则名称',
+  `strategy_id` int NULL DEFAULT NULL COMMENT '策略id',
+  `msg_type_id` int NULL DEFAULT NULL COMMENT '报文数据类型id',
+  `slide_time` int NULL DEFAULT NULL COMMENT '滑窗时间',
+  `slide_frequency` int NULL DEFAULT NULL COMMENT '滑窗频率',
+  `max_value` int NULL DEFAULT NULL COMMENT '最大值',
+  `min_value` int NULL DEFAULT NULL COMMENT '最小值',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for warn_slide_config
+-- ----------------------------
+DROP TABLE IF EXISTS `warn_slide_config`;
+CREATE TABLE `warn_slide_config`  (
+  `id` int NOT NULL COMMENT '滑窗id',
+  `vin` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆vin码',
+  `slide_time` int NULL DEFAULT NULL COMMENT '滑动时间',
+  `created_by` int NULL DEFAULT NULL COMMENT '创建人',
+  `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `updated_by` int NULL DEFAULT NULL COMMENT '更新人',
+  `updated_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for warn_strategy
+-- ----------------------------
+DROP TABLE IF EXISTS `warn_strategy`;
+CREATE TABLE `warn_strategy`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '策略id',
+  `car_type_id` int NULL DEFAULT NULL COMMENT '车辆类型id',
+  `strategy_name` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '策略名称',
+  `msg_id` int NULL DEFAULT NULL COMMENT '报文模版id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/init-file/saas_operation.sql b/init-file/saas_operation.sql
new file mode 100644
index 0000000..97438ae
--- /dev/null
+++ b/init-file/saas_operation.sql
@@ -0,0 +1,242 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 47.116.173.119
+ Source Server Type    : MySQL
+ Source Server Version : 80401
+ Source Host           : 47.116.173.119:3306
+ Source Schema         : saas_operation
+
+ Target Server Type    : MySQL
+ Target Server Version : 80401
+ File Encoding         : 65001
+
+ Date: 30/09/2024 10:21:52
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for sys_car
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_car`;
+CREATE TABLE `sys_car`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `car_vin` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆VIN码',
+  `car_plate` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆车牌号',
+  `car_brand` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆品牌',
+  `car_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆型号',
+  `car_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆车型(如客车,卡车,公交车等)',
+  `car_last_join_time` datetime NULL DEFAULT NULL COMMENT '最后一次连线时间',
+  `car_last_offline_time` datetime NULL DEFAULT NULL COMMENT '最后一次离线时间',
+  `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '2' COMMENT '启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中',
+  `create_by` int NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` int NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆基础信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_car_details
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_car_details`;
+CREATE TABLE `sys_car_details`  (
+  `id` int NOT NULL COMMENT '车辆ID',
+  `car_vin` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆VIN码',
+  `car_motor_manufacturer` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆电机厂商',
+  `car_motor_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电机型号',
+  `car_battery_manufacturer` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆电池厂商',
+  `car_battery_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电池型号',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆详细信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_car_fault
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_car_fault`;
+CREATE TABLE `sys_car_fault`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `fault_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆故障编码',
+  `fault_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障类型',
+  `fault_label` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障标签',
+  `fault_bit` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障位',
+  `fault_value` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障值',
+  `fault_warn` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '故障等级',
+  `fault_status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报警状态（Y.是，N.否）',
+  `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆故障表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_car_message
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_car_message`;
+CREATE TABLE `sys_car_message`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `model_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆型号编码',
+  `message_type_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆报文类型编码',
+  `message_start_index` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '开始位下标',
+  `message_end_index` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '结束位下标',
+  `message_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文分类',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文记录表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_corpuscle_fence
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_corpuscle_fence`;
+CREATE TABLE `sys_corpuscle_fence`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `fence_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '围栏编码',
+  `fence_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏名称',
+  `fence_type` int NOT NULL DEFAULT 1 COMMENT '围栏类型(1.驶入 2.驶出)',
+  `fence_position` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '围栏位置',
+  `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '1' COMMENT '启用状态(1.启用 2.停用)',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '电子围栏表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_ent
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_ent`;
+CREATE TABLE `sys_ent`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `ent_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业编码',
+  `ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业数据库IP',
+  `port` int NULL DEFAULT NULL COMMENT '数据库端口',
+  `db_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '连接数据库名称',
+  `user_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户名',
+  `password` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '密码',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '企业数据库信息记录表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_fence_group
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_fence_group`;
+CREATE TABLE `sys_fence_group`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `group_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组编码',
+  `group_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组名称',
+  `group_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组类型',
+  `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '启用状态',
+  `create_by` int NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` int NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '围栏组表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_fence_group_mid
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_fence_group_mid`;
+CREATE TABLE `sys_fence_group_mid`  (
+  `group_id` int NOT NULL COMMENT '围栏组id',
+  `fence_id` int NOT NULL COMMENT '围栏id',
+  `new_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`group_id`, `fence_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '围栏组连接表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_firm
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_firm`;
+CREATE TABLE `sys_firm`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `firm_credit_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '统一社会信用代码',
+  `firm_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业编码',
+  `firm_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业名称',
+  `firm_logs` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业logs',
+  `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '启用状态(1.开业 2.停业 3.休业)',
+  `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '企业基础信息表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for sys_message_type
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_message_type`;
+CREATE TABLE `sys_message_type`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `message_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文编码',
+  `message_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文名称',
+  `message_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文分类',
+  `message_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文字段类型',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文类型表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for warn_logs
+-- ----------------------------
+DROP TABLE IF EXISTS `warn_logs`;
+CREATE TABLE `warn_logs`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '预警日志id',
+  `vin` varchar(58) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆vin码',
+  `warn_rule_id` int NULL DEFAULT NULL COMMENT '规则id',
+  `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间',
+  `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间',
+  `max_value` int NULL DEFAULT NULL COMMENT '最大值',
+  `min_value` int NULL DEFAULT NULL COMMENT '最小值',
+  `avg_value` int NULL DEFAULT NULL COMMENT '平均值',
+  `median_value` int NULL DEFAULT NULL COMMENT '中位数',
+  `status` int NULL DEFAULT NULL COMMENT '是否发送预警',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for warn_rule
+-- ----------------------------
+DROP TABLE IF EXISTS `warn_rule`;
+CREATE TABLE `warn_rule`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '规则id',
+  `rule_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规则名称',
+  `strategy_id` int NULL DEFAULT NULL COMMENT '策略id',
+  `msg_type_id` int NULL DEFAULT NULL COMMENT '报文数据类型id',
+  `slide_time` int NULL DEFAULT NULL COMMENT '滑窗时间',
+  `slide_frequency` int NULL DEFAULT NULL COMMENT '滑窗频率',
+  `max_value` int NULL DEFAULT NULL COMMENT '最大值',
+  `min_value` int NULL DEFAULT NULL COMMENT '最小值',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for warn_slide_config
+-- ----------------------------
+DROP TABLE IF EXISTS `warn_slide_config`;
+CREATE TABLE `warn_slide_config`  (
+  `id` int NOT NULL COMMENT '滑窗id',
+  `vin` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆vin码',
+  `slide_time` int NULL DEFAULT NULL COMMENT '滑动时间',
+  `created_by` int NULL DEFAULT NULL COMMENT '创建人',
+  `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `updated_by` int NULL DEFAULT NULL COMMENT '更新人',
+  `updated_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for warn_strategy
+-- ----------------------------
+DROP TABLE IF EXISTS `warn_strategy`;
+CREATE TABLE `warn_strategy`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '策略id',
+  `car_type_id` int NULL DEFAULT NULL COMMENT '车辆类型id',
+  `strategy_name` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '策略名称',
+  `msg_id` int NULL DEFAULT NULL COMMENT '报文模版id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+SET FOREIGN_KEY_CHECKS = 1;

From 18baa2abe61b9fd5f3d910cb69afd7085f343d08 Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Wed, 2 Oct 2024 15:28:20 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E6=97=B6=E8=B5=8B=E4=BA=88=E7=9B=B8=E5=BA=94=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysFirmController.java  | 67 ++++++++++---------
 .../system/controller/SysMenuController.java  |  7 +-
 .../muyu/system/service/SysMenuService.java   |  1 -
 .../service/impl/SysFirmServiceImpl.java      |  7 +-
 .../service/impl/SysMenuServiceImpl.java      |  4 --
 5 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
index fc2fd33..2dc61ba 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
@@ -1,9 +1,6 @@
 package com.muyu.system.controller;
 
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
@@ -12,9 +9,10 @@ import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.SysDept;
 import com.muyu.common.system.domain.SysEnt;
+import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
-import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.system.domain.SysFirm;
+import com.muyu.system.domain.SysMenu;
 import com.muyu.system.domain.req.SysFirmReq;
 import com.muyu.system.service.ISysFirmService;
 import com.muyu.system.service.SysEntService;
@@ -32,7 +30,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.List;
-import java.util.UUID;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -59,6 +57,7 @@ public class SysFirmController extends BaseController
     @Resource
     private SysDeptController sysDeptController;
 
+
     private static final String FIRM_CREDIT_CODE = "^[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}$";
 
     /**
@@ -120,6 +119,30 @@ public class SysFirmController extends BaseController
             return error("新增 企业基础信息 '" + sysFirm + "'失败，统一社会信用代码格式不正确");
         }
 
+        //添加角色与角色权限
+        SysRole role = new SysRole();
+        role.setFirmCode(firmCode);
+        role.setRoleName(firmName+"超级管理员");
+        role.setRoleKey(firmCode+"_admin");
+        role.setRoleSort(1);
+        role.setDataScope("1");
+        role.setMenuCheckStrictly(true);
+        role.setDeptCheckStrictly(true);
+        role.setStatus("0");
+        role.setDelFlag("0");
+        SysMenu sysMenu = new SysMenu();
+        Result<List<SysMenu>> sysMenus = sysMenuController.list(sysMenu);
+        List<SysMenu> menulist = sysMenus.getData();
+        Long[] menuIds = menulist.stream()
+                .map(SysMenu::getMenuId)
+                .filter(Objects::nonNull) // 过滤掉 null 值
+                .toArray(Long[]::new);
+        role.setCreateBy(SecurityUtils.getUsername());
+        role.setMenuIds(menuIds);
+
+        sysRoleController.add(role);
+
+        //添加部门
         SysDept sysDept = new SysDept();
         Result list = sysDeptController.list(sysDept);
         List<SysDept> depts = (List<SysDept>) list.getData();
@@ -137,6 +160,7 @@ public class SysFirmController extends BaseController
         // 设置创建者和状态
         sysFirm.setCreateBy(SecurityUtils.getUsername());
 
+        //添加用户与用户角色
         SysUser sysUser = new SysUser();
         sysUser.setFirmCode(firmCode);
         sysUser.setUserName(sysFirm.getUserName());
@@ -144,34 +168,15 @@ public class SysFirmController extends BaseController
         sysUser.setPassword(sysFirm.getPassword());
         sysUser.setDeptId(sysDept.getDeptId());
         sysUser.setDept(sysDepts);
+        Result<TableDataInfo<SysRole>> resultRole = sysRoleController.list(role);
+        List<SysRole> roleList =  resultRole.getData().getRows();
+        Long[] roleIds = roleList.stream()
+                .map(SysRole::getRoleId)
+                .filter(Objects::nonNull) // 过滤掉 null 值
+                .toArray(Long[]::new);
+        sysUser.setRoleIds(new Long[]{roleIds[roleList.size() - 1]});
         sysUserController.add(sysUser);
 
-//        if (Result.FAIL == registerResult.getCode()) {
-//            throw new ServiceException(registerResult.getMsg());
-//        }
-//        recordLogService.recordLogininfor(SecurityUtils.getUsername(), Constants.REGISTER, "注册成功");
-//
-//        SysRole role = new SysRole();
-//
-//        role.setFirmCode(firmCode);
-//        role.setRoleName("超级管理员");
-//        role.setRoleKey("admin");
-//        role.setRoleSort(1);
-//        role.setDataScope("1");
-//        role.setMenuCheckStrictly(true);
-//        role.setDeptCheckStrictly(true);
-//        role.setStatus("0");
-//        role.setDelFlag("0");
-//        List<SysMenu> list = sysMenuController.list();
-//        Long[] menuIds = list.stream()
-//                .map(SysMenu::getMenuId)
-//                .filter(Objects::nonNull) // 过滤掉 null 值
-//                .toArray(Long[]::new);
-//        role.setCreateBy(SecurityUtils.getUsername());
-//        role.setMenuIds(menuIds);
-//
-//        sysRoleController.add(role);
-
         // 创建数据库和表
         try {
             createDatabaseAndTables(firmCode);
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java
index f4f1b36..063ca65 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java
@@ -28,17 +28,12 @@ public class SysMenuController extends BaseController {
     @Resource
     private SysMenuService menuService;
 
-    public List<SysMenu> list () {
-        List<SysMenu> menus = menuService.selectMenuList();
-        return menus;
-    }
-
     /**
      * 获取菜单列表
      */
     @RequiresPermissions("system:menu:list")
     @GetMapping("/list")
-    public Result list (SysMenu menu) {
+    public Result<List<SysMenu>> list (SysMenu menu) {
         Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuList(menu, userId);
         return success(menus);
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java
index 1e06a13..2c4ab14 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java
@@ -33,7 +33,6 @@ public interface SysMenuService extends IService<SysMenu> {
      */
     public List<SysMenu> selectMenuList (SysMenu menu, Long userId);
 
-    public List<SysMenu> selectMenuList ();
 
     /**
      * 根据用户ID查询权限
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
index 639820d..5e5ffcd 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java
@@ -70,8 +70,11 @@ public class SysFirmServiceImpl
     @Override
     public Boolean checkIdUnique(SysFirm sysFirm) {
         LambdaQueryWrapper<SysFirm> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysFirm::getFirmCreditCode, sysFirm.getFirmCreditCode());
-        queryWrapper.eq(SysFirm::getFirmCode, sysFirm.getFirmCode());
+        queryWrapper.eq(SysFirm::getFirmCreditCode, sysFirm.getFirmCreditCode())
+                .or()
+                .eq(SysFirm::getFirmCode, sysFirm.getFirmCode())
+                .or()
+                .eq(SysFirm::getFirmName, sysFirm.getFirmName());
         return this.count(queryWrapper) > 0;
     }
 
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
index 884a086..f796cb2 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java
@@ -72,10 +72,6 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return menuList;
     }
 
-    @Override
-    public List<SysMenu> selectMenuList() {
-        return this.list();
-    }
 
     /**
      * 根据用户ID查询权限

From 0160da832249cce2de64d4be75eedf53725bfb7d Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Sun, 6 Oct 2024 11:27:40 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E5=88=87=E6=8D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/common/system/domain/SysEnt.java |   1 +
 .../common/system/domain/SysFirmUser.java     |   1 +
 .../muyu/common/system/domain/SysMember.java  |  31 ++++++
 .../cloud-modules-openbusiness-server/pom.xml |  10 +-
 .../CloudOpenBusinessApplication.java         |  18 ++-
 .../controller/SysCarMessageController.java   |   6 +
 .../controller/SysUserController.java         |  10 +-
 .../muyu/openbusiness/feign/SystemFeign.java  |  11 ++
 .../openbusiness}/mapper/SysUserMapper.java   |   4 +-
 .../mapper/SysUserPostMapper.java             |   2 +-
 .../mapper/SysUserRoleMapper.java             |   2 +-
 .../openbusiness}/service/SysUserService.java |   2 +-
 .../impl/SysCarMessageServiceImpl.java        |   3 +-
 .../service/impl/SysUserServiceImpl.java      |  20 ++--
 .../mapper/openbusiness}/SysUserMapper.xml    |   2 +-
 .../openbusiness}/SysUserPostMapper.xml       |   2 +-
 .../openbusiness}/SysUserRoleMapper.xml       |   2 +-
 .../cloud-modules-system-saas/pom.xml         | 104 ------------------
 .../saas/CloudSystemSaasApplication.java      |  32 ------
 .../src/main/resources/banner.txt             |   2 -
 .../src/main/resources/bootstrap.yml          |  59 ----------
 .../src/main/resources/logback/dev.xml        |  74 -------------
 .../src/main/resources/logback/prod.xml       |  81 --------------
 .../src/main/resources/logback/test.xml       |  81 --------------
 .../system/controller/SysFirmController.java  |   2 +-
 .../controller/SysMemberController.java       |  28 +++++
 .../java/com/muyu/system/domain/SysFirm.java  |   4 +
 .../muyu/system/mapper/SysMemberMapper.java   |   7 ++
 .../muyu/system/service/SysMemberService.java |  10 ++
 .../service/impl/SysMemberServiceImpl.java    |  27 +++++
 cloud-modules/pom.xml                         |   1 -
 31 files changed, 174 insertions(+), 465 deletions(-)
 create mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java
 rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/controller/SysUserController.java (97%)
 create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java
 rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysUserMapper.java (93%)
 rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysUserPostMapper.java (96%)
 rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/mapper/SysUserRoleMapper.java (97%)
 rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/SysUserService.java (95%)
 rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness}/service/impl/SysUserServiceImpl.java (92%)
 rename cloud-modules/{cloud-modules-system-saas/src/main/resources/mapper/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysUserMapper.xml (98%)
 rename cloud-modules/{cloud-modules-system-saas/src/main/resources/mapper/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysUserPostMapper.xml (94%)
 rename cloud-modules/{cloud-modules-system-saas/src/main/resources/mapper/saas => cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness}/SysUserRoleMapper.xml (96%)
 delete mode 100644 cloud-modules/cloud-modules-system-saas/pom.xml
 delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java
 delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt
 delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml
 delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml
 delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml
 delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml
 create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java
 create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java
 create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java
 create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java

diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java
index 0c145d5..87dab28 100644
--- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java
+++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java
@@ -34,4 +34,5 @@ public class SysEnt {
     private String userName;
 
     private String password;
+    
 }
diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java
index 0bba83a..d99cd55 100644
--- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java
+++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java
@@ -22,4 +22,5 @@ public class SysFirmUser extends SysUser {
      * 用户数据库
      */
     private String databaseName;
+
 }
diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java
new file mode 100644
index 0000000..4d79d28
--- /dev/null
+++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java
@@ -0,0 +1,31 @@
+package com.muyu.common.system.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;
+
+/**
+ * 会员表(SysMember)实体类
+ *
+ */
+@Data
+@Setter
+@Getter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("sys_member")
+public class SysMember {
+    @TableId(type = IdType.AUTO)
+    private Long memberId;
+    @Excel(name = "会员等级")
+    private String memberName;
+    @Excel(name = "可添加车辆数量")
+    private Integer memberCarNum;
+    @Excel(name = "可添加报文模板数量")
+    private Integer memberCarType;
+}
+
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
index c73651d..d7b03d3 100644
--- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
@@ -18,7 +18,6 @@
     </properties>
 
     <dependencies>
-
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -102,6 +101,15 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-saas</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-system</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
index 4cab1e8..4aeb9d4 100644
--- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
@@ -1,9 +1,13 @@
 package com.muyu.openbusiness;
 
+import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
 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;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 系统模块
@@ -11,11 +15,17 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author muyu
  */
 @EnableCustomConfig
-//@EnableCustomSwagger2
 @EnableMyFeignClients
-@SpringBootApplication
+@SpringBootApplication(
+        exclude = {
+                DataSourceAutoConfiguration.class,
+                DruidDataSourceAutoConfigure.class,
+                DynamicDataSourceAutoConfiguration.class
+        }
+)
 public class CloudOpenBusinessApplication {
-    public static void main (String[] args) {
-            SpringApplication.run(CloudOpenBusinessApplication.class, args);
+    public static void main(String[] args) {
+        SpringApplication.run(CloudOpenBusinessApplication.class, args);
+        System.out.println("CloudSystemSaas 模块启动成功!");
     }
 }
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java
index 3a52354..e796a4a 100644
--- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java
@@ -1,5 +1,6 @@
 package com.muyu.openbusiness.controller;
 
+import com.muyu.common.system.domain.SysUser;
 import com.muyu.openbusiness.domain.SysCarMessage;
 
 import com.muyu.openbusiness.service.ISysCarMessageService;
@@ -32,6 +33,8 @@ public class SysCarMessageController extends BaseController
 {
     @Resource
     private ISysCarMessageService sysCarMessageService;
+//    @Autowired
+//    private SystemFeign feign;
     @Autowired
     private HttpSession session;
 
@@ -90,6 +93,8 @@ public class SysCarMessageController extends BaseController
     @GetMapping("/list")
     public Result<List<SysCarMessage>> list(SysCarMessage sysCarMessage)
     {
+//        Result info = feign.getInfo();
+//        SysUser sysUser = (SysUser) info.getData();
         List<SysCarMessage> list = sysCarMessageService.selectSysCarMessageList(sysCarMessage);
         session.setAttribute("list", list);
         return Result.success(list);
@@ -125,6 +130,7 @@ public class SysCarMessageController extends BaseController
     public Result<Integer> add(
             @Validated @RequestBody SysCarMessage sysCarMessage)
     {
+
         if (sysCarMessageService.checkIdUnique(sysCarMessage)) {
             return error("新增 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录已存在");
         }
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java
similarity index 97%
rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java
index 4cdbdc7..f34422a 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java
@@ -1,4 +1,4 @@
-package com.muyu.system.saas.controller;
+package com.muyu.openbusiness.controller;
 
 import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder;
 import com.muyu.common.core.domain.Result;
@@ -13,14 +13,14 @@ import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.SysDept;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.RemoteUserService;
-import com.muyu.system.saas.service.SysUserService;
-
-import javax.annotation.Resource;
 
+import com.muyu.openbusiness.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import lombok.extern.slf4j.Slf4j;
+
+import javax.annotation.Resource;
 
 
 /**
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java
new file mode 100644
index 0000000..72b89d6
--- /dev/null
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java
@@ -0,0 +1,11 @@
+//package com.muyu.openbusiness.feign;
+//
+//import com.muyu.common.core.domain.Result;
+//import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
+//import org.springframework.cloud.openfeign.FeignClient;
+//import org.springframework.web.bind.annotation.GetMapping;
+//@FeignClient(name = "cloud-system",fallbackFactory = RemoteUserFallbackFactory.class)
+//public interface SystemFeign {
+//    @GetMapping("/user/getInfo")
+//    public Result getInfo ();
+//}
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java
similarity index 93%
rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java
index 62c3965..235d8d5 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java
@@ -1,10 +1,10 @@
-package com.muyu.system.saas.mapper;
+package com.muyu.openbusiness.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.common.system.domain.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @Author: 胡杨
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java
similarity index 96%
rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java
index 806f76d..f2a9e01 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java
@@ -1,4 +1,4 @@
-package com.muyu.system.saas.mapper;
+package com.muyu.openbusiness.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.common.system.domain.SysUserPost;
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java
similarity index 97%
rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java
index d5c8072..5b3aa11 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java
@@ -1,4 +1,4 @@
-package com.muyu.system.saas.mapper;
+package com.muyu.openbusiness.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.common.system.domain.SysUserRole;
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java
similarity index 95%
rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java
index 4ee3d58..1eb66cf 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java
@@ -1,4 +1,4 @@
-package com.muyu.system.saas.service;
+package com.muyu.openbusiness.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java
index ed27d9e..8739004 100644
--- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java
@@ -67,7 +67,8 @@ public class SysCarMessageServiceImpl
     @Override
     public Boolean checkIdUnique(SysCarMessage sysCarMessage) {
         LambdaQueryWrapper<SysCarMessage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysCarMessage::getId, sysCarMessage.getId());
+        queryWrapper.eq(SysCarMessage::getModelCode, sysCarMessage.getModelCode())
+                .eq(SysCarMessage::getMessageTypeCode, sysCarMessage.getMessageTypeCode());
         return this.count(queryWrapper) > 0;
     }
 
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java
similarity index 92%
rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java
index a53838a..e5ac185 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java
@@ -1,25 +1,23 @@
-package com.muyu.system.saas.service.impl;
+package com.muyu.openbusiness.service.impl;
 
 
-import javax.annotation.Resource;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.muyu.common.core.constant.UserConstants;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.SysUserPost;
 import com.muyu.common.system.domain.SysUserRole;
 import com.muyu.common.system.remote.RemoteUserService;
-import com.muyu.system.saas.mapper.SysUserPostMapper;
-import com.muyu.system.saas.mapper.SysUserRoleMapper;
+
+import com.muyu.openbusiness.mapper.SysUserMapper;
+import com.muyu.openbusiness.mapper.SysUserPostMapper;
+import com.muyu.openbusiness.mapper.SysUserRoleMapper;
+import com.muyu.openbusiness.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
-import lombok.extern.slf4j.Slf4j;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.system.saas.mapper.SysUserMapper;
-import com.muyu.system.saas.service.SysUserService;
-import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml
similarity index 98%
rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml
index 4a480ae..7bbe181 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.system.saas.mapper.SysUserMapper">
+<mapper namespace="com.muyu.openbusiness.mapper.SysUserMapper">
 
     <resultMap type="com.muyu.common.system.domain.SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml
similarity index 94%
rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml
index f6bf547..b81edfe 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.system.saas.mapper.SysUserPostMapper">
+<mapper namespace="com.muyu.openbusiness.mapper.SysUserPostMapper">
 
     <resultMap type="com.muyu.common.system.domain.SysUserPost" id="SysUserPostResult">
         <result property="userId" column="user_id"/>
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml
similarity index 96%
rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml
rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml
index b352741..69d20fb 100644
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muyu.system.saas.mapper.SysUserRoleMapper">
+<mapper namespace="com.muyu.openbusiness.mapper.SysUserRoleMapper">
 
     <resultMap type="com.muyu.common.system.domain.SysUserRole" id="SysUserRoleResult">
         <result property="userId" column="user_id"/>
diff --git a/cloud-modules/cloud-modules-system-saas/pom.xml b/cloud-modules/cloud-modules-system-saas/pom.xml
deleted file mode 100644
index b9983d0..0000000
--- a/cloud-modules/cloud-modules-system-saas/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>cloud-modules</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>cloud-modules-system-saas</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-saas</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-system</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datasource</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-datascope</artifactId>
-        </dependency>
-
-        <!-- MuYu Common Log -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-log</artifactId>
-        </dependency>
-
-        <!-- 接口模块 -->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-api-doc</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java
deleted file mode 100644
index 95d43df..0000000
--- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.muyu.system.saas;
-
-import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
-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;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-/**
- * @Author: 胡杨
- * @Name: CloudSystemSaas
- * @Description: SaaS系统驱动器
- * @CreatedDate: 2024/9/22 上午10:05
- * @FilePath: com.muyu.system.saas
- */
-@EnableCustomConfig
-@EnableMyFeignClients
-@SpringBootApplication(
-        exclude = {
-                DataSourceAutoConfiguration.class,
-                DruidDataSourceAutoConfigure.class,
-                DynamicDataSourceAutoConfiguration.class
-        }
-)
-public class CloudSystemSaasApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(CloudSystemSaasApplication.class, args);
-        System.out.println("CloudSystemSaas 模块启动成功!");
-    }
-}
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt b/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt
deleted file mode 100644
index 0dd5eee..0000000
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml
deleted file mode 100644
index 3504989..0000000
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Tomcat
-server:
-  port: 9704
-
-# nacos线上地址
-nacos:
-  addr: 49.235.136.60:8848
-  user-name: nacos
-  password: nacos
-  namespace: wyh
-# 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-system-saas
-  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}
-
-logging:
-  level:
-    com.muyu.system.mapper: DEBUG
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml
deleted file mode 100644
index 44768a1..0000000
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-system-saas"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml
deleted file mode 100644
index 727021d..0000000
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-system-saas"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.sky.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 使用gRpc将日志发送到skywalking服务端 -->
-    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${log.sky.pattern}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="GRPC_LOG"/>
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml
deleted file mode 100644
index 727021d..0000000
--- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/cloud-system-saas"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-    <property name="log.sky.pattern" value="%d{HH:mm:ss.SSS} %yellow([%tid]) [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.sky.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 使用gRpc将日志发送到skywalking服务端 -->
-    <appender name="GRPC_LOG" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <Pattern>${log.sky.pattern}</Pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="GRPC_LOG"/>
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
index 2dc61ba..11a1744 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java
@@ -194,7 +194,7 @@ public class SysFirmController extends BaseController
         sysEnt.setPort(3306);
         sysEntService.save(sysEnt);
 
-
+        sysFirm.setMemberId(1L);
 
         return toAjax(sysFirmService.save((SysFirm) sysFirm));
     }
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java
new file mode 100644
index 0000000..2bd5c2c
--- /dev/null
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java
@@ -0,0 +1,28 @@
+package com.muyu.system.controller;
+
+import com.muyu.common.core.domain.Result;
+import com.muyu.common.system.domain.SysMember;
+import com.muyu.system.service.SysMemberService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+/*
+会员等级
+ */
+@RestController
+@RequestMapping("/member")
+public class SysMemberController {
+    @Resource
+    private SysMemberService service;
+
+    /**
+     * 查询会员等级列表
+     */
+    @GetMapping("/list")
+    private Result<List<SysMember>> selectList(SysMember member) {
+        return Result.success(service.selectSysMemberList(member));
+    }
+}
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java
index bc5698b..204f886 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java
@@ -51,6 +51,9 @@ public class SysFirm extends BaseEntity{
     @Excel(name = "启用状态(1.开业 2.停业 3.休业)")
     private String state;
 
+    @Excel(name = "会员等级")
+    private Long memberId;
+
 
 
     @Override
@@ -67,6 +70,7 @@ public class SysFirm extends BaseEntity{
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("memberId", getMemberId())
             .toString();
     }
 }
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java
new file mode 100644
index 0000000..965670d
--- /dev/null
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java
@@ -0,0 +1,7 @@
+package com.muyu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.common.system.domain.SysMember;
+
+public interface SysMemberMapper extends BaseMapper<SysMember> {
+}
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java
new file mode 100644
index 0000000..2c52ddb
--- /dev/null
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java
@@ -0,0 +1,10 @@
+package com.muyu.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.system.domain.SysMember;
+
+import java.util.List;
+
+public interface SysMemberService extends IService<SysMember> {
+    public List<SysMember> selectSysMemberList(SysMember sysMember);
+}
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java
new file mode 100644
index 0000000..a43ec93
--- /dev/null
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java
@@ -0,0 +1,27 @@
+package com.muyu.system.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.common.system.domain.SysMember;
+import com.muyu.system.mapper.SysMemberMapper;
+import com.muyu.system.service.SysMemberService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SysMemberServiceImpl extends
+        ServiceImpl<SysMemberMapper, SysMember>
+        implements SysMemberService {
+
+
+    @Override
+    public List<SysMember> selectSysMemberList(SysMember sysMember) {
+        LambdaQueryWrapper<SysMember> queryWrapper = new LambdaQueryWrapper<>();
+        if(sysMember.getMemberId()!=null){
+            queryWrapper.eq(SysMember::getMemberId, sysMember.getMemberId());
+        }
+        return this.list(queryWrapper);
+    }
+}
diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml
index 6f39aa8..34653b3 100644
--- a/cloud-modules/pom.xml
+++ b/cloud-modules/pom.xml
@@ -12,7 +12,6 @@
         <module>cloud-modules-system</module>
         <module>cloud-modules-gen</module>
         <module>cloud-modules-file</module>
-        <module>cloud-modules-system-saas</module>
         <module>cloud-modules-openbusiness</module>
     </modules>
 

From 8edcff30943eddfdc695f2bd3d67ff55bc0c7c82 Mon Sep 17 00:00:00 2001
From: Wang YiHang <3060234389@qq.com>
Date: Mon, 7 Oct 2024 18:36:36 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E5=88=87=E6=8D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud-modules-openbusiness-server/pom.xml |  5 ++
 .../CloudOpenBusinessApplication.java         |  1 +
 .../muyu/openbusiness/feign/SystemFeign.java  |  1 +
 .../cloud-modules-openbusiness/pom.xml        |  4 +-
 .../main/resources/static/saas_operation.sql  | 52 +++++++++++++++++++
 5 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
index d7b03d3..fe556ac 100644
--- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml
@@ -111,6 +111,11 @@
             <artifactId>cloud-common-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
index 4aeb9d4..c5d8137 100644
--- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java
@@ -14,6 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  *
  * @author muyu
  */
+//@EnableFeignClients
 @EnableCustomConfig
 @EnableMyFeignClients
 @SpringBootApplication(
diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java
index 72b89d6..5910690 100644
--- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java
+++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java
@@ -4,6 +4,7 @@
 //import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
 //import org.springframework.cloud.openfeign.FeignClient;
 //import org.springframework.web.bind.annotation.GetMapping;
+//
 //@FeignClient(name = "cloud-system",fallbackFactory = RemoteUserFallbackFactory.class)
 //public interface SystemFeign {
 //    @GetMapping("/user/getInfo")
diff --git a/cloud-modules/cloud-modules-openbusiness/pom.xml b/cloud-modules/cloud-modules-openbusiness/pom.xml
index c05eb1e..bae1e50 100644
--- a/cloud-modules/cloud-modules-openbusiness/pom.xml
+++ b/cloud-modules/cloud-modules-openbusiness/pom.xml
@@ -8,7 +8,9 @@
         <artifactId>cloud-modules</artifactId>
         <version>3.6.3</version>
     </parent>
-
+    <description>
+        cloud-modules-openbusiness企业运营
+    </description>
     <artifactId>cloud-modules-openbusiness</artifactId>
     <packaging>pom</packaging>
     <modules>
diff --git a/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql b/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql
index 97438ae..542944d 100644
--- a/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql
+++ b/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql
@@ -177,6 +177,58 @@ CREATE TABLE `sys_message_type`  (
   `message_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文字段类型',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文类型表' ROW_FORMAT = Dynamic;
+-- ----------------------------
+-- Records of sys_message_type
+-- ----------------------------
+INSERT INTO `sys_message_type` VALUES (1, 'vin', 'VIN码', 'identification', 'String');
+INSERT INTO `sys_message_type` VALUES (2, 'timestamp', '时间戳', 'identification', 'String');
+INSERT INTO `sys_message_type` VALUES (3, 'longitude', '经度', 'identification', 'String');
+INSERT INTO `sys_message_type` VALUES (4, 'latitude', '纬度', 'identification', 'String');
+INSERT INTO `sys_message_type` VALUES (5, 'speed', '车速', 'identification', 'String');
+INSERT INTO `sys_message_type` VALUES (6, 'TM', '总里程', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (7, 'TV', '总电压', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (8, 'CC', '总电流', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (9, 'IR', '绝缘电阻', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (10, 'GP', '档位', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (11, 'APTV', '加速踏板行程值', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (12, 'BPTV', '制动踏板行程值', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (13, 'SFC', '燃料消耗率', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (14, 'MCT', '电机控制器温度', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (15, 'MS', '电机转速', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (16, 'MTO', '电机转矩', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (17, 'MTE', '电机温度', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (18, 'MV', '电机电压', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (19, 'MC', '电机电流', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (20, 'PBRSOC', '动力电池剩余电量SOC', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (21, 'MACSFP', '当前状态允许的最大反馈功率', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (22, 'CSATMDP', '当前状态允许最大放电功率', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (23, 'BMS', 'BMS自检计数器', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (24, 'CADC', '动力电池充放电电流', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (25, 'PBLETVV3', '动力电池负载端总电压V3', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (26, 'SMV', '单次最大电压', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (27, 'MVOAB', '单体电池最低电压', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (28, 'MAXBT', '单体电池最高温度', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (29, 'MINBT', '单体电池最低温度', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (30, 'PBAC', '动力电池可用容量', 'information', 'String');
+INSERT INTO `sys_message_type` VALUES (31, 'VS', '车辆状态', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (32, 'CS', '充电状态', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (33, 'RS', '运行状态', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (34, 'SOC', 'SOC', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (35, 'RESDWC', '可充电储能装置工作状态', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (36, 'EAS', 'EAS', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (37, 'PTC', 'PTC', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (38, 'EPS', 'EPS', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (39, 'ABS', 'ABS', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (40, 'MCU', 'MCU', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (41, 'PBHS', '动力电池加热状态', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (42, 'PBCS', '动力电池当前状态', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (43, 'PBIS', '动力电池保温状态', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (44, 'DCDC', 'DCDC', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (45, 'CHG', 'CHG', 'status', 'String');
+INSERT INTO `sys_message_type` VALUES (46, 'CHB', '校验位', NULL, 'String');
+INSERT INTO `sys_message_type` VALUES (47, 'CUB', '截止位', NULL, 'String');
+
+SET FOREIGN_KEY_CHECKS = 1;
 
 -- ----------------------------
 -- Table structure for warn_logs