diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 856d7fb..1cdb12c 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -5,8 +5,8 @@ server: # nacos线上地址 nacos: addr: 159.75.188.178:8848 - user-name: - password: + user-name: nacos + password: nacos namespace: eight # Spring spring: diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml new file mode 100644 index 0000000..7cc9002 --- /dev/null +++ b/cloud-common/cloud-common-cache/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + cloud-common-cache + + + cloud-modules-cache 缓存基准 + + + + 17 + 17 + UTF-8 + + + + + + com.muyu + cloud-common-redis + + + 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 new file mode 100644 index 0000000..edda01c --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java @@ -0,0 +1,33 @@ +package com.muyu.common.cache; + +import com.muyu.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 抽象缓存层 + * @Author：yang + * @Package：com.muyu.common + * @Project：cloud-server-8 + * @name：CacheAbsBacis + * @Date：2024/9/30 11:19 + */ +public abstract class CacheAbsBasic implements CacheBasic{ + + @Autowired + private RedisService redisService; + + @Override + public void put(K key, V value) { + redisService.setCacheObject(encode(key),value); + } + + @Override + public V get(K key) { + return redisService.getCacheObject(encode(key)); + } + + @Override + public void remove(K key) { + redisService.deleteObject(encode(key)); + } +} 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 new file mode 100644 index 0000000..e4a5fc5 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java @@ -0,0 +1,18 @@ +package com.muyu.common.cache; + +/** + * 缓存基础 + * @Author：yang + * @Package：com.muyu.common.cache + * @Project：cloud-server-8 + * @name：CacheBasic + * @Date：2024/9/30 11:41 + */ +public interface CacheBasic extends PrimaryKeyBasic{ + + void put(K key,V value); + + V get(K key); + + void remove(K key); +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java new file mode 100644 index 0000000..1b60e9e --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java @@ -0,0 +1,34 @@ +package com.muyu.common.cache; + +/** + * 主键基础 + * @Author：yang + * @Package：com.muyu.common.cache + * @Project：cloud-server-8 + * @name：PrimaryKeyBasic + * @Date：2024/9/30 11:35 + */ +public interface PrimaryKeyBasic { + + /** + * key 前缀 + * @return 前缀 + */ + public String keyPre(); + /** + * 编码 + * @param key 缓存键 + * @return 装修键 + */ + public default String encode(K key){ + return key.toString(); + } + + /** + * 解码key + * @param key 编码Key + * @return 解码后的Key + */ + public K decode(String key); + +} diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index eead750..79c42b6 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -22,7 +22,6 @@ cloud-common-rabbit cloud-common-saas cloud-common-wechat - cloud-common-kafka cloud-common diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index 7f67420..a9335ac 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-Saas-Service/pom.xml b/cloud-modules/cloud-Saas-Service/pom.xml new file mode 100644 index 0000000..4f22a33 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + com.muyu + cloud-server + 3.6.3 + ../../pom.xml + + + cloud-Saas-Service + + + 17 + 17 + UTF-8 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + org.springframework.boot + spring-boot-starter-actuator + + + + com.mysql + mysql-connector-j + + + + com.muyu + cloud-common-datasource + + + + com.muyu + cloud-common-datascope + + + + com.muyu + cloud-common-api-doc + + + + com.muyu + cloud-electronic-common + 3.6.3 + + + com.github.pagehelper + pagehelper + 6.0.0 + + + + clod-Saas-Service + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/java/com/muyu/SaasServiceApplication.java b/cloud-modules/cloud-Saas-Service/src/main/java/com/muyu/SaasServiceApplication.java new file mode 100644 index 0000000..374d8af --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/java/com/muyu/SaasServiceApplication.java @@ -0,0 +1,20 @@ +package com.muyu; + +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @Author：杨闪闪 + * @Package：com.muyu.server.integration + * @Project：cloud-integration + * @name：Integration + * @Date：2024/9/17 下午9:56 + */ +@EnableMyFeignClients +@SpringBootApplication +public class SaasServiceApplication { + public static void main(String[] args) { + SpringApplication.run(SaasServiceApplication.class, args); + } +} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-Saas-Service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/banner.txt b/cloud-modules/cloud-Saas-Service/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml b/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..2fd8826 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml @@ -0,0 +1,47 @@ +# Tomcat +server: + port: 9121 + +# nacos线上地址 +nacos: + addr: 127.0.0.1:8848 + user-name: nacos + password: nacos + namespace: eight + +# Spring +spring: + application: + # 应用名称 + name: cloud-electronic + 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} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..187e473 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..9f04f11 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml new file mode 100644 index 0000000..9f04f11 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/CarMiddleGroupMapper.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/CarMiddleGroupMapper.xml new file mode 100644 index 0000000..e95c1a4 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/CarMiddleGroupMapper.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/CarMiddleMapper.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/CarMiddleMapper.xml new file mode 100644 index 0000000..69cd662 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/CarMiddleMapper.xml @@ -0,0 +1,12 @@ + + + + + + delete + from car_middle + where fence_group_id = #{id} and car_information_id = #{carId}; + + diff --git a/cloud-modules/cloud-modules-carData/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-carData/src/main/resources/bootstrap.yml index 8bc6afd..d373a24 100644 --- a/cloud-modules/cloud-modules-carData/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-carData/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml new file mode 100644 index 0000000..b1476a0 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + cloud-modules-enterprise-cache + + cloud-modules-enterprise-cache 缓存模块 + + + 17 + 17 + UTF-8 + + + + + com.muyu + cloud-common-cache + 3.6.3 + + + com.muyu + cloud-modules-enterprise-common + 1.0.0 + + + com.muyu + cloud-auth + 3.6.3 + + + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java new file mode 100644 index 0000000..92b94de --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java @@ -0,0 +1,27 @@ +package com.muyu.enterprise.cache.car; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.CarInformation; +import com.muyu.domain.req.CarInformationAddReq; + +import java.util.List; + +/** + * 添加车辆信息 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationAddService extends CacheAbsBasic { + @Override + public String keyPre() { + return "CarInformationAddReq:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java new file mode 100644 index 0000000..db77ce6 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java @@ -0,0 +1,27 @@ +package com.muyu.enterprise.cache.car; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.resp.CarInformationResp; + +import java.util.List; + +/** + * 车辆基础信息列表缓存 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationFenceRespService extends CacheAbsBasic> { + @Override + public String keyPre() { + return "CarInformationFenceResp:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java new file mode 100644 index 0000000..5611b12 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java @@ -0,0 +1,28 @@ +package com.muyu.enterprise.cache.car; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.CarInformation; +import com.muyu.domain.resp.CarInformationResp; + +import java.util.List; + +/** + * 分页查询车辆信息 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationRespService extends CacheAbsBasic> { + @Override + public String keyPre() { + return "CarInformationResp:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java new file mode 100644 index 0000000..0e56672 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java @@ -0,0 +1,27 @@ +package com.muyu.enterprise.cache.car; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.CarInformation; +import com.muyu.domain.resp.CarFenceGroupResp; + +import java.util.List; + +/** + * 查询车辆 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationService extends CacheAbsBasic> { + @Override + public String keyPre() { + return "CarInformation:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java new file mode 100644 index 0000000..9a155ee --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java @@ -0,0 +1,25 @@ +package com.muyu.enterprise.cache.car; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.req.CarInformationUpdReq; + +/** + * 修改车辆信息 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationUpdService extends CacheAbsBasic { + @Override + public String keyPre() { + return "CarInformationUpdReq:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/faultCode/VehicleCacheFaultCodeAddService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/faultCode/VehicleCacheFaultCodeAddService.java new file mode 100644 index 0000000..aea3d15 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/faultCode/VehicleCacheFaultCodeAddService.java @@ -0,0 +1,26 @@ +package com.muyu.enterprise.cache.faultCode; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.FaultCodeCache; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.req.FaultCodeAddReq; + +/** + * 添加车辆信息 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheFaultCodeAddService extends CacheAbsBasic { + @Override + public String keyPre() { + return "FaultCodeCache:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b335db7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,6 @@ +com.muyu.enterprise.cache.car.VehicleCacheCarInformationService +com.muyu.enterprise.cache.car.VehicleCacheCarInformationRespService +com.muyu.enterprise.cache.car.VehicleCacheCarInformationAddService +com.muyu.enterprise.cache.car.VehicleCacheCarInformationUpdService +com.muyu.enterprise.cache.car.VehicleCacheCarInformationFenceRespService +com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml index 68857c5..1759aec 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml @@ -15,8 +15,8 @@ cloud-modules-enterprise-common 企业业务common - 21 - 21 + 17 + 17 UTF-8 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java index 313f32c..59da175 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java @@ -71,8 +71,8 @@ public class CarInformation { /** * 车辆类型外键ID */ - @Schema(title = "车辆类型外键ID", type = "Integer") - private Integer carInformationType; +// @Schema(title = "车辆类型外键ID", type = "Long") + private Long carInformationType; /** * 车辆品牌 */ @@ -107,6 +107,13 @@ public class CarInformation { */ private Integer carInformationState; + /** + * 车辆策略id + */ + private Integer carStrategyId; + + + public static CarInformation carInformationBuilder(CarInformation carInformation) { return CarInformation.builder() .carInformationId(carInformation.getCarInformationId()) @@ -147,4 +154,23 @@ public class CarInformation { .carInformationMotorModel(carInformation.getCarInformationMotorModel()) .build(); } + + public static CarInformation carInformationListBuilder(CarInformation carInformation) { + return CarInformation.builder() + .carInformationId(carInformation.getCarInformationId()) + .carInformationVIN(carInformation.getCarInformationVIN()) + .carInformationLicensePlate(carInformation.getCarInformationLicensePlate()) + .carInformationBrand(carInformation.getCarInformationBrand()) + .carInformationColor(carInformation.getCarInformationColor()) + .carInformationDriver(carInformation.getCarInformationDriver()) + .carInformationMotorManufacturer(carInformation.getCarInformationMotorManufacturer()) + .carInformationMotorModel(carInformation.getCarInformationMotorModel()) + .carInformationBatteryManufacturer(carInformation.getCarInformationBatteryManufacturer()) + .carInformationBatteryModel(carInformation.getCarInformationBatteryModel()) + .carInformationFence(carInformation.getCarInformationFence()) + .carInformationType(carInformation.getCarInformationType()) + .carInformationMotorModel(carInformation.getCarInformationMotorModel()) + .carStrategyId(carInformation.getCarStrategyId()) + .build(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java index 2e541f2..95787e3 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java @@ -85,7 +85,7 @@ public class FaultCode { public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq){ return FaultCode.builder() - .faultcodeId(0) + .faultcodeId(faultCodeAddReq.getFaultcodeId()) .messageTypeId(faultCodeAddReq.getMessageTypeId()) .faultcodeNumber(faultCodeAddReq.getFaultcodeNumber()) .faultGroup(faultCodeAddReq.getFaultGroup()) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCodeCache.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCodeCache.java new file mode 100644 index 0000000..9bd7900 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCodeCache.java @@ -0,0 +1,46 @@ +package com.muyu.domain; + +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; + +/** + * 故障码，电子围栏，车辆，报文 + * @Author：yang + * @Package：com.muyu.domain + * @Project：cloud-server-8 + * @name：FaultCodeCache + * @Date：2024/10/6 16:07 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@Tag(name = "故障码，电子围栏，车辆，报文") +public class FaultCodeCache { + + /** + * 电子围栏信息 + */ + private List carFences; + + /** + * 故障标签信息 + */ + private WarnStrategy warnStrategies; + + /** + * 车辆信息 + */ + public List carInformation; + + /** + * 故障码信息 + */ + private List faultCode; + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java index 92ac825..039a5ee 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionUpdReq; +import com.muyu.domain.resp.FaultConditionTotalListResp; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -39,7 +40,7 @@ public class FaultCondition { /** * 车辆类型Id */ - private long carTypeId; + private Long carTypeId; /** *故障名称Id */ @@ -89,7 +90,11 @@ public class FaultCondition { } - - - + public static FaultCondition faultConditionBuilder(FaultCondition faultCondition) { + return FaultCondition.builder() + .carconditionId(faultCondition.getCarconditionId()) + .carTypeId(faultCondition.getCarTypeId()) + .messageTypeId(faultCondition.getMessageTypeId()) + .build(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java index 7fcb24e..097f9dd 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java @@ -47,16 +47,22 @@ public class FaultLabel { private String messageTypeBelongs; - public static FaultLabel addfaultLabel(FaultCodeAddReq faultCodeAddReq){ + public static FaultLabel addfaultLabel(FaultLabel faultLabel){ return FaultLabel.builder() - .messageTypeId(0) - .messageTypeId(faultCodeAddReq.getMessageTypeId()) - .messageTypeCode(faultCodeAddReq.getMessageTypeCode()) - .messageTypeName(faultCodeAddReq.getMessageTypeName()) - .messageTypeBelongs(faultCodeAddReq.getMessageTypeBelongs()) + .messageTypeId(faultLabel.getMessageTypeId()) + .messageTypeCode(faultLabel.getMessageTypeCode()) + .messageTypeName(faultLabel.getMessageTypeName()) + .messageTypeBelongs(faultLabel.getMessageTypeBelongs()) .build(); } - + public static FaultLabel selectFaultLabel(FaultLabel faultLabel) { + return FaultLabel.builder() + .messageTypeId(faultLabel.messageTypeId) + .messageTypeCode(faultLabel.messageTypeCode) + .messageTypeName(faultLabel.messageTypeName) + .messageTypeBelongs(faultLabel.messageTypeBelongs) + .build(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationAddReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationAddReq.java index ac596f9..19b7106 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationAddReq.java @@ -78,7 +78,7 @@ public class CarInformationAddReq { /** * 车辆类型外键ID */ - private Integer carInformationType; + private Long carInformationType; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationUpdReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationUpdReq.java index 6b1324d..aec0ed1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationUpdReq.java @@ -74,7 +74,7 @@ public class CarInformationUpdReq { * 车辆类型外键ID */ @Schema(title = "车辆类型外键ID", type = "Integer") - private Integer carInformationType; + private Long carInformationType; /** * 是否重点车辆 (0否默认 1是 ) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java index 2717a86..86be0b4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java @@ -1,5 +1,7 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -21,6 +23,10 @@ import lombok.experimental.SuperBuilder; @Builder public class FaultCodeAddReq { + /** + *故障码Id + */ + private long faultcodeId; /** *故障名称Id */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java index f27036a..285ec83 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java @@ -31,7 +31,7 @@ public class FaultConditionListResp { * 车辆类型Id */ private long carTypeId; - /** + /** *故障名称Id */ private long messageTypeId; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index de91dfc..2780ae1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -14,8 +14,8 @@ cloud-modules-enterprise-server 企业业务服务 - 21 - 21 + 17 + 17 UTF-8 @@ -44,10 +44,10 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - - org.apache.kafka - kafka-clients + com.muyu + cloud-modules-carData + 3.6.3 @@ -101,7 +101,12 @@ com.muyu - cloud-common-kafka + cloud-modules-carData + 3.6.3 + + + com.muyu + cloud-modules-enterprise-cache 3.6.3 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java index 67609f3..26560ce 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java @@ -36,10 +36,10 @@ public class CarFenceClazzController { @PostMapping("/selectClazz") @Operation(summary = "查询数据",description = "查询数据") public Result> selectConnect(){ + List connects = carFenceClazzService.list(); log.info("查询数据成功"); return Result.success( - connects, "操作成功" ); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java index eb25bc3..ae9e158 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java @@ -44,6 +44,7 @@ public class CarFenceController { ){ Page connects = carFenceService.selectCarFence(req); log.info("查询数据："+ connects); + return Result.success( connects, "操作成功" ); @@ -58,13 +59,13 @@ public class CarFenceController { @Validated @RequestBody CarFence carFence ){ Boolean connects = carFenceService.addCarFence(carFence); - log.info("shd"); + + log.info("shd"); return connects?Result.success( null, "操作成功" ):Result.success( null, "操作失败" ); - } /** @@ -94,6 +95,7 @@ public class CarFenceController { @Validated @RequestBody FenceGroupReq req ){ Boolean connects = carFenceService.addFenceGroup(req); + return connects?Result.success( null, "操作成功" ):Result.success( @@ -138,6 +140,7 @@ public class CarFenceController { @PostMapping("/carGroupList") @Operation(summary = "查询车辆围栏组数据",description = "查询车辆围栏组信息") public Result> carGroupList(@RequestBody CarFenceGroupReq req){ + List connects = carFenceService.carGroupList(req); return Result.success( connects, "操作成功" diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java index 0568280..1a4f6d1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java @@ -36,7 +36,9 @@ public class CarFenceTypeController { @PostMapping("/selectType") @Operation(summary = "查询数据",description = "查询数据") public Result> selectConnect(){ + List connects = carFenceTypeService.list(); + return Result.success( connects, "操作成功" ); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java index 180af3d..785bdb2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java @@ -4,15 +4,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarFenceType; import com.muyu.domain.CarInformation; import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationListReq; import com.muyu.domain.req.CarInformationUpdReq; import com.muyu.domain.resp.CarInformationResp; +import com.muyu.enterprise.cache.car.*; import com.muyu.server.service.CarInformationService; +import com.muyu.server.util.ObtainRootLogin; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,6 +34,11 @@ import java.util.List; public class CarInformationController { @Resource private CarInformationService carInformationService; + private VehicleCacheCarInformationService vehicleCacheCarInformationService; + private VehicleCacheCarInformationRespService vehicleCacheCarInformationRespService; + private VehicleCacheCarInformationAddService vehicleCacheCarInformationAddService; + private VehicleCacheCarInformationUpdService vehicleCacheCarInformationUpdService; + private VehicleCacheCarInformationFenceRespService vehicleCacheCarInformationFenceRespService; /** @@ -38,10 +47,20 @@ public class CarInformationController { @PostMapping("/selectCarInformation") @Operation(summary = "查询数据",description = "查询数据") public Result> selectConnect(){ + List carFenceRespPage = vehicleCacheCarInformationService + .get(vehicleCacheCarInformationService + .keyPre()+ ObtainRootLogin + .obtain()); + if (CollectionUtils.isEmpty(carFenceRespPage)) { + return Result.success(carFenceRespPage); + } List connects = carInformationService.list() .stream() .map(CarInformation::carInformationBuilder) .toList(); + vehicleCacheCarInformationService.put( + vehicleCacheCarInformationService.keyPre()+ObtainRootLogin.obtain() + ,connects); return Result.success( connects, "操作成功" ); @@ -68,8 +87,19 @@ public class CarInformationController { @PostMapping("/selectCarInformationList") @Operation(summary = "企业车辆管理列表") public Result> selectCarInformationList(@Validated @RequestBody CarInformationListReq carInformationListReq) { + + Page carFenceRespPage = vehicleCacheCarInformationRespService + .get(vehicleCacheCarInformationRespService + .keyPre()+ ObtainRootLogin + .obtain()); + if (CollectionUtils.isEmpty(carFenceRespPage.getRecords())) { + return Result.success(carFenceRespPage); + } Page pageInfo = carInformationService.selectCarInformationList(carInformationListReq); log.info("企业车辆管理列表查询",carInformationListReq,pageInfo); + vehicleCacheCarInformationRespService.put( + vehicleCacheCarInformationRespService.keyPre()+ObtainRootLogin.obtain() + ,pageInfo); return Result.success(pageInfo); } @@ -83,6 +113,10 @@ public class CarInformationController { @PostMapping("/addCarInformation") @Operation(summary = "企业车辆添加管理") public Result addCarInformation(@Validated @RequestBody CarInformationAddReq carInformationAddReq){ + + vehicleCacheCarInformationAddService.put( + vehicleCacheCarInformationAddService + .keyPre()+ObtainRootLogin.obtain(), carInformationAddReq); return carInformationService.addCarInformation(carInformationAddReq) ?Result.success("添加车辆成功") :Result.error(402,"添加车辆失败"); @@ -114,7 +148,9 @@ public class CarInformationController { public Result updateCarMessage(@Validated @RequestBody CarInformationUpdReq carInformationUpdReq){ boolean updatecarInformation = carInformationService.updatecarInformation(carInformationUpdReq); log.info(updatecarInformation); - System.out.println("我在这个里:"+updatecarInformation); + vehicleCacheCarInformationUpdService.put( + vehicleCacheCarInformationUpdService + .keyPre()+ObtainRootLogin.obtain(), carInformationUpdReq); if(updatecarInformation) { return Result.success(carInformationUpdReq,"修改成功"); @@ -133,7 +169,17 @@ public class CarInformationController { @GetMapping("/selectCarInformationIdAndLicensePlate") @Operation(summary = "查询企业车辆 carInformationID 和 carInformationLicensePlate") public Result> selectCarInformationIdAndLicensePlate(){ + List carFenceRespPage = vehicleCacheCarInformationFenceRespService + .get(vehicleCacheCarInformationFenceRespService + .keyPre()+ ObtainRootLogin + .obtain()); + if (CollectionUtils.isEmpty(carFenceRespPage)) { + return Result.success(carFenceRespPage); + } List carInformations = carInformationService.selectBycarInformationIDAndLicensePlate(); + vehicleCacheCarInformationFenceRespService.put( + vehicleCacheCarInformationFenceRespService.keyPre()+ObtainRootLogin.obtain() + ,carInformations); return Result.success(carInformations); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java index 8700799..b6ccdad 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java @@ -31,6 +31,7 @@ public class CarMessageController { @PostMapping("/selectCarMessageList") @Operation(summary = "报文模板展示列表") public Result> selectCarMessageList(){ + List carMessages = carMessageService.selectCarMessageList(); return Result.success(carMessages); } @@ -42,10 +43,8 @@ public class CarMessageController { @PostMapping("/insertCarMessage") @Operation(summary = "添加报文信息") public Result insertCarMessage(@Validated @RequestBody CarMessage carMessage){ + int inserted = carMessageService.insertCarMessage(carMessage); - if (inserted>0){ - return Result.success(200,"添加成功"); - } return Result.error(402,"添加失败"); } @@ -57,6 +56,7 @@ public class CarMessageController { @Operation(summary = "删除报文信息") public Result delectByCarMessageId(@RequestParam(name = "carMessageId") Integer carMessageId){ int deleteByCarMessageId = carMessageService.delectByCarMessageId(carMessageId); + if (deleteByCarMessageId>0){ return Result.success(200,"删除成功"); } @@ -69,6 +69,7 @@ public class CarMessageController { @PostMapping("/updateCarMessage") @Operation(summary = "修改报文信息") public Result updateCarMessage(@Validated @RequestBody CarMessage carMessage){ + int updateCarMessage = carMessageService.updateCarMessage(carMessage); if(updateCarMessage>0) { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java index 834fb02..c2217bb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 车辆电子围栏添加中间表控制层 * @Author：yang diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java index 30a5745..8a48892 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java @@ -2,6 +2,7 @@ package com.muyu.server.controller; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarType; import com.muyu.server.service.CarTypeService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; @@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 车辆类型控制层 * @Author：weiran @@ -33,6 +36,9 @@ public class CarTypeController { @PostMapping("/list") @Operation(summary = "车辆类型",description = "车辆类型信息") public Result carTypeList(){ - return Result.success(carTypeService.selectcarType()); + + List data = carTypeService.selectcarType(); + + return Result.success(data); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java index 9d550d9..dad58d1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java @@ -9,6 +9,7 @@ import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeTotalListResp; import com.muyu.server.service.FaultCodeService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -24,12 +25,14 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/faultcode") +@Tag(name = "车辆故障码控制层",description = "从故障信息表中查询数据") public class FaultCodeController { @Autowired private FaultCodeService faultCodeService; + /** * 故障码展示(故障码联查) * @param faultCodeListReq @@ -38,7 +41,8 @@ public class FaultCodeController { @PostMapping("/faultcodelist") @Operation(summary = "故障码列表(多)",description = "展示故障码信息") public Result selectfaultcodelist(@Validated @RequestBody FaultCodeListReq faultCodeListReq){ - return Result.success(faultCodeService.selectfaultcodelist(faultCodeListReq)); + FaultCodeTotalListResp selectfaultcodelist = faultCodeService.selectfaultcodelist(faultCodeListReq); + return Result.success(selectfaultcodelist,"操作成功"); } @@ -50,6 +54,7 @@ public class FaultCodeController { @PostMapping("/faultcodeadd") @Operation(summary = "新增故障码",description = "新增故障码信息") public Result insertfaultcode(@Validated @RequestBody FaultCodeAddReq faultCodeAddReq){ + faultCodeService.insert(faultCodeAddReq); return Result.success(null,"新增成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java index d83011f..83932cb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java @@ -6,9 +6,9 @@ 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.domain.resp.FaultConditionTotalListResp; import com.muyu.server.service.FaultConditionService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -40,7 +40,9 @@ public class FaultConditionController { @PostMapping("/list") @Operation(summary = "故障规则列表展示",description = "故障规则列表展示") public Result getfaultrulelist(@RequestBody @Validated FaultConditionListReq faultConditionListReq){ - return Result.success(faultConditionService.getfaultrulelist(faultConditionListReq)); + + FaultConditionTotalListResp getfaultrulelist = faultConditionService.getfaultrulelist(faultConditionListReq); + return Result.success(getfaultrulelist,"操作成功"); } @@ -57,7 +59,7 @@ public class FaultConditionController { if (faultConditionList.size()>0){ return Result.error("此车辆类型已存在所对应的故障规则,无需重新制定，可在原规则上进行修改"); } - faultConditionService.save(FaultCondition.faultConditionadd(faultConditionAddReq)); + faultConditionService.saveFaultCondition(FaultCondition.faultConditionadd(faultConditionAddReq)); return Result.success(null,"规则制定成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceService.java index 506a2fd..fe4e4b2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceService.java @@ -49,4 +49,9 @@ public interface CarFenceService extends IService { * 查询车辆围栏组信息 */ List carGroupList(CarFenceGroupReq req); + + /** + * 查询车辆围栏信息 + */ + List CarFenceList(Integer carInformationFence); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformationService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformationService.java index c33c641..b200e63 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformationService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformationService.java @@ -68,4 +68,9 @@ public interface CarInformationService extends IService { */ List selectBycarInformationIDAndLicensePlate(); + /** + * chaxunCar + * @param faulttypeId + */ + List selectCarInformation(Long faulttypeId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java index 26ff1f1..44dfc12 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java @@ -8,6 +8,8 @@ import com.muyu.domain.req.FaultCodeListReq; import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeTotalListResp; +import java.util.List; + /** * 车辆故障码业务层 @@ -50,4 +52,10 @@ public interface FaultCodeService extends IService { * @return */ void del(Integer messageTypeId); + + /** + * 故障码展示(故障码联查) + * @return + */ + List faultCodeList(long messageTypeId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java index cba1086..aee9c89 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java @@ -32,4 +32,12 @@ public interface FaultConditionService extends IService { * @return */ List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); + + void saveFaultCondition(FaultCondition faultCondition); + + /** + * 故障规则查询 + * @return + */ + List saveFaultConditionList(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java index 3491363..78162b4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java @@ -31,10 +31,10 @@ public interface FaultLabelService extends IService { /** * 添加故障项表 - * @param faultCodeAddReq + * @param faultLabel * @return */ - Integer insertfaultlabel(FaultCodeAddReq faultCodeAddReq); + Integer insertfaultlabel(FaultLabel faultLabel); /** * 删除对应的故障名称表信息 @@ -42,4 +42,5 @@ public interface FaultLabelService extends IService { * @return */ Integer delfaultlabel(Integer messageTypeId); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java index 8775c51..a66e592 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java @@ -316,4 +316,12 @@ public class CarFenceServiceImpl }); return fenceGroupList; } + + @Override + public List CarFenceList(Integer carInformationFence) { + return this.list(new LambdaQueryWrapper().eq(CarFence::getId,carInformationFence)) + .stream() + .map(CarFence::carFenceBuild) + .toList(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java index 372800d..70d422d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.server.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -149,4 +150,14 @@ public class CarInformationServiceImpl return carInformationResps; } + @Override + public List selectCarInformation(Long faulttypeId) { + List list = this.list(new LambdaQueryWrapper() + .eq(CarInformation::getCarInformationType, faulttypeId)) + .stream() + .map(CarInformation::carInformationListBuilder) + .toList(); + return list; + } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java index 101c5de..e944052 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java @@ -5,20 +5,25 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.utils.StringUtils; -import com.muyu.domain.FaultCode; -import com.muyu.domain.FaultLabel; +import com.muyu.domain.*; import com.muyu.domain.req.FaultCodeAddReq; import com.muyu.domain.req.FaultCodeListReq; import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeListResp; import com.muyu.domain.resp.FaultCodeTotalListResp; import com.muyu.domain.resp.FaultConditionListResp; +import com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService; import com.muyu.server.mapper.FaultCodeMapper; +import com.muyu.server.service.CarFenceService; +import com.muyu.server.service.CarInformationService; import com.muyu.server.service.FaultCodeService; import com.muyu.server.service.FaultLabelService; +import com.muyu.server.util.ObtainRootLogin; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -30,12 +35,13 @@ import java.util.List; * @Date：2024/9/17 14:53 */ @Service +@AllArgsConstructor public class FaultCodeServiceImpl extends ServiceImpl implements FaultCodeService { - @Autowired - private FaultCodeMapper faultCodeMapper; - @Autowired - private FaultLabelService faultLabelService; + private final FaultCodeMapper faultCodeMapper; + private final FaultLabelService faultLabelService; + private final CarInformationService carInformationService; + private final CarFenceService carFenceService; /** * 故障码展示(故障码联查) @@ -92,8 +98,13 @@ public class FaultCodeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(FaultCode::getMessageTypeId, messageTypeId); // 假设FaultCode实体类中有一个getMessageTypeId方法 + // 假设FaultCode实体类中有一个getMessageTypeId方法 + queryWrapper.eq(FaultCode::getMessageTypeId, messageTypeId); //删除故障码表信息 faultCodeMapper.delete(queryWrapper); //删除对应的故障名称表信息 faultLabelService.delfaultlabel(messageTypeId); } + + /** + * 故障码展示(故障码联查) + * @return + */ + @Override + public List faultCodeList(long messageTypeId) { + return this.list(new LambdaQueryWrapper() + .eq(FaultCode::getMessageTypeId,messageTypeId)) + .stream() + .map(FaultCode::faultCodeBuilder) + .toList(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java index a760b7e..cbefa8e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.muyu.domain.CarType; -import com.muyu.domain.FaultCode; -import com.muyu.domain.FaultCondition; -import com.muyu.domain.FaultLabel; +import com.muyu.domain.*; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionListReq; import com.muyu.domain.resp.FaultConditionListResp; @@ -15,9 +12,11 @@ import com.muyu.domain.resp.FaultConditionTotalListResp; import com.muyu.domain.resp.FaultLogListResp; import com.muyu.server.mapper.FaultConditionMapper; import com.muyu.server.service.FaultConditionService; +import com.muyu.server.util.ObtainRootLogin; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -30,7 +29,9 @@ import java.util.List; */ @Service -public class FaultConditionServiceImpl extends ServiceImpl implements FaultConditionService { +public class FaultConditionServiceImpl + extends ServiceImpl + implements FaultConditionService { @Autowired private FaultConditionMapper faultConditionMapper; @@ -83,4 +84,42 @@ public class FaultConditionServiceImpl extends ServiceImpl list = this.list(queryWrapper); return list; } + + @Override + public void saveFaultCondition(FaultCondition faultCondition) { + + } + + @Override + public List saveFaultConditionList() { + return this.list().stream().map(FaultCondition::faultConditionBuilder).toList(); + } + +// private void faultCache(long messageTypeId, Long faulttypeId,String faultcodeNumber) { +// FaultCodeCache faultCodeCache = new FaultCodeCache(); +// +// //添加故障标签 +// faultCodeCache.getFaultLabels().addAll(faultLabelService.selectFaultCode(messageTypeId)); +// +// //添加车辆 +// List carInformationList = carInformationService.selectCarInformation(faulttypeId); +// faultCodeCache.getCarInformation().addAll(carInformationList); +// +// //添加故障码 +// faultCodeCache.getFaultCode().addAll(this.list(new LambdaQueryWrapper() +// .eq(FaultCode::getFaultcodeNumber, faultcodeNumber)) +// .stream().map(FaultCode::faultCodeBuilder) +// .toList()); +// +// //添加围栏 +// ArrayList carFences1 = new ArrayList<>(); +// carInformationList.forEach(carInformation -> { +// CarFence carFence = carFenceService.selectCarFenceList(carInformation.getCarInformationFence()); +// carFences1.add(carFence); +// }); +// faultCodeCache.getCarFences().addAll(carFences1); +// vehicleCacheFaultCodeAddService.put(vehicleCacheFaultCodeAddService.keyPre() +// + ObtainRootLogin.obtain() +// , faultCodeCache); +// } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java index 7f541ff..0c608b1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java @@ -56,12 +56,12 @@ public class FaultLabelServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(FaultLabel::getMessageTypeId, messageTypeId); // 假设FaultCode实体类中有一个getMessageTypeId方法 + // 假设FaultCode实体类中有一个getMessageTypeId方法 + queryWrapper.eq(FaultLabel::getMessageTypeId, messageTypeId); return faultLabelMapper.delete(queryWrapper); } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java index 3502d65..ee942a9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java @@ -54,7 +54,7 @@ public class FaultRuleServiceImpl extends ServiceImpl() .eq(CarInformation::getCarInformationVIN, carFaultRule.getVin())); //根据车辆类型，查询表获取对应的类型的故障规则 - Integer carInformationType = null; + Long carInformationType = null; for (CarInformation carInformation : carInformationList) { carInformationType= carInformation.getCarInformationType(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/ObtainRootLogin.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/ObtainRootLogin.java new file mode 100644 index 0000000..e961ac7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/ObtainRootLogin.java @@ -0,0 +1,32 @@ +package com.muyu.server.util; + +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysUser; +import com.muyu.domain.CarFenceClazz; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * + * @Author：yang + * @Package：com.muyu.server.util + * @Project：cloud-server-8 + * @name：ObtainRootLogin + * @Date：2024/10/2 16:46 + */ +public class ObtainRootLogin { + + public static String obtain(){ + LoginUser loginUser = SecurityUtils.getLoginUser(); + + SysUser sysUser = loginUser.getSysUser(); + + return sysUser.getDatabaseName(); + }; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/RunCarCondition.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/RunCarCondition.java new file mode 100644 index 0000000..d00d53d --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/RunCarCondition.java @@ -0,0 +1,60 @@ +package com.muyu.server.util; + +import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.*; +import com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService; +import com.muyu.server.service.*; +import lombok.AllArgsConstructor; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author：yang + * @Package：com.muyu.server.util + * @Project：cloud-server-8 + * @name：RunCarCondition + * @Date：2024/10/7 19:43 + */ +@Component +@AllArgsConstructor +public class RunCarCondition implements ApplicationRunner { + + private final VehicleCacheFaultCodeAddService vehicleCacheFaultCodeAddService; + private final FaultConditionService faultConditionService; + private final CarInformationService carInformationService; + private final CarFenceService carFenceService; + private final WarnStrategyService warnStrategyService; + private final FaultCodeService faultCodeService; + + @Override + public void run(ApplicationArguments args) throws Exception { + List list = faultConditionService.saveFaultConditionList(); + list.forEach(faultCondition -> { + List carInformationList = carInformationService.selectCarInformation(faultCondition.getCarTypeId()); + carInformationList.forEach(carInformation -> { + FaultCodeCache faultCodeCache = new FaultCodeCache(); + if (StringUtils.isNotNull(carInformation.getCarInformationFence())){ + faultCodeCache.setCarFences(carFenceService.CarFenceList(carInformation.getCarInformationFence())); + } + if (StringUtils.isNotNull(carInformation.getCarInformationState())) { + faultCodeCache.setWarnStrategies(warnStrategyService + .selectWarnStrategyById(Long.valueOf(carInformation.getCarInformationState()))); + } + if (StringUtils.isNotNull(faultCondition.getMessageTypeId())) { + faultCodeCache.setFaultCode(faultCodeService.faultCodeList(faultCondition.getMessageTypeId())); + } + ArrayList carInformations = new ArrayList<>(); + carInformations.add(carInformation); + faultCodeCache.setCarInformation(carInformations); + vehicleCacheFaultCodeAddService.put(vehicleCacheFaultCodeAddService + .keyPre()+carInformation + .getCarInformationVIN(), faultCodeCache); + }); + }); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml index ae6db3d..eea96e5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: psr diff --git a/cloud-modules/cloud-modules-enterprise/pom.xml b/cloud-modules/cloud-modules-enterprise/pom.xml index f6897ed..5b59763 100644 --- a/cloud-modules/cloud-modules-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/pom.xml @@ -16,13 +16,14 @@ cloud-modules-enterprise-common cloud-modules-enterprise-server + cloud-modules-enterprise-cache cloud-modules-enterprise pom - 21 - 21 + 17 + 17 UTF-8 diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index a02fcfb..2863945 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 4663d03..5735ae2 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index e84eb4f..91799f9 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -5,8 +5,8 @@ server: # nacos线上地址 nacos: addr: 159.75.188.178:8848 - user-name: - password: + user-name: nacos + password: nacos namespace: eight # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index ae51cac..10e7fb8 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight