From 4c6ce87e8c72b7653a1bb095084e5e06c53a1623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E9=86=BA?= <14463847+zmw770157181@user.noreply.gitee.com> Date: Tue, 8 Oct 2024 20:00:14 +0800 Subject: [PATCH] =?UTF-8?q?1.feat():=20=E6=B7=BB=E5=8A=A0:=20a.=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=A2=84=E8=AD=A6=E7=B1=BB=20b.=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E8=BF=9C=E8=B0=83=E7=9A=84=E4=BB=A3=E7=A0=81,?= =?UTF-8?q?=E8=BF=9E=E5=90=8C=E7=86=94=E6=96=AD=202.fix():=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BA=86:=20a.=E4=BF=AE=E6=94=B9=E4=BA=86redis?= =?UTF-8?q?=E5=9C=A8=E5=88=97=E8=A1=A8=E9=80=9A=E8=BF=87vin=E7=A0=81?= =?UTF-8?q?=E5=AD=98=E5=82=A8=20b.=E4=BF=AE=E6=94=B9=E4=BA=86redis?= =?UTF-8?q?=E7=9A=84=E5=AD=98=E5=82=A8=E7=B1=BB=E5=9E=8B=20c.=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=86=E4=B8=80=E4=BA=9B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新时间10081949 --- .../common/cache/config/CacheAbsBasic.java | 2 +- .../muyu/common/cache/config/CacheBasic.java | 2 +- .../common/cache/config/PrimaryKeyBasic.java | 2 +- .../core/constant/ServiceNameConstants.java | 5 + .../annotation/EnableCustomSwagger2.java | 2 +- .../config/SwaggerAutoConfiguration.java | 2 +- .../config/SwaggerBeanPostProcessor.java | 2 +- .../swagger/config/SwaggerProperties.java | 2 +- .../config/SwaggerWebConfiguration.java | 2 +- .../muyu/common/system/domain/CarManage.java | 116 ++++++++++++++++++ .../system/remote/RemoteEntService.java | 36 ++++++ .../system/remote/RemoteWarnService.java | 36 ++++++ .../factory/RemoteEntFallbackFactory.java | 32 +++++ .../factory/RemoteWarnFallbackFactory.java | 34 +++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../cache/CarCompanyCacheService.java | 2 +- .../cache/CarFaultCacheService.java | 7 +- .../cache/CarManageCacheService.java | 7 +- .../cache/CarMessageCacheService.java | 2 +- .../cache/CarTemplateCacheService.java | 2 +- .../enterprise/cache/CarWarnCacheService.java | 12 +- .../muyu/enterprise/domain/CarCompany.java | 2 +- .../com/muyu/enterprise/domain/CarConfig.java | 2 +- .../com/muyu/enterprise/domain/CarManage.java | 7 +- .../muyu/enterprise/domain/CarMessage.java | 2 +- .../enterprise/domain/CarMessageType.java | 2 +- .../muyu/enterprise/domain/CarTemplate.java | 2 +- .../com/muyu/enterprise/domain/vo/CarVO.java | 7 +- .../com/muyu/enterprise/domain/vo/WarnVo.java | 38 ++++++ .../cloud-modules-enterprise-server/pom.xml | 2 +- .../CloudEnterpriseApplication.java | 8 ++ .../OpenFen/SysEntFallbackFactory.java | 17 --- .../controller/CarCompanyController.java | 2 +- .../controller/CarConfigController.java | 4 +- .../controller/CarManageController.java | 28 +++-- .../controller/CarMessageController.java | 2 +- .../controller/CarMessageTypeController.java | 2 +- .../controller/CarTemplateController.java | 2 +- .../controller/WarnRuleController.java | 4 +- .../controller/WarnStrategyController.java | 6 +- .../enterprise/mapper/CarCompanyMapper.java | 2 +- .../enterprise/mapper/CarConfigMapper.java | 2 +- .../enterprise/mapper/CarManageMapper.java | 2 +- .../enterprise/mapper/CarMessageMapper.java | 2 +- .../mapper/CarMessageTypeMapper.java | 2 +- .../enterprise/mapper/CarTemplateMapper.java | 2 +- .../muyu/enterprise/mapper/CarTypeMapper.java | 2 +- .../enterprise/mapper/WarnStrategyMapper.java | 2 +- .../enterprise/service/CarCompanyService.java | 2 +- .../enterprise/service/CarConfigService.java | 2 +- .../enterprise/service/CarManageService.java | 16 ++- .../enterprise/service/CarMessageService.java | 2 +- .../service/CarMessageTypeService.java | 2 +- .../service/CarTemplateService.java | 2 +- .../enterprise/service/CarTypeService.java | 2 +- .../enterprise/service/IWarnRuleService.java | 8 +- .../service/IWarnStrategyService.java | 2 +- .../service/impl/CarCompanyServiceImpl.java | 4 +- .../service/impl/CarConfigServiceImpl.java | 2 +- .../service/impl/CarManageServiceImpl.java | 47 ++++--- .../service/impl/CarMessageServiceImpl.java | 2 +- .../impl/CarMessageTypeServiceImpl.java | 2 +- .../service/impl/CarTemplateServiceImpl.java | 2 +- .../service/impl/CarTypeTypeServiceImpl.java | 2 +- .../service/impl/SysCarFaultServiceImpl.java | 2 + .../service/impl/WarnRuleServiceImpl.java | 12 +- .../service/impl/WarnStrategyServiceImpl.java | 41 ++++++- .../com/muyu/system/domain/resp/EntResp.java | 4 +- pom.xml | 22 ++-- 69 files changed, 524 insertions(+), 119 deletions(-) create mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/CarManage.java create mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteEntService.java create mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteWarnService.java create mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteEntFallbackFactory.java create mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteWarnFallbackFactory.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/WarnVo.java delete mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/OpenFen/SysEntFallbackFactory.java diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheAbsBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheAbsBasic.java index 165845e..4fdbab2 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheAbsBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheAbsBasic.java @@ -4,7 +4,7 @@ package com.muyu.common.cache.config; * @ClassName CacheAbsBasic * @Description CacheAbsBasic:类的描述 * @Date 2024/9/30 1:39 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ import com.muyu.common.redis.service.RedisService; diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheBasic.java index 7ce9015..1a3fd7c 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheBasic.java @@ -7,7 +7,7 @@ import java.awt.image.Kernel; * @ClassName CacheBasic * @Description CacheBasic:类的描述 * @Date 2024/9/30 1:36 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ public interface CacheBasic extends PrimaryKeyBasic{ diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/PrimaryKeyBasic.java index 88e822f..895cd76 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/PrimaryKeyBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/PrimaryKeyBasic.java @@ -5,7 +5,7 @@ package com.muyu.common.cache.config; * @ClassName PrimaryKeyBasic * @Description PrimaryKeyBasic:类的描述 * @Date 2024/9/30 0:15 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ public interface PrimaryKeyBasic { /** diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index bb59b70..b8d976d 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -20,4 +20,9 @@ public class ServiceNameConstants { * 文件服务的serviceid */ public static final String FILE_SERVICE = "cloud-file"; + + /** + * 文件服务的serviceid + */ + public static final String ENTERPRISE_SERVICE = "cloud-enterprise"; } diff --git a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java index 1693eea..793652c 100644 --- a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java +++ b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java @@ -9,7 +9,7 @@ import java.lang.annotation.*; * @ClassName EnableCustomSwagger2 * @Description EnableCustomSwagger2:类的描述 * @Date 2024/10/6 22:16 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ @Target({ElementType.TYPE}) diff --git a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java index 2fd91bf..b4cc016 100644 --- a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java +++ b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java @@ -25,7 +25,7 @@ import java.util.function.Predicate; * @ClassName SwaggerAutoConfiguration * @Description SwaggerAutoConfiguration:类的描述 * @Date 2024/10/6 22:16 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ @Configuration @EnableSwagger2 diff --git a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java index 231dcc6..ccf6390 100644 --- a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java +++ b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; * @ClassName SwaggerBeanPostProcessor * @Description SwaggerBeanPostProcessor:类的描述 * @Date 2024/10/6 22:16 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ public class SwaggerBeanPostProcessor implements BeanPostProcessor { @Override diff --git a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java index af09304..f72712b 100644 --- a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java +++ b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java @@ -10,7 +10,7 @@ import java.util.List; * @ClassName SwaggerProperties * @Description SwaggerProperties:类的描述 * @Date 2024/10/6 22:16 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ @ConfigurationProperties("swagger") public class SwaggerProperties { diff --git a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java index 4195a64..d5da45a 100644 --- a/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java +++ b/cloud-common/cloud-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java @@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @ClassName SwaggerWebConfiguration * @Description SwaggerWebConfiguration:类的描述 * @Date 2024/10/6 22:16 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ public class SwaggerWebConfiguration implements WebMvcConfigurer { @Override diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/CarManage.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/CarManage.java new file mode 100644 index 0000000..ed9dd06 --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/CarManage.java @@ -0,0 +1,116 @@ +package com.muyu.common.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.skywalking.apm.toolkit.trace.Tag; + +import java.util.Date; + +/** + * 车辆表--实体类 + * @ClassName CarManage + * @Description 车辆表 + * @author MingWei.Zong(微醺) + * @Date 2024/9/28 16:52 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "car_manage",autoResultMap = true) +public class CarManage { + /** + * 车辆表 + */ + @TableId(value = "car_id",type = IdType.AUTO) + private Long carId; + /** + * 车架号 + */ + private String carFrame; + /** + * 车牌号 + */ + private String carCode; + /** + * 车牌颜色 1.白色 2.绿色 3.黑色 4.银色 5.红色 + */ + private Integer carColor; + /** + * VIN码 + */ + private String carVin; + /** + * 驾驶员 + */ + private long userId; + /** + * 车辆配置 + */ + private long configId; + /** + * 年审日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date audditTime; + /** + * 行驶证到期日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date licenseTime; + /** + * 保险到期日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date insuranceTime; + /** + * 在线状态 1.无信号 2.行驶中 3.已停止 + */ + private Integer carStatus; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + /** + * 当前档位 + */ + private Integer carGears; + /** + * 车辆品牌 + */ + private String carModel; + /** + * 车辆型号 + */ + private String carBrand; + + /** 最后一次连线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最后一次连线时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date carLastJoinTime; + + /** 最后一次离线时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最后一次离线时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date carLastOfflineTime; + + /** + * 汽车所属企业id + */ + private Long enterpriseId; + + /** + * 汽车类型id + */ + private Long CarTypeId; + + +} diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteEntService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteEntService.java new file mode 100644 index 0000000..97ca0d2 --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteEntService.java @@ -0,0 +1,36 @@ +package com.muyu.common.system.remote; + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysEnt; +import com.muyu.common.system.remote.factory.RemoteEntFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + + +/** + * 企业服务 + * @ClassName RemoteEntService + * @PATH com.muyu.common.system.remote:类的路径 + * @author MingWei.Zong(微醺) + * @Date 2024/10/8 10:59 + */ +@FeignClient( + path = "/ent", + contextId = "remoteEntService", + value = ServiceNameConstants.SYSTEM_SERVICE, + fallbackFactory = RemoteEntFallbackFactory.class +) +public interface RemoteEntService { + /** + * 根据ID获取企业信息 + * @param entId 企业ID + * @return 响应结果 + */ + @GetMapping(value = "/{entId}") + public Result getById(@PathVariable(value = "entId") Long entId); +} + diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteWarnService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteWarnService.java new file mode 100644 index 0000000..b9fd290 --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteWarnService.java @@ -0,0 +1,36 @@ +package com.muyu.common.system.remote; + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.CarManage; +import com.muyu.common.system.domain.SysEnt; +import com.muyu.common.system.remote.factory.RemoteEntFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 预警服务 + * @ClassName RemoteWarnService + * @PATH com.muyu.common.system.remote:类的路径 + * @author MingWei.Zong(微醺) + * @Date 2024/10/8 10:59 + */ +@FeignClient( + path = "/strategy", + contextId = "remoteWarnService", + value = ServiceNameConstants.ENTERPRISE_SERVICE, + fallbackFactory = RemoteEntFallbackFactory.class +) +public interface RemoteWarnService { + /** + * 通过 carTypeId 查询车辆信息 + * @param carTypeId + * @return + */ + @PostMapping("carManageShowByCarTypeId") + public Result carManageShowByCarTypeId(@RequestParam("carTypeId") Long carTypeId); +} + diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteEntFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteEntFallbackFactory.java new file mode 100644 index 0000000..c8c6506 --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteEntFallbackFactory.java @@ -0,0 +1,32 @@ +package com.muyu.common.system.remote.factory; + + +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.remote.RemoteEntService; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * 企业服务降级处理 + * @ClassName RemoteEntFallbackFactory + * @PATH com.muyu.common.system.remote.factory:类的路径 + * @Date 2024/10/8 10:59 + * @author MingWei.Zong(微醺) + */ +@Component +public class RemoteEntFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteEntFallbackFactory.class); + @Override + public RemoteEntService create(Throwable throwable) { + log.error("企业服务调用失败:{}", throwable.getMessage()); + return new RemoteEntService() { + @Override + public Result getById(Long entId) { + return Result.error("查询企业失败:" + throwable.getMessage()); + } + }; + } +} diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteWarnFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteWarnFallbackFactory.java new file mode 100644 index 0000000..dd99b8d --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteWarnFallbackFactory.java @@ -0,0 +1,34 @@ +package com.muyu.common.system.remote.factory; + + +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.remote.RemoteEntService; +import com.muyu.common.system.remote.RemoteWarnService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +/** + * 预警服务降级处理--通过预警中车辆类型ID查询车辆信息 + * @ClassName RemoteWarnFallbackFactory + * @PATH com.muyu.common.system.remote.factory:类的路径 + * @Date 2024/10/8 10:59 + * @author MingWei.Zong(微醺) + */ +@Component +public class RemoteWarnFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteWarnFallbackFactory.class); + + @Override + public RemoteWarnService create(Throwable throwable) { + log.error("通过预警中车辆类型ID查询车辆信息服务调用失败:{}", throwable.getMessage()); + return new RemoteWarnService() { + @Override + public Result carManageShowByCarTypeId(Long carTypeId) { + return Result.error("通过预警中车辆类型ID查询车辆信息失败:" + throwable.getMessage()); + } + }; + } + +} diff --git a/cloud-common/cloud-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b9a11b8..b1c8d8c 100644 --- a/cloud-common/cloud-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-common/cloud-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,4 @@ com.muyu.common.system.remote.factory.RemoteUserFallbackFactory com.muyu.common.system.remote.factory.RemoteLogFallbackFactory com.muyu.common.system.remote.factory.RemoteFileFallbackFactory +com.muyu.common.system.remote.factory.RemoteEntFallbackFactory diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarCompanyCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarCompanyCacheService.java index 2bbaab4..90de672 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarCompanyCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarCompanyCacheService.java @@ -9,7 +9,7 @@ import com.muyu.enterprise.domain.CarManage; * @ClassName CarCompanyCacheService * @Description CarCompanyCacheService:类的描述 * @Date 2024/10/3 15:22 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ public class CarCompanyCacheService extends CacheAbsBasic { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarFaultCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarFaultCacheService.java index 72836b1..9c65e34 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarFaultCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarFaultCacheService.java @@ -3,19 +3,20 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.config.CacheAbsBasic; import com.muyu.enterprise.domain.CarCompany; import com.muyu.enterprise.domain.FaultType; +import com.muyu.enterprise.domain.SysCarFault; /** * redis故障业务层 * @ClassName CarFaultCacheService * @Description CarFaultCacheService:类的描述 * @Date 2024/10/3 15:22 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ -public class CarFaultCacheService extends CacheAbsBasic { +public class CarFaultCacheService extends CacheAbsBasic { @Override public String keyPre() { - return "faultType:info:"; + return "sysCarFault:info:"; } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarManageCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarManageCacheService.java index 38dcf9c..9ffad3c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarManageCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarManageCacheService.java @@ -2,16 +2,19 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.config.CacheAbsBasic; import com.muyu.enterprise.domain.CarManage; +import com.muyu.enterprise.domain.vo.CarVO; + +import java.util.List; /** * redis报文业务层 * @ClassName CarManageCacheService * @Description CarManageCacheService:类的描述 * @Date 2024/10/3 15:22 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ -public class CarManageCacheService extends CacheAbsBasic { +public class CarManageCacheService extends CacheAbsBasic> { @Override public String keyPre() { return "carManage:info:"; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarMessageCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarMessageCacheService.java index 8610fc8..4ca55ab 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarMessageCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarMessageCacheService.java @@ -8,7 +8,7 @@ import com.muyu.enterprise.domain.CarMessage; * @ClassName CarMessageCacheService * @Description CarMessageCacheService:类的描述 * @Date 2024/9/30 11:42 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ public class CarMessageCacheService extends CacheAbsBasic { @Override diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarTemplateCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarTemplateCacheService.java index 0008c7c..07b4099 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarTemplateCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarTemplateCacheService.java @@ -9,7 +9,7 @@ import com.muyu.enterprise.domain.CarTemplate; * @ClassName CarTemplateCacheService * @Description CarTemplateCacheService:类的描述 * @Date 2024/10/3 15:22 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ public class CarTemplateCacheService extends CacheAbsBasic { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarWarnCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarWarnCacheService.java index 36984f9..9fbb308 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarWarnCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarWarnCacheService.java @@ -1,27 +1,27 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.config.CacheAbsBasic; -import com.muyu.enterprise.domain.CarCompany; -import com.muyu.enterprise.domain.WarnRule; +import com.muyu.enterprise.domain.WarnStrategy; +import com.muyu.enterprise.domain.vo.WarnVo; /** * redis车辆预警业务层 * @ClassName CarWarnCacheService * @Description CarWarnCacheService:类的描述 * @Date 2024/10/3 15:22 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) */ -public class CarWarnCacheService extends CacheAbsBasic { +public class CarWarnCacheService extends CacheAbsBasic { @Override public String keyPre() { - return "warnRule:info:"; + return "warnStrategy:info:"; } @Override public String decode(String key) { - return key.replace("warnRule:info:",""); + return key.replace("warnStrategy:info:",""); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java index b7c6c6a..6def21c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; * 企业表--实体类 * @ClassName CarCompany * @Description 企业表 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Data diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarConfig.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarConfig.java index 1a6fcc8..0860918 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarConfig.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarConfig.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; * 车辆配置表--实体类 * @ClassName CarConfig * @Description 车辆配置表 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Data diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarManage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarManage.java index ba29ecf..daf4701 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarManage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarManage.java @@ -16,7 +16,7 @@ import java.util.Date; * 车辆表--实体类 * @ClassName CarManage * @Description 车辆表 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Data @@ -107,5 +107,10 @@ public class CarManage { */ private Long enterpriseId; + /** + * 汽车类型id + */ + private Long CarTypeId; + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java index a81cd72..157bc51 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; * 报文表--实体类 * @ClassName CarMessage * @Description 报文表 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Data diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java index 038b0e7..b4fd326 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; * 报文类型表--实体类 * @ClassName CarMessageType * @Description 报文类型表 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Data diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java index bb1d9f5..829088e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; * 报文模版表--实体类 * @ClassName CarTemplate * @Description 报文模版表 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Data diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java index c52f4d1..57352ac 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java @@ -96,6 +96,11 @@ public class CarVO { /** 所属企业 */ private Long enterpriseId; + /** + * 汽车类型id + */ + private Long CarTypeId; + // /** 车辆车型(如客车,卡车,公交车等) */ @@ -122,6 +127,6 @@ public class CarVO { * 企业名称 */ @TableField(exist = false) - private String companyName; + private String name; } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/WarnVo.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/WarnVo.java new file mode 100644 index 0000000..c2cab1f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/WarnVo.java @@ -0,0 +1,38 @@ +package com.muyu.enterprise.domain.vo; +/** + * 控制层 + * 业务实现层 + * @ClassName WarnVo + * @PATH com.muyu.enterprise.domain.vo:类的路径 + * @Date 2024/10/8 14:05 + * @author MingWei.Zong(微醺) + */ + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import com.muyu.enterprise.domain.WarnRule; +import lombok.Data; +import lombok.RequiredArgsConstructor; + +import java.util.List; + +@Data +public class WarnVo { + /** 策略id */ + private Long id; + + /** 车辆类型id */ + private Long carTypeId; + + /** 策略名称 */ + private String strategyName; + + /** 报文模版id */ + private Long templateId; + + /** + * 预警规则 + */ + List warnRuleList; +} 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 1b8d85c..aa106bc 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 @@ -99,8 +99,8 @@ com.github.yulichang mybatis-plus-join - 1.4.13 + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java index 8d19c0f..5df03ca 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java @@ -4,6 +4,8 @@ import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.web.client.RestTemplate; /** * 企业模块 @@ -16,4 +18,10 @@ public class CloudEnterpriseApplication { public static void main (String[] args) { SpringApplication.run(CloudEnterpriseApplication.class, args); } + + //实现远程调用 + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/OpenFen/SysEntFallbackFactory.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/OpenFen/SysEntFallbackFactory.java deleted file mode 100644 index 305b08e..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/OpenFen/SysEntFallbackFactory.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.enterprise.OpenFen; - - -import org.springframework.stereotype.Component; - -/** - * 企业远调 - * @ClassName SysEntOpenFen - * @Description SysEntOpenFen:类的描述 - * @Date 2024/10/7 11:52 - * @author MingWei.Zong(微醺) - */ - -@Component -public class SysEntFallbackFactory { - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarCompanyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarCompanyController.java index 817f58d..ef630f6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarCompanyController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarCompanyController.java @@ -15,7 +15,7 @@ import java.util.List; * 车辆企业--控制层 * @ClassName CarCompanyController * @Description 车辆企业 Controller 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarConfigController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarConfigController.java index 4ee3ec2..06efeec 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarConfigController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarConfigController.java @@ -19,7 +19,7 @@ import java.util.List; * 车辆配置--控制层 * @ClassName CarCompanyController * @Description 车辆配置 Controller 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @RestController @@ -32,7 +32,7 @@ public class CarConfigController extends BaseController { private final CarConfigService carConfigService; /** - * 通过 configId 查询企业 + * 通过 configId * @param configId * @return */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java index 6921566..38120ba 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.RandomUtil; import com.muyu.common.core.utils.StringUtils; import com.muyu.enterprise.cache.CarManageCacheService; import com.muyu.enterprise.domain.CarManage; +import com.muyu.enterprise.domain.CarMessage; import com.muyu.enterprise.domain.dto.CarDTO; import com.muyu.enterprise.domain.vo.CarVO; import com.muyu.enterprise.service.CarCompanyService; @@ -25,7 +26,7 @@ import java.util.List; * 车辆管理--控制层 * @ClassName CarManageController * @Description 车辆管理 Controller 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @RestController @@ -39,7 +40,7 @@ public class CarManageController extends BaseController { private final CarCompanyService sysCarCompanyService; - private final CarManageService sysCarService; + private final CarManageService carManageService; /** @@ -51,7 +52,7 @@ public class CarManageController extends BaseController { public Result> carListShow2(@RequestBody CarDTO carDTO){ startPage(); // 存到缓存中去 - return Result.success(sysCarService.carListShow2(carDTO)); + return Result.success(carManageService.carListShow2(carDTO)); } /** @@ -61,7 +62,7 @@ public class CarManageController extends BaseController { */ @PostMapping("/carListShow") public Result> carListShow(@RequestBody CarDTO carDTO){ - return Result.success(sysCarService.CarListShow(carDTO)); + return Result.success(carManageService.CarListShow(carDTO)); } /** @@ -71,7 +72,18 @@ public class CarManageController extends BaseController { */ @PostMapping("carManageShowByCarId") public Result carManageShowByCarId(@RequestParam("carId") Long carId){ - return Result.success(sysCarService.getById(carId)); + return Result.success(carManageService.carManageShowByCarId(carId)); + } + + /** + * 通过 carTypeId 查询车辆信息 + * @param carTypeId + * @return + */ + @PostMapping("carManageShowByCarTypeId") + public Result carManageShowByCarTypeId(@RequestParam("carTypeId") Long carTypeId){ + CarManage carManage = carManageService.carManageShowByCarTypeId(carTypeId); + return Result.success(carManage); } @@ -88,7 +100,7 @@ public class CarManageController extends BaseController { // 随机生成VIN码 String key2 = RandomUtil.randomNumbers(17); carVO.setCarVin(key2); - sysCarService.insertCar(carVO); + carManageService.insertCar(carVO); return Result.success("添加成功"); } @@ -102,7 +114,7 @@ public class CarManageController extends BaseController { public Result updataCar(@RequestBody CarManage carVO){ // carVO.setUserId(SecurityUtils.getUserId()); - sysCarService.updateById(carVO); + carManageService.updateById(carVO); return Result.success("车辆修改成功"); } @@ -113,7 +125,7 @@ public class CarManageController extends BaseController { */ @PostMapping("deleteCar") public Result deleteCar(@RequestParam("ids") List ids){ - sysCarService.removeBatchByIds(ids); + carManageService.removeBatchByIds(ids); return Result.success("车辆删除成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java index ed37436..430ace8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java @@ -17,7 +17,7 @@ import java.util.List; * 车辆报文--控制层 * @ClassName carMessageController * @Description 车辆类型 Controller 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageTypeController.java index 36deadb..e39bab1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageTypeController.java @@ -17,7 +17,7 @@ import java.util.List; * 报文类型--控制层 * @ClassName CarMessageTypeController * @Description 报文类型 Controller 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTemplateController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTemplateController.java index a5a3329..0549eaa 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTemplateController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTemplateController.java @@ -14,7 +14,7 @@ import java.util.List; * 报文模版--控制层 * @ClassName CarTemplateController * @Description 报文模版 Controller 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java index 3918766..3b7f2c3 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java @@ -111,8 +111,6 @@ public class WarnRuleController extends BaseController @GetMapping("/selectByStrategyId") public Result> selectByStrategyId (@RequestParam("strategyId") Long strategyId){ - List list = warnRuleService.list - (new LambdaQueryWrapper().eq(WarnRule::getStrategyId, strategyId)); - return success(list); + return success(warnRuleService.selectByStrategyId(strategyId)); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java index 900a267..d40be70 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java @@ -5,7 +5,6 @@ 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.enterprise.domain.resp.WarnStrategy; import com.muyu.enterprise.service.IWarnStrategyService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; @@ -25,6 +24,7 @@ import java.util.List; @RequestMapping("/strategy") public class WarnStrategyController extends BaseController { + @Resource private IWarnStrategyService warnStrategyService; @@ -107,8 +107,8 @@ public class WarnStrategyController extends BaseController * @return */ @PostMapping("/strategyRuleList") - public Result> StrategyRuleList(@RequestBody com.muyu.enterprise.domain.WarnStrategy warnStrategy){ - List list = warnStrategyService.strategyList(warnStrategy); + public Result> StrategyRuleList(@RequestBody com.muyu.enterprise.domain.WarnStrategy warnStrategy){ + List list = warnStrategyService.strategyList(warnStrategy); return Result.success(list); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarCompanyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarCompanyMapper.java index e070747..8ad5cb2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarCompanyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarCompanyMapper.java @@ -8,7 +8,7 @@ import com.muyu.enterprise.domain.CarCompany; * 车辆企业--持久层 * @ClassName CarCompanyMapper * @Description 车辆企业 Mapper 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ public interface CarCompanyMapper extends BaseMapper { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarConfigMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarConfigMapper.java index a3aafcb..4f32f93 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarConfigMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarConfigMapper.java @@ -13,7 +13,7 @@ import java.util.List; * 车辆配置--持久层 * @ClassName CarManageMapper * @Description 车辆配置 Mapper 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarManageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarManageMapper.java index 5117d62..7bbb674 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarManageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarManageMapper.java @@ -16,7 +16,7 @@ import java.util.List; * 车辆管理--持久层 * @ClassName CarManageMapper * @Description 车辆管理 Mapper 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Mapper diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java index f9ab668..f762136 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java @@ -9,7 +9,7 @@ import java.util.List; * 车辆报文--持久层 * @ClassName CarMessageMapper * @Description 车辆类型 Mapper 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Mapper diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageTypeMapper.java index 4778080..b02eec2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageTypeMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; * 报文类型--持久层 * @ClassName CarMessageTypeMapper * @Description 报文类型 Mapper 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Mapper diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTemplateMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTemplateMapper.java index be3a5c4..4d8b2f7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTemplateMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTemplateMapper.java @@ -9,7 +9,7 @@ import java.util.List; * 报文模版--持久层 * @ClassName CarTemplateMapper * @Description 报文模版 Mapper 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Mapper diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTypeMapper.java index 6d83be6..fb24474 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTypeMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param; * 车辆类型--持久层 * @ClassName CarTypeMapper * @Description 车辆类型 Mapper 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Mapper diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java index 83ad59c..afcf15b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java @@ -15,5 +15,5 @@ import java.util.List; @Mapper public interface WarnStrategyMapper extends BaseMapper{ - List strategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy); + List strategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java index e09aaf0..63f251c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.CarCompany; * 车辆企业--业务层 * @ClassName CarCompanyService * @Description 车辆企业 Service 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ public interface CarCompanyService extends IService { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarConfigService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarConfigService.java index bd70068..c730344 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarConfigService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarConfigService.java @@ -11,7 +11,7 @@ import java.util.List; * 车辆配置--业务层 * @ClassName CarConfigService * @Description 车辆配置 Service 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ public interface CarConfigService extends IService { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarManageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarManageService.java index c04c6fd..cad71f2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarManageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarManageService.java @@ -10,7 +10,7 @@ import java.util.List; * 车辆管理--业务层 * @ClassName CarManageService * @Description 车辆管理 Service 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ public interface CarManageService extends IService { @@ -34,4 +34,18 @@ public interface CarManageService extends IService { * @return */ void insertCar(CarManage carVO); + + /** + * 通过 carTypeId 查询车辆信息 + * @param carTypeId + * @return + */ + CarManage carManageShowByCarTypeId(Long carTypeId); + + /** + * 通过id查询 + * @param carId + * @return + */ + CarManage carManageShowByCarId(Long carId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageService.java index 590449f..420372c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageService.java @@ -8,7 +8,7 @@ import java.util.List; * 车辆报文--业务层 * @ClassName CarMessageService * @Description 车辆类型 Service 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ public interface CarMessageService extends IService { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageTypeService.java index 167bdbb..b29ae27 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageTypeService.java @@ -8,7 +8,7 @@ import java.util.List; * 报文类型--业务层 * @ClassName CarMessageTypeService * @Description 报文类型 Service 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ public interface CarMessageTypeService extends IService { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTemplateService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTemplateService.java index f013d87..fbefb92 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTemplateService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTemplateService.java @@ -8,7 +8,7 @@ import java.util.List; * 报文模版--业务层 * @ClassName CarTemplateService * @Description 报文模版 Service 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ public interface CarTemplateService extends IService { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTypeService.java index ca0d59e..2140dc4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTypeService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.CarType; * 车辆类型--业务层 * @ClassName CarTypeService * @Description 车辆类型 Service 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ public interface CarTypeService extends IService { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java index b91f689..bca45cd 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java @@ -35,6 +35,10 @@ public interface IWarnRuleService extends IService { */ Boolean checkIdUnique(WarnRule warnRule); - - + /** + * 根据策略id查询规则 + * @param strategyId + * @return + */ + List selectByStrategyId(Long strategyId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java index 93b4c5f..e03c8b7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java @@ -36,6 +36,6 @@ public interface IWarnStrategyService extends IService strategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy); + List strategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarCompanyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarCompanyServiceImpl.java index ecd3afa..21f840b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarCompanyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarCompanyServiceImpl.java @@ -12,14 +12,14 @@ import org.springframework.stereotype.Service; * 车辆企业--业务实现层 * @ClassName CarCompanyServiceImpl * @Description 车辆企业 ServiceImpl 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ /** * 车辆企业--业务层 * @ClassName CarCompanyService * @Description 车辆企业 Service 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Service diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarConfigServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarConfigServiceImpl.java index 1f14817..c3b0be9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarConfigServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarConfigServiceImpl.java @@ -23,7 +23,7 @@ import java.util.List; * 车辆配置--业务实现层 * @ClassName CarConfigServiceImpl * @Description 车辆配置 ServiceImpl 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Service diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java index 72f550c..2d84cf6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java @@ -3,10 +3,9 @@ package com.muyu.enterprise.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.system.domain.SysEnt; +import com.muyu.common.system.remote.RemoteEntService; import com.muyu.enterprise.cache.CarManageCacheService; -import com.muyu.enterprise.controller.CarCompanyController; import com.muyu.enterprise.domain.CarCompany; import com.muyu.enterprise.domain.CarConfig; import com.muyu.enterprise.domain.CarManage; @@ -16,8 +15,6 @@ import com.muyu.enterprise.mapper.CarManageMapper; import com.muyu.enterprise.service.CarCompanyService; import com.muyu.enterprise.service.CarConfigService; import com.muyu.enterprise.service.CarManageService; -import com.muyu.common.redis.service.RedisService; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +25,7 @@ import java.util.List; * 车辆管理--业务实现层 * @ClassName CarManageServiceImpl * @Description 车辆管理 ServiceImpl 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Service @@ -42,8 +39,9 @@ public class CarManageServiceImpl extends ServiceImpl carListShow2(CarDTO carDTO) { // 获取 企业 CarManage carManage = BeanUtil.copyProperties(carDTO, CarManage.class); + List list = lambdaQuery() .eq(carManage.getCarVin() != null && carManage.getCarVin() != "", CarManage::getCarVin, carManage.getCarVin()) .eq(carManage.getCarModel() != null && carManage.getCarModel() != "", CarManage::getCarModel, carManage.getCarModel()) @@ -71,14 +70,12 @@ public class CarManageServiceImpl extends ServiceImpl carVOS = new ArrayList<>(); + carVOS.add(carVO); save(carVO); // 存到缓存中去 - carManageCacheService.put(carVO.getCarVin(),new CarManage()); + carManageCacheService.put(carVO.getCarVin(),carVOS); + } + + /** + * 通过 carTypeId 查询车辆信息 + * @param carTypeId + * @return + */ + @Override + public CarManage carManageShowByCarTypeId(Long carTypeId) { + return getById(carTypeId); + } + + /** + * 通过id查询 + * @param carId + * @return + */ + @Override + public CarManage carManageShowByCarId(Long carId) { + return getById(carId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageServiceImpl.java index b424c94..4f368f4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageServiceImpl.java @@ -14,7 +14,7 @@ import java.util.List; * 车辆报文--业务实现层 * @ClassName CarMessageServiceImpl * @Description 车辆类型 ServiceImpl 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Service diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageTypeServiceImpl.java index 531aa55..7a2ee31 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarMessageTypeServiceImpl.java @@ -12,7 +12,7 @@ import java.util.List; * 报文类型--业务实现层 * @ClassName CarMessageTypeServiceImpl * @Description 报文类型 ServiceImpl 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Service diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTemplateServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTemplateServiceImpl.java index aa27d6e..c80931d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTemplateServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTemplateServiceImpl.java @@ -12,7 +12,7 @@ import java.util.List; * 报文模版--业务实现层 * @ClassName CarTemplateServiceImpl * @Description 报文模版 ServiceImpl 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Service diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTypeTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTypeTypeServiceImpl.java index 432638a..de3565e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTypeTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarTypeTypeServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; * 车辆类型--业务实现层 * @ClassName CarTypeTypeServiceImpl * @Description 车辆类型 ServiceImpl 层 - * @author MingWei.Zong + * @author MingWei.Zong(微醺) * @Date 2024/9/28 16:52 */ @Service diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java index e752002..c6bbc07 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java @@ -57,6 +57,8 @@ public class SysCarFaultServiceImpl SysCarFault::getCarVin, sysCarFault.getCarVin()); queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getFaultWarn()), SysCarFault::getFaultWarn, sysCarFault.getFaultWarn()); + + return this.list(queryWrapper); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java index 92c8fcd..eb92c10 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.enterprise.domain.WarnRule; import com.muyu.enterprise.mapper.WarnRuleMapper; +import com.muyu.enterprise.service.CarManageService; import com.muyu.enterprise.service.IWarnRuleService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -21,7 +23,6 @@ import java.util.List; public class WarnRuleServiceImpl extends ServiceImpl implements IWarnRuleService { - /** * 精确查询预警规则 * @@ -84,6 +85,15 @@ public class WarnRuleServiceImpl return this.count(queryWrapper) > 0; } + /** + * 根据策略id查询规则 + * @param strategyId + * @return + */ + @Override + public List selectByStrategyId(Long strategyId) { + return list(new LambdaQueryWrapper().eq(WarnRule::getStrategyId, strategyId)); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java index 1c22086..0482168 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java @@ -1,15 +1,24 @@ package com.muyu.enterprise.service.impl; +import cn.hutool.core.util.ObjectUtil; 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.enterprise.domain.resp.WarnStrategy; +import com.muyu.enterprise.cache.CarManageCacheService; +import com.muyu.enterprise.cache.CarWarnCacheService; +import com.muyu.enterprise.domain.CarManage; +import com.muyu.enterprise.domain.WarnRule; +import com.muyu.enterprise.domain.WarnStrategy; +import com.muyu.enterprise.domain.vo.WarnVo; import com.muyu.enterprise.mapper.WarnStrategyMapper; +import com.muyu.enterprise.service.CarManageService; +import com.muyu.enterprise.service.IWarnRuleService; import com.muyu.enterprise.service.IWarnStrategyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import javax.annotation.Resource; import java.util.List; /** @@ -23,6 +32,12 @@ public class WarnStrategyServiceImpl extends ServiceImpl implements IWarnStrategyService { + @Autowired + private CarManageService carManageService; + @Resource + private IWarnRuleService warnRuleService; + @Autowired + private CarWarnCacheService carWarnCacheService; @Autowired private WarnStrategyMapper warnStrategyMapper; @@ -61,7 +76,27 @@ public class WarnStrategyServiceImpl if (StringUtils.isNotNull(warnStrategy.getTemplateId())){ queryWrapper.eq(com.muyu.enterprise.domain.WarnStrategy::getTemplateId, warnStrategy.getTemplateId()); } - return this.list(queryWrapper); + // 1.获取 车辆 vin 码 + CarManage carManage = carManageService.carManageShowByCarTypeId(warnStrategy.getCarTypeId()); + List list = list(queryWrapper); + WarnVo warnVo = new WarnVo(); + // 遍历 赋值 + list.forEach(warnStrategy1 -> { + // 2.查询 对应的策略有没有规则 + List warnRules = warnRuleService.selectByStrategyId(warnStrategy1.getId()); + // 3.判断有没有对应的规则 + if(warnRules.size()!=0){// 有规则 + // 把查询出来的预警规则放入自定义的实体类 + warnVo.setWarnRuleList(warnRules); + } + warnVo.setId(warnStrategy1.getId()); + warnVo.setCarTypeId(warnStrategy1.getCarTypeId()); + warnVo.setStrategyName(warnStrategy1.getStrategyName()); + warnVo.setTemplateId(warnStrategy1.getTemplateId()); + }); + // 存储到 redis 中去 + carWarnCacheService.put(carManage.getCarVin(),warnVo); + return list; } /** @@ -77,7 +112,7 @@ public class WarnStrategyServiceImpl } @Override - public List strategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy) { + public List strategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy) { return warnStrategyMapper.strategyList(warnStrategy); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java index eb8ab22..84d077a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java @@ -41,7 +41,7 @@ public class EntResp { * 手机号码 */ @Schema(title = "手机号码", type = "String", defaultValue = "18321974313", description = "手机号码") - private String phoneNumber; + private String phone; /** * 邮箱 @@ -71,7 +71,7 @@ public class EntResp { .entId(sysEnt.getId()) .entName(sysEnt.getName()) .leader(sysEnt.getLeader()) - .phoneNumber(sysEnt.getPhone()) + .phone(sysEnt.getPhone()) .email(sysEnt.getEmail()) .entCode(sysEnt.getEntCode()) .entStatus(sysEnt.getEntStatus()) diff --git a/pom.xml b/pom.xml index ff352ab..eed7c23 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ 4.1.0 2.4.1 2.2.8 + 1.4.13 @@ -190,6 +191,20 @@ ${swagger.an.jakarta.verison} + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + + + com.github.yulichang + mybatis-plus-join + ${mybatis.plus.join.version} + + com.muyu @@ -218,13 +233,6 @@ ${muyu.version} - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - com.muyu