wuzudaniu
/
cloud-plus-server
6
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.qinmian.online/wuzudaniu/cloud-plus-server into dev.saas.yp

dev.data.process
YangPeng 2024-10-08 16:34:34 +08:00
parent 492be37314 47222f5f68
commit 1468206f1d
28 changed files with 39 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-auth/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: yp
namespace: wx
# Spring
spring:
application:

5
cloud-common/cloud-common-cache/pom.xml
View File

@ -27,11 +27,6 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-common-redis</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
</dependencies>
</project>

2
cloud-gateway/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: yp
namespace: wx
# Spring
spring:

2
cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml
View File

@ -122,7 +122,7 @@
<!-- 获取缓存 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterprise-cache</artifactId>
<artifactId>enterpise-cache</artifactId>
</dependency>
</dependencies>

6
cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/warn/WarningJudgment.java
View File

@ -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;

2
cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: yp
namespace: wx
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

59
cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
View File

@ -25,71 +25,12 @@
<version>${muyu.version}</version>
</dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!-- SpringCloud Alibaba Nacos Config -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<!-- SpringBoot Actuator -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- Mysql Connector -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- MuYu Common DataSource -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datasource</artifactId>
</dependency>
<!-- 缓存公共模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-cache</artifactId>
</dependency>
<!-- MuYu Common DataScope -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datascope</artifactId>
</dependency>
<!-- MuYu Common Log -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-log</artifactId>
</dependency>
<!-- 接口模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-api-doc</artifactId>
</dependency>
<!-- XllJob定时任务 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-xxl</artifactId>
</dependency>
</dependencies>
</project>

4
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/InformationDataService.java → cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/InformationDataService.java vendored
View File

@ -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;

2
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/MessageValueCacheService.java → cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java vendored
View File

@ -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;

2
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarCacheService.java → cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarCacheService.java vendored
View File

@ -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;

2
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/SysCarTypeCacheService.java → cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/SysCarTypeCacheService.java vendored
View File

@ -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;

2
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java → cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java vendored
View File

@ -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;

2
cloud-common/cloud-common-cache/src/main/java/com/muyu/common/domain/InformationData.java → cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/domain/InformationData.java vendored
View File

@ -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;

8
cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -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

5
cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml
View File

@ -46,10 +46,5 @@
<artifactId>cloud-common-system</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-saas</artifactId>
</dependency>
</dependencies>
</project>

6
cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
View File

@ -97,7 +97,11 @@
<artifactId>cloud-common-xxl</artifactId>
</dependency>
<!-- cache缓存框架 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-saas</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-cache</artifactId>

4
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java
View File

@ -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;
/**
* 报文数据列表查询

4
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java
View File

@ -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<SysCar> {
/**
* 查询车辆基础信息列表
*
* @param sysCar 车辆基础信息
* @param sysCarReq 车辆基础信息
* @return 车辆基础信息集合
*/
public List<SysCarResp> selectSysCarList(SysCarReq sysCarReq);

3
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java
View File

@ -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;

4
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java
View File

@ -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;

2
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java
View File

@ -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;

2
cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: yp
namespace: wx
# Spring
spring:

2
cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: yp
namespace: wx
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

6
cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java
View File

@ -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;

2
cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: yp
namespace: wx
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

4
cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 150.158.33.234:8848
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: dev
namespace: wx
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

2
cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: yp
namespace: wx
# Spring
spring:

25
pom.xml
View File

@ -283,31 +283,6 @@
<version>${muyu.version}</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-remote</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- 实体类 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterpise-common</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- 缓存框架 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>enterprise-cache</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- kafka 公共配置 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-kafka</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.muyu</groupId>-->
<!-- <artifactId>enterpise-c</artifactId>-->