From a08b98ca9557f9b07c013023a9920628077d644d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=AF=85=E5=A4=A7=E7=A5=9E?= <3163302184@qq.com> Date: Thu, 10 Oct 2024 20:58:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=BC=93=E5=AD=98=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ot.autoconfigure.AutoConfiguration.imports | 3 +- cloud-common/cloud-common-system/pom.xml | 4 + .../factory/RemoteUserFallbackFactory.java | 5 + .../openbusiness/VehicleCacheService.java | 34 ------- .../apply/InforMationDataService.java | 31 +++++++ .../apply/MessageValueCacheService.java | 34 +++++++ .../apply/SysCarCacheRemoteData.java | 46 +++++----- .../apply/SysCarCachessRemoteData.java | 22 +++++ .../apply/SysCarTypeCacheService.java | 37 ++++++++ .../openbusiness/apply/VehiCachService.java | 35 +++++++ .../apply/WarnStrategyCarService.java | 49 ++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../com/muyu/openbusiness/domain/SysCar.java | 2 +- .../remote/SysCarRemoteService.java | 28 +++--- .../cloud-modules-openbusiness-server/pom.xml | 11 +-- .../controller/RailController.java | 4 - .../controller/SysCarController.java | 33 +++---- .../controller/SysCarMessageController.java | 91 +++++++++++++++++-- .../controller/SysMessageTypeController.java | 23 ++++- .../controller/WarnLogsController.java | 21 +++++ .../controller/WarnRuleController.java | 14 +++ .../controller/WarnStrategyController.java | 14 +++ .../service/ISysCarMessageService.java | 4 + .../impl/SysCarMessageServiceImpl.java | 8 ++ cloud-modules/cloud-modules-parsing/pom.xml | 6 ++ ...ler.java => SysCarMessagesController.java} | 2 +- .../system/controller/SysFirmController.java | 2 +- 27 files changed, 439 insertions(+), 125 deletions(-) delete mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/VehicleCacheService.java create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/InforMationDataService.java create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/MessageValueCacheService.java create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarCachessRemoteData.java create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarTypeCacheService.java create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/VehiCachService.java create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/WarnStrategyCarService.java create mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java rename cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/{SysCarMessageController.java => SysCarMessagesController.java} (99%) diff --git a/cloud-common/cloud-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f4a1fdb..8b13789 100644 --- a/cloud-common/cloud-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-common/cloud-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1 @@ -com.muyu.common.kafka.config.KafkaConsumerConfig -com.muyu.common.kafka.config.KafkaProviderConfig + diff --git a/cloud-common/cloud-common-system/pom.xml b/cloud-common/cloud-common-system/pom.xml index ad4356f..23d227b 100644 --- a/cloud-common/cloud-common-system/pom.xml +++ b/cloud-common/cloud-common-system/pom.xml @@ -25,5 +25,9 @@ com.muyu cloud-common-core + + com.muyu + cloud-modules-openbusiness-common + diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index 5bffd3c..79dbfa0 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -10,6 +10,7 @@ import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; +import com.muyu.openbusiness.domain.SysCarMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -47,6 +48,10 @@ public class RemoteUserFallbackFactory implements FallbackFactory> companyList() { diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/VehicleCacheService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/VehicleCacheService.java deleted file mode 100644 index 6e119ad..0000000 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/VehicleCacheService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.openbusiness; - -import com.muyu.common.cache.BasicCacheData; -import com.muyu.common.cache.abs.CacheAbs; -import com.muyu.openbusiness.domain.SysCar; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class VehicleCacheService extends CacheAbs { - - @Autowired - private BasicCacheData basicCacheData; - - @Override - public SysCar getData(String key) { - return basicCacheData.apply(key); - } - - @Override - public SysCar defaultValue() { - return SysCar.builder().build(); - } - - @Override - public String keyPre() { - return "car:info:"; - } - - @Override - public String decode(String redisKey) { - return redisKey.replace(keyPre(), ""); - } -} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/InforMationDataService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/InforMationDataService.java new file mode 100644 index 0000000..ea930b6 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/InforMationDataService.java @@ -0,0 +1,31 @@ +package com.muyu.openbusiness.apply; + +import com.muyu.common.cache.abs.CacheAbs; +import com.muyu.openbusiness.domain.SysCarMessage; + +import java.util.List; +//车辆全部缓存 +public class InforMationDataService extends CacheAbs> { + + @Override + public List getData(String key) { + return null; + } + + @Override + public List defaultValue() { + return null; + } + + @Override + public String keyPre() { + return ""; + } + + @Override + public String decode(String redisKey) { + return null; + } + + +} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/MessageValueCacheService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/MessageValueCacheService.java new file mode 100644 index 0000000..7e05f24 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/MessageValueCacheService.java @@ -0,0 +1,34 @@ +package com.muyu.openbusiness.apply; + +import com.muyu.common.cache.abs.CacheAbs; +import com.muyu.openbusiness.domain.SysCarMessage; +import org.springframework.stereotype.Component; + +import java.util.List; +@Component +public class MessageValueCacheService extends CacheAbs> { + + +//缓存 + + @Override + public List getData(String key) { + return new InforMationDataService().getData(key); + + } + + @Override + public List defaultValue() { + return new InforMationDataService().defaultValue(); + } + + @Override + public String keyPre() { + return "messageVlue:info:"; + } + + @Override + public String decode(String key){ + return key.replace("messageValue:info", ""); + } +} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarCacheRemoteData.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarCacheRemoteData.java index 0ffcaec..e412bfb 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarCacheRemoteData.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarCacheRemoteData.java @@ -1,23 +1,23 @@ -package com.muyu.openbusiness.apply; - -import com.muyu.common.cache.BasicCacheData; -import com.muyu.openbusiness.domain.SysCar; -import com.muyu.openbusiness.remote.SysCarRemoteService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 键和值转换 - 车辆数据 - */ -@Component -public class SysCarCacheRemoteData implements BasicCacheData { - - - @Autowired - private SysCarRemoteService sysCarRemoteService; - - @Override - public SysCar apply(String key) { - return sysCarRemoteService.findByVin(key).getData(); - } -} +//package com.muyu.openbusiness.apply; +// +//import com.muyu.common.cache.BasicCacheData; +//import com.muyu.openbusiness.domain.SysCar; +////import com.muyu.openbusiness.remote.SysCarRemoteService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +///** +// * 键和值转换 - 车辆数据 +// */ +//@Component +//public class SysCarCacheRemoteData implements BasicCacheData { +// +// +// @Autowired +// private SysCarRemoteService sysCarRemoteService; +// +// @Override +// public SysCar apply(String key) { +// return sysCarRemoteService.findByVin(key).getData(); +// } +//} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarCachessRemoteData.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarCachessRemoteData.java new file mode 100644 index 0000000..d0b452a --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarCachessRemoteData.java @@ -0,0 +1,22 @@ +//package com.muyu.openbusiness.apply; +// +//import com.muyu.common.cache.BasicCacheData; +//import com.muyu.openbusiness.domain.SysCar; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +///** +// * 键和值转换 - 车辆数据 +// */ +//@Component +//public class SysCarCachessRemoteData implements BasicCacheData { +// +// +// @Autowired +// private SysCarRemoteService sysCarRemoteService; +// +// @Override +// public SysCar apply(String key) { +// return sysCarRemoteService.findByVin(key).getData(); +// } +//} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarTypeCacheService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarTypeCacheService.java new file mode 100644 index 0000000..9fd94ed --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/SysCarTypeCacheService.java @@ -0,0 +1,37 @@ +package com.muyu.openbusiness.apply; + +import com.muyu.common.cache.abs.CacheAbs; +/** + * 车型缓存服务 + * @version 1.0 + * @Author zhang yi + * @Date 2024/9/30 11:18 + * @注释 + */ +public class SysCarTypeCacheService extends CacheAbs { + + @Override + public String defaultValue() { + return null; + } + + @Override + public String keyPre() { + return "sysCarType:info:"; + } + + @Override + public String encode(String key){ + return super.encode(key); + } + + @Override + public String decode(String redisKey) { + return null; + } + + @Override + public String getData(String key) { + return null; + } +} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/VehiCachService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/VehiCachService.java new file mode 100644 index 0000000..da05f95 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/VehiCachService.java @@ -0,0 +1,35 @@ +package com.muyu.openbusiness.apply; + +import com.muyu.common.cache.abs.CacheAbs; +import com.muyu.openbusiness.domain.VehicleMessage; +import org.springframework.stereotype.Component; +/** + * 车辆缓存服务 + * @className: VehicleCacheService ️✈️ + * @author: zhang yi 🦅 + * @date: 2024/9/30 00:36 ⏰ + * @Version: 1.0 + * @description: + */ +@Component +public class VehiCachService extends CacheAbs { + @Override + public VehicleMessage getData(String key) { + return null; + } + + @Override + public VehicleMessage defaultValue() { + return null; + } + + @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-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/WarnStrategyCarService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/WarnStrategyCarService.java new file mode 100644 index 0000000..32672b3 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/java/com/muyu/openbusiness/apply/WarnStrategyCarService.java @@ -0,0 +1,49 @@ +package com.muyu.openbusiness.apply; + +import com.muyu.common.cache.abs.CacheAbs; +import com.muyu.openbusiness.domain.BreakDown; +import com.muyu.openbusiness.domain.VehicleMessage; +import com.muyu.openbusiness.domain.WarnRule; + +import java.util.List; +/** + * 预警缓存服务 + * @Author：yan + * @Package：com.muyu.enterpise.cache + * @Project：plus + * @name：WarnStrategyCacjeService + * @Date：2024/10/6 19:26 + */ +public class WarnStrategyCarService extends CacheAbs { + + @Override + public BreakDown getData(String key) { + return null; + } + + @Override + public BreakDown defaultValue() { + return null; + } + + @Override + public String keyPre() { + return "AllFenceGroup:info:"; + } + + @Override + public String decode(String key){ + return key.replace("AllFenceGroup:info:",""); + } + + public WarnRule findByWarnId(Long id) { + return null; + } + + public List List() { + return null; + } + + public void put(String carVin, WarnRule respList) { + } +} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..96f65de --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.openbusiness.apply.VehiCachService diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java index c6152d6..c6e25ac 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java @@ -26,7 +26,7 @@ import com.baomidou.mybatisplus.annotation.IdType; @NoArgsConstructor @AllArgsConstructor @TableName("sys_car") -public class SysCar { +public class SysCar extends VehicleMessage { private static final long serialVersionUID = 1L; /** 自增主键 */ diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-remote/src/main/java/com/muyu/openbusiness/remote/SysCarRemoteService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-remote/src/main/java/com/muyu/openbusiness/remote/SysCarRemoteService.java index f52e472..942fc1c 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-remote/src/main/java/com/muyu/openbusiness/remote/SysCarRemoteService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-remote/src/main/java/com/muyu/openbusiness/remote/SysCarRemoteService.java @@ -1,14 +1,14 @@ -package com.muyu.openbusiness.remote; - -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.openbusiness.domain.SysCar; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -@FeignClient(contextId = "sysCarRemoteService", value = ServiceNameConstants.CAR_SERVICE) -public interface SysCarRemoteService { - - @GetMapping("/car/findByVin") - public Result findByVin(String vin); -} +//package com.muyu.openbusiness.remote; +// +//import com.muyu.common.core.constant.ServiceNameConstants; +//import com.muyu.common.core.domain.Result; +//import com.muyu.openbusiness.domain.SysCar; +//import org.springframework.cloud.openfeign.FeignClient; +//import org.springframework.web.bind.annotation.GetMapping; +// +//@FeignClient(contextId = "sysCarRemoteService", value = ServiceNameConstants.CAR_SERVICE) +//public interface SysCarRemoteService { +// +// @GetMapping("/car/findByVin") +// public Result findByVin(String vin); +//} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml index 3805e06..b17f2a7 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml @@ -97,10 +97,6 @@ cloud-common-rabbit - - com.muyu - cloud-common-kafka - org.bouncycastle @@ -120,12 +116,7 @@ - - com.muyu - cloud-modules-carmanage - 3.6.3 - compile - + org.springframework.cloud spring-cloud-starter-openfeign diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java deleted file mode 100644 index 5e88e4c..0000000 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.muyu.openbusiness.controller; - -public class RailController { -} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java index 7d15508..ccd4dc0 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java @@ -1,8 +1,6 @@ package com.muyu.openbusiness.controller; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysMember; -import com.muyu.common.system.remote.RemoteUserService; +import com.muyu.openbusiness.config.SnowflakeIdWorker; import com.muyu.openbusiness.domain.SysCar; import com.muyu.openbusiness.service.ISysCarService; import com.muyu.common.core.domain.Result; @@ -12,10 +10,10 @@ import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import jakarta.servlet.http.HttpServletResponse; 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 javax.annotation.Resource; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; @@ -36,10 +34,9 @@ public class SysCarController extends BaseController { @Autowired private ISysCarService sysCarService; - @Resource - private RemoteUserService remoteUserService; - +@Autowired +private RedisTemplate redisTemplate; /** * 查询车辆基础信息列表 */ @@ -52,12 +49,6 @@ public class SysCarController extends BaseController return getDataTable(list); } - public List sysCarList() - { - List list = sysCarService.selectSysCarList(new SysCar()); - return list; - } - /** * 导出车辆基础信息列表 */ @@ -77,6 +68,13 @@ public class SysCarController extends BaseController @GetMapping(value = "/{id}") public Result> getInfo(@PathVariable("id") Long id) { + SnowflakeIdWorker snowMaker = new SnowflakeIdWorker(); + for (int i = 0; i < 100; i++) { + long ids = snowMaker.nextId(); + System.out.println(ids); + + } + redisTemplate.opsForValue().set("ids",sysCarService.selectSysCarById(id)); return success(sysCarService.selectSysCarById(id)); } @@ -88,13 +86,6 @@ public class SysCarController extends BaseController public Result add( @Validated @RequestBody SysCar sysCar) { - String saasKey = SecurityUtils.getSaasKey(); - Result sysMemberResult = remoteUserService.selectSysMemberListById(saasKey); - SysMember sysMember = sysMemberResult.getData(); - List list = this.sysCarList(); - if(list.size()>=sysMember.getMemberCarNum()){ - return Result.error("已达到当前会员等级可添加上限，请联系管理员升级会员等级"); - } // 获取当前时间（没有时区） LocalDateTime now = LocalDateTime.now(); // 假设我们使用系统默认时区 @@ -132,7 +123,7 @@ public class SysCarController extends BaseController * 删除车辆基础信息 */ @RequiresPermissions("car:car:remove") - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public Result remove(@PathVariable("ids") Long[] ids) { sysCarService.removeBatchByIds(Arrays.asList(ids)); diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java index 9ca2621..fc57edb 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java @@ -1,10 +1,12 @@ package com.muyu.openbusiness.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.remote.RemoteDataService; +import com.muyu.common.system.remote.RemoteUserService; +import com.muyu.openbusiness.apply.VehiCachService; +import com.muyu.openbusiness.domain.SysCar; import com.muyu.openbusiness.domain.SysCarMessage; -import com.muyu.openbusiness.domain.req.SysCarMessageReq; import com.muyu.openbusiness.service.ISysCarMessageService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -30,24 +32,91 @@ import java.util.concurrent.ExecutionException; * @date 2024-09-18 */ @RestController -@RequestMapping("/messageInfo") +@RequestMapping("/messagesInfo") public class SysCarMessageController extends BaseController { @Resource private ISysCarMessageService sysCarMessageService; +// @Autowired +// private SystemFeign feign; @Resource - private RemoteDataService remoteDataService; + private VehiCachService vehiCachService; + @Autowired + private HttpSession session; + + @Autowired + RemoteUserService remoteUserService; + + static String TEST = "7E 56 45 48 49 43 4C 45 5F 4D 53 47 3A 56 49 4E 31 32 B6 A1 C0 F2 B3 E5 D9 A8 C1 B2 E3 F4 A6 D7 C9 F1 E0 A3 B5 C8 D4 E2 A1 F5 B6 C7 E8 D9 A0 E3 B2 C4 F5 D6 A8 C0 E1 F2 B7 D8 A4 E3 C2 B1 A5 D9 F6 C8 E7 A0 B2 C3 D1 F4 E5 A9 3F 2A 7B D9 1E C8 4D A3 6F 5B 9A 0C 3E 7D F2 8B 46 1A 5E 9F 2D 73 8C 4A B1 6C 5D E2 7E C4 39 0B AD 7C 1F 0E 3C 68 92 B4 5A 7F 6E 81 0D 4B A5 E3 F9 2E 8A 37 6D 14 5C 73 8E D2 04 9B 3A 6C F1 70 BF 29 5F 8C 43 61 24 5D 7A 9C 0A D5 1B 3D 6E F4 78 3E 5B"; + + @RequiresPermissions("message:message:test") + @GetMapping("/test") + public Result test() throws InterruptedException, ExecutionException { + List list = (List) session.getAttribute("list"); + + // 检查 list 是否为空 + if (list == null || list.isEmpty()) { + return Result.success(new String[0]); // 或者返回一个适当的错误消息 + } + + String[] test = TEST.split(" "); + String[] results = new String[list.size()]; + + List> futures = new ArrayList<>(); + + for (SysCarMessage carMessage : list) { + futures.add(CompletableFuture.supplyAsync(() -> { + int startIndex = Integer.parseInt(carMessage.getMessageStartIndex()) - 1; + int endIndex = Integer.parseInt(carMessage.getMessageEndIndex()); + StringBuilder hexBuilder = new StringBuilder(); + + for (int j = startIndex; j < endIndex; j++) { + hexBuilder.append(test[j]); + } + + String hex = hexBuilder.toString(); + char[] result = new char[hex.length() / 2]; + + for (int x = 0; x < hex.length(); x += 2) { + int high = Character.digit(hex.charAt(x), 16); + int low = Character.digit(hex.charAt(x + 1), 16); + result[x / 2] = (char) ((high << 4) + low); + } + + return new String(result); + })); + } + + for (int i = 0; i < futures.size(); i++) { + results[i] = futures.get(i).get(); + } + + return Result.success(results); + } + + /** * 查询车辆报文记录列表 */ @RequiresPermissions("message:message:list") @GetMapping("/list") - public Result> list(SysCarMessageReq sysCarMessage) + public Result> list(SysCarMessage sysCarMessage) { - remoteDataService.carRealTimeStatus(sysCarMessage.getCarVin(),sysCarMessage.getFlag()); - SysCarMessage message = new SysCarMessage(); - message.setModelCode(sysCarMessage.getModelCode()); - List list = sysCarMessageService.selectSysCarMessageList(message); +// Result info = feign.getInfo(); +// SysUser sysUser = (SysUser) info.getData(); + List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); + + list.forEach(syscar -> { + List list1 = sysCarMessageService.selectSysCarMessageList(new LambdaQueryWrapper() + .eq(SysCar::getCarType,syscar.getMessageType())); + list1.forEach(sysCar -> { + + vehiCachService.put(vehiCachService.keyPre()+sysCar.getCarVin(),sysCar); +}); + }); + + + session.setAttribute("list", list); return Result.success(list); } @@ -68,7 +137,7 @@ public class SysCarMessageController extends BaseController */ @RequiresPermissions("message:message:query") @GetMapping(value = "/{id}") - public Result getInfo(@PathVariable("id") Long id) + public Result> getInfo(@PathVariable("id") Long id) { return success(sysCarMessageService.selectSysCarMessageById(id)); } @@ -99,6 +168,8 @@ public class SysCarMessageController extends BaseController if (!sysCarMessageService.checkIdUnique(sysCarMessage)) { return error("修改 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录不存在"); } + + return toAjax(sysCarMessageService.updateById(sysCarMessage)); } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java index 7e11dba..bd7999b 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java @@ -1,6 +1,6 @@ package com.muyu.openbusiness.controller; -import com.muyu.common.system.remote.RemoteDataService; +import com.muyu.openbusiness.config.SnowflakeIdWorker; import com.muyu.openbusiness.domain.SysMessageType; import com.muyu.openbusiness.service.ISysMessageTypeService; import com.muyu.common.core.domain.Result; @@ -8,6 +8,8 @@ import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.security.annotation.RequiresPermissions; import jakarta.servlet.http.HttpServletResponse; +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.*; @@ -26,9 +28,8 @@ import java.util.List; public class SysMessageTypeController extends BaseController { @Resource private ISysMessageTypeService sysMessageTypeService; - @Resource - private RemoteDataService remoteDataService; - +@Autowired + RedisTemplate redisTemplate; /** * 查询车辆报文类型列表 */ @@ -37,6 +38,13 @@ public class SysMessageTypeController extends BaseController { public Result> list(SysMessageType sysMessageType) { List list = sysMessageTypeService.selectSysMessageTypeList(sysMessageType); + SnowflakeIdWorker snowMaker = new SnowflakeIdWorker(); + for (int i = 0; i < 100; i++) { + long ids = snowMaker.nextId(); + System.out.println(ids); + + } + redisTemplate.opsForValue().set("ids",list); return Result.success(list); } @@ -63,6 +71,13 @@ public class SysMessageTypeController extends BaseController { for (int i = 0; i < messageCodes.length; i++) { list[i] = sysMessageTypeService.selectSysMessageTypeByMessageCode(messageCodes[i]); } + SnowflakeIdWorker snowMaker = new SnowflakeIdWorker(); + for (int i = 0; i < 100; i++) { + long ids = snowMaker.nextId(); + System.out.println(ids); + + } + redisTemplate.opsForValue().set("ids",list); return success(list); } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java index d855362..a3ed22f 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java @@ -5,9 +5,12 @@ import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.openbusiness.config.SnowflakeIdWorker; import com.muyu.openbusiness.domain.WarnLogs; import com.muyu.openbusiness.service.IWarnLogsService; import jakarta.servlet.http.HttpServletResponse; +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.*; @@ -27,6 +30,8 @@ public class WarnLogsController extends BaseController { @Resource private IWarnLogsService warnLogsService; +@Autowired +private RedisTemplate redisTemplate; /** * 查询预警日志列表 @@ -37,6 +42,13 @@ public class WarnLogsController extends BaseController { startPage(); List list = warnLogsService.selectWarnLogsList(warnLogs); + SnowflakeIdWorker snowMaker = new SnowflakeIdWorker(); + for (int i = 0; i < 100; i++) { + long ids = snowMaker.nextId(); + System.out.println(ids); + + } + redisTemplate.opsForValue().set("ids",list); return getDataTable(list); } @@ -59,6 +71,15 @@ public class WarnLogsController extends BaseController @GetMapping(value = "/{id}") public Result> getInfo(@PathVariable("id") Long id) { + SnowflakeIdWorker snowMaker = new SnowflakeIdWorker(); + for (int i = 0; i < 100; i++) { + long ids = snowMaker.nextId(); + System.out.println(ids); + + } + redisTemplate.opsForValue().set("ids",warnLogsService.selectWarnLogsById(id)); + + return success(warnLogsService.selectWarnLogsById(id)); } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java index eef03a2..446fece 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java @@ -5,10 +5,13 @@ import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.openbusiness.config.SnowflakeIdWorker; import com.muyu.openbusiness.domain.WarnRule; import com.muyu.openbusiness.domain.WarnRuleDTO; import com.muyu.openbusiness.service.IWarnRuleService; import jakarta.servlet.http.HttpServletResponse; +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.*; @@ -28,6 +31,8 @@ public class WarnRuleController extends BaseController { @Resource private IWarnRuleService warnRuleService; + @Autowired + RedisTemplate redisTemplate; /** * 查询预警规则列表 */ @@ -41,6 +46,14 @@ public class WarnRuleController extends BaseController { // .select(WarnStrategy::getStrategyName) // .leftJoin(WarnStrategy.class, WarnStrategy::getId, WarnRule::getStrategyId) // .stringQuery(); + SnowflakeIdWorker snowMaker = new SnowflakeIdWorker(); + for (int i = 0; i < 100; i++) { + long ids = snowMaker.nextId(); + System.out.println(ids); + + } + redisTemplate.opsForValue().set("ids",getDataTable(list)); + return getDataTable(list); } @@ -52,6 +65,7 @@ public class WarnRuleController extends BaseController { public void export(HttpServletResponse response, WarnRuleDTO warnRuleDTO) { List list = warnRuleService.selectWarnRuleList(warnRuleDTO); ExcelUtil util = new ExcelUtil(WarnRuleDTO.class); + util.exportExcel(response, list, "预警规则数据"); } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java index 01e38aa..fbedfa6 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java @@ -5,9 +5,12 @@ import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.openbusiness.config.SnowflakeIdWorker; import com.muyu.openbusiness.domain.WarnStrategy; import com.muyu.openbusiness.service.IWarnStrategyService; import jakarta.servlet.http.HttpServletResponse; +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.*; @@ -26,6 +29,8 @@ import java.util.List; public class WarnStrategyController extends BaseController { @Resource private IWarnStrategyService warnStrategyService; +@Autowired +private RedisTemplate redisTemplate; /** * 查询预警策略列表 @@ -35,6 +40,15 @@ public class WarnStrategyController extends BaseController { public Result> list(WarnStrategy warnStrategy) { startPage(); List list = warnStrategyService.selectWarnStrategyList(warnStrategy); + SnowflakeIdWorker snowMaker = new SnowflakeIdWorker(); + for (int i = 0; i < 100; i++) { + long ids = snowMaker.nextId(); + System.out.println(ids); + + } + redisTemplate.opsForValue().set("ids",getDataTable(list)); + + return getDataTable(list); } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java index e520847..b84a631 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java @@ -1,6 +1,8 @@ package com.muyu.openbusiness.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.openbusiness.domain.SysCar; import com.muyu.openbusiness.domain.SysCarMessage; import java.util.List; @@ -35,4 +37,6 @@ public interface ISysCarMessageService extends IService { */ Boolean checkIdUnique(SysCarMessage sysCarMessage); + + List selectSysCarMessageList(LambdaQueryWrapper eq); } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java index 3bca86c..1bc7261 100644 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.openbusiness.config.SnowflakeIdWorker; +import com.muyu.openbusiness.domain.SysCar; import com.muyu.openbusiness.domain.SysCarMessage; import com.muyu.openbusiness.mapper.SysCarMessageMapper; import com.muyu.openbusiness.service.ISysCarMessageService; @@ -91,4 +92,11 @@ public class SysCarMessageServiceImpl return this.count(queryWrapper) > 0; } + @Override + public List selectSysCarMessageList(LambdaQueryWrapper eq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + return null; + } + } diff --git a/cloud-modules/cloud-modules-parsing/pom.xml b/cloud-modules/cloud-modules-parsing/pom.xml index 385c394..cd292b5 100644 --- a/cloud-modules/cloud-modules-parsing/pom.xml +++ b/cloud-modules/cloud-modules-parsing/pom.xml @@ -111,6 +111,12 @@ io.netty netty-codec-mqtt + + com.muyu + cloud-modules-car-gateway + 3.6.3 + compile + diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessagesController.java similarity index 99% rename from cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessageController.java rename to cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessagesController.java index 32b038c..01f7bd5 100644 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessageController.java +++ b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessagesController.java @@ -35,7 +35,7 @@ import java.util.concurrent.ExecutionException; @Slf4j @RestController @RequestMapping("/messageInfo") -public class SysCarMessageController extends BaseController { +public class SysCarMessagesController extends BaseController { @Resource private ISysCarMessageService sysCarMessageService; @Resource diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java index 54dbb93..4a75dd9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java @@ -60,7 +60,7 @@ public class SysFirmController extends BaseController /** * 查询企业基础信息列表 */ - @RequiresPermissions("firm:firmInfo:list") +// @RequiresPermissions("firm:firmInfo:list") @GetMapping("/list") public Result> list(SysFirm sysFirm) {