From 63ebaee731551b806be4aa02349362b96b4ead48 Mon Sep 17 00:00:00 2001 From: ruyaxie <648179520@qq.comgit> Date: Mon, 30 Sep 2024 01:13:22 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-cache/pom.xml | 5 +- .../com/muyu/common/cache/CacheAbsBasic.java | 36 ++- .../com/muyu/common/cache/CacheBasic.java | 7 + cloud-common/cloud-common-kafka/pom.xml | 34 +++ .../kafka/config/KafkaConsumerConfig.java | 102 +++++++++ .../kafka/config/KafkaProducerConfig.java | 74 +++++++ .../kafka/constant/KafkaConfigConstants.java | 74 +++++++ ...ot.autoconfigure.AutoConfiguration.imports | 2 + cloud-common/pom.xml | 2 + cloud-gateway/cloud-modules-fault/pom.xml | 105 --------- .../java/com/muyu/SysCarFaultApplication.java | 35 --- .../fault/controller/CarTypeController.java | 35 --- .../fault/controller/FaultCodeController.java | 92 -------- .../controller/FaultConditionController.java | 92 -------- .../FaultDetectionStrategyController.java | 22 -- .../controller/FaultLabelController.java | 40 ---- .../fault/controller/FaultLogController.java | 37 ---- .../fault/controller/FaultRuleController.java | 49 ----- .../fault/controller/FaultTypeController.java | 38 ---- .../fault/controller/MessageController.java | 81 ------- .../controller/SysCarFaultController.java | 112 ---------- .../com/muyu/fault/domain/CarFaultRule.java | 206 ------------------ .../java/com/muyu/fault/domain/CarType.java | 34 --- .../java/com/muyu/fault/domain/FaultCode.java | 71 ------ .../com/muyu/fault/domain/FaultCondition.java | 87 -------- .../com/muyu/fault/domain/FaultLabel.java | 43 ---- .../java/com/muyu/fault/domain/FaultLog.java | 68 ------ .../com/muyu/fault/domain/FaultReport.java | 22 -- .../java/com/muyu/fault/domain/FaultRule.java | 67 ------ .../java/com/muyu/fault/domain/FaultType.java | 33 --- .../com/muyu/fault/domain/MessageDao.java | 37 ---- .../com/muyu/fault/domain/MessageService.java | 54 ----- .../com/muyu/fault/domain/SysCarFault.java | 102 --------- .../java/com/muyu/fault/domain/WarnLevel.java | 5 - .../muyu/fault/domain/message/Message.java | 66 ------ .../muyu/fault/domain/message/MessageReq.java | 33 --- .../fault/domain/message/MessageSendReq.java | 54 ----- .../com/muyu/fault/domain/message/User.java | 38 ---- .../fault/domain/req/FaultCodeAddReq.java | 69 ------ .../fault/domain/req/FaultCodeListReq.java | 41 ---- .../fault/domain/req/FaultCodeUpdReq.java | 78 ------- .../domain/req/FaultConditionAddReq.java | 43 ---- .../domain/req/FaultConditionListReq.java | 42 ---- .../domain/req/FaultConditionUpdReq.java | 43 ---- .../fault/domain/req/FaultLogListReq.java | 56 ----- .../fault/domain/resp/FaultCodeListResp.java | 88 -------- .../domain/resp/FaultCodeTotalListResp.java | 38 ---- .../domain/resp/FaultConditionListResp.java | 76 ------- .../resp/FaultConditionTotalListResp.java | 35 --- .../fault/domain/resp/FaultLogListResp.java | 83 ------- .../domain/resp/FaultLogTotalListResp.java | 36 --- .../com/muyu/fault/domain/vo/FaultCodeVo.java | 40 ---- .../com/muyu/fault/mapper/CarTypeMapper.java | 17 -- .../muyu/fault/mapper/FaultCodeMapper.java | 45 ---- .../fault/mapper/FaultConditionMapper.java | 26 --- .../mapper/FaultDetectionStrategyMapper.java | 11 - .../muyu/fault/mapper/FaultLabelMapper.java | 16 -- .../com/muyu/fault/mapper/FaultLogMapper.java | 24 -- .../muyu/fault/mapper/FaultRuleMapper.java | 16 -- .../muyu/fault/mapper/FaultTypeMapper.java | 22 -- .../com/muyu/fault/mapper/MessageMapper.java | 23 -- .../muyu/fault/mapper/SysCarFaultMapper.java | 17 -- .../muyu/fault/service/CarTypeService.java | 24 -- .../muyu/fault/service/FaultCodeService.java | 56 ----- .../fault/service/FaultConditionService.java | 35 --- .../fault/service/FaultDetectionStrategy.java | 16 -- .../FaultDetectionStrategyService.java | 4 - .../muyu/fault/service/FaultLabelService.java | 23 -- .../muyu/fault/service/FaultLogService.java | 26 --- .../muyu/fault/service/FaultRuleService.java | 23 -- .../muyu/fault/service/FaultTypeService.java | 28 --- .../fault/service/ISysCarFaultService.java | 37 ---- .../muyu/fault/service/MessageService.java | 49 ----- .../service/impl/CarTypeServiceImpl.java | 39 ---- .../service/impl/FaultCodeServiceImpl.java | 122 ----------- .../impl/FaultConditionServiceImpl.java | 63 ------ .../FaultDetectionStrategyServiceImpl.java | 20 -- .../service/impl/FaultLabelServiceImpl.java | 37 ---- .../service/impl/FaultLogServiceImpl.java | 46 ---- .../service/impl/FaultRuleServiceImpl.java | 66 ------ .../service/impl/FaultTypeServiceImpl.java | 50 ----- .../service/impl/MessageServiceImpl.java | 126 ----------- .../service/impl/SysCarFaultServiceImpl.java | 100 --------- .../FuelVehicleCarFaultDetectionStrategy.java | 19 -- ...PureElectricCarFaultDetectionStrategy.java | 199 ----------------- .../src/main/resources/bootstrap.yml | 49 ----- .../src/main/resources/logback/dev.xml | 74 ------- .../src/main/resources/logback/prod.xml | 81 ------- .../src/main/resources/logback/test.xml | 81 ------- .../mapper/faultcode/FaultCodeMapper.xml | 102 --------- .../mapper/faultcode/FaultConditionMapper.xml | 56 ----- .../mapper/faultcode/FaultLogMapper.xml | 45 ---- .../mapper/faultcode/MessageMapper.xml | 16 -- .../enterpise-cache/pom.xml | 36 +++ .../cache/EnterpiseCacheService.java | 42 ++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../java/com/muyu/domain/MessageValue.java | 11 + .../req/{SysCar.java => SysCarReq.java} | 30 +-- .../java/com/muyu/domain/resp/SysCarResp.java | 29 +-- .../enterpise-service/pom.xml | 8 + .../controller/CarFenceClazzController.java | 4 +- .../controller/CarFenceController.java | 6 +- .../controller/CarFenceTypeController.java | 4 +- .../controller/CarTypeController.java | 4 +- .../controller/FaultCodeController.java | 4 +- .../controller/FaultConditionController.java | 4 +- .../controller/FaultLabelController.java | 4 +- .../controller/FaultLogController.java | 4 +- .../controller/FaultRuleController.java | 4 +- .../controller/FaultTypeController.java | 4 +- .../controller/FenceGroupController.java | 4 +- .../controller/MessageController.java | 4 +- .../controller/MessageTemplateController.java | 4 +- .../controller/MessageValueController.java | 11 +- .../controller/MiddleController.java | 6 +- .../controller/SysCarController.java | 9 +- .../controller/SysCarFaultController.java | 4 +- .../controller/SysTypeController.java | 4 +- .../controller/WarnLogsController.java | 4 +- .../controller/WarnRuleController.java | 4 +- .../controller/WarnStrategyController.java | 4 +- .../mapper/CarFenceClazzMapper.java | 2 +- .../mapper/CarFenceMapper.java | 2 +- .../mapper/CarFenceServiceMybaitsMapper.java | 2 +- .../mapper/CarFenceTypeMapper.java | 2 +- .../{ => enterpise}/mapper/CarTypeMapper.java | 2 +- .../mapper/FaultCodeMapper.java | 2 +- .../mapper/FaultConditionMapper.java | 2 +- .../mapper/FaultLabelMapper.java | 2 +- .../mapper/FaultLogMapper.java | 2 +- .../mapper/FaultRuleMapper.java | 2 +- .../mapper/FaultTypeMapper.java | 2 +- .../mapper/FenceGroupMapper.java | 2 +- .../{ => enterpise}/mapper/MessageMapper.java | 2 +- .../mapper/MessageTemplateMapper.java | 2 +- .../mapper/MessageValueMapper.java | 2 +- .../{ => enterpise}/mapper/MiddleMapper.java | 2 +- .../mapper/SysCarFaultMapper.java | 2 +- .../{ => enterpise}/mapper/SysCarMapper.java | 2 +- .../{ => enterpise}/mapper/SysTypeMapper.java | 2 +- .../mapper/WarnLogsMapper.java | 2 +- .../mapper/WarnRuleMapper.java | 2 +- .../mapper/WarnStrategyMapper.java | 2 +- .../service/CarFenceClazzService.java | 2 +- .../service/CarFenceService.java | 2 +- .../service/CarFenceServiceMybaits.java | 2 +- .../service/CarFenceTypeService.java | 2 +- .../service/CarTypeService.java | 2 +- .../service/FaultCodeService.java | 2 +- .../service/FaultConditionService.java | 2 +- .../service/FaultDetectionStrategy.java | 2 +- .../FaultDetectionStrategyService.java | 2 +- .../service/FaultLabelService.java | 2 +- .../service/FaultLogService.java | 2 +- .../service/FaultRuleService.java | 2 +- .../service/FaultTypeService.java | 2 +- .../service/FenceGroupService.java | 2 +- .../service/ISysCarFaultService.java | 2 +- .../service/IWarnLogsService.java | 2 +- .../service/IWarnRuleService.java | 2 +- .../service/IWarnStrategyService.java | 2 +- .../service/MessageService.java | 2 +- .../service/MessageTemplateService.java | 2 +- .../service/MessageValueService.java | 2 +- .../service/MiddleService.java | 2 +- .../service/SysCarService.java | 5 +- .../service/SysTypeService.java | 2 +- .../impl/CarFenceClazzServiceImpl.java | 6 +- .../service/impl/CarFenceServiceImpl.java | 10 +- .../impl/CarFenceServiceMybaitsImpl.java | 6 +- .../service/impl/CarFenceTypeServiceImpl.java | 6 +- .../service/impl/CarTypeServiceImpl.java | 6 +- .../service/impl/FaultCodeServiceImpl.java | 6 +- .../impl/FaultConditionServiceImpl.java | 6 +- .../service/impl/FaultLabelServiceImpl.java | 6 +- .../service/impl/FaultLogServiceImpl.java | 6 +- .../service/impl/FaultRuleServiceImpl.java | 6 +- .../service/impl/FaultTypeServiceImpl.java | 6 +- .../service/impl/FenceGroupServiceImpl.java | 6 +- .../service/impl/MessageServiceImpl.java | 6 +- .../impl/MessageTemplateServiceImpl.java | 6 +- .../service/impl/MessageValueServiceImpl.java | 13 +- .../service/impl/MiddleServiceImpl.java | 6 +- .../service/impl/SysCarFaultServiceImpl.java | 6 +- .../service/impl/SysCarServiceImpl.java | 64 +++--- .../service/impl/SysTypeServiceImpl.java | 6 +- .../service/impl/WarnLogsServiceImpl.java | 6 +- .../service/impl/WarnRuleServiceImpl.java | 6 +- .../service/impl/WarnStrategyServiceImpl.java | 6 +- .../FuelVehicleCarFaultDetectionStrategy.java | 2 +- ...PureElectricCarFaultDetectionStrategy.java | 4 +- .../src/main/resources/bootstrap.yml | 2 +- .../mapper/CarFenceServiceMybaitsMapper.xml | 2 +- .../main/resources/mapper/FaultCodeMapper.xml | 2 +- .../resources/mapper/FaultConditionMapper.xml | 2 +- .../main/resources/mapper/FaultLogMapper.xml | 2 +- .../main/resources/mapper/MessageMapper.xml | 2 +- .../main/resources/mapper/MiddleMapper.xml | 2 +- .../cloud-modules-enterprise/pom.xml | 1 + cloud-modules/cloud-modules-parse/pom.xml | 16 +- .../com/muyu/parse/process/ProcessData.java | 26 ++- pom.xml | 1 - 202 files changed, 688 insertions(+), 4720 deletions(-) create mode 100644 cloud-common/cloud-common-kafka/pom.xml create mode 100644 cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java create mode 100644 cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaProducerConfig.java create mode 100644 cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/constant/KafkaConfigConstants.java create mode 100644 cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 cloud-gateway/cloud-modules-fault/pom.xml delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/SysCarFaultApplication.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/CarTypeController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultCodeController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultConditionController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultDetectionStrategyController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLabelController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultRuleController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/MessageController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarFaultRule.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarType.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCode.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCondition.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLabel.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultReport.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultRule.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultType.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageDao.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/SysCarFault.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/WarnLevel.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/User.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeAddReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeListReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeUpdReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionAddReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionListReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionUpdReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeListResp.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeTotalListResp.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionListResp.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionTotalListResp.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogTotalListResp.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/vo/FaultCodeVo.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/CarTypeMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultCodeMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultConditionMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultDetectionStrategyMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLabelMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultRuleMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/MessageMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/CarTypeService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultCodeService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultConditionService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategy.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategyService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLabelService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultRuleService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/ISysCarFaultService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/MessageService.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/CarTypeServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultCodeServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultConditionServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultDetectionStrategyServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLabelServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultRuleServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/MessageServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/resources/bootstrap.yml delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/resources/logback/dev.xml delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/resources/logback/prod.xml delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/resources/logback/test.xml delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultCodeMapper.xml delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultConditionMapper.xml delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultLogMapper.xml delete mode 100644 cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/MessageMapper.xml create mode 100644 cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml create mode 100644 cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/EnterpiseCacheService.java create mode 100644 cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/{SysCar.java => SysCarReq.java} (62%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/CarFenceClazzController.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/CarFenceController.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/CarFenceTypeController.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/CarTypeController.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/FaultCodeController.java (97%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/FaultConditionController.java (97%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/FaultLabelController.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/FaultLogController.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/FaultRuleController.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/FaultTypeController.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/FenceGroupController.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/MessageController.java (96%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/MessageTemplateController.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/MessageValueController.java (89%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/MiddleController.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/SysCarController.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/SysCarFaultController.java (97%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/SysTypeController.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/WarnLogsController.java (96%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/WarnRuleController.java (96%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/controller/WarnStrategyController.java (97%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/CarFenceClazzMapper.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/CarFenceMapper.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/CarFenceServiceMybaitsMapper.java (98%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/CarFenceTypeMapper.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/CarTypeMapper.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/FaultCodeMapper.java (97%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/FaultConditionMapper.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/FaultLabelMapper.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/FaultLogMapper.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/FaultRuleMapper.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/FaultTypeMapper.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/FenceGroupMapper.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/MessageMapper.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/MessageTemplateMapper.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/MessageValueMapper.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/MiddleMapper.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/SysCarFaultMapper.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/SysCarMapper.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/SysTypeMapper.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/WarnLogsMapper.java (88%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/WarnRuleMapper.java (88%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/mapper/WarnStrategyMapper.java (89%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/CarFenceClazzService.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/CarFenceService.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/CarFenceServiceMybaits.java (97%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/CarFenceTypeService.java (90%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/CarTypeService.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FaultCodeService.java (97%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FaultConditionService.java (96%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FaultDetectionStrategy.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FaultDetectionStrategyService.java (88%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FaultLabelService.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FaultLogService.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FaultRuleService.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FaultTypeService.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/FenceGroupService.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/ISysCarFaultService.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/IWarnLogsService.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/IWarnRuleService.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/IWarnStrategyService.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/MessageService.java (96%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/MessageTemplateService.java (89%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/MessageValueService.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/MiddleService.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/SysCarService.java (84%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/SysTypeService.java (92%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/CarFenceClazzServiceImpl.java (77%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/CarFenceServiceImpl.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/CarFenceServiceMybaitsImpl.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/CarFenceTypeServiceImpl.java (77%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/CarTypeServiceImpl.java (87%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/FaultCodeServiceImpl.java (96%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/FaultConditionServiceImpl.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/FaultLabelServiceImpl.java (86%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/FaultLogServiceImpl.java (91%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/FaultRuleServiceImpl.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/FaultTypeServiceImpl.java (90%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/FenceGroupServiceImpl.java (84%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/MessageServiceImpl.java (96%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/MessageTemplateServiceImpl.java (80%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/MessageValueServiceImpl.java (85%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/MiddleServiceImpl.java (83%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/SysCarFaultServiceImpl.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/SysCarServiceImpl.java (50%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/SysTypeServiceImpl.java (83%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/WarnLogsServiceImpl.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/WarnRuleServiceImpl.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/WarnStrategyServiceImpl.java (93%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java (84%) rename cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/{ => enterpise}/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java (92%) diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml index 8a3ac5d..488b785 100644 --- a/cloud-common/cloud-common-cache/pom.xml +++ b/cloud-common/cloud-common-cache/pom.xml @@ -5,16 +5,15 @@ 4.0.0 com.muyu - cloud-server + cloud-common 3.6.3 - ../../pom.xml cloud-common-cache 缓存基准 - cloud-common- + cloud-common-cache 23 diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java index 8ea3f8d..7d54ada 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java @@ -1,8 +1,11 @@ package com.muyu.common.cache; +import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.redis.service.RedisService; import org.springframework.beans.factory.annotation.Autowired; +import java.util.concurrent.TimeUnit; + /** * 抽象缓存层 * * @className: CacheAbsBasic ️✈️ @@ -18,16 +21,43 @@ public abstract class CacheAbsBasic implements CacheBasic{ @Override public void put(K key, V value) { - redisService.setCacheObject(encode(key), value); + + try { + redisService.setCacheObject(encode(key), value,30L,TimeUnit.MINUTES); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } } @Override public V get(K key) { - return redisService.getCacheObject(encode(key)); + + try { + return redisService.getCacheObject(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } } @Override public void remove(K key) { - redisService.deleteObject(encode(key)); + + try { + redisService.deleteObject(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + } + + @Override + public boolean hashKey(K key){ + Boolean b = false; + + try { + b = redisService.hasKey(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + return b; } } diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java index 924f5cc..0971ac2 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java @@ -1,5 +1,10 @@ package com.muyu.common.cache; +import org.springframework.data.redis.core.TimeoutUtils; + +import java.util.Date; +import java.util.concurrent.TimeUnit; + /** * 缓存基础 * * @className: CacheBasic ️✈️ @@ -14,4 +19,6 @@ public interface CacheBasic extends PrimaryKeyBasic{ V get(K key); void remove(K key); + + boolean hashKey(K key); } diff --git a/cloud-common/cloud-common-kafka/pom.xml b/cloud-common/cloud-common-kafka/pom.xml new file mode 100644 index 0000000..1d7e765 --- /dev/null +++ b/cloud-common/cloud-common-kafka/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + cloud-common-kafka + + + 8 + 8 + UTF-8 + + + + + + com.muyu + cloud-common-core + + + + + org.apache.kafka + kafka-clients + + + + diff --git a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java new file mode 100644 index 0000000..2a75122 --- /dev/null +++ b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java @@ -0,0 +1,102 @@ +package com.muyu.common.kafka.config; + +import com.muyu.common.core.text.StrFormatter; +import com.muyu.common.kafka.constant.KafkaConfigConstants; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.common.serialization.Deserializer; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import java.util.HashMap; + +/** + * @Author: wangXin + * @Date 2024/9/28 20:32 + * @Description Kafka消费者配置 + */ +@Configuration +public class KafkaConsumerConfig { + + /** + * 服务端IP + */ + @Value("${kafka.consumer.bootstrap-servers-ip}") + private String bootstrapServersIP; + + /** + * 服务端口号 + */ + @Value("${kafka.consumer.bootstrap-servers-port}") + private String bootstrapServersPort; + + /** + * 开启消费者偏移量 + */ + @Value("${kafka.consumer.enable-auto-commit}") + private Boolean enableAutoCommit; + + /** + * 自动提交时间间隔 + */ + @Value("${kafka.consumer.auto-commit-interval}") + private Integer autoCommitInterval; + + /** + * 自动重置偏移量 + */ + @Value("${kafka.consumer.auto-offset-reset}") + private String autoOffsetReset; + + /** + * 请求阻塞的最大时间 + */ + @Value("${kafka.consumer.fetch-max-wait}") + private Integer fetchMaxWait; + + /** + * 请求应答的最小字节数 + */ + @Value("${kafka.consumer.fetch-min-size}") + private Integer fetchMinSize; + + /** + * 心跳间隔时间 + */ + @Value("${kafka.consumer.heartbeat-interval}") + private Integer heartbeatInterval; + + /** + * 一次调用poll返回的最大记录条数 + */ + @Value("${kafka.consumer.max-poll-records}") + private Integer maxPollRecords; + + /** + * 指定消费组 + */ + @Value("${kafka.consumer.group-id}") + private String groupId; + + /** + * Kafka消费者初始化配置 + * @return Kafka消费者实例 + */ + @Bean + public KafkaConsumer kafkaConsumer() { + HashMap configs = new HashMap<>(); + configs.put(KafkaConfigConstants.BOOTSTRAP_SERVERS, + StrFormatter.format("{}:{}", bootstrapServersIP, bootstrapServersPort)); + configs.put(KafkaConfigConstants.ENABLE_AUTO_COMMIT, enableAutoCommit); + configs.put(KafkaConfigConstants.AUTO_COMMIT_INTERVAL, autoCommitInterval); + configs.put(KafkaConfigConstants.AUTO_OFFSET_RESET, autoOffsetReset); + configs.put(KafkaConfigConstants.FETCH_MAX_WAIT, fetchMaxWait); + configs.put(KafkaConfigConstants.FETCH_MIN_SIZE, fetchMinSize); + configs.put(KafkaConfigConstants.HEARTBEAT_INTERVAL, heartbeatInterval); + configs.put(KafkaConfigConstants.MAX_POLL_RECORDS, maxPollRecords); + configs.put(KafkaConfigConstants.GROUP_ID, groupId); + Deserializer keyDeserializer = new StringDeserializer(); + Deserializer valueDeserializer = new StringDeserializer(); + return new KafkaConsumer<>(configs, keyDeserializer, valueDeserializer); + } +} diff --git a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaProducerConfig.java b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaProducerConfig.java new file mode 100644 index 0000000..51162de --- /dev/null +++ b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaProducerConfig.java @@ -0,0 +1,74 @@ +package com.muyu.common.kafka.config; + +import com.muyu.common.core.text.StrFormatter; +import com.muyu.common.kafka.constant.KafkaConfigConstants; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.serialization.StringSerializer; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import java.util.HashMap; + +/** + * @Author: wangXin + * @Date 2024/9/28 16:35 + * @Description Kafka生产者配置 + */ +@Configuration +public class KafkaProducerConfig { + + /** + * 服务端IP + */ + @Value("${kafka.producer.bootstrap-servers-ip}") + private String bootstrapServersIP; + + /** + * 服务端口号 + */ + @Value("${kafka.producer.bootstrap-servers-port}") + private String bootstrapServersPort; + + /** + * 重试次数 + */ + @Value("${kafka.producer.retries}") + private Integer retries; + + /** + * 默认批量大小 + */ + @Value("${kafka.producer.batch-size}") + private Integer batchSize; + + /** + * 总内存字节数 + */ + @Value("${kafka.producer.buffer-memory}") + private Integer bufferMemory; + + /** + * 偏移量 + */ + @Value("${kafka.producer.acks}") + private String acks; + + /** + * Kafka生产者初始化配置 + * @return kafka生产者实例 + */ + @Bean + public KafkaProducer kafkaProducer() { + HashMap configs = new HashMap<>(); + configs.put(KafkaConfigConstants.BOOTSTRAP_SERVERS, + StrFormatter.format("{}:{}", bootstrapServersIP, bootstrapServersPort)); + configs.put(KafkaConfigConstants.RETRIES, retries); + configs.put(KafkaConfigConstants.BATCH_SIZE, batchSize); + configs.put(KafkaConfigConstants.BUFFER_MEMORY, bufferMemory); + configs.put(KafkaConfigConstants.ACKS, acks); + Serializer keySerializer = new StringSerializer(); + Serializer valueSerializer = new StringSerializer(); + return new KafkaProducer<>(configs, keySerializer, valueSerializer); + } +} diff --git a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/constant/KafkaConfigConstants.java b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/constant/KafkaConfigConstants.java new file mode 100644 index 0000000..0bd1f73 --- /dev/null +++ b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/constant/KafkaConfigConstants.java @@ -0,0 +1,74 @@ +package com.muyu.common.kafka.constant; + +/** + * @Author: wangXin + * @Date 2024/9/28 20:07 + * @Description Kafka配置通用常量 + */ +public class KafkaConfigConstants { + + /** + * 服务端ip+端口号 + */ + public static final String BOOTSTRAP_SERVERS = "bootstrap.servers"; + + /** + * 重试次数 + */ + public static final String RETRIES = "retries"; + + /** + * 默认批量大小 + */ + public static final String BATCH_SIZE = "batch.size"; + + /** + * 总内存字节数 + */ + public static final String BUFFER_MEMORY = "buffer-memory"; + + /** + * 偏移量 + */ + public static final String ACKS = "acks"; + + /** + * 开启消费者偏移量 + */ + public static final String ENABLE_AUTO_COMMIT = "enable.auto.commit"; + + /** + * 自动提交时间间隔 + */ + public static final String AUTO_COMMIT_INTERVAL = "auto.commit.interval"; + + /** + * 自动重置偏移量 + */ + public static final String AUTO_OFFSET_RESET = "auto.offset.reset"; + + /** + * 请求阻塞的最大时间 + */ + public static final String FETCH_MAX_WAIT = "fetch.max.wait"; + + /** + * 请求应答的最小字节数 + */ + public static final String FETCH_MIN_SIZE = "fetch.min.size"; + + /** + * 心跳间隔时间 + */ + public static final String HEARTBEAT_INTERVAL = "heartbeat-interval"; + + /** + * 一次调用poll返回的最大记录条数 + */ + public static final String MAX_POLL_RECORDS = "max.poll.records"; + + /** + * 指定消费组 + */ + public static final String GROUP_ID = "group.id"; +} diff --git a/cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1d39066 --- /dev/null +++ b/cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.muyu.common.kafka.config.KafkaProducerConfig +com.muyu.common.kafka.config.KafkaConsumerConfig diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index d00dfc6..eb626f1 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -20,6 +20,8 @@ cloud-common-system cloud-common-xxl cloud-common-rabbit + cloud-common-cache + cloud-common-kafka cloud-common diff --git a/cloud-gateway/cloud-modules-fault/pom.xml b/cloud-gateway/cloud-modules-fault/pom.xml deleted file mode 100644 index a2c8c47..0000000 --- a/cloud-gateway/cloud-modules-fault/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-fault - - - 17 - 17 - UTF-8 - - - cloud-modules-fault故障模块 - - - - - - - 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 - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - - diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/SysCarFaultApplication.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/SysCarFaultApplication.java deleted file mode 100644 index c18a353..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/SysCarFaultApplication.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu; - -import cn.hutool.core.date.DateTime; -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 javax.xml.crypto.Data; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Random; -import java.util.TimeZone; - -/** - * @className: SysCarFaultApplication ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/21 11:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication -public class SysCarFaultApplication { - public static void main (String[] args) throws ParseException { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+08")); - String format = simpleDateFormat.format(new Date()); - System.out.println("故障模块启动成功"+format); - SpringApplication.run(SysCarFaultApplication.class, args); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/CarTypeController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/CarTypeController.java deleted file mode 100644 index 680da12..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/CarTypeController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.fault.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.service.CarTypeService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: CarTypeController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ -@RequestMapping("/cartype") -@RestController -public class CarTypeController { - - @Autowired - private CarTypeService carTypeService; - - /** - * 车辆类型 - * @return - */ - @PostMapping("/list") - @Operation(summary = "车辆类型",description = "车辆类型信息") - public Result carTypeList(){ - return Result.success(carTypeService.selectcarType()); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultCodeController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultCodeController.java deleted file mode 100644 index 381a12e..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultCodeController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.muyu.fault.controller; - - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import com.muyu.fault.domain.req.FaultCodeListReq; -import com.muyu.fault.domain.req.FaultCodeUpdReq; -import com.muyu.fault.domain.resp.FaultCodeTotalListResp; -import com.muyu.fault.service.FaultCodeService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * @className: CarTypeController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障码 - */ - -@RestController -@RequestMapping("/faultcode") -public class FaultCodeController { - - @Autowired - private FaultCodeService faultCodeService; - - /** - * 故障码展示(仅故障码单表) - * @param faultCodeListReq - * @return - */ - @PostMapping(path = "/list") - @Operation(summary = "故障码列表(单)",description = "展示故障码信息") - public Result selectlist(@Validated @RequestBody FaultCodeListReq faultCodeListReq){ - return Result.success(faultCodeService.selectlist(faultCodeListReq)); - } - - - /** - * 故障码展示(故障码联查) - * @param faultCodeListReq - * @return - */ - @PostMapping("/faultcodelist") - @Operation(summary = "故障码列表(多)",description = "展示故障码信息") - public Result selectfaultcodelist(@Validated @RequestBody FaultCodeListReq faultCodeListReq){ - return Result.success(faultCodeService.selectfaultcodelist(faultCodeListReq)); - } - - - /** - * 新增故障码 - * @param faultCodeAddReq - * @return - */ - @PostMapping("/faultcodeadd") - @Operation(summary = "新增故障码",description = "新增故障码信息") - public Result insertfaultcode(@Validated @RequestBody FaultCodeAddReq faultCodeAddReq){ - faultCodeService.insert(faultCodeAddReq); - return Result.success(null,"新增成功"); - } - - /** - * 修改故障码 - * @param faultCodeUpdReq - * @return - */ - @PostMapping("/faultcodeupd") - @Operation(summary = "修改故障码",description = "修改故障码信息") - public Result updfaultcode(@Validated @RequestBody FaultCodeUpdReq faultCodeUpdReq){ - faultCodeService.upd(faultCodeUpdReq); - return Result.success(null,"修改成功"); - } - - /** - * 删除故障码 - * @param messageTypeId - * @return - */ - @PostMapping("/faultcodedel/{messageTypeId}") - @Operation(summary = "删除故障码",description = "删除故障码信息") - public Result delfaultcode(@PathVariable("messageTypeId") Integer messageTypeId){ - faultCodeService.del(messageTypeId); - return Result.success(null,"删除成功"); - } - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultConditionController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultConditionController.java deleted file mode 100644 index 8648deb..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultConditionController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.muyu.fault.controller; - - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.FaultCondition; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionListReq; -import com.muyu.fault.domain.req.FaultConditionUpdReq; -import com.muyu.fault.service.FaultConditionService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @className: CarTypeController ️✈️ -* @author: Yang 鹏 🦅 -* @date: 2024/9/23 22:06 ⏰ -* @Version: 1.0 -* @description: 故障检测 -*/ - -@RestController -@RequestMapping("/faultcondition") -public class FaultConditionController { - - @Autowired - private FaultConditionService faultConditionService; - - - /** - * 故障规则 - * @param faultConditionListReq - * @return - */ - @PostMapping("/list") - @Operation(summary = "故障规则列表展示",description = "故障规则列表展示") - public Result getfaultrulelist(@RequestBody @Validated FaultConditionListReq faultConditionListReq){ - return Result.success(faultConditionService.getfaultrulelist(faultConditionListReq)); - } - - - /** - * 故障规则添加 - * @param faultConditionAddReq - * @return - */ - @PostMapping("/faultconditionadd") - @Operation(summary = "添加规则",description = "添加故障规则") - public Result faultconditionadd(@RequestBody FaultConditionAddReq faultConditionAddReq){ - //判断车辆类型是否已存在所对应的故障规则 - List faultConditionList = faultConditionService.selectBytypeAndlabel(faultConditionAddReq); - if (faultConditionList.size()>0){ - return Result.error("此车辆类型已存在所对应的故障规则,无需重新制定，可在原规则上进行修改"); - } - faultConditionService.save(FaultCondition.faultConditionadd(faultConditionAddReq)); - return Result.success(null,"规则制定成功"); - } - - /** - * 故障规则修改 - * @param - * @param faultConditionUpdReq - * @return - */ - @PostMapping("/faultconditionupd") - @Operation(summary = "修改规则",description = "修改故障规则") - public Result faultconditionupd( - @RequestBody @Validated FaultConditionUpdReq faultConditionUpdReq){ - faultConditionService.updateById(FaultCondition.faultConditionupd(faultConditionUpdReq,()->faultConditionUpdReq.getCarconditionId())); - return Result.success(null,"规则修改成功"); - } - - - /** - * 故障规则删除 - * @param carconditionId - * @return - */ - @PostMapping("/faultconditiondel/{carconditionId}") - @Operation(summary = "删除规则",description = "删除故障规则") - public Result faultconditiondel(@PathVariable("carconditionId") long carconditionId){ - faultConditionService.removeById(carconditionId); - return Result.success(null,"规则删除成功"); - } - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultDetectionStrategyController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultDetectionStrategyController.java deleted file mode 100644 index 0f23788..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultDetectionStrategyController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.fault.controller; - -import com.muyu.fault.service.FaultDetectionStrategyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultDetectionStrategyController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障码 - */ -@RestController -@RequestMapping("/faultdetectionstrategy") -public class FaultDetectionStrategyController { - - @Autowired - private FaultDetectionStrategyService faultDetectionStrategyService; - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLabelController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLabelController.java deleted file mode 100644 index 8bc5e50..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLabelController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.muyu.fault.controller; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.service.FaultLabelService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 故障码分类 - */ -@RestController -@RequestMapping("/faultlabel") -public class FaultLabelController { - - @Autowired - private FaultLabelService faultLabelService; - - - /** - * 故障名称 - * @return - */ - @PostMapping("/list") - @Operation(summary = "故障名称查询",description = "故障名称信息") - public Result findfaulttype(){ - return Result.success(faultLabelService.select()); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java deleted file mode 100644 index 2440f9f..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fault.controller; -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.req.FaultLogListReq; -import com.muyu.fault.service.FaultLogService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ -@RestController -@RequestMapping("/faultlog") -public class FaultLogController { - @Autowired - private FaultLogService faultLogService; - - - /** - * 故障日志列表 - * @param faultLogListReq - * @return - */ - @PostMapping("/list") - @Operation(summary = "故障日志列表",description = "故障日志列表展示") - public Result selectfaultlog(@Validated @RequestBody FaultLogListReq faultLogListReq){ - return Result.success(faultLogService.selectfaultlog(faultLogListReq)); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultRuleController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultRuleController.java deleted file mode 100644 index a60905b..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultRuleController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.muyu.fault.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.CarFaultRule; -import com.muyu.fault.domain.FaultRule; -import com.muyu.fault.service.FaultRuleService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@RestController -@RequestMapping("/faultrule") -public class FaultRuleController { - - @Autowired - private FaultRuleService faultRuleService; - - - /** - * 车辆故障检测 - * @return - */ - @PostMapping("/check-faults") - @Operation(summary = "检查故障",description = "进行故障检查") - public Result checkfault(@Validated FaultRule faultRule){ - String checkfaults = faultRuleService.checkfaults(faultRule); - return Result.success(checkfaults); - } - - - @PostMapping("/cheakfaults") - @Operation(summary = "故障参数匹配检查",description = "获取报文数据与故障参数进行比较") - public Result cheakfaults(@Validated @RequestBody CarFaultRule carFaultRule){ -// faultRuleService.checkfaults(carFaultRule); - return null; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java deleted file mode 100644 index 30ebfc5..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.fault.controller; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -import com.muyu.common.core.domain.Result; -import com.muyu.fault.service.FaultTypeService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 故障码分类 - */ -@RestController -@RequestMapping("/faulttype") -public class FaultTypeController { - - @Autowired - private FaultTypeService faultTypeService; - - - /** - * 故障码分类查询 - * @return - */ - @PostMapping("/list") - @Operation(summary = "故障码分类查询",description = "故障码分类信息") - public Result findfaulttype(){ - return Result.success(faultTypeService.select()); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/MessageController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/MessageController.java deleted file mode 100644 index ee0aa0e..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/MessageController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.muyu.fault.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.message.Message; -import com.muyu.fault.domain.message.MessageReq; -import com.muyu.fault.domain.message.MessageSendReq; -import com.muyu.fault.service.MessageService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@RestController -@RequestMapping("/message") -public class MessageController { - - @Autowired - private MessageService messageService; - - /** - * 消息发送 - * @param messageSendReq - * @return - */ - @PostMapping("/sendmessage") - @Operation(summary = "发送消息",description = "站内信消息发送") - public Result sendmessage(@Validated MessageSendReq messageSendReq){ - messageService.sendmessage(messageSendReq); - return Result.success(null,"发送成功"); - } - - /** - * 消息查看 - * @param messageReq - * @param - * @return - */ - @PostMapping("/messagelist") - @Operation(summary = "消息查看(能根据登录人新的信息查看当前登录人的消息栏)",description = "消息查看") - public Result selectmessage(@Validated @RequestBody MessageReq messageReq){ - return Result.success(messageService.selectmessage(messageReq)); - } - - /** - * 查看消息改变状态 - * @param message - * @return - */ - @PostMapping("/changestatus") - @Operation(summary = "状态改变",description = "状态改变") - public Result changestatus(@RequestBody Message message){ - messageService.changestatus(message); - return Result.success(null,"成功"); - } - - - /** - * 查看未读的消息 - * @return - */ - @PostMapping("/unread") - @Operation(summary = "查看未读的消息",description = "查看未读的消息") - public Result unread(){ - return Result.success(messageService.unread()); - } - - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java deleted file mode 100644 index 10728a1..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.muyu.fault.controller; - -import java.util.Arrays; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.fault.domain.SysCarFault; -import com.muyu.fault.service.ISysCarFaultService; -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 - * - * @author Yang鹏 - * @date 2024-09-18 - */ -@RestController -@RequestMapping("/fault") -public class SysCarFaultController extends BaseController -{ - @Resource - private ISysCarFaultService sysCarFaultService; - - /** - * 查询车辆故障列表 - */ - - @GetMapping("/list") - public Result> list(SysCarFault sysCarFault) - { - startPage(); - List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); - return getDataTable(list); - } - - /** - * 导出车辆故障列表 - */ - @RequiresPermissions("syscarfault:fault:export") - @PostMapping("/export") - public void export(HttpServletResponse response, SysCarFault sysCarFault) - { - List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); - ExcelUtil util = new ExcelUtil(SysCarFault.class); - util.exportExcel(response, list, "车辆故障数据"); - } - - /** - * 获取车辆故障详细信息 - */ - @RequiresPermissions("syscarfault:fault:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { - return success(sysCarFaultService.selectSysCarFaultById(id)); - } - - /** - * 新增车辆故障 - */ - @RequiresPermissions("syscarfault:fault:add") - @PostMapping - public Result add( - @Validated @RequestBody SysCarFault sysCarFault) - { - if (sysCarFaultService.checkIdUnique(sysCarFault)) { - return error("新增 车辆故障 '" + sysCarFault + "'失败，车辆故障已存在"); - } - sysCarFault.setCreateBy(SecurityUtils.getUsername()); - return toAjax(sysCarFaultService.save(sysCarFault)); - } - - /** - * 修改车辆故障 - */ - @RequiresPermissions("syscarfault:fault:edit") - @PutMapping - public Result edit( - @Validated @RequestBody SysCarFault sysCarFault) - { - if (!sysCarFaultService.checkIdUnique(sysCarFault)) { - return error("修改 车辆故障 '" + sysCarFault + "'失败，车辆故障不存在"); - } - sysCarFault.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(sysCarFaultService.updateById(sysCarFault)); - } - - /** - * 删除车辆故障 - */ - @RequiresPermissions("syscarfault:fault:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { - sysCarFaultService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarFaultRule.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarFaultRule.java deleted file mode 100644 index d6c1daf..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarFaultRule.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.muyu.fault.domain; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class CarFaultRule {/** - * VIN码VIN码VIN码 - */ -private String vin; - /** - * 时间戳时间戳时间戳 - */ - private long timestamp; - /** - * 经度经度经度 - */ - private double longitude; - /** - * 纬度纬度纬度 - */ - private double latitude; - /** - * 车速车速车速 - */ - private double speed; - /** - * 总里程总里程总里程 - */ - private long TM; - /** - * 总电压总电压总电压 - */ - private double TV; - /** - * 总电流总电流总电流 - */ - private double CC; - /** - * 绝缘电阻绝缘电阻绝缘电阻 - */ - private double IR; - /** - * 档位档位档位 - */ - private String GP; - /** - * 加速踏板行程值加速踏板行程值加速踏板行程值 - */ - private double APTV; - /** - * 制动踏板行程值制动踏板行程值制动踏板行程值 - */ - private double BPTV; - /** - * 燃料消耗率燃料消耗率燃料消耗率 - */ - private double SFC; - /** - * 电机控制器温度电机控制器温度电机控制器温度 - */ - private double MCT; - /** - * 电机转速电机转速电机转速 - */ - private int MS; - /** - * 电机转矩电机转矩电机转矩 - */ - private double MTO; - /** - * 电机温度电机温度电机温度 - */ - private double MTE; - /** - * 电机电压电机电压电机电压 - */ - private double MV; - /** - * 电机电流电机电流电机电流 - */ - private double MC; - /** - * 动力电池剩余电量SOC动力电池剩余电量SOC动力电池剩余电量SOC - */ - private double PBRSOC; - /** - * 当前状态允许的最大反馈功率当前状态允许的最大反馈功率当前状态允许的最大反馈功率 - */ - private double MACSFP; - /** - * 当前状态允许最大放电功率当前状态允许最大放电功率当前状态允许最大放电功率 - */ - private double CSATMDP; - /** - * BMS自检计数器BMS自检计数器BMS自检计数器 - */ - private int BMS; - /** - * 动力电池充放电电流动力电池充放电电流动力电池充放电电流 - */ - private double CADC; - /** - * 动力电池负载端总电压V3动力电池负载端总电压V3动力电池负载端总电压V3 - */ - private double PBLETVV3; - /** - * 单次最大电压单次最大电压单次最大电压 - */ - private double SMV; - /** - * 单体电池最低电压单体电池最低电压单体电池最低电压 - */ - private double MVOAB; - /** - * 单体电池最高温度单体电池最高温度单体电池最高温度 - */ - private double MAXBT; - /** - * 单体电池最低温度单体电池最低温度单体电池最低温度 - */ - private double MINBT; - /** - * 动力电池可用容量动力电池可用容量动力电池可用容量 - */ - private double PBAC; - /** - * 车辆状态车辆状态车辆状态 - */ - private String VS; - /** - * 充电状态充电状态充电状态 - */ - private String CS; - /** - * 运行状态运行状态运行状态 - */ - private String RS; - /** - * SOCSOCSOC - */ - private double SOC; - /** - * 可充电储能装置工作状态可充电储能装置工作状态可充电储能装置工作状态 - */ - private String RESDWC; - /** - * EASEASEAS - */ - private String EAS; - /** - * PTCPTCPTC - */ - private String PTC; - /** - * EPSEPSEPS - */ - private String EPS; - /** - * ABSABSABS - */ - private String ABS; - /** - * MCUMCUMCU - */ - private String MCU; - /** - * 动力电池加热状态动力电池加热状态动力电池加热状态 - */ - private String PBHS; - /** - * 动力电池当前状态动力电池当前状态动力电池当前状态 - */ - private String PBCS; - /** - * 动力电池保温状态动力电池保温状态动力电池保温状态 - */ - private String PBIS; - /** - * DCDCDCDCDCDC - */ - private String DCDC; - /** - * CHGCHGCHG - */ - private String CHG; - /** - * 校验位校验位校验位 - */ - private byte CHB; - /** - * 截止位截止位截止位 - */ - private byte CUB; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarType.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarType.java deleted file mode 100644 index f5f1c35..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarType.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: CarType ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:01 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_type",autoResultMap = true) -public class CarType { - /** - * 车辆类型ID - */ - private long carTypeId; - /** - * 车辆类型名 - */ - private String carTypeName; - /** - * 车辆规则外键ID - */ - private long carTypeRules; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCode.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCode.java deleted file mode 100644 index 9ae4b02..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCode.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultCode ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:21 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_faultcode", autoResultMap = true) -public class FaultCode { - /** - * 故障码Id - */ - @TableId(value = "faultcode_id", type = IdType.AUTO) - private long faultcodeId; - /** - * 故障名称Id - */ - private long messageTypeId; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 故障组 - */ - private String faultGroup; - /** - * 故障位 - */ - private String faultBit; - /** - * 故障值 - */ - private String faultValue; - /** - * 是否警告 - */ - private Integer isWarning; - - private String faulttypeName; - private String messageTypeName; - private String messageTypeCode; - private String messageTypeBelongs; - - public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq) { - return FaultCode.builder() - .faultcodeId(0) - .messageTypeId(faultCodeAddReq.getMessageTypeId()) - .faultcodeNumber(faultCodeAddReq.getFaultcodeNumber()) - .faultGroup(faultCodeAddReq.getFaultGroup()) - .faultBit(faultCodeAddReq.getFaultBit()) - .faultValue(faultCodeAddReq.getFaultValue()) - .isWarning(faultCodeAddReq.getIsWarning()) - .build(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCondition.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCondition.java deleted file mode 100644 index 1e5c926..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCondition.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionUpdReq; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; -import java.util.function.Supplier; - -/** - * @className: FaultCondition ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:07 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_condition",autoResultMap = true) -public class FaultCondition { - /** - * 故障规则表Id - */ - @TableId(value = "carcondition_id",type = IdType.AUTO) - private long carconditionId; - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障条件 - */ - private String faultconditionIdentification; - /** - * 故障规则参数 - */ - private BigDecimal faultconditionParameter; - /** - * 车辆类型名称 - */ - private String carTypeName; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - - - public static FaultCondition faultConditionadd(FaultConditionAddReq faultConditionAddReq){ - return FaultCondition.builder() - .carTypeId(faultConditionAddReq.getCarTypeId()) - .messageTypeId(faultConditionAddReq.getMessageTypeId()) - .faultconditionIdentification(faultConditionAddReq.getFaultconditionIdentification()) - .faultconditionParameter(faultConditionAddReq.getFaultconditionParameter()) - .build(); - } - - public static FaultCondition faultConditionupd(FaultConditionUpdReq faultConditionUpdReq, Supplier idSupplier){ - return FaultCondition.builder() - .carconditionId(faultConditionUpdReq.getCarconditionId()) - .carTypeId(faultConditionUpdReq.getCarTypeId()) - .messageTypeId(faultConditionUpdReq.getMessageTypeId()) - .faultconditionIdentification(faultConditionUpdReq.getFaultconditionIdentification()) - .faultconditionParameter(faultConditionUpdReq.getFaultconditionParameter()) - .build(); - } - - - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLabel.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLabel.java deleted file mode 100644 index 3211a6b..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLabel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultLabel ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:07 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_label",autoResultMap = true) -public class FaultLabel { - - /** - *自增主键 - */ - @TableId(value = "message_type_id",type = IdType.AUTO) - private String messageTypeId; - /** - *报文编码 - */ - private String messageTypeCode; - /** - *报文名称 - */ - private String messageTypeName; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java deleted file mode 100644 index 2be245f..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.Date; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_log",autoResultMap = true) -public class FaultLog { - - /** - * 故障日志Id - */ - @TableId(value = "log_id",type = IdType.AUTO) - private long logId; - /** - * 故障码Id - */ - private long faultcodeId; - /** - * 车辆Id - */ - private long carInformationId; - /** - * 车辆VIN - */ - private String carVin; - /** - * 开始报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date startwarningTime; - /** - * 结束报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date endwarningTime; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 车辆vin - */ - private String carInformationVIN; - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultReport.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultReport.java deleted file mode 100644 index bd26bce..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultReport.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.fault.domain; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultReport ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:05 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class FaultReport { - private String VehicleType; - private String FaultDescription; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultRule.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultRule.java deleted file mode 100644 index d081ac2..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultRule.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * @className: FaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:05 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_condition",autoResultMap = true) -public class FaultRule { - /** - * 触发条件Id - */ - private long conditionId; - - /** - * 故障码Id - */ - private long faultcodeId; - - /** - * 触发条件描述 - */ - private String conditionContent; - - /** - * 单个参数的阈值 - */ - private BigDecimal singleThreshold; - - /** - * 区间参数的阈值的最小值 - */ - private BigDecimal minThreshold; - - /** - * 区间参数的阈值的最大值 - */ - private BigDecimal maxThreshold; - - /** - * 触发条件是否激活 - */ - private Integer isActive; - - /** - * 车辆数据值 - */ - private BigDecimal Threshold; - - - -} - diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultType.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultType.java deleted file mode 100644 index 613f366..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultType.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultType ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:04 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_type",autoResultMap = true) -public class FaultType { - /** - *故障类型Id - */ - @TableId(value = "faulttype_id",type = IdType.AUTO) - private long faulttypeId; - /** - *故障类型名称 - */ - private String faulttypeName; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageDao.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageDao.java deleted file mode 100644 index 0d19cbd..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageDao.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fault.domain; - -import com.muyu.fault.domain.message.Message; -import lombok.Data; - -import java.sql.Connection; -import java.sql.PreparedStatement; - -/** - * @className: MessageDao ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:58 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -public class MessageDao { - private Connection connection; - - public MessageDao(Connection connection){ - this.connection=connection; - } - - public void sendMessage(Message message) throws Exception{ - String sql="INSERT INTO `eight`.`car_fault_message` (`id`, `sender`, `receiver`, `content`, `status`, `create_time`, `user_id`) " + - "VALUES (NULL, NULL, NULL, NULL, NULL, NULL, NULL)"; - try(PreparedStatement pstmt=connection.prepareStatement(sql)){ - pstmt.setString(1, message.getContent()); - pstmt.setString(2, message.getSender()); - pstmt.setString(3, message.getReceiver()); - pstmt.setObject(4, message.getCreateTime()); - pstmt.executeUpdate(); - } - - - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageService.java deleted file mode 100644 index 70dea96..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.muyu.fault.domain; - -import com.muyu.fault.domain.message.Message; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; - -/** - * @className: MessageService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:01 ⏰ - * @Version: 1.0 - * @description: 业务逻辑层将负责实现消息的发送逻辑 - */ - -public class MessageService { - private MessageDao messageDao; - - public MessageService(MessageDao messageDao){ - this.messageDao=messageDao; - } - - public void sendMessage(String content,String sender,String receiver){ - - // 定义一个DateTimeFormatter对象，用于格式化日期时间为yyyy-MM-dd HH:mm:ss - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - // 获取当前日期和时间 - LocalDateTime now = LocalDateTime.now(); - // 使用formatter格式化当前日期和时间 - String formattedDateTime = now.format(formatter); - // 使用formatter将字符串解析回LocalDateTime - LocalDateTime parsedDateTime = LocalDateTime.parse(formattedDateTime, formatter); - // 然后按照上面的步骤将LocalDateTime转换为Date - ZonedDateTime zdt = parsedDateTime.atZone(ZoneId.systemDefault()); - Date date = Date.from(zdt.toInstant()); - - - Message message = new Message(); - message.setContent(content); - message.setSender(sender); - message.setReceiver(receiver); - message.setCreateTime(date); - - try { - messageDao.sendMessage(message); - } catch (Exception e) { - e.printStackTrace(); - } - - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/SysCarFault.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/SysCarFault.java deleted file mode 100644 index e05d86b..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/SysCarFault.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.muyu.fault.domain; - -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; - -/** - * 车辆故障对象 sys_car_fault - * - * @author Yang鹏 - * @date 2024-09-18 - */ - -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("sys_car_fault") -public class SysCarFault extends BaseEntity{ - private static final long serialVersionUID = 1L; - - /** 自增主键 */ - @TableId( type = IdType.AUTO) - private Long id; - - /** 车辆故障编码; */ - @Excel(name = "车辆故障编码;") - private String faultCode; - - /** 车辆故障名称 */ - @Excel(name = "车辆故障名称") - private String faultName; - - /** 车辆故障类型 */ - @Excel(name = "车辆故障类型") - private String faultType; - - /** 故障VIN编码 */ - @Excel(name = "故障VIN编码") - private String carVin; - - /** 车辆故障标签 */ - @Excel(name = "车辆故障标签") - private String faultLabel; - - /** 车辆故障位 */ - @Excel(name = "车辆故障位") - private String faultBit; - - /** 车辆故障值 */ - @Excel(name = "车辆故障值") - private String faultValue; - - /** 故障级别; */ - @Excel(name = "故障级别;") - private String faultWarn; - - /** 报警状态（Y.是，N.否） */ - @Excel(name = "报警状态", readConverterExp = "Y=.是，N.否") - private String warnStatus; - - /** 故障描述信息 */ - @Excel(name = "故障描述信息") - private String faultDesc; - - /** 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) */ - @Excel(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") - private String state; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("faultCode", getFaultCode()) - .append("faultName", getFaultName()) - .append("faultType", getFaultType()) - .append("carVin", getCarVin()) - .append("faultLabel", getFaultLabel()) - .append("faultBit", getFaultBit()) - .append("faultValue", getFaultValue()) - .append("faultWarn", getFaultWarn()) - .append("warnStatus", getWarnStatus()) - .append("faultDesc", getFaultDesc()) - .append("state", getState()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/WarnLevel.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/WarnLevel.java deleted file mode 100644 index bd25d39..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/WarnLevel.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.muyu.fault.domain; - -public enum WarnLevel { - LOW, MEDIUM, HIGH -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java deleted file mode 100644 index bfcca6c..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.muyu.fault.domain.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.Date; - -/** - * @className: Message ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_message",autoResultMap = true) -public class Message { - /** - * id - */ - @TableId(value = "id",type = IdType.AUTO) - private long id; - - /** - * 发送者 - */ - private String sender; - - /** - * 接收者 - */ - private String receiver; - - /** - * 消息内容 - */ - private String content; - - /** - * 消息状态 - */ - private Integer status; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date createTime; - /** - * 登录人Id - */ - private long userId; - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageReq.java deleted file mode 100644 index 0d18799..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageReq.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.muyu.fault.domain.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: MessageReq ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:59 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class MessageReq { - /** - * 消息状态 - */ - @TableId(type = IdType.AUTO,value = "status") - private Integer status; - /** - * 登录人Id - */ - @Excel(name = "登录人Id") - private long userId; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java deleted file mode 100644 index 7e90572..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.muyu.fault.domain.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @className: MessageSendReq ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:00 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class MessageSendReq { - /** - * 发送者 - */ - @TableId(type = IdType.AUTO,value = "id") - private String sender; - /** - * 接收者 - */ - @Excel(name = "接收者") - private String receiver; - - /** - * 消息内容 - */ - @Excel(name = "消息内容") - private String content; - /** - * 登录人Id - */ - @Excel(name = "登录人Id") - private long userId; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "String") - private Date createTime; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/User.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/User.java deleted file mode 100644 index 4fc85cc..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/User.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.fault.domain.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: User ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:56 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class User { - /** - * 用户id - */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - /** - * 用户名 - */ - @Excel(name = "用户名") - private String username; - /** - * 邮箱 - */ - @Excel(name="邮箱") - private String email; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeAddReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeAddReq.java deleted file mode 100644 index 37d61a1..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeAddReq.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.muyu.fault.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultCodeAddReq { - - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 故障分类Id - */ - private long faulttypeId; - /** - * 是否产生报警 - */ - private Integer isWarning; - /** - * 故障描述 - */ - private String faultContent; - /** - *故障组 - */ - private String faultGroup; - /** - *故障位 - */ - private String faultBit; - /** - *故障值 - */ - private String faultValue; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeListReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeListReq.java deleted file mode 100644 index 0c7907a..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeListReq.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.muyu.fault.domain.req; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - -@Tag(name = "故障码列表请求对象") -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultCodeListReq { - /** - *故障码 - */ - private String faultcodeNumber; - /** - *故障位 - */ - private String faultBit; - /** - * 页码，从1开始 - */ - private Integer pageNum=1; - /** - * 每页大小 - */ - private Integer pageSize=10; - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeUpdReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeUpdReq.java deleted file mode 100644 index c1ed026..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeUpdReq.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.muyu.fault.domain.req; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultCodeUpdReq { - - /** - *故障码Id - */ - private long faultcodeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 故障分类Id - */ - private long faulttypeId; - /** - * 是否产生报警 - */ - private Integer isWarning; - /** - * 故障描述 - */ - private String faultContent; - /** - *故障状态 - */ - private Integer faultStatus; - /** - *故障组 - */ - private String faultGroup; - /** - *故障位 - */ - private String faultBit; - /** - *故障值 - */ - private String faultValue; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionAddReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionAddReq.java deleted file mode 100644 index bfd372b..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionAddReq.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.muyu.fault.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultConditionAddReq { - /** - * 故障规则表Id - */ - private long carconditionId; - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障条件 - */ - private String faultconditionIdentification; - /** - * 故障规则参数 - */ - private BigDecimal faultconditionParameter; - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionListReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionListReq.java deleted file mode 100644 index 279e996..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionListReq.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.muyu.fault.domain.req; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Tag(name = "故障规则列表请求对象") -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultConditionListReq { - - - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 页码，从1开始 - */ - private Integer pageNum=1; - /** - * 每页大小 - */ - private Integer pageSize=10; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionUpdReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionUpdReq.java deleted file mode 100644 index 615cbe7..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionUpdReq.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.muyu.fault.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultConditionUpdReq { - - /** - * 故障规则表Id - */ - private long carconditionId; - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障条件 - */ - private String faultconditionIdentification; - /** - * 故障规则参数 - */ - private BigDecimal faultconditionParameter; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java deleted file mode 100644 index 9bc7697..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.muyu.fault.domain.req; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Tag(name = "故障日志列表请求对象") -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultLogListReq { - - /** - * 故障码Id - */ - private long faultcodeId; - /** - * 车辆VIN - */ - private String carVin; - /** - * 开始报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date startwarningTime; - /** - * 结束报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date endwarningTime; - - /** - * 页码，从1开始 - */ - private Integer pageNum=1; - /** - * 每页大小 - */ - private Integer pageSize=10; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeListResp.java deleted file mode 100644 index ae9e049..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeListResp.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.muyu.fault.domain.resp; - -import com.muyu.fault.domain.vo.FaultCodeVo; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; - -/** - * @className: Messages ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@Builder -@AllArgsConstructor -@Tag(name="故障码信息响应对象",description = "故障码查询的响应结果") -public class FaultCodeListResp { - - /** - *故障码Id - */ - private long faultcodeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - *故障码 - */ - private String faultcodeNumber; - /** - *故障组 - */ - private String faultGroup; - /** - *故障位 - */ - private String faultBit; - /** - *故障值 - */ - private String faultValue; - /** - *是否警告 - */ - private Integer isWarning; - /** - *故障类型名称 - */ - private String faulttypeName; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - - /** - * 数据库对象构建为返回结果对象 - * @param faultCodeVO - * @return - */ - public static FaultCodeListResp faultCodeListResp(FaultCodeVo faultCodeVO){ - return FaultCodeListResp.builder() - .faultcodeId(faultCodeVO.getFaultcodeId()) - .messageTypeId(faultCodeVO.getMessageTypeId()) - .faultcodeNumber(faultCodeVO.getFaultcodeNumber()) - .faultGroup(faultCodeVO.getFaultGroup()) - .faultBit(faultCodeVO.getFaultBit()) - .faultValue(faultCodeVO.getFaultValue()) - .isWarning(faultCodeVO.getIsWarning()) - .faulttypeName(faultCodeVO.getFaulttypeName()) - .messageTypeName(faultCodeVO.getMessageTypeName()) - .messageTypeCode(faultCodeVO.getMessageTypeCode()) - .messageTypeBelongs(faultCodeVO.getMessageTypeBelongs()) - .build(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeTotalListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeTotalListResp.java deleted file mode 100644 index bfa9107..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeTotalListResp.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.fault.domain.resp; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -/** - * @className: Messages ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@Tag(name="数据总数列表",description = "数据和总数的响应") -public class FaultCodeTotalListResp { - - - private List faultCodeListRespList; - - private long total; - - public static FaultCodeTotalListResp faultCodeTotalListResp(List faultCodeListRespList,long total){ - FaultCodeTotalListResp faultCodeTotalListResp = new FaultCodeTotalListResp(); - faultCodeTotalListResp.setFaultCodeListRespList(faultCodeListRespList); - faultCodeTotalListResp.setTotal(total); - return faultCodeTotalListResp; - } - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionListResp.java deleted file mode 100644 index 0af43ed..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionListResp.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.muyu.fault.domain.resp; - - -import com.muyu.fault.domain.FaultCondition; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@Builder -@AllArgsConstructor -@Tag(name="故障规则信息响应对象",description = "故障规则查询的响应结果") -public class FaultConditionListResp { - - /** - * 故障规则表Id - */ - private long carconditionId; - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障条件 - */ - private String faultconditionIdentification; - /** - * 故障规则参数 - */ - private BigDecimal faultconditionParameter; - /** - * 车辆类型名称 - */ - private String carTypeName; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - - /** - * 数据库对象构建为返回结果对象 - * @param faultCondition - * @return - */ - public static FaultConditionListResp faultConditionListResp(FaultCondition faultCondition){ - return FaultConditionListResp.builder() - .carconditionId(faultCondition.getCarconditionId()) - .carTypeId(faultCondition.getCarTypeId()) - .messageTypeId(faultCondition.getMessageTypeId()) - .faultconditionParameter(faultCondition.getFaultconditionParameter()) - .faultconditionIdentification(faultCondition.getFaultconditionIdentification()) - .carTypeName(faultCondition.getCarTypeName()) - .messageTypeName(faultCondition.getMessageTypeName()) - .messageTypeCode(faultCondition.getMessageTypeCode()) - .build(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionTotalListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionTotalListResp.java deleted file mode 100644 index 1968d71..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionTotalListResp.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.fault.domain.resp; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@Tag(name="故障规则数据总数列表",description = "数据和总数的响应") -public class FaultConditionTotalListResp { - - private List faultConditionListRespList; - - private long total; - - public static FaultConditionTotalListResp faultConditionTotalListResp(List faultConditionListRespList,long total){ - FaultConditionTotalListResp faultConditionTotalListResp = new FaultConditionTotalListResp(); - faultConditionTotalListResp.setFaultConditionListRespList(faultConditionListRespList); - faultConditionTotalListResp.setTotal(total); - return faultConditionTotalListResp; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java deleted file mode 100644 index d0bfaa2..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.muyu.fault.domain.resp; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import com.muyu.fault.domain.FaultLog; -import com.muyu.common.core.annotation.Excel; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; - -import java.util.Date; - -/** - * @className: Messages ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@Builder -@AllArgsConstructor -@Tag(name="故障日志信息响应对象",description = "故障日志的响应结果") -public class FaultLogListResp { - - - /** - * 故障日志Id - */ - private long logId; - /** - * 故障码Id - */ - private long faultcodeId; - /** - * 车辆Id - */ - private long carInformationId; - /** - * 车辆VIN - */ - private String carVin; - /** - * 开始报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date startwarningTime; - /** - * 结束报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date endwarningTime; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 车辆vin - */ - private String carInformationVIN; - - - /** - * 数据库对象构建为返回结果对象 - * @param faultLog - * @return - */ - public static FaultLogListResp faultLogListResp(FaultLog faultLog){ - return FaultLogListResp.builder() - .logId(faultLog.getLogId()) - .faultcodeId(faultLog.getFaultcodeId()) - .carInformationId(faultLog.getCarInformationId()) - .carVin(faultLog.getCarVin()) - .startwarningTime(faultLog.getStartwarningTime()) - .endwarningTime(faultLog.getEndwarningTime()) - .faultcodeNumber(faultLog.getFaultcodeNumber()) - .carInformationVIN(faultLog.getCarInformationVIN()) - .build(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogTotalListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogTotalListResp.java deleted file mode 100644 index b77392d..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogTotalListResp.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.fault.domain.resp; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -/** - * @className: Messages ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@Tag(name="故障日志数据总数列表",description = "数据和总数的响应") -public class FaultLogTotalListResp { - - private List faultLogListRespList; - - private long total; - - public static FaultLogTotalListResp faultLogTotalListResp(List faultLogListRespList,long total){ - FaultLogTotalListResp faultLogTotalListResp = new FaultLogTotalListResp(); - faultLogTotalListResp.setFaultLogListRespList(faultLogListRespList); - faultLogTotalListResp.setTotal(total); - return faultLogTotalListResp; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/vo/FaultCodeVo.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/vo/FaultCodeVo.java deleted file mode 100644 index 56f3c00..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/vo/FaultCodeVo.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.muyu.fault.domain.vo; - -import com.muyu.fault.domain.FaultCode; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -/** - * @className: FaultCodeVo ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:18 ⏰ - * @Version: 1.0 - * @description: - */ -@EqualsAndHashCode(callSuper = true) -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class FaultCodeVo extends FaultCode { - /** - *故障类型名称 - */ - private String faulttypeName; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/CarTypeMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/CarTypeMapper.java deleted file mode 100644 index 2460a6a..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/CarTypeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.domain.CarType; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: CarTypeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface CarTypeMapper extends BaseMapper { - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultCodeMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultCodeMapper.java deleted file mode 100644 index bb36881..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultCodeMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.FaultCode; - -import com.muyu.fault.domain.FaultLabel; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import com.muyu.fault.domain.req.FaultCodeListReq; -import com.muyu.fault.domain.req.FaultCodeUpdReq; -import com.muyu.fault.domain.vo.FaultCodeVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @className: FaultCodeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultCodeMapper extends BaseMapper { - - List selectfaultcodelist(FaultCodeListReq faultCodeListReq); - - - - //新增故障码 - FaultLabel selectfaultName(@Param("messageTypeName") String messageTypeName); - FaultCode selectfaultCode(@Param("faultcodeNumber") String faultcodeNumber); - Integer insertfaultlabel(FaultCodeAddReq faultCodeAddReq); - Integer insertfaultcode(FaultCodeAddReq faultCodeAddReq); - - //修改故障码 - Integer updfaultlabel(FaultCodeUpdReq faultCodeUpdReq); - Integer updfaultcode(FaultCodeUpdReq faultCodeUpdReq); - - - - Integer delfaultcode(@Param("messageTypeId") long messageTypeId); - Integer delfaultlabel(@Param("messageTypeId") long messageTypeId); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultConditionMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultConditionMapper.java deleted file mode 100644 index 006db23..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultConditionMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.FaultCondition; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionListReq; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @className: FaultConditionMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultConditionMapper extends BaseMapper { - - List selectfaultconditionlist(FaultConditionListReq faultConditionListReq); - - - List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultDetectionStrategyMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultDetectionStrategyMapper.java deleted file mode 100644 index 1164673..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultDetectionStrategyMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.muyu.fault.mapper; - -/** - * @className: FaultDetectionStrategyMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 23:59 ⏰ - * @Version: 1.0 - * @description: - */ -public interface FaultDetectionStrategyMapper { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLabelMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLabelMapper.java deleted file mode 100644 index c463cd4..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLabelMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.domain.FaultLabel; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: FaultLabelMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultLabelMapper extends BaseMapper { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java deleted file mode 100644 index e21d993..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.FaultLog; -import com.muyu.fault.domain.req.FaultLogListReq; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultLogMapper extends BaseMapper { - - - List selectfaultLogMapper(FaultLogListReq faultLogListReq); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultRuleMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultRuleMapper.java deleted file mode 100644 index aa31e05..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultRuleMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.domain.FaultRule; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: FaultRuleMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultRuleMapper extends BaseMapper { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java deleted file mode 100644 index f2a0305..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.FaultType; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: FaultTypeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultTypeMapper extends BaseMapper { - Integer add(FaultType faultType); - - Integer update(FaultType faultType); - - Integer delete(Integer id); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/MessageMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/MessageMapper.java deleted file mode 100644 index 6ed2bd3..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/MessageMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.message.Message; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @className: MessageMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ -@Mapper -public interface MessageMapper extends BaseMapper { - void changestatus(Message message); - - List unread(); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java deleted file mode 100644 index 0bde603..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.fault.mapper; - -import com.muyu.fault.domain.SysCarFault; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: MessageMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024-09-18 21:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障Mapper接口 - */ -@Mapper -public interface SysCarFaultMapper extends BaseMapper{ - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/CarTypeService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/CarTypeService.java deleted file mode 100644 index 33aad1c..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/CarTypeService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.CarType; - - -import java.util.List; - -/** - * @className: CarTypeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ -public interface CarTypeService extends IService { - - /** - * 车辆类型 - * @return - */ - List selectcarType(); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultCodeService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultCodeService.java deleted file mode 100644 index 1d5fd57..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultCodeService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.muyu.fault.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import com.muyu.fault.domain.req.FaultCodeListReq; -import com.muyu.fault.domain.req.FaultCodeUpdReq; -import com.muyu.fault.domain.resp.FaultCodeTotalListResp; -import com.muyu.fault.domain.vo.FaultCodeVo; - -/** - * @className: FaultCodeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -public interface FaultCodeService extends IService { - - /** - * 故障码展示 - * @param faultCodeListReq - * @return - */ - FaultCodeTotalListResp selectlist(FaultCodeListReq faultCodeListReq); - - /** - * 故障码展示(故障码联查) - * @param faultCodeListReq - * @return - */ - FaultCodeTotalListResp selectfaultcodelist(FaultCodeListReq faultCodeListReq); - - /** - * 新增故障码 - * @param faultCodeAddReq - * @return - */ - void insert(FaultCodeAddReq faultCodeAddReq); - - - /** - * 修改故障码 - * @param faultCodeUpdReq - * @return - */ - void upd(FaultCodeUpdReq faultCodeUpdReq); - - - /** - * 删除故障码 - * @param messageTypeId - * @return - */ - void del(Integer messageTypeId); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultConditionService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultConditionService.java deleted file mode 100644 index 3c8e815..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultConditionService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultCondition; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionListReq; -import com.muyu.fault.domain.resp.FaultConditionTotalListResp; - - -import java.util.List; - -/** - * @className: FaultConditionService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -public interface FaultConditionService extends IService { - - - /** - * 故障规则 - * @param faultConditionListReq - * @return - */ - FaultConditionTotalListResp getfaultrulelist(FaultConditionListReq faultConditionListReq); - - /** - * 故障规则添加 - * @param faultConditionAddReq - * @return - */ - List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategy.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategy.java deleted file mode 100644 index 2d4cc55..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategy.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.fault.service; - -import com.muyu.fault.domain.CarFaultRule; -import com.muyu.fault.domain.FaultReport; -/** - * @className: FaultDetectionStrategy ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -public interface FaultDetectionStrategy { - - FaultReport detectFaults(CarFaultRule carFaultRule); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategyService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategyService.java deleted file mode 100644 index 805cf15..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategyService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.muyu.fault.service; - -public interface FaultDetectionStrategyService { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLabelService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLabelService.java deleted file mode 100644 index ec9b278..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLabelService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultLabel; - - -import java.util.List; - -/** - * @className: FaultLabelService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultLabelService extends IService { - /** - * 故障名称 - * @return - */ - List select(); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java deleted file mode 100644 index fa5f126..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultLog; -import com.muyu.fault.domain.req.FaultLogListReq; -import com.muyu.fault.domain.resp.FaultLogTotalListResp; - - -import java.util.List; - -/** - * @className: FaultLogService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultLogService extends IService { - - /** - * 故障日志列表 - * @param faultLogListReq - * @return - */ - FaultLogTotalListResp selectfaultlog(FaultLogListReq faultLogListReq); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultRuleService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultRuleService.java deleted file mode 100644 index 1569c52..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultRuleService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultRule; - - -/** - * @className: FaultRuleService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultRuleService extends IService { - - /** - * 车辆故障检测 - * @return - */ - String checkfaults(FaultRule faultRule); - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java deleted file mode 100644 index 01868e6..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultType; - -import java.util.List; - -/** - * @className: FaultTypeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultTypeService extends IService { - - /** - * 故障码分类查询 - * @return - */ - List select(); - - Integer add(FaultType faultType); - - Integer update(FaultType faultType); - - Integer delete(Integer id); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/ISysCarFaultService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/ISysCarFaultService.java deleted file mode 100644 index dc6b566..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/ISysCarFaultService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fault.service; - -import java.util.List; -import com.muyu.fault.domain.SysCarFault; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 车辆故障Service接口 - * - * @author Yang鹏 - * @date 2024-09-18 - */ -public interface ISysCarFaultService extends IService { - /** - * 精确查询车辆故障 - * - * @param id 车辆故障主键 - * @return 车辆故障 - */ - public SysCarFault selectSysCarFaultById(Long id); - - /** - * 查询车辆故障列表 - * - * @param sysCarFault 车辆故障 - * @return 车辆故障集合 - */ - public List selectSysCarFaultList(SysCarFault sysCarFault); - - /** - * 判断 车辆故障 id是否唯一 - * @param sysCarFault 车辆故障 - * @return 结果 - */ - Boolean checkIdUnique(SysCarFault sysCarFault); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/MessageService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/MessageService.java deleted file mode 100644 index 1d0cbe3..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/MessageService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.message.Message; -import com.muyu.fault.domain.message.MessageReq; -import com.muyu.fault.domain.message.MessageSendReq; - - -import java.util.List; - -/** - * @className: MessageService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface MessageService extends IService { - - /** - * 消息发送 - * @param messageSendReq - * @return - */ - void sendmessage(MessageSendReq messageSendReq); - - /** - * 消息查看 - * @param messageReq - * @param - * @return - */ - List selectmessage(MessageReq messageReq); - - - /** - * 查看消息改变状态 - * @param message - * @return - */ - void changestatus(Message message); - - - /** - * 查看未读的消息 - * @return - */ - List unread(); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/CarTypeServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/CarTypeServiceImpl.java deleted file mode 100644 index 6f9b99d..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/CarTypeServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.CarType; -import com.muyu.fault.mapper.CarTypeMapper; -import com.muyu.fault.service.CarTypeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ -@Service -public class CarTypeServiceImpl extends ServiceImpl implements CarTypeService { - - @Autowired - private CarTypeMapper carTypeMapper; - - /** - * 车辆类型 - * @return - */ - @Override - public List selectcarType() { - LambdaQueryWrapper carTypeLambdaQueryWrapper = new LambdaQueryWrapper<>(); - List list = this.list(carTypeLambdaQueryWrapper); - return list; - } - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultCodeServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultCodeServiceImpl.java deleted file mode 100644 index 9754afa..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultCodeServiceImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.fault.domain.FaultCode; -import com.muyu.fault.domain.FaultLabel; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import com.muyu.fault.domain.req.FaultCodeListReq; -import com.muyu.fault.domain.req.FaultCodeUpdReq; -import com.muyu.fault.domain.resp.FaultCodeListResp; -import com.muyu.fault.domain.resp.FaultCodeTotalListResp; -import com.muyu.fault.domain.vo.FaultCodeVo; -import com.muyu.fault.mapper.FaultCodeMapper; -import com.muyu.fault.service.FaultCodeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultCodeServiceImpl extends ServiceImpl implements FaultCodeService { - @Autowired - private FaultCodeMapper faultCodeMapper; - - /** - * 故障码展示 - * @param faultCodeListReq - * @return - */ - @Override - public FaultCodeTotalListResp selectlist(FaultCodeListReq faultCodeListReq) { - Integer pageNum = faultCodeListReq.getPageNum(); - Integer pageSize = faultCodeListReq.getPageSize(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultcodeNumber()), - FaultCodeVo::getFaultcodeNumber,faultCodeListReq.getFaultcodeNumber()); - queryWrapper.eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultBit()), - FaultCodeVo::getFaultBit,faultCodeListReq.getFaultBit()); - long count = this.count(queryWrapper); - queryWrapper.last("LIMIT "+ ((pageNum-1)*pageSize)+", "+pageSize); - List faultCodeVOList = this.list(queryWrapper); - List faultCodeListRespList = faultCodeVOList.stream() - .map(FaultCodeListResp::faultCodeListResp) - .toList(); - return FaultCodeTotalListResp.faultCodeTotalListResp(faultCodeListRespList,count); - } - - - /** - * 故障码展示(故障码联查) - * @param faultCodeListReq - * @return - */ - @Override - public FaultCodeTotalListResp selectfaultcodelist(FaultCodeListReq faultCodeListReq) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultCodeListReq.getPageNum() - 1) * faultCodeListReq.getPageSize(); - faultCodeListReq.setPageNum(offset); - List selectfaultcodelist = faultCodeMapper.selectfaultcodelist(faultCodeListReq); - List faultCodeListRespList = selectfaultcodelist.stream() - .map(FaultCodeListResp::faultCodeListResp) - .toList(); - return FaultCodeTotalListResp.faultCodeTotalListResp(faultCodeListRespList,count); - } - - /** - * 新增故障码 - * @param faultCodeAddReq - * @return - */ - @Override - public void insert(FaultCodeAddReq faultCodeAddReq) { - //判断故障名称或故障码是否存在,若都不存在先添加故障名称表，在添加故障码表 - //1.判断故障名称是否存在 - String messageTypeName = faultCodeAddReq.getMessageTypeName(); - FaultLabel faultLabel = faultCodeMapper.selectfaultName(messageTypeName); - //2.判断故障码是否存在 - String faultcodeNumber = faultCodeAddReq.getFaultcodeNumber(); - FaultCode faultCode = faultCodeMapper.selectfaultCode(faultcodeNumber); - if (faultLabel==null && faultCode==null){ - faultCodeMapper.insertfaultlabel(faultCodeAddReq); - faultCodeMapper.insertfaultcode(faultCodeAddReq); - } - } - - - /** - * 修改故障码 - * @param faultCodeUpdReq - * @return - */ - @Override - public void upd(FaultCodeUpdReq faultCodeUpdReq) { - //修改故障名称表信息和故障码表信息 -// faultCodeMapper.updfaultlabel(faultCodeUpdReq); - faultCodeMapper.updfaultcode(faultCodeUpdReq); - } - - - /** - * 删除故障码 - * @param messageTypeId - * @return - */ - @Override - public void del(Integer messageTypeId) { - - //删除故障码表信息 - faultCodeMapper.delfaultcode(messageTypeId); - //删除对应的故障名称表信息 - faultCodeMapper.delfaultlabel(messageTypeId); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultConditionServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultConditionServiceImpl.java deleted file mode 100644 index 2332018..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultConditionServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.fault.domain.FaultCondition; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionListReq; -import com.muyu.fault.domain.resp.FaultConditionListResp; -import com.muyu.fault.domain.resp.FaultConditionTotalListResp; -import com.muyu.fault.mapper.FaultConditionMapper; -import com.muyu.fault.service.FaultConditionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultConditionServiceImpl extends ServiceImpl implements FaultConditionService { - - @Autowired - private FaultConditionMapper faultConditionMapper; - - - - /** - * 故障规则 - * @param faultConditionListReq - * @return - */ - @Override - public FaultConditionTotalListResp getfaultrulelist(FaultConditionListReq faultConditionListReq) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultConditionListReq.getPageNum() - 1) * faultConditionListReq.getPageSize(); - faultConditionListReq.setPageNum(offset); - - List selectfaultconditionlist = faultConditionMapper.selectfaultconditionlist(faultConditionListReq); - List faultConditionListRespList = selectfaultconditionlist.stream() - .map(FaultConditionListResp::faultConditionListResp) - .toList(); - return FaultConditionTotalListResp.faultConditionTotalListResp(faultConditionListRespList,count); - } - - - /** - * 故障规则添加 判断故障规则是否存在 - * @param faultConditionAddReq - * @return - */ - @Override - public List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq) { - List faultConditionList = faultConditionMapper.selectBytypeAndlabel(faultConditionAddReq); - return faultConditionList; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultDetectionStrategyServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultDetectionStrategyServiceImpl.java deleted file mode 100644 index aa77e83..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultDetectionStrategyServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.muyu.fault.mapper.FaultDetectionStrategyMapper; -import com.muyu.fault.service.FaultDetectionStrategyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @className: FaultDetectionStrategyServiceImpl ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 23:58 ⏰ - * @Version: 1.0 - * @description: - */ -@Service -public class FaultDetectionStrategyServiceImpl implements FaultDetectionStrategyService { - - @Autowired - private FaultDetectionStrategyMapper faultDetectionStrategyMapper; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLabelServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLabelServiceImpl.java deleted file mode 100644 index ceff5c6..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLabelServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.FaultLabel; -import com.muyu.fault.mapper.FaultLabelMapper; -import com.muyu.fault.service.FaultLabelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultLabelServiceImpl extends ServiceImpl implements FaultLabelService { - @Autowired - private FaultLabelMapper faultLabelMapper; - - - /** - * 故障信息查询 - * @return - */ - @Override - public List select() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - List list = this.list(queryWrapper); - return list; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java deleted file mode 100644 index 1eecb65..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.FaultLog; -import com.muyu.fault.domain.req.FaultLogListReq; -import com.muyu.fault.domain.resp.FaultLogListResp; -import com.muyu.fault.domain.resp.FaultLogTotalListResp; -import com.muyu.fault.mapper.FaultLogMapper; -import com.muyu.fault.service.FaultLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService { - @Autowired - private FaultLogMapper faultLogMapper; - - /** - * 故障日志列表 - * @param faultLogListReq - * @return - */ - @Override - public FaultLogTotalListResp selectfaultlog(FaultLogListReq faultLogListReq) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultLogListReq.getPageNum() - 1) * faultLogListReq.getPageSize(); - faultLogListReq.setPageNum(offset); - List faultLogListResps = faultLogMapper.selectfaultLogMapper(faultLogListReq); - List faultLogListRespList = faultLogListResps.stream() - .map(FaultLogListResp::faultLogListResp) - .toList(); - return FaultLogTotalListResp.faultLogTotalListResp(faultLogListRespList,count); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultRuleServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultRuleServiceImpl.java deleted file mode 100644 index ff37c01..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultRuleServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.FaultRule; -import com.muyu.fault.mapper.FaultRuleMapper; -import com.muyu.fault.service.FaultRuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultRuleServiceImpl extends ServiceImpl implements FaultRuleService { - - @Autowired - private FaultRuleMapper faultRuleMapper; - - /** - * 车辆故障检测 - * @return - */ - @Override - public String checkfaults(FaultRule faultRule) { - //获取触发条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (Long.valueOf(faultRule.getFaultcodeId())!=null && faultRule.getFaultcodeId()!=0){ - queryWrapper.eq(FaultRule::getFaultcodeId, faultRule.getFaultcodeId()); - } - List faultRuleList = this.list(queryWrapper); - for (FaultRule rule : faultRuleList) { - //单个值比较 - if (faultRule.getSingleThreshold()!=null && faultRule.getMaxThreshold()==null && faultRule.getMinThreshold()==null){ - //大于阈值 - if (faultRule.getConditionContent().contains(">") || faultRule.getConditionContent().contains("大于")){ - if (faultRule.getThreshold().compareTo(rule.getSingleThreshold())>0){ - return "数据超过阈值，出现异常"; - } - } - //小于阈值 - if (faultRule.getConditionContent().contains("<") || faultRule.getConditionContent().contains("小于")){ - if (faultRule.getThreshold().compareTo(rule.getSingleThreshold())<0){ - return "数据过低，出现异常"; - } - } - }else { //区间值比较 - if (faultRule.getThreshold().compareTo(rule.getMinThreshold())<0 || faultRule.getThreshold().compareTo(rule.getMaxThreshold())>0){ - return "数据不在可控范围内，出现异常"; - } - } - } - return "判断出现异常"; - } - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java deleted file mode 100644 index 3c67125..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.FaultType; -import com.muyu.fault.mapper.FaultTypeMapper; -import com.muyu.fault.service.FaultTypeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultTypeServiceImpl extends ServiceImpl implements FaultTypeService { - @Autowired - private FaultTypeMapper faultTypeMapper; - /** - * 故障码分类查询 - * @return - */ - @Override - public List select() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - List list = this.list(queryWrapper); - return list; - } - - @Override - public Integer add(FaultType faultType) { - return faultTypeMapper.add(faultType); - } - - @Override - public Integer update(FaultType faultType) { - return faultTypeMapper.update(faultType); - } - - @Override - public Integer delete(Integer id) { - return faultTypeMapper.delete(id); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/MessageServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/MessageServiceImpl.java deleted file mode 100644 index eea14a6..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/MessageServiceImpl.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.muyu.fault.service.impl; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.security.service.TokenService; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.LoginUser; -import com.muyu.fault.domain.message.Message; -import com.muyu.fault.domain.message.MessageReq; -import com.muyu.fault.domain.message.MessageSendReq; -import com.muyu.fault.mapper.MessageMapper; -import com.muyu.fault.service.MessageService; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class MessageServiceImpl extends ServiceImpl implements MessageService { - @Autowired - private TokenService tokenService; - @Autowired - private HttpServletRequest request; - @Autowired - private MessageMapper messageMapper; - /** - * 消息发送 - * @param messageSendReq - * @return - */ - @Override - public void sendmessage(MessageSendReq messageSendReq) { - String token = SecurityUtils.getToken();// 获取当前Token - LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户 - if (loginUser == null) { - throw new RuntimeException("用户未登录或Token无效"); - } - Long userid = loginUser.getUserid(); - messageSendReq.setUserId(userid); - - // 定义一个DateTimeFormatter对象，用于格式化日期时间为yyyy-MM-dd HH:mm:ss - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - // 获取当前日期和时间 - LocalDateTime now = LocalDateTime.now(); - // 使用formatter格式化当前日期和时间 - String formattedDateTime = now.format(formatter); - // 使用formatter将字符串解析回LocalDateTime - LocalDateTime parsedDateTime = LocalDateTime.parse(formattedDateTime, formatter); - // 然后按照上面的步骤将LocalDateTime转换为Date - ZonedDateTime zdt = parsedDateTime.atZone(ZoneId.systemDefault()); - Date date = Date.from(zdt.toInstant()); - // 现在date是一个包含了字符串中日期和时间的Date对象 - messageSendReq.setCreateTime(date); - - - - } - - - /** - * 消息查看 - * @param messageReq - * @param - * @return - */ - @Override - public List selectmessage(MessageReq messageReq) { - String token = SecurityUtils.getToken();// 获取当前Token - LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户 - if (loginUser == null) { - throw new RuntimeException("用户未登录或Token无效"); - } - Long userid = loginUser.getUserid(); - messageReq.setUserId(userid); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(messageReq.getStatus())), -// Message::getStatus,messageReq.getStatus()); -// queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(messageReq.getUserId())), -// Message::getUserId,messageReq.getUserId()); - if (messageReq.getStatus() != null) { - queryWrapper.eq(Message::getStatus, messageReq.getStatus()); - } - queryWrapper.eq(Message::getUserId, messageReq.getUserId()); - List list = this.list(queryWrapper); - return list; - } - - /** - * 查看消息改变状态 - * @param message - * @return - */ - @Override - public void changestatus(Message message) { - messageMapper.changestatus(message); - } - - /** - * 查看未读的消息 - * @return - */ - @Override - public List unread() { -// return messageMapper.unread(); - return null; - } - - - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java deleted file mode 100644 index c219241..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.fault.domain.SysCarFault; -import com.muyu.fault.mapper.SysCarFaultMapper; -import com.muyu.fault.service.ISysCarFaultService; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.List; - -/** - * 车辆故障Service业务层处理 - * - * @author Yang鹏 - * @date 2024-09-18 - */ -@Service -public class SysCarFaultServiceImpl - extends ServiceImpl - implements ISysCarFaultService { - - /** - * 精确查询车辆故障 - * - * @param id 车辆故障主键 - * @return 车辆故障 - */ - @Override - public SysCarFault selectSysCarFaultById(Long id) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(SysCarFault::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询车辆故障列表 - * - * @param sysCarFault 车辆故障 - * @return 车辆故障 - */ - @Override - public List selectSysCarFaultList(SysCarFault sysCarFault) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarFault.getFaultCode())){ - queryWrapper.eq(SysCarFault::getFaultCode, sysCarFault.getFaultCode()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultName())){ - queryWrapper.like(SysCarFault::getFaultName, sysCarFault.getFaultName()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultType())){ - queryWrapper.eq(SysCarFault::getFaultType, sysCarFault.getFaultType()); - } - if (StringUtils.isNotEmpty(sysCarFault.getCarVin())){ - queryWrapper.eq(SysCarFault::getCarVin, sysCarFault.getCarVin()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultLabel())){ - queryWrapper.eq(SysCarFault::getFaultLabel, sysCarFault.getFaultLabel()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultBit())){ - queryWrapper.eq(SysCarFault::getFaultBit, sysCarFault.getFaultBit()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultValue())){ - queryWrapper.eq(SysCarFault::getFaultValue, sysCarFault.getFaultValue()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultWarn())){ - queryWrapper.eq(SysCarFault::getFaultWarn, sysCarFault.getFaultWarn()); - } - if (StringUtils.isNotEmpty(sysCarFault.getWarnStatus())){ - queryWrapper.eq(SysCarFault::getWarnStatus, sysCarFault.getWarnStatus()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultDesc())){ - queryWrapper.eq(SysCarFault::getFaultDesc, sysCarFault.getFaultDesc()); - } - if (StringUtils.isNotEmpty(sysCarFault.getState())){ - queryWrapper.eq(SysCarFault::getState, sysCarFault.getState()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * @param sysCarFault 车辆故障 - * @return 车辆故障 - */ - @Override - public Boolean checkIdUnique(SysCarFault sysCarFault) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCarFault::getId, sysCarFault.getId()); - return this.count(queryWrapper) > 0; - } - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java deleted file mode 100644 index fcac7ac..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.fault.service.impl.faultDetectionStrategy; - -import org.springframework.stereotype.Service; - -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ - - -/** - * 针对燃油车的故障检测逻辑 - */ -@Service(value = "FuelVehicleCar") -public class FuelVehicleCarFaultDetectionStrategy { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java deleted file mode 100644 index 6321250..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.muyu.fault.service.impl.faultDetectionStrategy; - - -import com.muyu.fault.domain.CarFaultRule; -import com.muyu.fault.domain.FaultReport; -import com.muyu.fault.service.FaultDetectionStrategy; -import org.springframework.stereotype.Service; - -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ - -/** - * 针对纯电车的故障检测逻辑 - */ -@Service(value = "PureElectricCar") -public class PureElectricCarFaultDetectionStrategy implements FaultDetectionStrategy { - - - - @Override - public FaultReport detectFaults(CarFaultRule carFaultRule) { - - - //检测车速是否处于正常范围 - if (carFaultRule.getSpeed()>200 || carFaultRule.getSpeed()<0){ - return new FaultReport("纯电车","车速不在正常范围内,请注意"); - } - //检测总里程数是否超过正常数 - if (carFaultRule.getTM()>5000000){ - return new FaultReport("纯电车","总里程数已超标,请注意"); - } - //检测总电压是否正常 - if (carFaultRule.getTV()>650){ - return new FaultReport("纯电车","总电压过高,请注意"); - } - //检测电流是否超标 - if (carFaultRule.getCC()>50){ - return new FaultReport("纯电车","电流过高,请注意"); - } - //检测绝缘电阻 - if (carFaultRule.getIR()>100000){ - return new FaultReport("纯电车","绝缘电阻过高,请注意"); - } -// //检测加速踏板行程值 -// if (carFaultRule.getAPTV()){ -// -// } -// //检测制动踏板行程值 -// if (carFaultRule.getBPTV()){ -// -// } -// //检测燃料消耗率 -// if (carFaultRule.getSFC()){ -// -// } -// //检测电机控制器温度 -// if (carFaultRule.getMCT()){ -// -// } -// //检测电机转速 -// if (carFaultRule.getMS()){ -// -// } -// //检测电机转矩 -// if (carFaultRule.getMTO()){ -// -// } -// //检测电机温度 -// if (carFaultRule.getMTE()){ -// -// } -// //检测电机电压 -// if (carFaultRule.getMV()){ -// -// } -// //检测电机电流 -// if (carFaultRule.getMC()){ -// -// } -// //检测动力电池剩余电量SOC -// if (carFaultRule.getPBRSOC()){ -// -// } -// //检测当前状态允许的最大反馈功率 -// if (carFaultRule.getMACSFP()){ -// -// } -// //检测当前状态允许最大放电功率 -// if (carFaultRule.getCSATMDP()) { -// -// } -// //检测BMS自检计数器 -// if (carFaultRule.getBMS()) { -// -// } -// //检测动力电池充放电电流 -// if (carFaultRule.getCADC()) { -// -// } -// //检测动力电池负载端总电压V3 -// if (carFaultRule.getPBLETVV3()) { -// -// } -// //检测单次最大电压 -// if (carFaultRule.getSMV()) { -// -// } -// //检测单体电池最低电压 -// if (carFaultRule.getMVOAB()) { -// -// } -// //检测单体电池最高温度 -// if (carFaultRule.getMAXBT()) { -// -// } -// //检测单体电池最低温度 -// if (carFaultRule.getMINBT()) { -// -// } -// //检测动力电池可用容量 -// if (carFaultRule.getPBAC()) { -// -// } -// //检测车辆状态 -// if (carFaultRule.getVS()) { -// -// } -// //检测充电状态 -// if (carFaultRule.getCS()) { -// -// } -// //检测运行状态 -// if (carFaultRule.getRS()) { -// -// } -// //检测SOC -// if (carFaultRule.getSOC()) { -// -// } -// //检测可充电储能装置工作状态 -// if (carFaultRule.getRESDWC()) { -// -// } -// //检测驱动电机状态 -// if (carFaultRule.getEAS()) { -// -// } -// //检测定位是否有效 -// if (carFaultRule.getPTC()) { -// -// } -// //检测EAS -// if (carFaultRule.getEPS()) { -// -// } -// //检测PTC -// if (carFaultRule.getABS()) { -// -// } -// //检测EPS -// if (carFaultRule.getMCU()) { -// -// } -// //检测ABS -// if (carFaultRule.getPBHS()) { -// -// } -// //检测MCU -// if (carFaultRule.getPBCS()) { -// -// } -// //检测动力电池加热状态 -// if (carFaultRule.getPBIS()) { -// -// } -// //检测动力电池当前状态 -// if (carFaultRule.getDCDC()) { -// -// } -// //检测动力电池保温状态 -// if (carFaultRule.getCHG()) { -// -// } -// //检测DCDC -// if (carFaultRule.getCHB()) { -// -// } -// //检测CHG -// if (carFaultRule.getCUB()) { -// -// } - return null; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/bootstrap.yml b/cloud-gateway/cloud-modules-fault/src/main/resources/bootstrap.yml deleted file mode 100644 index 1dc47cd..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,49 +0,0 @@ -# Tomcat -server: - port: 9434 - -# nacos线上地址 -nacos: - addr: 123.57.152.124:8848 - user-name: nacos - password: nacos - namespace: five - -# Spring -spring: - application: - # 应用名称 - name: cloud-fault - 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} diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/logback/dev.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/logback/dev.xml deleted file mode 100644 index f350dd2..0000000 --- a/cloud-gateway/cloud-modules-fault/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-gateway/cloud-modules-fault/src/main/resources/logback/prod.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/logback/prod.xml deleted file mode 100644 index f523344..0000000 --- a/cloud-gateway/cloud-modules-fault/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-gateway/cloud-modules-fault/src/main/resources/logback/test.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/logback/test.xml deleted file mode 100644 index f523344..0000000 --- a/cloud-gateway/cloud-modules-fault/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-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultCodeMapper.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultCodeMapper.xml deleted file mode 100644 index cf47a98..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultCodeMapper.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - SELECT - car_faultcode.faultcode_id, - car_faultcode.message_type_id, - car_fault_label.message_type_code, - car_faultcode.faultcode_number, - car_faultcode.fault_group, - car_faultcode.fault_bit, - car_faultcode.fault_value, - car_fault_label.message_type_name, - car_faultcode.is_warning - FROM - car_faultcode - LEFT JOIN car_fault_label ON car_faultcode.message_type_id = car_fault_label.message_type_id - - - - - - - - - - - - INSERT INTO `eight`.`car_fault_label` - (`message_type_id`, `message_type_code`, `message_type_name`, `message_type_belongs`) VALUES - (0, #{messageTypeCode}, #{messageTypeName}, '车辆基础'); - - - INSERT INTO `eight`.`car_faultcode` - (`faultcode_id`, `message_type_id`, `faultcode_number`, `fault_group`, `fault_bit`, `fault_value`, `is_warning`) VALUES - (0, #{messageTypeId}, #{faultcodeNumber}, #{faultGroup}, #{faultBit}, #{faultValue}, #{isWarning}); - - - - - - - UPDATE `eight`.`car_fault_label` - SET `message_type_code` = #{messageTypeCode}, - `message_type_name` = #{messageTypeName}, - `message_type_belongs` =#{messageTypeBelongs} - WHERE `message_type_id` = #{messageTypeId}; - - - UPDATE `eight`.`car_faultcode` - SET `message_type_id` = #{messageTypeId}, - `faultcode_number` = #{faultcodeNumber}, - `fault_group` = #{faultGroup}, - `fault_bit` = #{faultBit}, - `fault_value` = #{faultValue}, - `is_warning` = #{isWarning} - WHERE `faultcode_id` = #{faultcodeId}; - - - - - - delete from car_faultcode where message_type_id=#{messageTypeId} - - - delete from car_fault_label where message_type_id=#{messageTypeId} - - diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultConditionMapper.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultConditionMapper.xml deleted file mode 100644 index 6ae69b4..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultConditionMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT - car_fault_condition.*, - car_type.car_type_name, - car_fault_label.message_type_name, - car_fault_label.message_type_code - FROM - car_fault_condition - LEFT JOIN car_type ON car_fault_condition.car_type_id = car_type.car_type_id - LEFT JOIN car_fault_label ON car_fault_condition.message_type_id = car_fault_label.message_type_id - - - - - - - - - diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultLogMapper.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultLogMapper.xml deleted file mode 100644 index 62e8af8..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultLogMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT - car_fault_log.*, - car_faultcode.faultcode_number, - car_information.car_information_VIN - FROM - car_fault_log - LEFT JOIN car_faultcode ON car_fault_log.faultcode_id = car_faultcode.faultcode_id - LEFT JOIN car_information ON car_fault_log.car_information_id = car_information.car_information_id - - - - - diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/MessageMapper.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/MessageMapper.xml deleted file mode 100644 index a635225..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/MessageMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - update car_fault_message set status=1 where id=#{id} - - - diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml new file mode 100644 index 0000000..54111f7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + enterpise-cache + + + 17 + 17 + UTF-8 + + + + + + + + com.muyu + cloud-common-cache + ${muyu.version} + + + + com.muyu + enterpise-common + + + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/EnterpiseCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/EnterpiseCacheService.java new file mode 100644 index 0000000..575a974 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/EnterpiseCacheService.java @@ -0,0 +1,42 @@ +package com.muyu.enterpise.cache; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.common.cache.CacheBasic; +import com.muyu.domain.MessageValue; +import org.springframework.stereotype.Component; + +/** + * @version 1.0 + * @Author xie ya ru + * @Date 2024/9/29 20:04 + * @注释 + */ +@Component +public class EnterpiseCacheService extends CacheAbsBasic { + + /** + * 前缀 + * @return + */ + @Override + public String keyPre() { + return"messageValue:info:"; + } + + + @Override + public String encode(String key) { + return super.encode(key); + } + + + /** + * 解密 + * @param key 缓存建 + * @return + */ + @Override + public String decode(String key) { + return key.replace("messageValue:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6fd26a8 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.enterpise.cache.EnterpiseCacheService diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java index 88f16ed..3395bda 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.domain.req.MessageValueAddReq; +import com.muyu.domain.resp.MessageValueListResp; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -82,4 +83,14 @@ public class MessageValue extends BaseEntity { .messageEndIndex(messageValueAddReq.getMessageEndIndex()) .build(); } + public static MessageValue addRollback(MessageValueListResp messageValueListResp){ + return MessageValue.builder() + .templateId(messageValueListResp.getMessageId()) + .messageType(messageValueListResp.getMessageType()) + .messageCode(messageValueListResp.getMessageCode()) + .messageLabel(messageValueListResp.getMessageLabel()) + .messageStartIndex(messageValueListResp.getMessageStartIndex()) + .messageEndIndex(messageValueListResp.getMessageEndIndex()) + .build(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCarReq.java similarity index 62% rename from cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCarReq.java index 142b116..0da2dea 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCarReq.java @@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -21,14 +18,13 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @date 2024-09-18 */ -@EqualsAndHashCode(callSuper = true) @Data -@SuperBuilder +@Builder @NoArgsConstructor @AllArgsConstructor @TableName(value = "sys_car", autoResultMap = true) @Tag(name = "车辆基础信息对象") -public class SysCar extends BaseEntity{ +public class SysCarReq { /** 自增主键 */ @TableId( type = IdType.AUTO) @@ -68,24 +64,4 @@ public class SysCar extends BaseEntity{ private Integer state; - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("carVin", getCarVin()) - .append("carPlate", getCarPlate()) - .append("carBrand", getCarBrand()) - .append("carModel", getCarModel()) - .append("carType", getCarType()) - .append("warnStrategy", getWarnStrategy()) - .append("groupCode", getGroupCode()) - .append("state", getState()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java index 19c61e5..b85b6b2 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java @@ -3,6 +3,7 @@ package com.muyu.domain.resp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.domain.SysCar; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -89,19 +90,19 @@ public class SysCarResp { @Schema(description = "启用状态") private Integer state; - @Override - public String toString() { - return "SysCarResp{" + - "id=" + id + - ", carVin='" + carVin + '\'' + - ", carPlate='" + carPlate + '\'' + - ", carBrand='" + carBrand + '\'' + - ", carModel='" + carModel + '\'' + - ", carType=" + carType + - ", sysTypeName='" + sysTypeName + '\'' + - ", warnStrategy=" + warnStrategy + - ", groupCode='" + groupCode + '\'' + - ", state=" + state + - '}'; + + public static SysCarResp reverseResp(SysCar sysCar){ + return SysCarResp.builder() + .id(sysCar.getId()) + .carVin(sysCar.getCarVin()) + .carPlate(sysCar.getCarPlate()) + .carBrand(sysCar.getCarBrand()) + .carModel(sysCar.getCarModel()) + .carType(sysCar.getCarType()) + .warnStrategy(sysCar.getWarnStrategy()) + .groupCode(sysCar.getGroupCode()) + .state(sysCar.getState()) + .build(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index dd92d17..56b5964 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -83,6 +83,14 @@ com.muyu cloud-common-xxl + + + + com.muyu + enterpise-cache + ${muyu.version} + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceClazzController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceClazzController.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceClazzController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceClazzController.java index 43f27ea..8440cb4 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceClazzController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceClazzController.java @@ -1,9 +1,9 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFenceClazz; -import com.muyu.service.CarFenceClazzService; +import com.muyu.enterpise.service.CarFenceClazzService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceController.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceController.java index e323d6c..b1b6563 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceController.java @@ -1,12 +1,12 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFence; import com.muyu.domain.req.CarFenceReq; import com.muyu.domain.resp.CarFenceResq; -import com.muyu.service.CarFenceService; -import com.muyu.service.CarFenceServiceMybaits; +import com.muyu.enterpise.service.CarFenceService; +import com.muyu.enterpise.service.CarFenceServiceMybaits; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceTypeController.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceTypeController.java index 2b3024b..c47d09a 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceTypeController.java @@ -1,8 +1,8 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFenceType; -import com.muyu.service.CarFenceTypeService; +import com.muyu.enterpise.service.CarFenceTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarTypeController.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarTypeController.java index 26b37e9..85dcd97 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarTypeController.java @@ -1,8 +1,8 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.service.CarTypeService; +import com.muyu.enterpise.service.CarTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultCodeController.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultCodeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultCodeController.java index d209501..8c1df61 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultCodeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultCodeController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; @@ -7,7 +7,7 @@ import com.muyu.domain.req.FaultCodeAddReq; import com.muyu.domain.req.FaultCodeListReq; import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeTotalListResp; -import com.muyu.service.FaultCodeService; +import com.muyu.enterpise.service.FaultCodeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultConditionController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java index 7e6cb77..703d222 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultConditionController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; @@ -7,7 +7,7 @@ import com.muyu.domain.FaultCondition; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionListReq; import com.muyu.domain.req.FaultConditionUpdReq; -import com.muyu.service.FaultConditionService; +import com.muyu.enterpise.service.FaultConditionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLabelController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLabelController.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLabelController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLabelController.java index 96924c7..3ec1325 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLabelController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLabelController.java @@ -1,6 +1,6 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.service.FaultLabelService; +import com.muyu.enterpise.service.FaultLabelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLogController.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLogController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLogController.java index 4bdf04f..c67767c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLogController.java @@ -1,7 +1,7 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.req.FaultLogListReq; -import com.muyu.service.FaultLogService; +import com.muyu.enterpise.service.FaultLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultRuleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultRuleController.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultRuleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultRuleController.java index 5f1b91c..bcac91c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultRuleController.java @@ -1,10 +1,10 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFaultRule; import com.muyu.domain.FaultRule; -import com.muyu.service.FaultRuleService; +import com.muyu.enterpise.service.FaultRuleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultTypeController.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultTypeController.java index 40818d6..97b373b 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultTypeController.java @@ -1,6 +1,6 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.service.FaultTypeService; +import com.muyu.enterpise.service.FaultTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FenceGroupController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FenceGroupController.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FenceGroupController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FenceGroupController.java index 3678693..1b4c76a 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FenceGroupController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FenceGroupController.java @@ -1,8 +1,8 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.FenceGroup; -import com.muyu.service.FenceGroupService; +import com.muyu.enterpise.service.FenceGroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageController.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageController.java index 98ce3c6..0bcd21a 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageController.java @@ -1,11 +1,11 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.message.Message; import com.muyu.domain.message.MessageReq; import com.muyu.domain.message.MessageSendReq; -import com.muyu.service.MessageService; +import com.muyu.enterpise.service.MessageService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageTemplateController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageTemplateController.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageTemplateController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageTemplateController.java index 148e9e1..75edf5c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageTemplateController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageTemplateController.java @@ -1,10 +1,10 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.MessageTemplate; import com.muyu.domain.req.MessageTemplateAddReq; import com.muyu.domain.resp.MessageTemplateListResp; -import com.muyu.service.MessageTemplateService; +import com.muyu.enterpise.service.MessageTemplateService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageValueController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageValueController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java index 5236756..6b3e7d7 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageValueController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; @@ -6,7 +6,8 @@ import com.muyu.domain.MessageValue; import com.muyu.domain.req.MessageValueAddReq; import com.muyu.domain.req.MessageValueReq; import com.muyu.domain.resp.MessageValueListResp; -import com.muyu.service.MessageValueService; +import com.muyu.enterpise.cache.EnterpiseCacheService; +import com.muyu.enterpise.service.MessageValueService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; @@ -33,8 +34,8 @@ public class MessageValueController extends BaseController { @Autowired private MessageValueService messageValueService; - @Resource - private RedisTemplate redisTemplate; + @Autowired + private EnterpiseCacheService enterpiseCacheService; /** * 报文数据列表查询 @@ -56,8 +57,8 @@ public class MessageValueController extends BaseController { @PostMapping("/") @Operation(summary = "添加报文数据", description = "新增报文数据") public Result save(@RequestBody MessageValueAddReq messageValueAddReq){ - redisTemplate.boundValueOps("messageValue:" +messageValueAddReq.getTemplateId()).increment(1); messageValueService.save(MessageValue.addBuild(messageValueAddReq)); + enterpiseCacheService.put(String.valueOf(messageValueAddReq.getTemplateId()),MessageValue.addBuild(messageValueAddReq)); return Result.success("添加成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MiddleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MiddleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java index 7e6de8c..348561b 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MiddleController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java @@ -1,10 +1,10 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.FenceGroup; import com.muyu.domain.req.CarFenceAdd; -import com.muyu.service.CarFenceServiceMybaits; -import com.muyu.service.MiddleService; +import com.muyu.enterpise.service.CarFenceServiceMybaits; +import com.muyu.enterpise.service.MiddleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarController.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarController.java index 3aba980..d398b9d 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; @@ -6,8 +6,9 @@ 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.domain.SysCar; +import com.muyu.domain.req.SysCarReq; import com.muyu.domain.resp.SysCarResp; -import com.muyu.service.SysCarService; +import com.muyu.enterpise.service.SysCarService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,10 +35,10 @@ public class SysCarController extends BaseController */ @RequiresPermissions("car:car:list") @GetMapping("/list") - public Result> list(SysCar sysCar) + public Result> list(SysCarReq sysCarReq) { startPage(); - List list = sysCarService.selectSysCarList(sysCar); + List list = sysCarService.selectSysCarList(sysCarReq); return getDataTable(list); } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarFaultController.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarFaultController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarFaultController.java index 5b3f287..6e73975 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarFaultController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -7,7 +7,7 @@ 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.domain.SysCarFault; -import com.muyu.service.ISysCarFaultService; +import com.muyu.enterpise.service.ISysCarFaultService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java index 7eb5abe..a2ad3b3 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java @@ -1,10 +1,10 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.domain.SysCarType; -import com.muyu.service.SysTypeService; +import com.muyu.enterpise.service.SysTypeService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnLogsController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnLogsController.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnLogsController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnLogsController.java index 9e6f3fd..225af02 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnLogsController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.domain.WarnLogs; -import com.muyu.service.IWarnLogsService; +import com.muyu.enterpise.service.IWarnLogsService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnRuleController.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnRuleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnRuleController.java index 0189a41..17680c4 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnRuleController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.domain.WarnRule; -import com.muyu.service.IWarnRuleService; +import com.muyu.enterpise.service.IWarnRuleService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnStrategyController.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnStrategyController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnStrategyController.java index 1cb1478..7f3b24f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnStrategyController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.domain.WarnStrategy; -import com.muyu.service.IWarnStrategyService; +import com.muyu.enterpise.service.IWarnStrategyService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceClazzMapper.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceClazzMapper.java index 30ada37..ba6acb1 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceClazzMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarFenceClazz; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceMapper.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceMapper.java index c6198b0..451261d 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarFence; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceServiceMybaitsMapper.java similarity index 98% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceServiceMybaitsMapper.java index e41f497..7503a27 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceServiceMybaitsMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.muyu.domain.CarFence; import com.muyu.domain.CarMiddle; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceTypeMapper.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceTypeMapper.java index efa6855..4b4d9ba 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceTypeMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarFenceType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarTypeMapper.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarTypeMapper.java index 3d2d805..829e92a 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarTypeMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultCodeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultCodeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java index 1805157..0461600 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultCodeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultCode; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultConditionMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultConditionMapper.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultConditionMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultConditionMapper.java index f4a7aa3..9068d18 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultConditionMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultConditionMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultCondition; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLabelMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLabelMapper.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLabelMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLabelMapper.java index 8d188fa..4b29d39 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLabelMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLabelMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultLabel; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLogMapper.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLogMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLogMapper.java index f5afe1f..3d13bd8 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLogMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultLog; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultRuleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultRuleMapper.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultRuleMapper.java index 0e42646..86a42cd 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultRuleMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultRule; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultTypeMapper.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultTypeMapper.java index 65971a5..542f13c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultTypeMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FenceGroupMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FenceGroupMapper.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FenceGroupMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FenceGroupMapper.java index cb52bf0..c663ba1 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FenceGroupMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FenceGroupMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FenceGroup; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageMapper.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageMapper.java index 5dde70a..417753a 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.message.Message; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageTemplateMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageTemplateMapper.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageTemplateMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageTemplateMapper.java index eddf39d..85d4d52 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageTemplateMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageTemplateMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.MessageTemplate; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageValueMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageValueMapper.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageValueMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageValueMapper.java index df21a71..233d11f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageValueMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageValueMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.MessageValue; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MiddleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MiddleMapper.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MiddleMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MiddleMapper.java index bb9ac8b..9d1b8a2 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MiddleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MiddleMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarFaultMapper.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarFaultMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarFaultMapper.java index f743f89..deb269b 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarFaultMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarFaultMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.SysCarFault; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java index 5d18dba..abd13a3 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.SysCar; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java index 9197cc2..8ca2562 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.SysCarType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnLogsMapper.java similarity index 88% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnLogsMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnLogsMapper.java index b8917c4..01288e5 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnLogsMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnLogsMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.WarnLogs; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnRuleMapper.java similarity index 88% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnRuleMapper.java index 9b41857..2e3c1d8 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnRuleMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnStrategyMapper.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnStrategyMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnStrategyMapper.java index 7d55fbd..892d593 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnStrategyMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceClazzService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceClazzService.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceClazzService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceClazzService.java index 1df33ac..086db20 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceClazzService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceClazzService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.CarFenceClazz; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceService.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceService.java index 78b717d..168f749 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceServiceMybaits.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceServiceMybaits.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java index 913cb27..a2474ff 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceServiceMybaits.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.muyu.domain.CarFence; import com.muyu.domain.FenceGroup; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceTypeService.java similarity index 90% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceTypeService.java index b90043a..597f415 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceTypeService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.CarFenceType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarTypeService.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarTypeService.java index 0292832..0222e8b 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarTypeService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.CarType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultCodeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultCodeService.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultCodeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultCodeService.java index 096ffe1..36369e5 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultCodeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultCodeService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultConditionService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultConditionService.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultConditionService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultConditionService.java index 2954aae..a429871 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultConditionService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultConditionService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultCondition; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategy.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategy.java index e1a9619..f1ed1c3 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.muyu.domain.CarFaultRule; import com.muyu.domain.FaultReport; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategyService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategyService.java similarity index 88% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategyService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategyService.java index 1ef9726..f6d7575 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategyService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategyService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; /** * 故障检测策略的接口 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLabelService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLabelService.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLabelService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLabelService.java index c8cbe2f..c134a55 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLabelService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLabelService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultLabel; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLogService.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLogService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLogService.java index 7014adf..0ffa24c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLogService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultLog; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultRuleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultRuleService.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultRuleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultRuleService.java index 5dcdd85..1d3b8ba 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultRuleService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultRule; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultTypeService.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultTypeService.java index d4e7791..4f4ecb2 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultTypeService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FenceGroupService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FenceGroupService.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FenceGroupService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FenceGroupService.java index 085d485..4edcbd2 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FenceGroupService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FenceGroupService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FenceGroup; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/ISysCarFaultService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/ISysCarFaultService.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/ISysCarFaultService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/ISysCarFaultService.java index ff8d275..0aa20ed 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/ISysCarFaultService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/ISysCarFaultService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.SysCarFault; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnLogsService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnLogsService.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnLogsService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnLogsService.java index 0ded45b..5a75aad 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnLogsService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnLogsService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.WarnLogs; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnRuleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnRuleService.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnRuleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnRuleService.java index e239d0a..a882960 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnRuleService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.WarnRule; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnStrategyService.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnStrategyService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnStrategyService.java index 2b95076..5a887c1 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnStrategyService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnStrategyService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.WarnStrategy; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageService.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageService.java index ed74af9..b5c6604 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.message.Message; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageTemplateService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageTemplateService.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageTemplateService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageTemplateService.java index 5b515f1..d3503ae 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageTemplateService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageTemplateService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.MessageTemplate; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageValueService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageValueService.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageValueService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageValueService.java index 39c599d..7817ddd 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageValueService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageValueService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.MessageValue; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MiddleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MiddleService.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MiddleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MiddleService.java index 157e0b0..95df7c2 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MiddleService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MiddleService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; /** * 中间表服务接口 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysCarService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java similarity index 84% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysCarService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java index 4d012b9..9e9d0da 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysCarService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java @@ -1,7 +1,8 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.SysCar; +import com.muyu.domain.req.SysCarReq; import com.muyu.domain.resp.SysCarResp; import java.util.List; @@ -26,7 +27,7 @@ public interface SysCarService extends IService { * @param sysCar 车辆基础信息 * @return 车辆基础信息集合 */ - public List selectSysCarList(SysCar sysCar); + public List selectSysCarList(SysCarReq sysCarReq); /** * 判断 车辆基础信息 id是否唯一 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysTypeService.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysTypeService.java index af89808..fd21274 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysTypeService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.SysCarType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceClazzServiceImpl.java similarity index 77% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceClazzServiceImpl.java index df0a210..3c832f5 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceClazzServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.CarFenceClazz; -import com.muyu.mapper.CarFenceClazzMapper; -import com.muyu.service.CarFenceClazzService; +import com.muyu.enterpise.mapper.CarFenceClazzMapper; +import com.muyu.enterpise.service.CarFenceClazzService; import org.springframework.stereotype.Service; /** diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java index c855522..5519cf1 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -9,10 +9,10 @@ import com.muyu.domain.CarFenceClazz; import com.muyu.domain.CarFenceType; import com.muyu.domain.req.CarFenceReq; import com.muyu.domain.resp.CarFenceResq; -import com.muyu.mapper.CarFenceMapper; -import com.muyu.service.CarFenceClazzService; -import com.muyu.service.CarFenceService; -import com.muyu.service.CarFenceTypeService; +import com.muyu.enterpise.mapper.CarFenceMapper; +import com.muyu.enterpise.service.CarFenceClazzService; +import com.muyu.enterpise.service.CarFenceService; +import com.muyu.enterpise.service.CarFenceTypeService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java index 9a60f37..40023da 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java @@ -1,12 +1,12 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.muyu.domain.CarFence; import com.muyu.domain.CarMiddle; import com.muyu.domain.FenceAndGroupMiddle; import com.muyu.domain.FenceGroup; import com.muyu.domain.req.CarFenceAdd; -import com.muyu.mapper.CarFenceServiceMybaitsMapper; -import com.muyu.service.CarFenceServiceMybaits; +import com.muyu.enterpise.mapper.CarFenceServiceMybaitsMapper; +import com.muyu.enterpise.service.CarFenceServiceMybaits; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceTypeServiceImpl.java similarity index 77% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceTypeServiceImpl.java index e587835..c625541 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceTypeServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.CarFenceType; -import com.muyu.mapper.CarFenceTypeMapper; -import com.muyu.service.CarFenceTypeService; +import com.muyu.enterpise.mapper.CarFenceTypeMapper; +import com.muyu.enterpise.service.CarFenceTypeService; import org.springframework.stereotype.Service; /** diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarTypeServiceImpl.java similarity index 87% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarTypeServiceImpl.java index fee335e..2df19ce 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarTypeServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.CarType; -import com.muyu.mapper.CarTypeMapper; -import com.muyu.service.CarTypeService; +import com.muyu.enterpise.mapper.CarTypeMapper; +import com.muyu.enterpise.service.CarTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java index 710703f..2978b89 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,8 +11,8 @@ import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeListResp; import com.muyu.domain.resp.FaultCodeTotalListResp; import com.muyu.domain.vo.FaultCodeVo; -import com.muyu.mapper.FaultCodeMapper; -import com.muyu.service.FaultCodeService; +import com.muyu.enterpise.mapper.FaultCodeMapper; +import com.muyu.enterpise.service.FaultCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultConditionServiceImpl.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultConditionServiceImpl.java index eef3ca1..eaaeeb0 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultConditionServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -7,8 +7,8 @@ import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionListReq; import com.muyu.domain.resp.FaultConditionListResp; import com.muyu.domain.resp.FaultConditionTotalListResp; -import com.muyu.mapper.FaultConditionMapper; -import com.muyu.service.FaultConditionService; +import com.muyu.enterpise.mapper.FaultConditionMapper; +import com.muyu.enterpise.service.FaultConditionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLabelServiceImpl.java similarity index 86% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLabelServiceImpl.java index fade30b..8af081b 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLabelServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FaultLabel; -import com.muyu.mapper.FaultLabelMapper; -import com.muyu.service.FaultLabelService; +import com.muyu.enterpise.mapper.FaultLabelMapper; +import com.muyu.enterpise.service.FaultLabelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java index 2f18497..ecb4add 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -6,8 +6,8 @@ import com.muyu.domain.FaultLog; import com.muyu.domain.req.FaultLogListReq; import com.muyu.domain.resp.FaultLogListResp; import com.muyu.domain.resp.FaultLogTotalListResp; -import com.muyu.mapper.FaultLogMapper; -import com.muyu.service.FaultLogService; +import com.muyu.enterpise.mapper.FaultLogMapper; +import com.muyu.enterpise.service.FaultLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultRuleServiceImpl.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultRuleServiceImpl.java index a6a2b33..6c7fc4f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultRuleServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FaultRule; -import com.muyu.mapper.FaultRuleMapper; -import com.muyu.service.FaultRuleService; +import com.muyu.enterpise.mapper.FaultRuleMapper; +import com.muyu.enterpise.service.FaultRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultTypeServiceImpl.java similarity index 90% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultTypeServiceImpl.java index feca6bd..8d0abd0 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultTypeServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FaultType; -import com.muyu.mapper.FaultTypeMapper; -import com.muyu.service.FaultTypeService; +import com.muyu.enterpise.mapper.FaultTypeMapper; +import com.muyu.enterpise.service.FaultTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FenceGroupServiceImpl.java similarity index 84% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FenceGroupServiceImpl.java index ef4ec27..b28fe78 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FenceGroupServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FenceGroup; -import com.muyu.mapper.FenceGroupMapper; -import com.muyu.service.FenceGroupService; +import com.muyu.enterpise.mapper.FenceGroupMapper; +import com.muyu.enterpise.service.FenceGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageServiceImpl.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageServiceImpl.java index 3105c9d..48780b3 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,8 +9,8 @@ import com.muyu.common.system.domain.LoginUser; import com.muyu.domain.message.Message; import com.muyu.domain.message.MessageReq; import com.muyu.domain.message.MessageSendReq; -import com.muyu.mapper.MessageMapper; -import com.muyu.service.MessageService; +import com.muyu.enterpise.mapper.MessageMapper; +import com.muyu.enterpise.service.MessageService; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageTemplateServiceImpl.java similarity index 80% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageTemplateServiceImpl.java index 0efa970..9144447 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageTemplateServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.MessageTemplate; -import com.muyu.mapper.MessageTemplateMapper; -import com.muyu.service.MessageTemplateService; +import com.muyu.enterpise.mapper.MessageTemplateMapper; +import com.muyu.enterpise.service.MessageTemplateService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java similarity index 85% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java index 892f788..2e3282b 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,14 +7,13 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.MessageValue; import com.muyu.domain.req.MessageValueReq; import com.muyu.domain.resp.MessageValueListResp; -import com.muyu.mapper.MessageValueMapper; -import com.muyu.service.MessageValueService; +import com.muyu.enterpise.mapper.MessageValueMapper; +import com.muyu.enterpise.service.MessageValueService; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; -import java.util.Objects; /** * 消息值服务实现类 @@ -32,7 +31,7 @@ public class MessageValueServiceImpl private MessageValueMapper messageValueMapper; - private RedisTemplate redisTemplate; + /** * 查询所有消息值 * @param messageValueReq @@ -54,9 +53,7 @@ public class MessageValueServiceImpl } List list = this.list(queryWrapper); - for (MessageValue messageValue : list){ - redisTemplate.boundValueOps("messageValue:" + messageValue.getTemplateId()).set(messageValue); - } + return list.stream() .map(messageValue -> MessageValueListResp.valueBuild( diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MiddleServiceImpl.java similarity index 83% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MiddleServiceImpl.java index 33ff30a..4bb8d72 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MiddleServiceImpl.java @@ -1,7 +1,7 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; -import com.muyu.mapper.MiddleMapper; -import com.muyu.service.MiddleService; +import com.muyu.enterpise.mapper.MiddleMapper; +import com.muyu.enterpise.service.MiddleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarFaultServiceImpl.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarFaultServiceImpl.java index 6f06f94..1418161 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarFaultServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.SysCarFault; -import com.muyu.mapper.SysCarFaultMapper; -import com.muyu.service.ISysCarFaultService; +import com.muyu.enterpise.mapper.SysCarFaultMapper; +import com.muyu.enterpise.service.ISysCarFaultService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java similarity index 50% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java index c67bb8e..6dc4e15 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java @@ -1,15 +1,18 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.SysCar; +import com.muyu.domain.req.SysCarReq; import com.muyu.domain.resp.SysCarResp; -import com.muyu.mapper.SysCarMapper; -import com.muyu.service.SysCarService; +import com.muyu.enterpise.mapper.SysCarMapper; +import com.muyu.enterpise.service.SysCarService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import java.util.ArrayList; import java.util.List; /** @@ -32,11 +35,12 @@ public class SysCarServiceImpl * @return 车辆基础信息 */ @Override - public SysCar selectSysCarById(Long id) - { + public SysCar selectSysCarById(Long id) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); Assert.notNull(id, "id不可为空"); queryWrapper.eq(SysCar::getId, id); + + return this.getOne(queryWrapper); } @@ -44,35 +48,37 @@ public class SysCarServiceImpl /** * 查询车辆基础信息列表 * - * @param sysCar 车辆基础信息 + * @param sysCarReq 车辆基础信息 * @return 车辆基础信息 */ @Override - public List selectSysCarList(SysCar sysCar) - { - return sysCarMapper.selectSysCarList(sysCar); -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// if (StringUtils.isNotEmpty(sysCar.getCarVin())){ -// queryWrapper.like(SysCarResp::getCarVin, sysCar.getCarVin()); -// } -// if (StringUtils.isNotEmpty(sysCar.getCarPlate())){ -// queryWrapper.like(SysCarResp::getCarPlate, sysCar.getCarPlate()); -// } -// if (StringUtils.isNotEmpty(sysCar.getCarBrand())){ -// queryWrapper.eq(SysCarResp::getCarBrand, sysCar.getCarBrand()); -// } -// if (StringUtils.isNotEmpty(sysCar.getCarModel())){ -// queryWrapper.eq(SysCarResp::getCarModel, sysCar.getCarModel()); -// } -// if (StringUtils.isNotEmpty(String.valueOf(sysCar.getCarType()))){ -// queryWrapper.eq(SysCarResp::getCarType, sysCar.getCarType()); -// } -// if (StringUtils.isNotEmpty(String.valueOf(sysCar.getState()))){ -// queryWrapper.eq(SysCarResp::getState, sysCar.getState()); -// } -// return this.list(queryWrapper); + public List selectSysCarList(SysCarReq sysCarReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarReq.getCarVin())) { + queryWrapper.eq(SysCar::getCarVin,sysCarReq.getCarVin()); + } + if (StringUtils.isNotEmpty(sysCarReq.getCarPlate())) { + queryWrapper.like(SysCar::getCarPlate, sysCarReq.getCarPlate()); + } + if (StringUtils.isNotEmpty(sysCarReq.getCarBrand())) { + queryWrapper.eq(SysCar::getCarBrand, sysCarReq.getCarBrand()); + } + if (StringUtils.isNotEmpty(sysCarReq.getCarModel())) { + queryWrapper.eq(SysCar::getCarModel, sysCarReq.getCarModel()); + } + if (null == sysCarReq.getCarType()) { + queryWrapper.eq(SysCar::getCarType, sysCarReq.getCarType()); + } + if (null == sysCarReq.getState()) { + queryWrapper.eq(SysCar::getState, sysCarReq.getState()); + } + List list = this.list(queryWrapper); + return list.stream() + .map(SysCarResp::reverseResp) + .toList(); } + /** * 唯一 判断 * @param sysCar 车辆基础信息 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java similarity index 83% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java index c0e47fd..e2f8728 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.SysCarType; -import com.muyu.mapper.SysTypeMapper; -import com.muyu.service.SysTypeService; +import com.muyu.enterpise.mapper.SysTypeMapper; +import com.muyu.enterpise.service.SysTypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnLogsServiceImpl.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnLogsServiceImpl.java index c7ed3b3..1d3eef0 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnLogsServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.WarnLogs; -import com.muyu.mapper.WarnLogsMapper; -import com.muyu.service.IWarnLogsService; +import com.muyu.enterpise.mapper.WarnLogsMapper; +import com.muyu.enterpise.service.IWarnLogsService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnRuleServiceImpl.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnRuleServiceImpl.java index f5faab3..762c31f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnRuleServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.WarnRule; -import com.muyu.mapper.WarnRuleMapper; -import com.muyu.service.IWarnRuleService; +import com.muyu.enterpise.mapper.WarnRuleMapper; +import com.muyu.enterpise.service.IWarnRuleService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java index f0db750..a4f1b4e 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.WarnStrategy; -import com.muyu.mapper.WarnStrategyMapper; -import com.muyu.service.IWarnStrategyService; +import com.muyu.enterpise.mapper.WarnStrategyMapper; +import com.muyu.enterpise.service.IWarnStrategyService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java similarity index 84% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java index 6899198..86b4817 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl.faultDetectionStrategy; +package com.muyu.enterpise.service.impl.faultDetectionStrategy; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java similarity index 92% rename from cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java index c4c88d7..d9df9af 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java @@ -1,9 +1,9 @@ -package com.muyu.service.impl.faultDetectionStrategy; +package com.muyu.enterpise.service.impl.faultDetectionStrategy; import com.muyu.domain.CarFaultRule; import com.muyu.domain.FaultReport; -import com.muyu.service.FaultDetectionStrategy; +import com.muyu.enterpise.service.FaultDetectionStrategy; import org.springframework.stereotype.Service; /** diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml index 60732a3..59bb63a 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: yan1 + namespace: xyr # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml index a822ddd..2f41ac0 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml @@ -2,7 +2,7 @@ - + insert into car_fence values (0,#{name},#{clazzId},#{typeId},#{fenceText},#{fenceStart},#{fenceEnd},#{fenceCreate},0) diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml index 57f6336..9e5a7b8 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml index 3d1c04b..d8b6622 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml index 1709abd..1979526 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml index 5313061..cb4f9e3 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +