From 625809dae6f44cfceb105bf92be4cca97d45c92f 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: Sat, 28 Sep 2024 15:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9C=8B=E7=9C=8B=E5=BE=97?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common-enterprise-operation/pom.xml | 20 +++ .../com/muyu/enterpise}/domain/BreakDown.java | 2 +- .../com/muyu/enterpise}/domain/FaultLog.java | 2 +- .../com/muyu/enterpise}/domain/GenTable.java | 2 +- .../enterpise}/domain/GenTableColumn.java | 2 +- .../muyu/enterpise}/domain/GenTableResp.java | 2 +- .../muyu/enterpise}/domain/MessageMap.java | 2 +- .../com/muyu/enterpise}/domain/Messages.java | 2 +- .../muyu/enterpise}/domain/SysCarMessage.java | 2 +- .../com/muyu/enterpise}/domain/SysConfig.java | 2 +- .../muyu/enterpise}/domain/SysCorpuscle.java | 2 +- .../com/muyu/enterpise}/domain/SysFence.java | 2 +- .../com/muyu/enterpise}/domain/SysFirm.java | 2 +- .../com/muyu/enterpise}/domain/SysMenu.java | 2 +- .../com/muyu/enterpise}/domain/SysNotice.java | 2 +- .../com/muyu/enterpise}/domain/SysPost.java | 2 +- .../muyu/enterpise}/domain/SysRoleDept.java | 2 +- .../muyu/enterpise}/domain/SysRoleMenu.java | 2 +- .../muyu/enterpise}/domain/SysUserOnline.java | 2 +- .../com/muyu/enterpise}/domain/WarnLogs.java | 2 +- .../com/muyu/enterpise}/domain/WarnRule.java | 2 +- .../muyu/enterpise}/domain/WarnRuleDTO.java | 2 +- .../muyu/enterpise}/domain/WarnStrategy.java | 2 +- .../enterpise}/domain/resp/AuthRoleResp.java | 3 +- .../enterpise}/domain/resp/DeptTreeResp.java | 4 +- .../enterpise}/domain/resp/ProfileResp.java | 2 +- .../domain/resp/RoleMenuTreeResp.java | 4 +- .../domain/resp/UserDetailInfoResp.java | 2 +- .../enterpise}/domain/resp/UserInfoResp.java | 2 +- .../com/muyu/enterpise}/domain/vo/MetaVo.java | 2 +- .../muyu/enterpise}/domain/vo/RouterVo.java | 2 +- .../muyu/enterpise}/domain/vo/TreeSelect.java | 4 +- .../enterpise/domain/vx}/AccessToken.java | 2 +- .../muyu/enterpise/domain/vx}/Message.java | 2 +- cloud-common/cloud-common-core/pom.xml | 5 +- .../cloud-breakdown-client/pom.xml | 27 --- .../cloud-breakdown-common/pom.xml | 26 --- .../com/muyu/breakdown/DTO/MessageDTO.java | 93 ---------- .../cloud-breakdown-remote/pom.xml | 27 --- ...ot.autoconfigure.AutoConfiguration.imports | 1 - .../cloud-breakdown-server/pom.xml | 92 ---------- .../breakdown/config/MybatisPlusConfig.java | 37 ---- .../src/main/resources/banner.txt | 1 - .../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 --- .../muyu/carrail/mapper/SysFenceMapper.java | 16 -- .../src/main/resources/bootstrap.yml | 58 ------- .../mapper/carrail/SysFenceMapper.xml | 54 ------ .../mapper/carrail/SyscarRailMapper.xml | 16 -- cloud-modules/cloud-modules-file/pom.xml | 5 +- .../com/muyu/file/CloudFileApplication.java | 1 + .../mapper/generator/GenTableColumnMapper.xml | 8 +- .../mapper/generator/GenTableMapper.xml | 14 +- .../cloud-modules-operations/pom.xml | 124 +++++++++++++ .../muyu/operation/OperationApplication.java} | 15 +- .../operation/config/MybatisPlusConfig.java | 37 ++++ .../operation}/config/RabbitMQConfig.java | 5 +- .../config/RabbitMQDirectConfig.java | 6 +- .../config/RabbitMQTopicConfig.java | 2 +- .../operation/config/ResourcesConfig.java | 48 ++++++ .../controller/BreakDownController.java | 11 +- .../controller/FaultLogController.java | 10 +- .../controller/StationMessageController.java | 8 +- .../controller/SysCarMessageController.java | 4 +- .../controller/SysCorpuscleController.java | 9 +- .../controller/SysFenceController.java | 13 +- .../controller/SysUserController.java | 11 +- .../operation}/mapper/BreakDownMapper.java | 5 +- .../operation}/mapper/FaultLogMapper.java | 8 +- .../mapper/StationMessageMapper.java | 6 +- .../mapper/SysCarMessageMapper.java | 5 +- .../operation}/mapper/SysCorpuscleMapper.java | 5 +- .../muyu/operation/mapper/SysFenceMapper.java | 15 ++ .../muyu/operation}/mapper/SysUserMapper.java | 2 +- .../operation}/mapper/SysUserPostMapper.java | 2 +- .../operation}/mapper/SysUserRoleMapper.java | 2 +- .../operation}/service/BreakDownService.java | 8 +- .../operation}/service/IFaultLogService.java | 5 +- .../service/ISysCorpuscleService.java | 4 +- .../operation}/service/ISysFenceService.java | 5 +- .../service/StationMessageService.java | 4 +- .../service/SysCarMessageService.java | 5 +- .../operation}/service/SysUserService.java | 2 +- .../service/imp}/BreakDownServiceImpl.java | 18 +- .../service/imp}/FaultLogServiceImpl.java | 8 +- .../imp}/StationMessageServiceImpl.java | 10 +- .../imp}/SysCarMessageServiceImpl.java | 9 +- .../service/imp}/SysCorpuscleServiceImpl.java | 18 +- .../service/imp}/SysFenceServiceImpl.java | 10 +- .../service/imp}/SysUserServiceImpl.java | 19 +- .../muyu/operation/utils/FileUploadUtils.java | 163 ++++++++++++++++++ .../src/main/resources/bootstrap.yml | 0 .../pom.xml | 12 +- cloud-modules/cloud-modules-rail/pom.xml | 91 ---------- .../zhangyi/rail/CloudRailApplication.java | 4 - .../rail/controller/RailController.java | 44 ----- .../main/java/com/zhangyi/rail/domain/R.java | 16 -- .../com/zhangyi/rail/domain/SysFenceRail.java | 56 ------ .../com/zhangyi/rail/mapper/RailMapper.java | 7 - .../com/zhangyi/rail/service/RailService.java | 12 -- .../zhangyi/rail/service/RailServiceImpl.java | 23 --- .../cloud-modules-system-saas/pom.xml | 104 ----------- .../saas/CloudSystemSaasApplication.java | 32 ---- .../src/main/resources/banner.txt | 2 - .../src/main/resources/logback/dev.xml | 74 -------- .../src/main/resources/logback/prod.xml | 81 --------- .../src/main/resources/logback/test.xml | 81 --------- .../resources/mapper/saas/SysUserMapper.xml | 81 --------- .../mapper/saas/SysUserPostMapper.xml | 38 ---- .../mapper/saas/SysUserRoleMapper.xml | 51 ------ cloud-modules/cloud-modules-system/pom.xml | 6 + .../muyu/system/CloudSystemApplication.java | 2 +- .../controller/SysConfigController.java | 2 +- .../system/controller/SysMenuController.java | 2 +- .../controller/SysProfileController.java | 6 +- .../system/controller/SysRoleController.java | 2 +- .../system/controller/SysUserController.java | 6 +- .../com/muyu/system/rabbit/RabbitTest.java | 2 +- .../muyu/system/service/SysConfigService.java | 4 +- .../muyu/system/service/SysDeptService.java | 2 +- .../muyu/system/service/SysMenuService.java | 4 +- .../system/service/SysUserOnlineService.java | 1 - .../service/impl/SysDeptServiceImpl.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 6 +- .../impl/SysUserOnlineServiceImpl.java | 1 - .../mapper/system/SysConfigMapper.xml | 10 +- .../resources/mapper/system/SysFirmMapper.xml | 8 +- .../resources/mapper/system/SysMenuMapper.xml | 12 +- .../mapper/system/SysNoticeMapper.xml | 8 +- .../resources/mapper/system/SysPostMapper.xml | 8 +- .../mapper/system/SysRoleDeptMapper.xml | 2 +- .../mapper/system/SysRoleMenuMapper.xml | 2 +- .../cloud-warn-common/pom.xml | 138 --------------- .../cloud-warn-remote/pom.xml | 20 --- .../controller/WarnRuleController.java | 3 - .../controller/WarnRulesController.java | 1 - .../muyu/warning/mapper/WarnRuleMapper.java | 2 - .../warning/service/IWarnRuleService.java | 1 - .../service/impl/WarnRuleServiceImpl.java | 2 - .../mapper/platform/WarnRulesMapper.xml | 2 +- cloud-modules/cloud-modules-warn/pom.xml | 5 +- cloud-modules/pom.xml | 6 +- 147 files changed, 655 insertions(+), 2088 deletions(-) rename {cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/BreakDown.java (97%) rename {cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/FaultLog.java (97%) rename {cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/GenTable.java (99%) rename {cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/GenTableColumn.java (99%) rename {cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/GenTableResp.java (95%) rename {cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/MessageMap.java (92%) rename {cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/Messages.java (96%) rename {cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysCarMessage.java (95%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysConfig.java (98%) rename {cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysCorpuscle.java (98%) rename {cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysFence.java (98%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysFirm.java (98%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysMenu.java (98%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysNotice.java (97%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysPost.java (98%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysRoleDept.java (91%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysRoleMenu.java (91%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/SysUserOnline.java (95%) rename {cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/WarnLogs.java (98%) rename {cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/WarnRule.java (98%) rename {cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/WarnRuleDTO.java (97%) rename {cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/WarnStrategy.java (97%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/resp/AuthRoleResp.java (93%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/resp/DeptTreeResp.java (84%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/resp/ProfileResp.java (93%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/resp/RoleMenuTreeResp.java (85%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/resp/UserDetailInfoResp.java (95%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/resp/UserInfoResp.java (93%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/vo/MetaVo.java (96%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/vo/RouterVo.java (96%) rename {cloud-modules/cloud-modules-system/src/main/java/com/muyu/system => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise}/domain/vo/TreeSelect.java (93%) rename {cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vx}/AccessToken.java (87%) rename {cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx => cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vx}/Message.java (92%) delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/pom.xml delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java delete mode 100644 cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt 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/java/com/muyu/carrail/mapper/SysFenceMapper.java delete mode 100644 cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml delete mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml delete mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/pom.xml rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/OperationApplication.java} (57%) create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/config/MybatisPlusConfig.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/config/RabbitMQConfig.java (97%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/config/RabbitMQDirectConfig.java (93%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/config/RabbitMQTopicConfig.java (98%) create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/config/ResourcesConfig.java rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/controller/BreakDownController.java (95%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/controller/FaultLogController.java (96%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/controller/StationMessageController.java (85%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/controller/SysCarMessageController.java (83%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/controller/SysCorpuscleController.java (89%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/controller/SysFenceController.java (95%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/controller/SysUserController.java (97%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/mapper/BreakDownMapper.java (80%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/mapper/FaultLogMapper.java (53%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/mapper/StationMessageMapper.java (71%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/mapper/SysCarMessageMapper.java (79%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/mapper/SysCorpuscleMapper.java (73%) create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysFenceMapper.java rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/mapper/SysUserMapper.java (93%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/mapper/SysUserPostMapper.java (96%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/mapper/SysUserRoleMapper.java (97%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/service/BreakDownService.java (87%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/service/IFaultLogService.java (90%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/service/ISysCorpuscleService.java (85%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/service/ISysFenceService.java (90%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/service/StationMessageService.java (81%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/service/SysCarMessageService.java (76%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation}/service/SysUserService.java (95%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp}/BreakDownServiceImpl.java (83%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp}/FaultLogServiceImpl.java (92%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp}/StationMessageServiceImpl.java (72%) rename cloud-modules/{cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp}/SysCarMessageServiceImpl.java (66%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail/service/impl => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp}/SysCorpuscleServiceImpl.java (75%) rename cloud-modules/{cloud-modules-car/src/main/java/com/muyu/carrail/service/impl => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp}/SysFenceServiceImpl.java (88%) rename cloud-modules/{cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl => cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp}/SysUserServiceImpl.java (92%) create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/utils/FileUploadUtils.java rename cloud-modules/{cloud-modules-system-saas => cloud-modules-openbusiness/cloud-modules-operations}/src/main/resources/bootstrap.yml (100%) rename cloud-modules/{cloud-modules-warn/cloud-warn-client => cloud-modules-openbusiness}/pom.xml (75%) 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 delete mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/R.java delete mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java delete mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/mapper/RailMapper.java delete mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailService.java delete mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-system-saas/pom.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml delete mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.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 diff --git a/cloud-common-enterprise-operation/pom.xml b/cloud-common-enterprise-operation/pom.xml index 8d9fd24..37f022b 100644 --- a/cloud-common-enterprise-operation/pom.xml +++ b/cloud-common-enterprise-operation/pom.xml @@ -10,6 +10,26 @@ 4.0.0 cloud-common-enterprise-operation + + + org.projectlombok + lombok + + + com.baomidou + mybatis-plus-annotation + 3.5.6 + compile + + + com.muyu + cloud-common-core + + + com.muyu + cloud-common-system + + 17 diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/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-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/BreakDown.java index 208c12b..5b8c6e2 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/BreakDown.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/BreakDown.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterpise.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-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/FaultLog.java similarity index 97% rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/FaultLog.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/FaultLog.java index 3dd3a01..a0581ee 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/FaultLog.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/FaultLog.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterpise.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTable.java similarity index 99% rename from cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTable.java index c906725..db22b65 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTable.java @@ -1,4 +1,4 @@ -package com.muyu.gen.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.constant.GenConstants; import com.muyu.common.core.utils.StringUtils; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTableColumn.java similarity index 99% rename from cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTableColumn.java index 98e4c28..fee300b 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTableColumn.java @@ -1,4 +1,4 @@ -package com.muyu.gen.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableResp.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTableResp.java similarity index 95% rename from cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableResp.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTableResp.java index 70b30dc..bcf17b9 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableResp.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/GenTableResp.java @@ -1,4 +1,4 @@ -package com.muyu.gen.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.constant.GenConstants; import com.muyu.common.core.utils.StringUtils; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/MessageMap.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/MessageMap.java similarity index 92% rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/MessageMap.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/MessageMap.java index c75401f..2fb9c36 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/MessageMap.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/MessageMap.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterpise.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-common-enterprise-operation/src/main/java/com/muyu/enterpise/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-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/Messages.java index 4e430fb..6eaee40 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/Messages.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/Messages.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterpise.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/SysCarMessage.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysCarMessage.java similarity index 95% rename from cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/SysCarMessage.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysCarMessage.java index 7cadf9c..182abaf 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/domain/SysCarMessage.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysCarMessage.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.domain; +package com.muyu.enterpise.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysConfig.java similarity index 98% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysConfig.java index 6f7e8bf..90452d5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysConfig.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.enterpise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysCorpuscle.java similarity index 98% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysCorpuscle.java index 2f85c6e..5ecb9de 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysCorpuscle.java @@ -1,4 +1,4 @@ -package com.muyu.carrail.domain; +package com.muyu.enterpise.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/SysFence.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysFence.java similarity index 98% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysFence.java index b7d068b..e62b5f0 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysFence.java @@ -1,4 +1,4 @@ -package com.muyu.carrail.domain; +package com.muyu.enterpise.domain; import cn.hutool.core.date.DateTime; import com.muyu.common.core.annotation.Excel; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysFirm.java similarity index 98% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysFirm.java index bc5698b..03ff7c9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysFirm.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysMenu.java similarity index 98% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysMenu.java index e4ad4e4..b96fb52 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysMenu.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysNotice.java similarity index 97% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysNotice.java index a0c30e0..63b12dc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysNotice.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.xss.Xss; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysPost.java similarity index 98% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysPost.java index 326987c..7ff0d74 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysPost.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysRoleDept.java similarity index 91% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysRoleDept.java index ef9f13c..5266761 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.enterpise.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysRoleMenu.java similarity index 91% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysRoleMenu.java index fe4074b..4c8193f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.enterpise.domain; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysUserOnline.java similarity index 95% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysUserOnline.java index 23d1979..4060a9f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.muyu.enterpise.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/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-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnLogs.java index 43250f3..7f9aa25 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnLogs.java @@ -1,4 +1,4 @@ -package com.muyu.warning.domain; +package com.muyu.enterpise.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnRule.java similarity index 98% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnRule.java index 7e82a98..c44b611 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnRule.java @@ -1,4 +1,4 @@ -package com.muyu.warning.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.annotation.Excel; import lombok.*; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRuleDTO.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/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-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnRuleDTO.java index 6a8d311..193573e 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRuleDTO.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnRuleDTO.java @@ -1,4 +1,4 @@ -package com.muyu.warning.domain; +package com.muyu.enterpise.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-common-enterprise-operation/src/main/java/com/muyu/enterpise/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-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnStrategy.java index 481e6fe..d489311 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/WarnStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.warning.domain; +package com.muyu.enterpise.domain; import com.muyu.common.core.annotation.Excel; import lombok.*; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/AuthRoleResp.java similarity index 93% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/AuthRoleResp.java index 69294b6..fd95d98 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/AuthRoleResp.java @@ -1,4 +1,5 @@ -package com.muyu.system.domain.resp; +package com.muyu.enterpise.domain.resp; + import com.muyu.common.system.domain.SysRole; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/DeptTreeResp.java similarity index 84% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/DeptTreeResp.java index cd72807..09332fc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/DeptTreeResp.java @@ -1,7 +1,7 @@ -package com.muyu.system.domain.resp; +package com.muyu.enterpise.domain.resp; -import com.muyu.system.domain.vo.TreeSelect; +import com.muyu.enterpise.domain.vo.TreeSelect; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/ProfileResp.java similarity index 93% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/ProfileResp.java index 21d9808..09a0a1c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/ProfileResp.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain.resp; +package com.muyu.enterpise.domain.resp; import com.muyu.common.system.domain.SysUser; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/RoleMenuTreeResp.java similarity index 85% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/RoleMenuTreeResp.java index 696763e..c5c7276 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/RoleMenuTreeResp.java @@ -1,6 +1,6 @@ -package com.muyu.system.domain.resp; +package com.muyu.enterpise.domain.resp; -import com.muyu.system.domain.vo.TreeSelect; +import com.muyu.enterpise.domain.vo.TreeSelect; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/UserDetailInfoResp.java similarity index 95% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/UserDetailInfoResp.java index 4c61832..1013467 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/UserDetailInfoResp.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain.resp; +package com.muyu.enterpise.domain.resp; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/UserInfoResp.java similarity index 93% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/UserInfoResp.java index d15a760..a7c10ec 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/resp/UserInfoResp.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain.resp; +package com.muyu.enterpise.domain.resp; import com.muyu.common.system.domain.SysUser; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/MetaVo.java similarity index 96% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/MetaVo.java index c7d5f25..32d4d5b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/MetaVo.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain.vo; +package com.muyu.enterpise.domain.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/RouterVo.java similarity index 96% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/RouterVo.java index 6ea8d3f..3d2cc07 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain.vo; +package com.muyu.enterpise.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/TreeSelect.java similarity index 93% rename from cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/TreeSelect.java index d1ef75f..913cfd3 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vo/TreeSelect.java @@ -1,8 +1,8 @@ -package com.muyu.system.domain.vo; +package com.muyu.enterpise.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import com.muyu.common.system.domain.SysDept; -import com.muyu.system.domain.SysMenu; +import com.muyu.enterpise.domain.SysMenu; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vx/AccessToken.java similarity index 87% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vx/AccessToken.java index f844623..e2659ac 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vx/AccessToken.java @@ -1,4 +1,4 @@ -package com.muyu.warning.wx; +package com.muyu.enterpise.domain.vx; 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-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vx/Message.java similarity index 92% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java rename to cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vx/Message.java index f17130a..65940a2 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java +++ b/cloud-common-enterprise-operation/src/main/java/com/muyu/enterpise/domain/vx/Message.java @@ -1,4 +1,4 @@ -package com.muyu.warning.wx; +package com.muyu.enterpise.domain.vx; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index be06f0a..3d43cae 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -44,7 +44,10 @@ org.springframework spring-web - + + org.springframework.boot + spring-boot-starter-web + com.alibaba diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml deleted file mode 100644 index 603eba0..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-client/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-breakdown - 3.6.3 - - - cloud-breakdown-client - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-breakdown-common - 3.6.3 - - - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml deleted file mode 100644 index fc96ca7..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-breakdown - 3.6.3 - - - cloud-breakdown-common - - - 17 - 17 - UTF-8 - - - - com.muyu - cloud-common-core - - - - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java b/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java deleted file mode 100644 index 5e933f7..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-common/src/main/java/com/muyu/breakdown/DTO/MessageDTO.java +++ /dev/null @@ -1,93 +0,0 @@ -//package com.muyu.breakdown.DTO; -// -// -//import com.muyu.breakdown.domain.Messages; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; -// -//import java.sql.*; -//import java.util.*; -// -///** -// * @ Tool：IntelliJ IDEA -// * @ Author：CHX -// * @ Date：2024-09-18-15:00 -// * @ Version：1.0 -// * @ Description：数据库连接层 -// * @author Lenovo -// */ -//@Component -//public class MessageDTO { -// private static final String DB_URL = "jdbc:mysql://106.54.193.225:3306/one"; -// private static final String USER = "root"; -// private static final String PASSWORD = "bawei2112A"; -// -// // 2. 建立数据库连接 -// Connection connection; -// // 构造函数，初始化数据库连接 -// // 保存消息到数据库 -// public void saveMessage(Messages message) { -// String sql = "INSERT INTO sys_messages (sender_id, receiver_id, content) VALUES (?, ?, ?)"; -// try { -// Class.forName("com.mysql.cj.jdbc.Driver"); -// } catch (ClassNotFoundException e) { -// throw new RuntimeException(e); -// } -// try { -// connection = DriverManager.getConnection(DB_URL, USER, PASSWORD); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { -// preparedStatement.setInt(1, message.getSenderId()); -// preparedStatement.setInt(2, message.getReceiverId()); -// preparedStatement.setString(3, message.getContent()); -// // 执行添加操作 -// preparedStatement.executeUpdate(); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// try { -// connection.close(); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// } -// -// // 获取所有消息 -// public List getAllMessages(int receiverId){ -// String sql = "SELECT * FROM sys_messages WHERE receiver_id = ?"; -// try { -// Class.forName("com.mysql.cj.jdbc.Driver"); -// } catch (ClassNotFoundException e) { -// throw new RuntimeException(e); -// } -// List messages = new ArrayList<>(); -// try { -// connection = DriverManager.getConnection(DB_URL, USER, PASSWORD); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { -// preparedStatement.setInt(1, receiverId); -// // 执行查询操作 -// ResultSet rs = preparedStatement.executeQuery(); -// while (rs.next()) { -// Messages message = new Messages(rs.getInt("sender_id"), receiverId, rs.getString("content")); -// -// // 添加到消息列表 -// messages.add(message); -// } -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// try { -// connection.close(); -// } catch (SQLException e) { -// throw new RuntimeException(e); -// } -// // 返回消息列表 -// return messages; -// } -// -//} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml deleted file mode 100644 index c3b50cc..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-breakdown - 3.6.3 - - - cloud-breakdown-remote - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-breakdown-common - 3.6.3 - - - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8b13789..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ - diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/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/breakdown/config/MybatisPlusConfig.java b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java deleted file mode 100644 index 5a1131d..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/MybatisPlusConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.breakdown.config; - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.core.MybatisConfiguration; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-17-15:41 - * @ Version：1.0 - * @ Description：mybatisplus配置类 - * @author Lenovo - */ -//@Configuration -//public class MybatisPlusConfig { -// /** -// * 添加分页插件 -// */ -// @Bean -// public MybatisPlusInterceptor mybatisPlusInterceptor() { -// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); -// // 如果配置多个插件, 切记分页最后添加 -// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); -// // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType -// return interceptor; -// } -// @Bean -// public MybatisConfiguration mybatisConfiguration(){ -// MybatisConfiguration configuration = new MybatisConfiguration(); -// return configuration; -// } -// -//} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt b/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt deleted file mode 100644 index 8b13789..0000000 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/resources/banner.txt +++ /dev/null @@ -1 +0,0 @@ - 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/java/com/muyu/carrail/mapper/SysFenceMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java deleted file mode 100644 index 725c176..0000000 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.carrail.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.carrail.domain.SysFence; -import org.apache.ibatis.annotations.Mapper; - -/** - * 围栏组Mapper接口 - * - * @author muyu - * @date 2024-09-17 - */ -public interface SysFenceMapper extends BaseMapper{ - -} 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 501d4c9..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,58 +0,0 @@ -# Tomcat -server: - port: 10012 - -# nacos线上地址 -nacos: - addr: 110.42.213.184:8848 - user-name: nacos - password: nacos - namespace: pubilc -# 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-car/src/main/resources/mapper/carrail/SysFenceMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml deleted file mode 100644 index 26be2dc..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, group_code, group_name, group_type, state, create_by, create_time, update_by, update_time, remark from sys_fence_group - - - - - - - - - - - delete from sys_fence_group where id = #{id} - - - - delete from sys_fence_group where id in - - #{id} - - - diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml deleted file mode 100644 index c9f9205..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - insert into sys_corpuscle_fence(fence_code,fence_name,fence_type,fence_position,state) - values(#{fenceCode},#{fenceName},#{fenceType},#{fencePosition},#{state}) - - - - - diff --git a/cloud-modules/cloud-modules-file/pom.xml b/cloud-modules/cloud-modules-file/pom.xml index e151176..bf85657 100644 --- a/cloud-modules/cloud-modules-file/pom.xml +++ b/cloud-modules/cloud-modules-file/pom.xml @@ -53,7 +53,10 @@ com.muyu cloud-common-system - + + com.muyu + cloud-common-enterprise-operation + com.muyu diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java index a7b6fcc..d033f0f 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java @@ -16,3 +16,4 @@ public class CloudFileApplication { System.out.println("CloudFile 模块启动成功!"); } } + diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index ea0616b..41bc740 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column - where table_id = #{tableId} order by sort @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by ordinal_position - + insert into gen_table_column ( table_id, column_name, @@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update gen_table_column column_comment = #{columnComment}, diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml index ba9b0cf..64b4ff8 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select table_name, table_comment, create_time, update_time from information_schema.tables where @@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select table_name,table_comment,table_schema db_name from information_schema.tables where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema in (select table_schema from information_schema.tables @@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY table_schema) - + insert into gen_table ( db_name, table_name, @@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update gen_table db_name = #{dbName}, diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/pom.xml new file mode 100644 index 0000000..e545bbd --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/pom.xml @@ -0,0 +1,124 @@ + + + + cloud-modules + com.muyu + 3.6.3 + + 4.0.0 + + cloud-modules-operations + + + 17 + 17 + + + + + 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 + + + org.springframework.boot + spring-boot-actuator + 2.7.18 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-web + + + + com.muyu + cloud-common-saas + + + org.springframework.amqp + spring-rabbit + + + com.muyu + cloud-common-enterprise-operation + 3.6.3 + compile + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/OperationApplication.java similarity index 57% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/OperationApplication.java index 3d4869c..9659081 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/BreakDownApplication.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/OperationApplication.java @@ -1,23 +1,14 @@ -package com.muyu; +package com.muyu.operation; 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 class OperationApplication { public static void main(String[] args) { - SpringApplication.run(BreakDownApplication.class, args); + SpringApplication.run(OperationApplication.class, args); } } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/config/MybatisPlusConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/config/MybatisPlusConfig.java new file mode 100644 index 0000000..4afa793 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/config/MybatisPlusConfig.java @@ -0,0 +1,37 @@ +package com.muyu.operation.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:41 + * @ Version：1.0 + * @ Description：mybatisplus配置类 + * @author Lenovo + */ +@Configuration +public class MybatisPlusConfig { + /** + * 添加分页插件 + */ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 如果配置多个插件, 切记分页最后添加 + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; + } + @Bean + public MybatisConfiguration mybatisConfiguration(){ + MybatisConfiguration configuration = new MybatisConfiguration(); + return configuration; + } + +} diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/config/RabbitMQConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/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-operations/src/main/java/com/muyu/operation/config/RabbitMQConfig.java index a735a6e..fbf0ed7 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-operations/src/main/java/com/muyu/operation/config/RabbitMQConfig.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.config; +package com.muyu.operation.config; import org.springframework.amqp.core.Binding; import org.springframework.amqp.core.BindingBuilder; @@ -6,6 +6,9 @@ import org.springframework.amqp.core.FanoutExchange; import org.springframework.amqp.core.Queue; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; + + + /** * 绑定交换机与队列 * */ 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-operations/src/main/java/com/muyu/operation/config/RabbitMQDirectConfig.java similarity index 93% 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-operations/src/main/java/com/muyu/operation/config/RabbitMQDirectConfig.java index e0b2f8b..a3c5305 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-operations/src/main/java/com/muyu/operation/config/RabbitMQDirectConfig.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.config; +package com.muyu.operation.config; import org.springframework.amqp.core.*; import org.springframework.context.annotation.Bean; @@ -6,9 +6,11 @@ import org.springframework.context.annotation.Configuration; import java.util.HashMap; + /** * 绑定交换机与队列 * */ + @Configuration public class RabbitMQDirectConfig { /** @@ -27,7 +29,7 @@ public class RabbitMQDirectConfig { map.put("x-delayed-letter-exchange","direct"); map.put("x-delayed-routing-key","directduanxin"); map.put("x-message-ttl",10000); - return QueueBuilder.durable("directduanxin").withArguments(map).build(); + return (Queue) QueueBuilder.durable("directduanxin").withArguments(map).build(); } 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-operations/src/main/java/com/muyu/operation/config/RabbitMQTopicConfig.java similarity index 98% 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-operations/src/main/java/com/muyu/operation/config/RabbitMQTopicConfig.java index 58630e5..db58e56 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-operations/src/main/java/com/muyu/operation/config/RabbitMQTopicConfig.java @@ -1,4 +1,4 @@ -package com.muyu.breakdown.config; +package com.muyu.operation.config; import org.springframework.amqp.core.Binding; import org.springframework.amqp.core.BindingBuilder; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/config/ResourcesConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/config/ResourcesConfig.java new file mode 100644 index 0000000..3d2400e --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/config/ResourcesConfig.java @@ -0,0 +1,48 @@ +package com.muyu.operation.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.io.File; + +/** + * 通用映射配置 + * + * @author muyu + */ +@Configuration +public class ResourcesConfig implements WebMvcConfigurer { + /** + * 资源映射路径 前缀 + */ + @Value("${file.prefix}") + public String localFilePrefix; + /** + * 上传文件存储在本地的根路径 + */ + @Value("${file.path}") + private String localFilePath; + + @Override + public void addResourceHandlers (ResourceHandlerRegistry registry) { + /** 本地文件上传路径 */ + registry.addResourceHandler(localFilePrefix + "/**") + .addResourceLocations("file:" + localFilePath + File.separator); + } + + /** + * 开启跨域 + */ + @Override + public void addCorsMappings (CorsRegistry registry) { + // 设置允许跨域的路由 + registry.addMapping(localFilePrefix + "/**") + // 设置允许跨域请求的域名 + .allowedOrigins("*") + // 设置允许的方法 + .allowedMethods("GET"); + } +} 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-operations/src/main/java/com/muyu/operation/controller/BreakDownController.java similarity index 95% 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-operations/src/main/java/com/muyu/operation/controller/BreakDownController.java index 1e8dea0..a53948f 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-operations/src/main/java/com/muyu/operation/controller/BreakDownController.java @@ -1,20 +1,23 @@ -package com.muyu.breakdown.controller; +package com.muyu.operation.controller; + -import com.muyu.breakdown.domain.BreakDown; -import com.muyu.breakdown.domain.MessageMap; -import com.muyu.breakdown.service.BreakDownService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.enterpise.domain.BreakDown; +import com.muyu.enterpise.domain.MessageMap; +import com.muyu.operation.service.BreakDownService; 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.util.Arrays; + import java.util.List; import java.util.Map; 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-operations/src/main/java/com/muyu/operation/controller/FaultLogController.java similarity index 96% 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-operations/src/main/java/com/muyu/operation/controller/FaultLogController.java index d66c519..707c32e 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-operations/src/main/java/com/muyu/operation/controller/FaultLogController.java @@ -1,10 +1,12 @@ -package com.muyu.breakdown.controller; +package com.muyu.operation.controller; import java.util.Arrays; import java.util.List; -import com.muyu.breakdown.domain.FaultLog; -import com.muyu.breakdown.service.IFaultLogService; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.enterpise.domain.FaultLog; +import com.muyu.operation.service.IFaultLogService; import jakarta.servlet.http.HttpServletResponse; import javax.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; @@ -18,10 +20,8 @@ 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 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-operations/src/main/java/com/muyu/operation/controller/StationMessageController.java similarity index 85% 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-operations/src/main/java/com/muyu/operation/controller/StationMessageController.java index 2e2fdf9..df051d3 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-operations/src/main/java/com/muyu/operation/controller/StationMessageController.java @@ -1,11 +1,11 @@ -package com.muyu.breakdown.controller; +package com.muyu.operation.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.muyu.breakdown.domain.Messages; -import com.muyu.breakdown.service.BreakDownService; -import com.muyu.breakdown.service.StationMessageService; + import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.enterpise.domain.Messages; +import com.muyu.operation.service.StationMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/controller/SysCarMessageController.java similarity index 83% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/SysCarMessageController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/controller/SysCarMessageController.java index 11bba59..fcf7def 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/controller/SysCarMessageController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/controller/SysCarMessageController.java @@ -1,7 +1,7 @@ -package com.muyu.breakdown.controller; +package com.muyu.operation.controller; -import com.muyu.breakdown.service.SysCarMessageService; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.operation.service.SysCarMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; 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-operations/src/main/java/com/muyu/operation/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-operations/src/main/java/com/muyu/operation/controller/SysCorpuscleController.java index 15e083c..f0ca836 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/controller/SysCorpuscleController.java @@ -1,18 +1,15 @@ -package com.muyu.carrail.controller; +package com.muyu.operation.controller; import java.util.Arrays; import java.util.List; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import jakarta.annotation.Resource; +import com.muyu.enterpise.domain.SysCorpuscle; +import com.muyu.operation.service.ISysCorpuscleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - -import com.muyu.carrail.domain.SysCorpuscle; -import com.muyu.carrail.service.ISysCorpuscleService; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; 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-operations/src/main/java/com/muyu/operation/controller/SysFenceController.java similarity index 95% 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-operations/src/main/java/com/muyu/operation/controller/SysFenceController.java index a3ff506..26da0aa 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/controller/SysFenceController.java @@ -1,10 +1,13 @@ -package com.muyu.carrail.controller; +package com.muyu.operation.controller; import java.util.Arrays; import java.util.List; -import com.muyu.carrail.domain.SysFence; -import com.muyu.carrail.service.ISysFenceService; + +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.enterpise.domain.SysFence; +import com.muyu.operation.service.ISysFenceService; import jakarta.servlet.http.HttpServletResponse; import javax.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; @@ -18,9 +21,9 @@ import org.springframework.web.bind.annotation.RestController; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; + import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; + /** * 围栏组Controller diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/controller/SysUserController.java similarity index 97% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/controller/SysUserController.java index 412f2cf..ae0a80d 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/controller/SysUserController.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.controller; +package com.muyu.operation.controller; import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder; import com.muyu.common.core.domain.Result; @@ -13,14 +13,13 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.system.saas.service.SysUserService; - -import javax.annotation.Resource; - +import com.muyu.operation.service.SysUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; /** diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/BreakDownMapper.java similarity index 80% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/mapper/BreakDownMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/BreakDownMapper.java index 8f93626..ce45156 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-operations/src/main/java/com/muyu/operation/mapper/BreakDownMapper.java @@ -1,7 +1,8 @@ -package com.muyu.breakdown.mapper; +package com.muyu.operation.mapper; import com.github.yulichang.base.MPJBaseMapper; -import com.muyu.breakdown.domain.BreakDown; + +import com.muyu.enterpise.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-operations/src/main/java/com/muyu/operation/mapper/FaultLogMapper.java similarity index 53% 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-operations/src/main/java/com/muyu/operation/mapper/FaultLogMapper.java index d5f1d7e..c4b35bc 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-operations/src/main/java/com/muyu/operation/mapper/FaultLogMapper.java @@ -1,8 +1,8 @@ -package com.muyu.breakdown.mapper; +package com.muyu.operation.mapper; + -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.breakdown.domain.FaultLog; +import com.muyu.enterpise.domain.FaultLog; import org.apache.ibatis.annotations.Mapper; /** @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2024-09-20 */ @Mapper -public interface FaultLogMapper extends BaseMapper{ +public interface FaultLogMapper extends BaseMapper { } 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-operations/src/main/java/com/muyu/operation/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-operations/src/main/java/com/muyu/operation/mapper/StationMessageMapper.java index 450ebb4..c7a0bb0 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-operations/src/main/java/com/muyu/operation/mapper/StationMessageMapper.java @@ -1,8 +1,8 @@ -package com.muyu.breakdown.mapper; +package com.muyu.operation.mapper; + -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; -import com.muyu.breakdown.domain.Messages; +import com.muyu.enterpise.domain.Messages; import org.apache.ibatis.annotations.Mapper; /** 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-operations/src/main/java/com/muyu/operation/mapper/SysCarMessageMapper.java similarity index 79% 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-operations/src/main/java/com/muyu/operation/mapper/SysCarMessageMapper.java index 5629f33..ad6e2a5 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-operations/src/main/java/com/muyu/operation/mapper/SysCarMessageMapper.java @@ -1,7 +1,8 @@ -package com.muyu.breakdown.mapper; +package com.muyu.operation.mapper; + import com.github.yulichang.base.MPJBaseMapper; -import com.muyu.breakdown.domain.SysCarMessage; +import com.muyu.enterpise.domain.SysCarMessage; import org.apache.ibatis.annotations.Mapper; /** 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-operations/src/main/java/com/muyu/operation/mapper/SysCorpuscleMapper.java similarity index 73% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysCorpuscleMapper.java index b2cb32e..faf0c70 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysCorpuscleMapper.java @@ -1,9 +1,8 @@ -package com.muyu.carrail.mapper; +package com.muyu.operation.mapper; import java.util.List; -import com.muyu.carrail.domain.SysCorpuscle; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; +import com.muyu.enterpise.domain.SysCorpuscle; /** * 电子围栏Mapper接口 diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysFenceMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysFenceMapper.java new file mode 100644 index 0000000..f5163e7 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysFenceMapper.java @@ -0,0 +1,15 @@ +package com.muyu.operation.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.enterpise.domain.SysFence; + +/** + * 围栏组Mapper接口 + * + * @author muyu + * @date 2024-09-17 + */ +public interface SysFenceMapper extends BaseMapper { + +} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserMapper.java similarity index 93% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserMapper.java index 62c3965..f2dcdbc 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.mapper; +package com.muyu.operation.mapper; import com.muyu.common.system.domain.SysUser; import org.apache.ibatis.annotations.Mapper; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserPostMapper.java similarity index 96% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserPostMapper.java index 806f76d..f7f4c86 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserPostMapper.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.mapper; +package com.muyu.operation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUserPost; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserRoleMapper.java similarity index 97% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserRoleMapper.java index d5c8072..136b307 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/mapper/SysUserRoleMapper.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.mapper; +package com.muyu.operation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUserRole; 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-operations/src/main/java/com/muyu/operation/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-operations/src/main/java/com/muyu/operation/service/BreakDownService.java index 325424c..a5cf55f 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-operations/src/main/java/com/muyu/operation/service/BreakDownService.java @@ -1,8 +1,10 @@ -package com.muyu.breakdown.service; +package com.muyu.operation.service; + + import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.breakdown.domain.BreakDown; -import com.muyu.breakdown.domain.MessageMap; +import com.muyu.enterpise.domain.BreakDown; +import com.muyu.enterpise.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-operations/src/main/java/com/muyu/operation/service/IFaultLogService.java similarity index 90% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/IFaultLogService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/IFaultLogService.java index e6ef523..9cf9fbf 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-operations/src/main/java/com/muyu/operation/service/IFaultLogService.java @@ -1,8 +1,9 @@ -package com.muyu.breakdown.service; +package com.muyu.operation.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.breakdown.domain.FaultLog; + +import com.muyu.enterpise.domain.FaultLog; /** * 故障日志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-operations/src/main/java/com/muyu/operation/service/ISysCorpuscleService.java similarity index 85% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/ISysCorpuscleService.java index 276b2d4..39d5806 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/ISysCorpuscleService.java @@ -1,8 +1,8 @@ -package com.muyu.carrail.service; +package com.muyu.operation.service; import java.util.List; -import com.muyu.carrail.domain.SysCorpuscle; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterpise.domain.SysCorpuscle; /** * 电子围栏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-operations/src/main/java/com/muyu/operation/service/ISysFenceService.java similarity index 90% 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-operations/src/main/java/com/muyu/operation/service/ISysFenceService.java index 7ba33a8..b2e8b31 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/ISysFenceService.java @@ -1,9 +1,10 @@ -package com.muyu.carrail.service; +package com.muyu.operation.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.carrail.domain.SysFence; + +import com.muyu.enterpise.domain.SysFence; /** * 围栏组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-operations/src/main/java/com/muyu/operation/service/StationMessageService.java similarity index 81% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/StationMessageService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/StationMessageService.java index 5af194c..198197a 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-operations/src/main/java/com/muyu/operation/service/StationMessageService.java @@ -1,7 +1,7 @@ -package com.muyu.breakdown.service; +package com.muyu.operation.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.breakdown.domain.Messages; +import com.muyu.enterpise.domain.Messages; import java.util.List; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/SysCarMessageService.java similarity index 76% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/SysCarMessageService.java index f0103b6..046bdcc 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/SysCarMessageService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/SysCarMessageService.java @@ -1,7 +1,8 @@ -package com.muyu.breakdown.service; +package com.muyu.operation.service; + import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.breakdown.domain.SysCarMessage; +import com.muyu.enterpise.domain.SysCarMessage; /** * @ Tool：IntelliJ IDEA diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/SysUserService.java similarity index 95% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/SysUserService.java index 4ee3d58..9e64dd2 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/SysUserService.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.service; +package com.muyu.operation.service; import com.baomidou.mybatisplus.extension.service.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-operations/src/main/java/com/muyu/operation/service/imp/BreakDownServiceImpl.java similarity index 83% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/BreakDownServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/BreakDownServiceImpl.java index 62c0085..00b1819 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-operations/src/main/java/com/muyu/operation/service/imp/BreakDownServiceImpl.java @@ -1,22 +1,20 @@ -package com.muyu.breakdown.service.impl; +package com.muyu.operation.service.imp; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.muyu.breakdown.domain.BreakDown; -import com.muyu.breakdown.domain.MessageMap; -import com.muyu.breakdown.domain.SysCarMessage; -import com.muyu.breakdown.mapper.BreakDownMapper; -import com.muyu.breakdown.service.BreakDownService; -import com.muyu.breakdown.service.SysCarMessageService; import com.muyu.common.core.utils.StringUtils; -import org.springframework.amqp.rabbit.annotation.RabbitListener; + +import com.muyu.enterpise.domain.BreakDown; +import com.muyu.enterpise.domain.MessageMap; +import com.muyu.operation.mapper.BreakDownMapper; +import com.muyu.operation.service.BreakDownService; +import com.muyu.operation.service.SysCarMessageService; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/FaultLogServiceImpl.java similarity index 92% 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-operations/src/main/java/com/muyu/operation/service/imp/FaultLogServiceImpl.java index 7124779..65a6d4a 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-operations/src/main/java/com/muyu/operation/service/imp/FaultLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.breakdown.service.impl; +package com.muyu.operation.service.imp; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.breakdown.domain.FaultLog; -import com.muyu.breakdown.mapper.FaultLogMapper; -import com.muyu.breakdown.service.IFaultLogService; import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterpise.domain.FaultLog; +import com.muyu.operation.mapper.FaultLogMapper; +import com.muyu.operation.service.IFaultLogService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/StationMessageServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/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-operations/src/main/java/com/muyu/operation/service/imp/StationMessageServiceImpl.java index 462db1f..b63494c 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-operations/src/main/java/com/muyu/operation/service/imp/StationMessageServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.breakdown.service.impl; +package com.muyu.operation.service.imp; -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.enterpise.domain.Messages; +import com.muyu.operation.mapper.StationMessageMapper; +import com.muyu.operation.service.StationMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/SysCarMessageServiceImpl.java similarity index 66% rename from cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/SysCarMessageServiceImpl.java index 754fc9b..c0ba1e0 100644 --- a/cloud-modules/cloud-breakdown/cloud-breakdown-server/src/main/java/com/muyu/breakdown/service/impl/SysCarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/SysCarMessageServiceImpl.java @@ -1,9 +1,10 @@ -package com.muyu.breakdown.service.impl; +package com.muyu.operation.service.imp; 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 com.muyu.enterpise.domain.SysCarMessage; +import com.muyu.operation.mapper.SysCarMessageMapper; +import com.muyu.operation.service.SysCarMessageService; import org.springframework.stereotype.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-operations/src/main/java/com/muyu/operation/service/imp/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-operations/src/main/java/com/muyu/operation/service/imp/SysCorpuscleServiceImpl.java index 61024fe..ac22a1e 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-operations/src/main/java/com/muyu/operation/service/imp/SysCorpuscleServiceImpl.java @@ -1,15 +1,15 @@ -package com.muyu.carrail.service.impl; +package com.muyu.operation.service.imp; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.enterpise.domain.SysCorpuscle; +import com.muyu.operation.mapper.SysCorpuscleMapper; +import com.muyu.operation.service.ISysCorpuscleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; -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; /** * 电子围栏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-operations/src/main/java/com/muyu/operation/service/imp/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-operations/src/main/java/com/muyu/operation/service/imp/SysFenceServiceImpl.java index 5ebffcc..0a0b76a 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-operations/src/main/java/com/muyu/operation/service/imp/SysFenceServiceImpl.java @@ -1,14 +1,14 @@ -package com.muyu.carrail.service.impl; +package com.muyu.operation.service.imp; import java.util.List; 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.muyu.enterpise.domain.SysFence; +import com.muyu.operation.mapper.SysFenceMapper; +import com.muyu.operation.service.ISysFenceService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/SysUserServiceImpl.java similarity index 92% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/SysUserServiceImpl.java index a53838a..b1ad6bc 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/service/imp/SysUserServiceImpl.java @@ -1,25 +1,22 @@ -package com.muyu.system.saas.service.impl; +package com.muyu.operation.service.imp; -import javax.annotation.Resource; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.muyu.common.core.constant.UserConstants; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.SysUserPost; import com.muyu.common.system.domain.SysUserRole; import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.system.saas.mapper.SysUserPostMapper; -import com.muyu.system.saas.mapper.SysUserRoleMapper; +import com.muyu.operation.mapper.SysUserMapper; +import com.muyu.operation.mapper.SysUserPostMapper; +import com.muyu.operation.mapper.SysUserRoleMapper; +import com.muyu.operation.service.SysUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; -import lombok.extern.slf4j.Slf4j; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.system.saas.mapper.SysUserMapper; -import com.muyu.system.saas.service.SysUserService; -import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/utils/FileUploadUtils.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/utils/FileUploadUtils.java new file mode 100644 index 0000000..0707e95 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/java/com/muyu/operation/utils/FileUploadUtils.java @@ -0,0 +1,163 @@ +package com.muyu.operation.utils; + +import com.muyu.common.core.exception.file.FileException; +import com.muyu.common.core.exception.file.FileNameLengthLimitExceededException; +import com.muyu.common.core.exception.file.FileSizeLimitExceededException; +import com.muyu.common.core.exception.file.InvalidExtensionException; +import com.muyu.common.core.utils.DateUtils; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.utils.file.FileTypeUtils; +import com.muyu.common.core.utils.file.MimeTypeUtils; +import com.muyu.common.core.utils.uuid.Seq; +import org.apache.commons.io.FilenameUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Objects; + +/** + * 文件上传工具类 + * + * @author muyu + */ +public class FileUploadUtils { + /** + * 默认大小 50M + */ + public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024; + + /** + * 默认的文件名最大长度 100 + */ + public static final int DEFAULT_FILE_NAME_LENGTH = 100; + + /** + * 根据文件路径上传 + * + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 + * + * @return 文件名称 + * + * @throws IOException + */ + public static final String upload (String baseDir, MultipartFile file) throws IOException { + try { + return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); + } catch (FileException fe) { + throw new IOException(fe.getDefaultMessage(), fe); + } catch (Exception e) { + throw new IOException(e.getMessage(), e); + } + } + + /** + * 文件上传 + * + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 + * @param allowedExtension 上传文件类型 + * + * @return 返回上传成功的文件名 + * + * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws FileNameLengthLimitExceededException 文件名太长 + * @throws IOException 比如读写文件出错时 + * @throws InvalidExtensionException 文件校验异常 + */ + public static final String upload (String baseDir, MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, + InvalidExtensionException { + int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); + if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) { + throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); + } + + assertAllowed(file, allowedExtension); + + String fileName = extractFilename(file); + + String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath(); + file.transferTo(Paths.get(absPath)); + return getPathFileName(fileName); + } + + /** + * 编码文件名 + */ + public static final String extractFilename (MultipartFile file) { + return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), + FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); + } + + private static final File getAbsoluteFile (String uploadDir, String fileName) throws IOException { + File desc = new File(uploadDir + File.separator + fileName); + + if (!desc.exists()) { + if (!desc.getParentFile().exists()) { + desc.getParentFile().mkdirs(); + } + } + return desc.isAbsolute() ? desc : desc.getAbsoluteFile(); + } + + private static final String getPathFileName (String fileName) throws IOException { + String pathFileName = "/" + fileName; + return pathFileName; + } + + /** + * 文件大小校验 + * + * @param file 上传的文件 + * + * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws InvalidExtensionException 文件校验异常 + */ + public static final void assertAllowed (MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, InvalidExtensionException { + long size = file.getSize(); + if (size > DEFAULT_MAX_SIZE) { + throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); + } + + String fileName = file.getOriginalFilename(); + String extension = FileTypeUtils.getExtension(file); + if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) { + if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) { + throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, + fileName); + } else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) { + throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, + fileName); + } else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) { + throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, + fileName); + } else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) { + throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, + fileName); + } else { + throw new InvalidExtensionException(allowedExtension, extension, fileName); + } + } + } + + /** + * 判断MIME类型是否是允许的MIME类型 + * + * @param extension 上传文件类型 + * @param allowedExtension 允许上传文件类型 + * + * @return true/false + */ + public static final boolean isAllowedExtension (String extension, String[] allowedExtension) { + for (String str : allowedExtension) { + if (str.equalsIgnoreCase(extension)) { + return true; + } + } + return false; + } +} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/resources/bootstrap.yml similarity index 100% rename from cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-operations/src/main/resources/bootstrap.yml diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml b/cloud-modules/cloud-modules-openbusiness/pom.xml similarity index 75% rename from cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml rename to cloud-modules/cloud-modules-openbusiness/pom.xml index 47ec49c..b7f6e2b 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml +++ b/cloud-modules/cloud-modules-openbusiness/pom.xml @@ -2,19 +2,23 @@ - 4.0.0 + cloud-modules com.muyu - cloud-modules-warn 3.6.3 + 4.0.0 - cloud-warn-client + cloud-modules-openbusiness 17 17 - UTF-8 + + cloud-modules-operations + + + diff --git a/cloud-modules/cloud-modules-rail/pom.xml b/cloud-modules/cloud-modules-rail/pom.xml deleted file mode 100644 index 2353a2c..0000000 --- a/cloud-modules/cloud-modules-rail/pom.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - cloud-modules - com.muyu - 3.6.3 - - 4.0.0 - - cloud-modules-rail - - - 17 - 17 - - - - - - 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-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java deleted file mode 100644 index 47aba27..0000000 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.zhangyi.rail; - -public class CloudRailApplication { -} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java deleted file mode 100644 index a2ce7dd..0000000 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zhangyi.rail.controller; - -import com.zhangyi.rail.domain.R; -import com.zhangyi.rail.domain.SysFenceRail; -import com.zhangyi.rail.service.RailService; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.ApplicationArguments; -import org.springframework.core.convert.ConversionService; -import org.springframework.core.env.Environment; -import org.springframework.core.env.PropertyResolver; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.WebApplicationContext; - -@RestController -@RequestMapping("/raill") -public class RailController { - - @Autowired - RailService railService; - - - @PostMapping("rail") -public R RailListCode(SysFenceRail sysFenceRail){ - return railService.RailListCode(sysFenceRail); -} - -public R Railadd(SysFenceRail sysFenceRail){ - return railService.RailListAdd(sysFenceRail); -} - -public R RailEdit(SysFenceRail sysFenceRail){ - return railService.RailListEdit(sysFenceRail); -} - -} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/R.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/R.java deleted file mode 100644 index e45b60d..0000000 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/R.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zhangyi.rail.domain; - -import lombok.*; - -@Data -@Setter -@Getter -@NoArgsConstructor -@AllArgsConstructor -public class R { - - private Integer code; - private Object data; - private String msg; - -} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java deleted file mode 100644 index 0380422..0000000 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.zhangyi.rail.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 java.util.Date; - -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("sys_corpuscle_fence") -public class SysFenceRail { -private static final long seriaversionUID =1L; -/** 自增主键 */ -@TableId(type = IdType.AUTO) - private Long id; - -/** 围栏编码 */ -@Excel(name="围栏编码") - private String fenceCode; - /**围栏名称**/ - @Excel(name = "围栏名称") - private String fenceName; - - /**围栏类型**/ - @Excel(name = "围栏类型") - private Long fenceType; - - @Excel(name = "围栏类型") - private String fenceTypeName; - - @Excel(name = "围栏状态") - private String state; - - @Excel(name = "创建人") - private String createBy; - - @Excel(name = "创建时间") - private Date createTime; - -@Excel(name = "更新人") - private String updateBy; - -@Excel(name = "更新时间") - private Date updateTime; - -@Excel(name = "备注") - private String remark; -} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/mapper/RailMapper.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/mapper/RailMapper.java deleted file mode 100644 index 7f3b965..0000000 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/mapper/RailMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.zhangyi.rail.mapper; - -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface RailMapper { -} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailService.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailService.java deleted file mode 100644 index 8c1d6b4..0000000 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.zhangyi.rail.service; - -import com.zhangyi.rail.domain.R; -import com.zhangyi.rail.domain.SysFenceRail; - -public interface RailService { - R RailListCode(SysFenceRail sysFenceRail); - - R RailListAdd(SysFenceRail sysFenceRail); - - R RailListEdit(SysFenceRail sysFenceRail); -} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailServiceImpl.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailServiceImpl.java deleted file mode 100644 index a401fb5..0000000 --- a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/service/RailServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.zhangyi.rail.service; - -import com.zhangyi.rail.domain.R; -import com.zhangyi.rail.domain.SysFenceRail; -import org.springframework.stereotype.Service; - -@Service -public class RailServiceImpl implements RailService{ - @Override - public R RailListCode(SysFenceRail sysFenceRail) { - return null; - } - - @Override - public R RailListAdd(SysFenceRail sysFenceRail) { - return null; - } - - @Override - public R RailListEdit(SysFenceRail sysFenceRail) { - return null; - } -} diff --git a/cloud-modules/cloud-modules-system-saas/pom.xml b/cloud-modules/cloud-modules-system-saas/pom.xml deleted file mode 100644 index b9983d0..0000000 --- a/cloud-modules/cloud-modules-system-saas/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-system-saas - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-common-saas - - - - com.muyu - cloud-common-system - - - - - 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 - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java deleted file mode 100644 index 95d43df..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.system.saas; - -import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; -import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -/** - * @Author: 胡杨 - * @Name: CloudSystemSaas - * @Description: SaaS系统驱动器 - * @CreatedDate: 2024/9/22 上午10:05 - * @FilePath: com.muyu.system.saas - */ -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication( - exclude = { - DataSourceAutoConfiguration.class, - DruidDataSourceAutoConfigure.class, - DynamicDataSourceAutoConfiguration.class - } -) -public class CloudSystemSaasApplication { - public static void main(String[] args) { - SpringApplication.run(CloudSystemSaasApplication.class, args); - System.out.println("CloudSystemSaas 模块启动成功!"); - } -} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt b/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml deleted file mode 100644 index 44768a1..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${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-modules-system-saas/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml deleted file mode 100644 index 727021d..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${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-modules-system-saas/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml deleted file mode 100644 index 727021d..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${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-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml deleted file mode 100644 index 4a480ae..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select u.user_id, - u.is_admin, - u.dept_id, - u.firm_code, - u.user_name, - u.nick_name, - u.email, - u.avatar, - u.phonenumber, - u.password, - u.sex, - u.status, - u.del_flag, - u.login_ip, - u.login_date, - u.create_by, - u.create_time, - u.remark, - ur.role_id - from sys_user u - left join sys_user_role ur on u.user_id = ur.user_id - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml deleted file mode 100644 index f6bf547..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - delete - from sys_user_post - where user_id = #{userId} - - - - - - delete from sys_user_post where user_id in - - #{userId} - - - - - insert into sys_user_post(user_id, post_id) values - - (#{item.userId},#{item.postId}) - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml deleted file mode 100644 index b352741..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - delete - from sys_user_role - where user_id = #{userId} - - - - - - delete from sys_user_role where user_id in - - #{userId} - - - - - insert into sys_user_role(user_id, role_id) values - - (#{item.userId},#{item.roleId}) - - - - - delete - from sys_user_role - where user_id = #{userId} - and role_id = #{roleId} - - - - delete from sys_user_role where role_id=#{roleId} and user_id in - - #{userId} - - - diff --git a/cloud-modules/cloud-modules-system/pom.xml b/cloud-modules/cloud-modules-system/pom.xml index b362f24..8b72277 100644 --- a/cloud-modules/cloud-modules-system/pom.xml +++ b/cloud-modules/cloud-modules-system/pom.xml @@ -81,6 +81,12 @@ com.muyu cloud-common-xxl + + com.muyu + cloud-common-enterprise-operation + 3.6.3 + compile + diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java index ecf18c3..4b4ba89 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java @@ -14,8 +14,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author muyu */ @EnableCustomConfig -//@EnableCustomSwagger2 @EnableMyFeignClients +//@EnableCustomSwagger2 @SpringBootApplication //@SpringBootApplication( // exclude = { diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index f1b9dad..e12708e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -8,7 +8,7 @@ import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.system.domain.SysConfig; +import com.muyu.enterpise.domain.SysConfig; import com.muyu.system.service.SysConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index 2149ace..8552c2f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -9,7 +9,7 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.resp.RoleMenuTreeResp; +import com.muyu.enterpise.domain.resp.RoleMenuTreeResp; import com.muyu.system.service.SysMenuService; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java index 3decd3f..0f284ce 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java @@ -1,7 +1,6 @@ package com.muyu.system.controller; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.file.FileTypeUtils; import com.muyu.common.core.utils.file.MimeTypeUtils; @@ -14,14 +13,13 @@ import com.muyu.common.system.remote.RemoteFileService; import com.muyu.common.system.domain.SysFile; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; -import com.muyu.system.domain.resp.ProfileResp; +import com.muyu.enterpise.domain.resp.ProfileResp; import com.muyu.system.service.SysUserService; -import jakarta.servlet.http.HttpServletRequest; + import javax.annotation.Resource; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.util.Arrays; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index 652ede4..4609923 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -12,7 +12,7 @@ import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.SysUserRole; -import com.muyu.system.domain.resp.DeptTreeResp; +import com.muyu.enterpise.domain.resp.DeptTreeResp; import com.muyu.system.service.SysDeptService; import com.muyu.system.service.SysRoleService; import com.muyu.system.service.SysUserService; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index cd66eea..4f7eb15 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -14,9 +14,9 @@ import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; -import com.muyu.system.domain.resp.AuthRoleResp; -import com.muyu.system.domain.resp.UserDetailInfoResp; -import com.muyu.system.domain.resp.UserInfoResp; +import com.muyu.enterpise.domain.resp.AuthRoleResp; +import com.muyu.enterpise.domain.resp.UserDetailInfoResp; +import com.muyu.enterpise.domain.resp.UserInfoResp; import com.muyu.system.service.*; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java index 21ae678..ae808da 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java @@ -1,7 +1,7 @@ //package com.muyu.system.rabbit; // //import com.alibaba.fastjson2.JSONObject; -//import com.muyu.system.domain.SysConfig; +//import com.muyu.enterpise.domain.SysConfig; //import jakarta.annotation.PostConstruct; //import lombok.extern.log4j.Log4j2; //import org.springframework.amqp.core.Queue; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index a79f102..216a432 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; + + import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.system.domain.SysConfig; +import com.muyu.enterpise.domain.SysConfig; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java index 140cf91..dd3485c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java @@ -2,7 +2,7 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysDept; -import com.muyu.system.domain.vo.TreeSelect; +import com.muyu.enterpise.domain.vo.TreeSelect; import java.util.List; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java index 29bfb07..8294e7d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -2,8 +2,8 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.vo.RouterVo; -import com.muyu.system.domain.vo.TreeSelect; +import com.muyu.enterpise.domain.vo.RouterVo; +import com.muyu.enterpise.domain.vo.TreeSelect; import java.util.List; import java.util.Set; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java index 531735b..bf3622b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java @@ -1,6 +1,5 @@ package com.muyu.system.service; -import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.SysUserOnline; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java index 00d97f4..20549dd 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java @@ -11,7 +11,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; -import com.muyu.system.domain.vo.TreeSelect; +import com.muyu.enterpise.domain.vo.TreeSelect; import com.muyu.system.mapper.SysDeptMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.service.SysDeptService; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index 0a17000..9b78bef 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -8,9 +8,9 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.vo.MetaVo; -import com.muyu.system.domain.vo.RouterVo; -import com.muyu.system.domain.vo.TreeSelect; +import com.muyu.enterpise.domain.vo.MetaVo; +import com.muyu.enterpise.domain.vo.RouterVo; +import com.muyu.enterpise.domain.vo.TreeSelect; import com.muyu.system.mapper.SysMenuMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.mapper.SysRoleMenuMapper; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java index 8ede754..c1ef1ee 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,6 +1,5 @@ package com.muyu.system.service.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.SysUserOnline; diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml index 2c35243..3cdd33b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -42,12 +42,12 @@ - - @@ -78,7 +78,7 @@ where config_key = #{configKey} limit 1 - + insert into sys_config ( config_name, config_key, @@ -98,7 +98,7 @@ ) - + update sys_config config_name = #{configName}, diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysFirmMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysFirmMapper.xml index 25c02a3..14a468b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysFirmMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysFirmMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, firm_credit_code, firm_code, firm_name, firm_logs , state, create_by, create_time, update_by, update_time, remark from sys_firm - and firm_name like concat('%', #{firmName}, '%') @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_firm firm_credit_code, @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_firm firm_credit_code = #{firmCreditCode}, diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml index 1dac5c4..9b838b2 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -46,7 +46,7 @@ from sys_menu - @@ -84,7 +84,7 @@ order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m @@ -181,12 +181,12 @@ where parent_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - + update sys_menu menu_name = #{menuName}, @@ -209,7 +209,7 @@ where menu_id = #{menuId} - + insert into sys_menu( menu_id, parent_id, diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 0687403..4a6214d 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -36,7 +36,7 @@ where notice_id = #{noticeId} - @@ -51,7 +51,7 @@ - + insert into sys_notice ( notice_title, notice_type, @@ -71,7 +71,7 @@ ) - + update sys_notice notice_title = #{noticeTitle}, diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysPostMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysPostMapper.xml index 63142c3..da89e0b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -29,7 +29,7 @@ from sys_post - @@ -79,7 +79,7 @@ where post_code=#{postCode} limit 1 - + update sys_post post_code = #{postCode}, @@ -93,7 +93,7 @@ where post_id = #{postId} - + insert into sys_post( post_id, post_code, diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 1a9ab92..d8a9edd 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index 22d2609..3158217 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml b/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml deleted file mode 100644 index 809ecc3..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules-warn - 3.6.3 - - - cloud-warn-common - - - 17 - 17 - UTF-8 - - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - com.muyu - cloud-common-xxl - - - - com.muyu - cloud-common-rabbit - - - - com.muyu - cloud-common-core - 3.6.3 - - - - - - com.squareup.okhttp3 - okhttp - 4.9.3 - - - com.thoughtworks.xstream - xstream - 1.4.20 - - - org.projectlombok - lombok - 1.18.34 - - - org.springframework.boot - spring-boot-starter - 3.3.2 - - - org.springframework.boot - spring-boot-starter-web - 3.3.2 - - - - org.dom4j - dom4j - 2.1.3 - - - com.alibaba.fastjson2 - fastjson2 - 2.0.43 - - - - - - - - diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml b/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml deleted file mode 100644 index dfaa873..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules-warn - 3.6.3 - - - cloud-warn-remote - - - 17 - 17 - UTF-8 - - - 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-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java index f549518..dc0b674 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java @@ -3,8 +3,6 @@ package com.muyu.warning.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; @@ -21,7 +19,6 @@ 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; 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-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java index 8a87908..55e428c 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java @@ -4,7 +4,6 @@ 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 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/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java index e3d67d3..d9fc656 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java @@ -1,7 +1,5 @@ package com.muyu.warning.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; 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-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java index ef327d0..7b2e427 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java @@ -1,7 +1,6 @@ package com.muyu.warning.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.yulichang.base.MPJBaseService; import com.muyu.warning.domain.WarnRuleDTO; import java.util.List; 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-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java index 4fa0aab..eda1dfc 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-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java @@ -2,12 +2,10 @@ package com.muyu.warning.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 org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml index a9ef466..519b2c4 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml @@ -5,5 +5,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + diff --git a/cloud-modules/cloud-modules-warn/pom.xml b/cloud-modules/cloud-modules-warn/pom.xml index 7e15d11..0b925b5 100644 --- a/cloud-modules/cloud-modules-warn/pom.xml +++ b/cloud-modules/cloud-modules-warn/pom.xml @@ -12,9 +12,8 @@ cloud-modules-warn pom - cloud-warn-common - cloud-warn-client - cloud-warn-remote + + cloud-warn-server diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 70a8ff4..7fb381c 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -12,11 +12,9 @@ cloud-modules-system cloud-modules-gen cloud-modules-file - cloud-modules-system-saas - cloud-breakdown cloud-modules-warn - cloud-modules-rail - cloud-modules-car + + cloud-modules-openbusiness cloud-modules