From 1e9002ea932b5c9d6de27cc5125f196611fba559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=AF=85=E5=A4=A7=E7=A5=9E?= <3163302184@qq.com>
Date: Sun, 29 Sep 2024 10:11:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
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 | 110 +++++++++++++-
.../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, 660 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 @@
-
-
- 4.0.0
-
- com.muyu
- cloud-breakdown
- 3.6.3
-
-
- cloud-breakdown-client
-
-
- 17
- 17
- UTF-8
-
-
-
-
- com.muyu
- cloud-breakdown-common
- 3.6.3
-
-
-
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml
deleted file mode 100644
index fc96ca7..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- 4.0.0
-
- com.muyu
- cloud-breakdown
- 3.6.3
-
-
- cloud-breakdown-common
-
-
- 17
- 17
- UTF-8
-
-
-
- com.muyu
- cloud-common-core
-
-
-
-
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/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 @@
-
-
- 4.0.0
-
- com.muyu
- cloud-breakdown
- 3.6.3
-
-
- cloud-breakdown-remote
-
-
- 17
- 17
- UTF-8
-
-
-
-
- com.muyu
- cloud-breakdown-common
- 3.6.3
-
-
-
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 8b13789..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/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 @@
-
-
- 4.0.0
-
- com.muyu
- cloud-breakdown
- 3.6.3
-
-
- cloud-breakdown-server
-
-
- 17
- 17
- UTF-8
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-discovery
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-config
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-sentinel
-
-
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
-
-
-
- com.mysql
- mysql-connector-j
-
-
-
-
- com.muyu
- cloud-common-datasource
-
-
-
-
- com.muyu
- cloud-common-datascope
-
-
-
-
- com.muyu
- cloud-common-log
-
-
-
-
- com.muyu
- cloud-common-api-doc
-
-
-
-
- com.muyu
- cloud-common-xxl
-
-
-
- com.muyu
- cloud-common-rabbit
-
-
-
- com.muyu
- cloud-breakdown-common
- 3.6.3
-
-
-
-
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 {
-}
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java
deleted file mode 100644
index 754fc9b..0000000
--- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.muyu.breakdown.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.breakdown.domain.SysCarMessage;
-import com.muyu.breakdown.mapper.SysCarMessageMapper;
-import com.muyu.breakdown.service.SysCarMessageService;
-import org.springframework.stereotype.Service;
-
-/**
- * @ Tool:IntelliJ IDEA
- * @ Author:CHX
- * @ Date:2024-09-20-15:42
- * @ Version:1.0
- * @ Description:
- * @author Lenovo
- */
-@Service
-public class SysCarMessageServiceImpl extends ServiceImpl implements SysCarMessageService {
-}
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/bootstrap.yml
deleted file mode 100644
index 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 @@
-
-
-
-
-
-
-
-
-
-
- ${log.pattern}
-
-
-
-
-
- ${log.path}/info.log
-
-
-
- ${log.path}/info.%d{yyyy-MM-dd}.log
-
- 60
-
-
- ${log.pattern}
-
-
-
- INFO
-
- ACCEPT
-
- DENY
-
-
-
-
- ${log.path}/error.log
-
-
-
- ${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
-
-
- ${log.pattern}
-
-
-
- ERROR
-
- ACCEPT
-
- DENY
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
-
-
-
-
- ${log.sky.pattern}
-
-
-
-
-
- ${log.path}/info.log
-
-
-
- ${log.path}/info.%d{yyyy-MM-dd}.log
-
- 60
-
-
-
-
- INFO
-
- ACCEPT
-
- DENY
-
-
-
-
- ${log.path}/error.log
-
-
-
- ${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
-
-
-
-
- ERROR
-
- ACCEPT
-
- DENY
-
-
-
-
-
-
-
- ${log.sky.pattern}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
-
-
-
-
- ${log.sky.pattern}
-
-
-
-
-
- ${log.path}/info.log
-
-
-
- ${log.path}/info.%d{yyyy-MM-dd}.log
-
- 60
-
-
-
-
- INFO
-
- ACCEPT
-
- DENY
-
-
-
-
- ${log.path}/error.log
-
-
-
- ${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
-
-
-
-
- ERROR
-
- ACCEPT
-
- DENY
-
-
-
-
-
-
-
- ${log.sky.pattern}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
- 4.0.0
-
- com.muyu
- cloud-modules
- 3.6.3
-
-
- cloud-breakdown
- pom
-
- cloud-breakdown-common
- cloud-breakdown-server
- cloud-breakdown-remote
- cloud-breakdown-client
-
-
-
- 17
- 17
- UTF-8
-
-
-
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 @@
-
-
- 4.0.0
-
- com.muyu
- cloud-modules
- 3.6.3
-
-
- cloud-modules-car
-
-
- 17
- 17
- UTF-8
-
-
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-discovery
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-config
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-sentinel
-
-
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
-
-
-
- com.mysql
- mysql-connector-j
-
-
-
-
- com.muyu
- cloud-common-datasource
-
-
-
-
- com.muyu
- cloud-common-datascope
-
-
-
- com.muyu
- cloud-common-core
-
-
-
- com.muyu
- cloud-common-api-doc
-
-
-
-
-
-
- ${project.artifactId}
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
- repackage
-
-
-
-
-
-
-
-
-
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java
deleted file mode 100644
index 98d9546..0000000
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.muyu.carrail;
-
-import com.muyu.common.security.annotation.EnableCustomConfig;
-import com.muyu.common.security.annotation.EnableMyFeignClients;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-@EnableCustomConfig
-@EnableMyFeignClients
-@MapperScan("com.muyu.carrail.mapper")
-@SpringBootApplication
-public class CloudCarRailApplication {
- public static void main(String[] args) {
-// try {
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
- SpringApplication.run(CloudCarRailApplication.class, args);
- }
-}
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/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{
- ListdobList(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 @@
4.0.0
com.muyu
- cloud-modules-warn
+ cloud-modules-openbusiness
3.6.3
- cloud-warn-server
+ cloud-modules-openbusiness-common
17
17
UTF-8
+
com.muyu
- cloud-warn-common
- 3.6.3
+ cloud-common-core
-
-
-
-
-
+
- com.github.yulichang
- mybatis-plus-join-boot-starter
- 1.4.11
+ dom4j
+ dom4j
+ 1.6.1
+
com.squareup.okhttp3
okhttp
@@ -57,17 +54,5 @@
spring-boot-starter-web
3.3.2
-
-
- org.dom4j
- dom4j
- 2.1.3
-
-
- com.alibaba.fastjson2
- fastjson2
- 2.0.43
-
-
diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/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 @@
4.0.0
com.muyu
- cloud-modules
+ cloud-modules-openbusiness
3.6.3
- cloud-modules-carmanage
+ cloud-modules-openbusiness-server
17
@@ -89,6 +89,20 @@
bcpkix-jdk15on
1.70
+
+ com.muyu
+ cloud-modules-carmanage
+ 3.6.3
+ compile
+
+
+ com.muyu
+ cloud-modules-openbusiness-common
+ 3.6.3
+ compile
+
+
+
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> dobList(SysMessageVO sysMessageVO)
- {
- List 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{
}
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 {
+public interface SysCarMessageMapper extends BaseMapper {
}
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{
List 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{
}
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 {
-
- ListdobList(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 {
+//}
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 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
implements ISysCarMessageService {
- @Autowired
- private SysCarMessageMapper mapper;
- @Override
- public List 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
-
+
ERROR
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 @@
-
+
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 @@
-
+
@@ -27,17 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{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 @@
-
+
-
+
@@ -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
-