From ef0311d3626748acb517c4a266f4d1f48b33d6aa Mon Sep 17 00:00:00 2001 From: sy200 <2063514638@qq.com> Date: Fri, 4 Oct 2024 16:43:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:()=E6=B7=BB=E5=8A=A0=E5=88=97=E8=A1=A8?= =?UTF-8?q?Redis=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JavaSample-tcp111231501461883/.lck | 0 .../cache/AllFaultCacheService.java | 23 ++++++++++++ .../cache/AllFenceCahceService.java | 26 ++++++++++++++ .../cache/AllMessageValueCacheService.java | 28 +++++++++++++++ .../cache/AllVehicleCacheService.java | 36 +++++++++++++++++++ .../cache/AllVehicleTypeCacheService.java | 24 +++++++++++++ .../cache/MessageValueCacheService.java | 26 ++++++++++++++ .../enterprise/cache/VehicleCacheService.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 14 ++++++-- .../controller/ElectController.java | 4 ++- .../controller/VehicleController.java | 15 +++++++- .../controller/VehicleTypeController.java | 11 +++--- .../service/impl/VehicleServiceImpl.java | 1 + 13 files changed, 199 insertions(+), 11 deletions(-) create mode 100644 JavaSample-tcp111231501461883/.lck create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java diff --git a/JavaSample-tcp111231501461883/.lck b/JavaSample-tcp111231501461883/.lck new file mode 100644 index 0000000..e69de29 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java new file mode 100644 index 0000000..66efe2b --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFaultCacheService.java @@ -0,0 +1,23 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; + +/** + * 所有故障缓存服务 + */ +public class AllFaultCacheService extends CacheAbsBacis { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "Allfault:info:"; + } + + @Override + public String decode(String key) { + return key.replace("Allfault:info:", ""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java new file mode 100644 index 0000000..b899371 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceCahceService.java @@ -0,0 +1,26 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.Fence; +import com.muyu.domain.req.FenceReq; + +/** + * 所有电子围栏缓存 + */ +public class AllFenceCahceService extends CacheAbsBacis { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "Allfence:info:"; + } + + @Override + public String decode(String key) { + return key.replace("Allfence:info:", ""); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java new file mode 100644 index 0000000..f17d968 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java @@ -0,0 +1,28 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.MessageTemplate; +import com.muyu.domain.MessageValue; +import com.muyu.domain.req.MessageValueReq; + +/** + * 报文模版缓存 + */ +public class AllMessageValueCacheService extends CacheAbsBacis { + + + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "Allmessagevalue:info:"; + } + + @Override + public String decode(String key) { + return key.replace("Allmessagevalue:info:", ""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java new file mode 100644 index 0000000..5da3875 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleCacheService.java @@ -0,0 +1,36 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.Vehicle; +import com.muyu.domain.req.VehicleAddReq; +import com.muyu.domain.req.VehicleManageReq; +import com.muyu.domain.resp.VehicleManageResp; + +import java.util.List; + +/** + * 所有车辆缓存 + */ +public class AllVehicleCacheService extends CacheAbsBacis { + + + @Override + public void clear() { + + } + + /** + * 缓存key前缀 + * @return + */ + @Override + public String keyPre() { + return "allvehicle:info:"; + } + + @Override + public String decode(String key) { + return key.replace("allvehicle:info:", ""); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java new file mode 100644 index 0000000..130776c --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllVehicleTypeCacheService.java @@ -0,0 +1,24 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.VehicleType; + +/** + * 所有车辆类型缓存 + */ +public class AllVehicleTypeCacheService extends CacheAbsBacis { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "vehicleType:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicleType:info:", ""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java new file mode 100644 index 0000000..956a360 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java @@ -0,0 +1,26 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.MessageValue; + +/** + * 报文模版缓存 + */ +public class MessageValueCacheService extends CacheAbsBacis { + + + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "messagevalue:info:"; + } + + @Override + public String decode(String key) { + return key.replace("messagevalue:info:", ""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java index 052fa9d..dfeebd3 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java @@ -4,7 +4,7 @@ import com.muyu.common.cache.CacheAbsBacis; import com.muyu.domain.Vehicle; /** - * 车辆缓存 + * 添加车辆缓存 */ public class VehicleCacheService extends CacheAbsBacis { 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 index faeca69..c2d5f8e 100644 --- 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 @@ -1,7 +1,15 @@ -com.muyu.enterprise.cache.VehicleCacheService +com.muyu.enterprise.cache.AllFaultCacheService +com.muyu.enterprise.cache.AllFenceCahceService +com.muyu.enterprise.cache.AllMessageValueCacheService +com.muyu.enterprise.cache.AllVehicleCacheService +com.muyu.enterprise.cache.AllVehicleTypeCacheService com.muyu.enterprise.cache.FaultCacheService com.muyu.enterprise.cache.FenceCahceService +com.muyu.enterprise.cache.MessageTemplateCacheService +com.muyu.enterprise.cache.MessageValueCacheService +com.muyu.enterprise.cache.VehicleCacheService +com.muyu.enterprise.cache.VehicleTypeCacheService com.muyu.enterprise.cache.WarnRuleCacheService com.muyu.enterprise.cache.WarnStrategyCacheService -com.muyu.enterprise.cache.MessageTemplateCacheService -com.muyu.enterprise.cache.VehicleTypeCacheService + + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java index 70e093f..f812425 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java @@ -28,7 +28,9 @@ import java.security.Security; import java.util.List; import java.util.concurrent.TimeUnit; - +/** + * 电子围栏信息 + */ @RequestMapping("/elect") @RestController @Log4j2 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java index 7639027..a3ce787 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java @@ -3,6 +3,7 @@ package com.muyu.enterprise.controller; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.domain.req.BoundFenceGroupReq; +import com.muyu.enterprise.cache.AllVehicleCacheService; import com.muyu.enterprise.cache.VehicleCacheService; import com.muyu.enterprise.service.VehicleService; import com.muyu.common.core.domain.Result; @@ -20,9 +21,11 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Collections; import java.util.List; /** @@ -42,9 +45,15 @@ public class VehicleController extends BaseController { @Autowired private VehicleService vehicleService; - //车辆缓存 + //添加车辆缓存 @Autowired private VehicleCacheService vehicleCacheService; + //车辆信息 + @Autowired + private AllVehicleCacheService allVehicleCacheService; + + @Autowired + private RedisTemplate redisTemplate; /** @@ -57,6 +66,10 @@ public class VehicleController extends BaseController { public Result> getVehicleList(@RequestBody VehicleManageReq vehicleManageReq) { startPage(); List list = vehicleService.getVehicleList(vehicleManageReq); +// 将车辆信息存到Redis + for (VehicleManageResp resp : list) { + allVehicleCacheService.put(resp.getVehicleVin(), resp); + } return getDataTable(list); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java index c0a6cd4..dd16cc7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java @@ -57,12 +57,13 @@ public class VehicleTypeController { @Operation(summary = "添加报文数据", description = "新增报文数据") public Result save(@RequestBody VehicleType vehicleType) { boolean save = vehicleTypeService.save(vehicleType); - //获取用户信息 - LoginUser loginUser = SecurityUtils.getLoginUser(); - //获取租户唯一标识 - String databaseName = loginUser.getSysUser().getDatabaseName(); +// //获取用户信息 +// LoginUser loginUser = SecurityUtils.getLoginUser(); +// //获取租户唯一标识 +// String databaseName = loginUser.getSysUser().getDatabaseName(); //存到redis - vehicleTypeCacheService.put(databaseName+vehicleType.getVehicleTypeId(),vehicleType); +// vehicleTypeCacheService.put(databaseName+vehicleType.getVehicleTypeId(),vehicleType); + vehicleTypeCacheService.put(String.valueOf(vehicleType.getVehicleTypeId()),vehicleType); return Result.success(save? "添加成功" : "添加失败"); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java index 37bd6f2..d0ca10e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java @@ -8,6 +8,7 @@ import com.muyu.domain.VehicleType; import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.domain.req.VehicleManageReq; import com.muyu.domain.resp.VehicleManageResp; +import com.muyu.enterprise.cache.AllVehicleCacheService; import com.muyu.enterprise.mapper.VehicleMapper; import com.muyu.enterprise.service.VehicleService; import org.springframework.beans.factory.annotation.Autowired; From 2c5387f0484e2928ca838ca2ad1483b5a51ed9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Fri, 4 Oct 2024 20:05:55 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat():=20=E6=B7=BB=E5=8A=A0=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E7=B1=BB=E5=9E=8B=E7=BC=93=E5=AD=98=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 2 +- cloud-gateway/src/main/resources/bootstrap.yml | 2 +- .../muyu/enterprise/controller/VehicleTypeController.java | 6 +++++- .../src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-file/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-gen/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-gen/src/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-system/src/main/resources/bootstrap.yml | 2 +- .../cloud-visual-monitor/src/main/resources/bootstrap.yml | 2 +- 11 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index d8dd0cc..7ed5410 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # Spring spring: application: diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index c9b97fd..906bcab 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # Spring spring: diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java index dd16cc7..1b253ad 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java @@ -45,7 +45,11 @@ public class VehicleTypeController { @RequestMapping(path = "/", method = RequestMethod.POST) @Operation(summary = "车辆类型列表",description = "车辆类型列表") public Result> findAll(){ - return Result.success(vehicleTypeService.list()); + List list = vehicleTypeService.list(); + list.forEach(vehicleType -> { + vehicleTypeCacheService.put(String.valueOf(vehicleType.getVehicleTypeId()), vehicleType); + }); + return Result.success(list); } /** 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 66bc686..9c1cb91 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 @@ -8,7 +8,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: 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 489071b..06ace7d 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # Spring spring: 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 97fb5ad..cbde7dd 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # Spring spring: diff --git a/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml index d0dbae7..3cf9ba1 100644 --- a/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # Spring spring: diff --git a/cloud-modules/cloud-modules-processing/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-processing/src/main/resources/bootstrap.yml index 6937759..bbf62ae 100644 --- a/cloud-modules/cloud-modules-processing/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-processing/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml index 619fc26..6091eb3 100644 --- a/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: 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 b5ea3d8..80afd61 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring 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 8ce1850..54dd098 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: vehicle # Spring spring: From 960d68f72e0a160b9b0a4ecdaaef86bdb3d6de31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Fri, 4 Oct 2024 20:38:00 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E6=95=B0=E6=8D=AE=E7=9A=84=E7=BC=93=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/cache/AllMessageValueCacheService.java | 10 +++++----- .../service/impl/MessageValueServiceImpl.java | 9 +++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java index f17d968..f39ffbe 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java @@ -1,14 +1,14 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBacis; -import com.muyu.domain.MessageTemplate; import com.muyu.domain.MessageValue; -import com.muyu.domain.req.MessageValueReq; + +import java.util.List; /** * 报文模版缓存 */ -public class AllMessageValueCacheService extends CacheAbsBacis { +public class AllMessageValueCacheService extends CacheAbsBacis> { @Override @@ -18,11 +18,11 @@ public class AllMessageValueCacheService extends CacheAbsBacis queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MessageValue::getTemplateId, templateId); List list = this.list(queryWrapper); + allMessageValueCacheService.put(String.valueOf(templateId), list); return list.stream() .map(messageValue -> MessageValueListResp.valueBuild( messageValue From a834f9d1bd10f698d28454deddd007d3a488d24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Fri, 4 Oct 2024 20:46:16 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E6=95=B0=E6=8D=AE=E7=9A=84=E7=BC=93=E5=AD=98=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/enterprise/cache/AllMessageValueCacheService.java | 4 ++-- .../enterprise/service/impl/MessageValueServiceImpl.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java index f39ffbe..e576cc1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllMessageValueCacheService.java @@ -1,14 +1,14 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBacis; -import com.muyu.domain.MessageValue; +import com.muyu.domain.resp.MessageValueListResp; import java.util.List; /** * 报文模版缓存 */ -public class AllMessageValueCacheService extends CacheAbsBacis> { +public class AllMessageValueCacheService extends CacheAbsBacis> { @Override diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/MessageValueServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/MessageValueServiceImpl.java index 982159f..7d12c08 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/MessageValueServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/MessageValueServiceImpl.java @@ -67,12 +67,13 @@ public class MessageValueServiceImpl LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MessageValue::getTemplateId, templateId); List list = this.list(queryWrapper); - allMessageValueCacheService.put(String.valueOf(templateId), list); - return list.stream() + List collect = list.stream() .map(messageValue -> MessageValueListResp.valueBuild( messageValue ) ).collect(Collectors.toList()); + allMessageValueCacheService.put(String.valueOf(templateId), collect); + return collect; } From 542a656dc64819cf7c1d6ee2e7be128b0476679a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Fri, 4 Oct 2024 22:09:59 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=8A=A5=E6=96=87=E6=95=B0=E6=8D=AE=E6=A8=A1=E7=89=88=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/domain/VehicleType.java | 2 +- .../controller/VehicleController.java | 16 ++--- .../cloud-modules-protocol-parsing/pom.xml | 6 ++ .../protocol/parsing/test/ParsingTest.java | 70 ++++++++++++------- 4 files changed, 56 insertions(+), 38 deletions(-) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java index 629720b..21bfdf6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java @@ -41,7 +41,7 @@ public class VehicleType extends BaseEntity { * 报文模版外键 */ @Schema(type = "Integer",description = "报文模版外键") - private Integer messageTemplateId; + private Long messageTemplateId; /** * 添加车辆类型 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java index a3ce787..429bba4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java @@ -48,13 +48,6 @@ public class VehicleController extends BaseController { //添加车辆缓存 @Autowired private VehicleCacheService vehicleCacheService; - //车辆信息 - @Autowired - private AllVehicleCacheService allVehicleCacheService; - - @Autowired - private RedisTemplate redisTemplate; - /** * 查询车辆管理列表 @@ -66,10 +59,11 @@ public class VehicleController extends BaseController { public Result> getVehicleList(@RequestBody VehicleManageReq vehicleManageReq) { startPage(); List list = vehicleService.getVehicleList(vehicleManageReq); -// 将车辆信息存到Redis - for (VehicleManageResp resp : list) { - allVehicleCacheService.put(resp.getVehicleVin(), resp); - } + //将车辆信息存到Redis + List vehicleList = vehicleService.list(); + vehicleList.forEach(vehicle -> { + vehicleCacheService.put(vehicle.getVehicleVin(), vehicle); + }); return getDataTable(list); } diff --git a/cloud-modules/cloud-modules-protocol-parsing/pom.xml b/cloud-modules/cloud-modules-protocol-parsing/pom.xml index fa6b4ec..6d31bae 100644 --- a/cloud-modules/cloud-modules-protocol-parsing/pom.xml +++ b/cloud-modules/cloud-modules-protocol-parsing/pom.xml @@ -116,6 +116,12 @@ cloud-common-kafka + + com.muyu + cloud-modules-enterprise-cache + 3.6.3 + + diff --git a/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingTest.java b/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingTest.java index 9d9e31b..b3c056c 100644 --- a/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingTest.java +++ b/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingTest.java @@ -4,7 +4,14 @@ import cn.hutool.json.JSONObject; import com.alibaba.fastjson.JSON; import com.muyu.cloud.protocol.parsing.feign.RemoteServiceClient; import com.muyu.common.core.domain.Result; +import com.muyu.domain.Vehicle; +import com.muyu.domain.VehicleType; import com.muyu.domain.resp.MessageValueListResp; +import com.muyu.domain.resp.VehicleManageResp; +import com.muyu.enterprise.cache.AllMessageValueCacheService; +import com.muyu.enterprise.cache.AllVehicleCacheService; +import com.muyu.enterprise.cache.VehicleCacheService; +import com.muyu.enterprise.cache.VehicleTypeCacheService; import lombok.extern.log4j.Log4j2; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; @@ -38,6 +45,15 @@ public class ParsingTest { @Resource private KafkaProducer kafkaProducer; + @Autowired + private VehicleCacheService vehicleCacheService; + + @Autowired + private VehicleTypeCacheService vehicleTypeCacheService; + + @Autowired + private AllMessageValueCacheService allMessageValueCacheService; + /** * 协议解析 */ @@ -92,32 +108,34 @@ public class ParsingTest { String vehicleVin = result.substring(1, 18); log.info("车辆VIN码: " + vehicleVin); //根据车辆VIN码查询报文模板ID - Result byVehicleVin = remoteServiceClient.findByVehicleVin(vehicleVin); - Long templateId = byVehicleVin.getData(); - List templateList; - //从redis缓存中获取报文模板数据 - try { - String redisKey = "messageTemplate" + templateId; - if (redisTemplate.hasKey(redisKey)) { - List list = redisTemplate.opsForList().range(redisKey, 0, -1); - templateList = list.stream() - .map(obj -> JSON.parseObject(obj.toString(), MessageValueListResp.class)) - .toList(); - log.info("Redis缓存查询成功"); - } else { - Result> byTemplateId = remoteServiceClient.findByTemplateId(templateId); - templateList = byTemplateId.getData(); - templateList.forEach( - listResp -> - redisTemplate.opsForList().rightPush( - redisKey, JSON.toJSONString(listResp) - ) - ); - log.info("数据库查询成功"); - } - } catch (Exception e) { - throw new RuntimeException("获取报文模板失败"); - } + Vehicle vehicle = vehicleCacheService.get(vehicleVin); + Long vehicleTypeId = vehicle.getVehicleTypeId(); + VehicleType vehicleType = vehicleTypeCacheService.get(String.valueOf(vehicleTypeId)); + Long templateId = vehicleType.getMessageTemplateId(); + List templateList = allMessageValueCacheService.get(String.valueOf(templateId)); +// //从redis缓存中获取报文模板数据 +// try { +// String redisKey = "messageTemplate" + templateId; +// if (redisTemplate.hasKey(redisKey)) { +// List list = redisTemplate.opsForList().range(redisKey, 0, -1); +// templateList = list.stream() +// .map(obj -> JSON.parseObject(obj.toString(), MessageValueListResp.class)) +// .toList(); +// log.info("Redis缓存查询成功"); +// } else { +// Result> byTemplateId = remoteServiceClient.findByTemplateId(templateId); +// templateList = byTemplateId.getData(); +// templateList.forEach( +// listResp -> +// redisTemplate.opsForList().rightPush( +// redisKey, JSON.toJSONString(listResp) +// ) +// ); +// log.info("数据库查询成功"); +// } +// } catch (Exception e) { +// throw new RuntimeException("获取报文模板失败"); +// } //判断报文模板列表不为空 if (templateList.isEmpty()) { throw new RuntimeException("报文模版为空"); From 846a03f75c7535093a9c5a1cda38e457a503b6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 09:55:24 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=8A=A5=E6=96=87=E6=95=B0=E6=8D=AE=E6=A8=A1=E7=89=88=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JavaSample-tcp111231501461883/.lck | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 JavaSample-tcp111231501461883/.lck diff --git a/JavaSample-tcp111231501461883/.lck b/JavaSample-tcp111231501461883/.lck deleted file mode 100644 index e69de29..0000000 From 3b35565404ae5b746618c31c88aa75e376b5e006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 14:17:59 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat():=E5=88=A0=E9=99=A4=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JavaSample-tcp111231501461883/.lck | 0 .../parsing/feign/RemoteServiceClient.java | 40 ------------------- .../factory/RemoteServiceClientFactory.java | 40 ------------------- .../{ParsingTest.java => ParsingMessage.java} | 14 +------ 4 files changed, 1 insertion(+), 93 deletions(-) create mode 100644 JavaSample-tcp111231501461883/.lck delete mode 100644 cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/RemoteServiceClient.java delete mode 100644 cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/factory/RemoteServiceClientFactory.java rename cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/{ParsingTest.java => ParsingMessage.java} (93%) diff --git a/JavaSample-tcp111231501461883/.lck b/JavaSample-tcp111231501461883/.lck new file mode 100644 index 0000000..e69de29 diff --git a/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/RemoteServiceClient.java b/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/RemoteServiceClient.java deleted file mode 100644 index 1f12ca7..0000000 --- a/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/RemoteServiceClient.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.muyu.cloud.protocol.parsing.feign; - -import com.muyu.common.core.domain.Result; -import com.muyu.domain.resp.MessageValueListResp; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - -/** - * @Author: LiDongJia - * @Package: com.muyu.cloud.protocol.parsing.feign - * @Project: 2112-car-cloud-server - * @name: RemoteServiceClient - * @Date: 2024/9/28 14:49 - * @Description: 远程调用接口 - */ -@FeignClient(name = "cloud-car") -public interface RemoteServiceClient { - - /** - * 通过车辆vin码查询模板id - * @param vehicleVin - * @return - */ - @GetMapping("/vehicleManage/findByVehicleVin/{vehicleVin}") - @Operation(description = "通过车辆vin码查询模板id") - public Result findByVehicleVin(@PathVariable("vehicleVin") String vehicleVin); - - /** - * 根据报文模版id查询报文数据 - * @param templateId - * @return - */ - @GetMapping("/messageValue/findByTemplateId/{templateId}") - @Operation(summary = "根据报文模版id查询报文数据", description = "根据报文模版id查询报文数据") - public Result> findByTemplateId(@PathVariable("templateId") Long templateId); -} diff --git a/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/factory/RemoteServiceClientFactory.java b/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/factory/RemoteServiceClientFactory.java deleted file mode 100644 index 3d2af79..0000000 --- a/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/feign/factory/RemoteServiceClientFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.muyu.cloud.protocol.parsing.feign.factory; - -import com.muyu.cloud.protocol.parsing.feign.RemoteServiceClient; -import com.muyu.common.core.domain.Result; -import com.muyu.domain.resp.MessageValueListResp; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cloud.openfeign.FallbackFactory; - -import java.util.List; - -/** - * 报文模版对象服务降级处理 - * @Author：李庆帅 - * @Package：com.muyu.analysis.parsing.remote.factory - * @Project：cloud-server - * @name：RemoteServiceClientFactory - * @Date：2024/9/28 21:16 - */ -public class RemoteServiceClientFactory implements FallbackFactory -{ - private static final Logger log = LoggerFactory.getLogger(com.muyu.cloud.protocol.parsing.feign.factory.RemoteServiceClientFactory.class); - - @Override - public RemoteServiceClient create(Throwable throwable) { - log.error("报文模版传参调用失败:{}", throwable.getMessage()); - return new RemoteServiceClient() { - - @Override - public Result findByVehicleVin(String vehicleVin) { - return Result.success(Long.valueOf(vehicleVin)); - } - - @Override - public Result> findByTemplateId(Long templateId) { - return null; - } - }; - } -} diff --git a/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingTest.java b/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingMessage.java similarity index 93% rename from cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingTest.java rename to cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingMessage.java index b3c056c..d0bbdea 100644 --- a/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingTest.java +++ b/cloud-modules/cloud-modules-protocol-parsing/src/main/java/com/muyu/cloud/protocol/parsing/test/ParsingMessage.java @@ -1,15 +1,10 @@ package com.muyu.cloud.protocol.parsing.test; import cn.hutool.json.JSONObject; -import com.alibaba.fastjson.JSON; -import com.muyu.cloud.protocol.parsing.feign.RemoteServiceClient; -import com.muyu.common.core.domain.Result; import com.muyu.domain.Vehicle; import com.muyu.domain.VehicleType; import com.muyu.domain.resp.MessageValueListResp; -import com.muyu.domain.resp.VehicleManageResp; import com.muyu.enterprise.cache.AllMessageValueCacheService; -import com.muyu.enterprise.cache.AllVehicleCacheService; import com.muyu.enterprise.cache.VehicleCacheService; import com.muyu.enterprise.cache.VehicleTypeCacheService; import lombok.extern.log4j.Log4j2; @@ -17,7 +12,6 @@ import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; import org.eclipse.paho.client.mqttv3.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @@ -34,13 +28,7 @@ import java.util.List; */ @Log4j2 @Component -public class ParsingTest { - - @Resource - private RedisTemplate redisTemplate; - - @Autowired - private RemoteServiceClient remoteServiceClient; +public class ParsingMessage { @Resource private KafkaProducer kafkaProducer; From b29363a31ad691ea9bcbe8f77cd65fb88ce0ed03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 14:28:52 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat():=E6=9B=B4=E6=94=B9nacos=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 2 +- cloud-gateway/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-file/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-gen/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-gen/src/src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-processing/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-system/src/main/resources/bootstrap.yml | 2 +- .../cloud-visual-monitor/src/main/resources/bootstrap.yml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 7ed5410..d8dd0cc 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # Spring spring: application: diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index 906bcab..c9b97fd 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # Spring spring: 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 9c1cb91..66bc686 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 @@ -8,7 +8,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: 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 06ace7d..489071b 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # Spring spring: 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 cbde7dd..97fb5ad 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # Spring spring: diff --git a/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml index 3cf9ba1..d0dbae7 100644 --- a/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # Spring spring: diff --git a/cloud-modules/cloud-modules-processing/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-processing/src/main/resources/bootstrap.yml index bbf62ae..6937759 100644 --- a/cloud-modules/cloud-modules-processing/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-processing/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml index 6091eb3..619fc26 100644 --- a/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: 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 80afd61..b5ea3d8 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring 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 54dd098..8ce1850 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: vehicle + namespace: seven # Spring spring: