From 47222f5f68b2c6aa20c2b93fc9dda66ef8769d26 Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Tue, 8 Oct 2024 16:25:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=88=EF=BC=89:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8C=85=E5=90=8D=E7=AD=89=E6=A0=BC=E5=BC=8F=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-cache/pom.xml | 5 -- .../cloud-modules-data-process-server/pom.xml | 2 +- .../com/muyu/data/warn/WarningJudgment.java | 6 +- .../enterpise-cache/pom.xml | 59 ------------------- .../cache/InformationDataService.java | 4 +- .../cache/MessageValueCacheService.java | 2 +- .../cache/SysCarCacheService.java | 2 +- .../cache/SysCarTypeCacheService.java | 2 +- .../cache/WarnStrategyCacjeService.java | 2 +- .../cache}/domain/InformationData.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 8 +-- .../enterpise-common/pom.xml | 5 -- .../enterpise-service/pom.xml | 6 +- .../controller/MessageValueController.java | 4 +- .../muyu/enterpise/service/SysCarService.java | 4 +- .../service/impl/MessageValueServiceImpl.java | 3 +- .../service/impl/SysCarServiceImpl.java | 4 +- .../service/impl/WarnStrategyServiceImpl.java | 2 +- .../com/muyu/parse/process/ProcessData.java | 6 +- 19 files changed, 30 insertions(+), 98 deletions(-) rename cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/{enterpise => enterprise}/cache/InformationDataService.java (87%) rename cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/{enterpise => enterprise}/cache/MessageValueCacheService.java (95%) rename cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/{enterpise => enterprise}/cache/SysCarCacheService.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/{enterpise => enterprise}/cache/SysCarTypeCacheService.java (94%) rename cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/{enterpise => enterprise}/cache/WarnStrategyCacjeService.java (95%) rename {cloud-common/cloud-common-cache/src/main/java/com/muyu/common => cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache}/domain/InformationData.java (95%) diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml index 09d679b..488b785 100644 --- a/cloud-common/cloud-common-cache/pom.xml +++ b/cloud-common/cloud-common-cache/pom.xml @@ -27,11 +27,6 @@ com.muyu cloud-common-redis - - com.muyu - enterpise-common - ${muyu.version} - diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml index 3bff106..47bd2df 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml @@ -122,7 +122,7 @@ com.muyu - enterprise-cache + enterpise-cache diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/warn/WarningJudgment.java b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/warn/WarningJudgment.java index 1a10be6..6a38d71 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/warn/WarningJudgment.java +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/warn/WarningJudgment.java @@ -1,10 +1,8 @@ package com.muyu.data.warn; -import com.muyu.domain.SysCar; -import com.muyu.enterpise.cache.SysCarCacheService; -import com.muyu.enterpise.cache.SysCarTypeCacheService; +import com.muyu.enterprise.cache.SysCarCacheService; +import com.muyu.enterprise.cache.SysCarTypeCacheService; import org.springframework.stereotype.Component; -import org.apache.catalina.mapper.*; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml index 5df41ff..ae47445 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml @@ -25,71 +25,12 @@ ${muyu.version} - - - 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-cache - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - com.muyu - cloud-common-xxl - - diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/InformationDataService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/InformationDataService.java similarity index 87% rename from cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/InformationDataService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/InformationDataService.java index c260c4f..ad7a0d2 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/InformationDataService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/InformationDataService.java @@ -1,7 +1,7 @@ -package com.muyu.enterpise.cache; +package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBasic; -import com.muyu.common.domain.InformationData; +import com.muyu.enterprise.cache.domain.InformationData; import org.springframework.stereotype.Component; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java index 9790da2..0fd1d59 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java @@ -1,4 +1,4 @@ -package com.muyu.enterpise.cache; +package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBasic; import com.muyu.domain.MessageValue; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarCacheService.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarCacheService.java index 8c92453..d636670 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarCacheService.java @@ -1,4 +1,4 @@ -package com.muyu.enterpise.cache; +package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBasic; import com.muyu.domain.SysCar; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarTypeCacheService.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarTypeCacheService.java index d3906d9..f5f2e35 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarTypeCacheService.java @@ -1,4 +1,4 @@ -package com.muyu.enterpise.cache; +package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBasic; import com.muyu.domain.SysCarType; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java index 30c611e..0e91b29 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java @@ -1,4 +1,4 @@ -package com.muyu.enterpise.cache; +package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBasic; import com.muyu.domain.WarnStrategy; diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/domain/InformationData.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/domain/InformationData.java similarity index 95% rename from cloud-common/cloud-common-cache/src/main/java/com/muyu/common/domain/InformationData.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/domain/InformationData.java index 208749b..b51feee 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/domain/InformationData.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/domain/InformationData.java @@ -1,4 +1,4 @@ -package com.muyu.common.domain; +package com.muyu.enterprise.cache.domain; import com.muyu.common.system.domain.SysDept; import com.muyu.domain.SysCar; 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 index e1854da..da917b3 100644 --- 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 @@ -1,5 +1,5 @@ -com.muyu.enterpise.cache.MessageValueCacheService -com.muyu.enterpise.cache.SysCarCacheService -com.muyu.enterpise.cache.SysCarTypeCacheService -com.muyu.enterpise.cache.WarnStrategyCacjeService +com.muyu.enterprise.cache.MessageValueCacheService +com.muyu.enterprise.cache.SysCarCacheService +com.muyu.enterprise.cache.SysCarTypeCacheService +com.muyu.enterprise.cache.WarnStrategyCacjeService diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml index 9bb9136..8d98d66 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml @@ -46,10 +46,5 @@ cloud-common-system - - com.muyu - cloud-common-saas - - diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index 1131b07..422f454 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -97,7 +97,11 @@ cloud-common-xxl - + + com.muyu + cloud-common-saas + + com.muyu enterpise-cache diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java index 6bdb51a..85d5b99 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java @@ -6,7 +6,7 @@ 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.enterpise.cache.MessageValueCacheService; +import com.muyu.enterprise.cache.MessageValueCacheService; import com.muyu.enterpise.service.MessageValueService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -33,7 +33,7 @@ public class MessageValueController extends BaseController { private MessageValueService messageValueService; @Autowired - private MessageValueCacheService enterpiseCacheService; + private MessageValueCacheService enterpriseCacheService; /** * 报文数据列表查询 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java index bce64ff..1c78faf 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java @@ -1,10 +1,10 @@ package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.domain.InformationData; import com.muyu.domain.SysCar; import com.muyu.domain.req.SysCarReq; import com.muyu.domain.resp.SysCarResp; +import com.muyu.enterprise.cache.domain.InformationData; import java.util.List; @@ -25,7 +25,7 @@ public interface SysCarService extends IService { /** * 查询车辆基础信息列表 * - * @param sysCar 车辆基础信息 + * @param sysCarReq 车辆基础信息 * @return 车辆基础信息集合 */ public List selectSysCarList(SysCarReq sysCarReq); diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java index fd122bf..3414a04 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java @@ -7,10 +7,9 @@ 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.enterpise.cache.MessageValueCacheService; +import com.muyu.enterprise.cache.MessageValueCacheService; 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; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java index 001879e..88c0bc5 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java @@ -2,13 +2,13 @@ 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.domain.InformationData; import com.muyu.domain.SysCar; import com.muyu.domain.req.SysCarReq; import com.muyu.domain.resp.SysCarResp; -import com.muyu.enterpise.cache.SysCarCacheService; +import com.muyu.enterprise.cache.SysCarCacheService; import com.muyu.enterpise.mapper.SysCarMapper; import com.muyu.enterpise.service.SysCarService; +import com.muyu.enterprise.cache.domain.InformationData; import org.apache.commons.lang3.StringUtils; 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/enterpise/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java index d4bc2b8..e518303 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java @@ -4,7 +4,7 @@ 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.enterpise.cache.WarnStrategyCacjeService; +import com.muyu.enterprise.cache.WarnStrategyCacjeService; import com.muyu.enterpise.mapper.WarnStrategyMapper; import com.muyu.enterpise.service.IWarnStrategyService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java index c554ac3..7e1e6cc 100644 --- a/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java +++ b/cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java @@ -5,9 +5,9 @@ import com.muyu.common.kafka.config.KafkaProducerConfig; import com.muyu.domain.MessageValue; import com.muyu.domain.SysCar; import com.muyu.domain.SysCarType; -import com.muyu.enterpise.cache.MessageValueCacheService; -import com.muyu.enterpise.cache.SysCarCacheService; -import com.muyu.enterpise.cache.SysCarTypeCacheService; +import com.muyu.enterprise.cache.MessageValueCacheService; +import com.muyu.enterprise.cache.SysCarCacheService; +import com.muyu.enterprise.cache.SysCarTypeCacheService; import com.muyu.parse.uitl.DataParseUtil; import lombok.extern.log4j.Log4j2; import org.apache.kafka.clients.producer.ProducerRecord;