diff --git a/JavaSample-tcp120556201883/.lck b/JavaSample-tcp120556201883/.lck deleted file mode 100644 index e69de29..0000000 diff --git a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java index c9d9f2a..33a05e4 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java @@ -2,7 +2,6 @@ package com.muyu.auth.controller; import com.muyu.auth.form.LoginBody; import com.muyu.auth.form.RegisterBody; -import com.muyu.auth.remote.RunCarConditionRemote; import com.muyu.auth.service.SysLoginService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.JwtUtils; @@ -35,16 +34,12 @@ public class TokenController { @Autowired private SysLoginService sysLoginService; - @Resource - private RunCarConditionRemote runCarCondition; - @PostMapping("login") public Result login (@RequestBody LoginBody form) { // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(),form.getFirmName()); // 获取登录token Map token = tokenService.createToken(userInfo); - runCarCondition.runCarCondition(); return Result.success(token); } diff --git a/cloud-auth/src/main/java/com/muyu/auth/remote/RunCarConditionRemote.java b/cloud-auth/src/main/java/com/muyu/auth/remote/RunCarConditionRemote.java deleted file mode 100644 index 05c2e28..0000000 --- a/cloud-auth/src/main/java/com/muyu/auth/remote/RunCarConditionRemote.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.auth.remote; - -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @Author：yang - * @Package：com.muyu.auth.remote - * @Project：cloud-server-8 - * @name：RunCarConditionRemote - * @Date：2024/10/8 22:21 - */ -@FeignClient(name = "cloud-electronic") -public interface RunCarConditionRemote { - - @GetMapping("/text") - public void runCarCondition(); -} diff --git a/cloud-modules/cloud-modules-car-gateway/pom.xml b/cloud-modules/cloud-modules-car-gateway/pom.xml index c602346..a2c7444 100644 --- a/cloud-modules/cloud-modules-car-gateway/pom.xml +++ b/cloud-modules/cloud-modules-car-gateway/pom.xml @@ -86,12 +86,6 @@ cloud-common-core - - com.muyu - cloud-modules-car - 3.6.3 - - com.aliyun ecs20140526 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java index 0e56672..7c5dc67 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java @@ -3,18 +3,19 @@ package com.muyu.enterprise.cache.car; import com.muyu.common.cache.CacheAbsBasic; import com.muyu.domain.CarInformation; import com.muyu.domain.resp.CarFenceGroupResp; +import com.muyu.domain.resp.CarInformationResp; import java.util.List; /** - * 查询车辆 + * 车辆缓存 * @Author：yang * @Package：com.muyu.cache * @Project：cloud-server-8 * @name：VehicleCacheService * @Date：2024/9/30 11:50 */ -public class VehicleCacheCarInformationService extends CacheAbsBasic> { +public class VehicleCacheCarInformationService extends CacheAbsBasic> { @Override public String keyPre() { return "CarInformation:info:"; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java index 9a155ee..d28ebbf 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java @@ -5,7 +5,7 @@ import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationUpdReq; /** - * 修改车辆信息 + * 车辆管理修改缓存 * @Author：yang * @Package：com.muyu.cache * @Project：cloud-server-8 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarTypeService.java similarity index 54% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarTypeService.java index db77ce6..23f177a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarTypeService.java @@ -1,23 +1,21 @@ package com.muyu.enterprise.cache.car; import com.muyu.common.cache.CacheAbsBasic; -import com.muyu.domain.req.CarInformationAddReq; -import com.muyu.domain.resp.CarInformationResp; - -import java.util.List; +import com.muyu.domain.CarFence; +import com.muyu.domain.CarType; /** - * 车辆基础信息列表缓存 + * 车辆类型表缓存 * @Author：yang * @Package：com.muyu.cache * @Project：cloud-server-8 * @name：VehicleCacheService * @Date：2024/9/30 11:50 */ -public class VehicleCacheCarInformationFenceRespService extends CacheAbsBasic> { +public class VehicleCacheCarTypeService extends CacheAbsBasic { @Override public String keyPre() { - return "CarInformationFenceResp:info:"; + return "CarType:info:"; } @Override diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fault/VehicleCacheFaultService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fault/VehicleCacheFaultService.java new file mode 100644 index 0000000..fd9a335 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fault/VehicleCacheFaultService.java @@ -0,0 +1,25 @@ +package com.muyu.enterprise.cache.fault; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.FaultCode; +import com.muyu.domain.resp.CarFenceResp; + +/** + * 故障码缓存 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheFaultService extends CacheAbsBasic { + @Override + public String keyPre() { + return "FaultCode:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/faultCode/VehicleCacheFaultCodeAddService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/faultCode/VehicleCacheFaultCodeAddService.java index aea3d15..9240b80 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/faultCode/VehicleCacheFaultCodeAddService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/faultCode/VehicleCacheFaultCodeAddService.java @@ -6,7 +6,7 @@ import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.FaultCodeAddReq; /** - * 添加车辆信息 + * 添加故障码缓存 * @Author：yang * @Package：com.muyu.cache * @Project：cloud-server-8 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fence/VehicleCacheFenceAddService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fence/VehicleCacheFenceAddService.java new file mode 100644 index 0000000..c7dade5 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fence/VehicleCacheFenceAddService.java @@ -0,0 +1,25 @@ +package com.muyu.enterprise.cache.fence; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.CarFence; +import com.muyu.domain.resp.CarFenceResp; + +/** + * 电子围栏add缓存 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheFenceAddService extends CacheAbsBasic { + @Override + public String keyPre() { + return "CarFenceAdd:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fence/VehicleCacheFenceService.java similarity index 55% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fence/VehicleCacheFenceService.java index 5611b12..b0f089f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/fence/VehicleCacheFenceService.java @@ -1,24 +1,24 @@ -package com.muyu.enterprise.cache.car; +package com.muyu.enterprise.cache.fence; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.CarFence; import com.muyu.domain.CarInformation; -import com.muyu.domain.resp.CarInformationResp; +import com.muyu.domain.resp.CarFenceResp; import java.util.List; /** - * 分页查询车辆信息 + * 电子围栏缓存 * @Author：yang * @Package：com.muyu.cache * @Project：cloud-server-8 * @name：VehicleCacheService * @Date：2024/9/30 11:50 */ -public class VehicleCacheCarInformationRespService extends CacheAbsBasic> { +public class VehicleCacheFenceService extends CacheAbsBasic { @Override public String keyPre() { - return "CarInformationResp:info:"; + return "CarFenceResp:info:"; } @Override diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b335db7..bf4ac0d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,6 +1,8 @@ com.muyu.enterprise.cache.car.VehicleCacheCarInformationService -com.muyu.enterprise.cache.car.VehicleCacheCarInformationRespService com.muyu.enterprise.cache.car.VehicleCacheCarInformationAddService com.muyu.enterprise.cache.car.VehicleCacheCarInformationUpdService -com.muyu.enterprise.cache.car.VehicleCacheCarInformationFenceRespService +com.muyu.enterprise.cache.car.VehicleCacheCarTypeService com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService +com.muyu.enterprise.cache.fence.VehicleCacheFenceService +com.muyu.enterprise.cache.fence.VehicleCacheFenceAddService +com.muyu.enterprise.cache.fault.VehicleCacheFaultService diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceClazz.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceClazz.java index b472aa7..77fa0f1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceClazz.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceClazz.java @@ -1,5 +1,7 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -25,6 +27,7 @@ public class CarFenceClazz { /** * 业务类型ID */ + @TableId(value = "clazz_id",type = IdType.AUTO) private Integer clazzId; /** * 业务类型名称 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceType.java index 38893a4..5eed316 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceType.java @@ -1,5 +1,7 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -25,6 +27,7 @@ public class CarFenceType { /** * 围栏类型ID */ + @TableId(value = "type_id",type = IdType.AUTO) private Integer typeId; /** * 围栏类型名称 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessage.java index 6de2217..4ed2c7a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessage.java @@ -1,5 +1,7 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -25,6 +27,7 @@ public class CarMessage { /** * 自增主键 */ + @TableId(value = "message_type_id",type = IdType.AUTO) private Long messageTypeId; /** * 报文编码 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarType.java index 161f0bc..238a257 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarType.java @@ -1,5 +1,7 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -26,7 +28,8 @@ public class CarType { /** * 车辆类型ID */ - private long carTypeId; + @TableId(value = "car_type_id",type = IdType.AUTO) + private Long carTypeId; /** * 车辆类型名 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java index 95787e3..9268ef8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java @@ -36,7 +36,7 @@ public class FaultCode { *故障码Id */ @TableId(value = "faultcode_id",type = IdType.AUTO) - private long faultcodeId; + private Long faultcodeId; /** *故障名称Id */ @@ -97,7 +97,7 @@ public class FaultCode { public static FaultCode updfaultcode(FaultCodeUpdReq faultCodeUpdReq){ return FaultCode.builder() - .faultcodeId(0) + .faultcodeId(0L) .messageTypeId(faultCodeUpdReq.getMessageTypeId()) .faultcodeNumber(faultCodeUpdReq.getFaultcodeNumber()) .faultGroup(faultCodeUpdReq.getFaultGroup()) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCodeCache.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCodeCache.java index 76076d9..a05407b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCodeCache.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCodeCache.java @@ -23,25 +23,15 @@ import java.util.List; @Tag(name = "故障码，电子围栏，车辆，报文") public class FaultCodeCache { - /** - * 电子围栏信息 - */ - private List carFences; - - /** - * 故障标签信息 - */ - private WarnStrategy warnStrategies; - /** * 车辆信息 */ - public List carInformation; + public CarInformation carInformation; /** * 故障码信息 */ - private List faultCode; + private FaultCode faultCode; /** * 故障标签 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java index 039a5ee..0f02edb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java @@ -36,7 +36,7 @@ public class FaultCondition { * 故障规则表Id */ @TableId(value = "carcondition_id",type = IdType.AUTO) - private long carconditionId; + private Long carconditionId; /** * 车辆类型Id */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java index 097f9dd..ca7d72d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java @@ -32,7 +32,7 @@ public class FaultLabel { *自增主键 */ @TableId(value = "message_type_id",type = IdType.AUTO) - private long messageTypeId; + private Long messageTypeId; /** *报文编码 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java index c88f881..dcef7dd 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java @@ -34,7 +34,7 @@ public class FaultLog { * 故障日志Id */ @TableId(value = "log_id",type = IdType.AUTO) - private long logId; + private Long logId; /** * 故障码Id */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultType.java index 587c8fc..d039697 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultType.java @@ -26,7 +26,7 @@ public class FaultType { *故障类型Id */ @TableId(value = "faulttype_id",type = IdType.AUTO) - private long faulttypeId; + private Long faulttypeId; /** *故障类型名称 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java index 9c4b150..b9eb03d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java @@ -27,7 +27,7 @@ public class FirmPermission { * 企业权限Id */ @TableId(value = "permission_id") - private long permissionId; + private Long permissionId; /** * 权限等级 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java index 21f38e3..f3b3922 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java @@ -33,7 +33,7 @@ public class Message { * id */ @TableId(value = "id",type = IdType.AUTO) - private long id; + private Long id; /** * 发送者 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java index ae9e158..c862abf 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java @@ -43,7 +43,8 @@ public class CarFenceController { @Validated @RequestBody CarFenceReq req ){ Page connects = carFenceService.selectCarFence(req); - log.info("查询数据："+ connects); + + log.info("查询数据："+ connects); return Result.success( connects, "操作成功" diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java index 785bdb2..7e009cb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java @@ -35,32 +35,21 @@ public class CarInformationController { @Resource private CarInformationService carInformationService; private VehicleCacheCarInformationService vehicleCacheCarInformationService; - private VehicleCacheCarInformationRespService vehicleCacheCarInformationRespService; private VehicleCacheCarInformationAddService vehicleCacheCarInformationAddService; private VehicleCacheCarInformationUpdService vehicleCacheCarInformationUpdService; - private VehicleCacheCarInformationFenceRespService vehicleCacheCarInformationFenceRespService; /** - * 查询围栏业务信息 + * 查询车辆业务信息 */ @PostMapping("/selectCarInformation") @Operation(summary = "查询数据",description = "查询数据") public Result> selectConnect(){ - List carFenceRespPage = vehicleCacheCarInformationService - .get(vehicleCacheCarInformationService - .keyPre()+ ObtainRootLogin - .obtain()); - if (CollectionUtils.isEmpty(carFenceRespPage)) { - return Result.success(carFenceRespPage); - } List connects = carInformationService.list() .stream() .map(CarInformation::carInformationBuilder) .toList(); - vehicleCacheCarInformationService.put( - vehicleCacheCarInformationService.keyPre()+ObtainRootLogin.obtain() - ,connects); + return Result.success( connects, "操作成功" ); @@ -88,18 +77,14 @@ public class CarInformationController { @Operation(summary = "企业车辆管理列表") public Result> selectCarInformationList(@Validated @RequestBody CarInformationListReq carInformationListReq) { - Page carFenceRespPage = vehicleCacheCarInformationRespService - .get(vehicleCacheCarInformationRespService - .keyPre()+ ObtainRootLogin - .obtain()); - if (CollectionUtils.isEmpty(carFenceRespPage.getRecords())) { - return Result.success(carFenceRespPage); - } Page pageInfo = carInformationService.selectCarInformationList(carInformationListReq); log.info("企业车辆管理列表查询",carInformationListReq,pageInfo); - vehicleCacheCarInformationRespService.put( - vehicleCacheCarInformationRespService.keyPre()+ObtainRootLogin.obtain() - ,pageInfo); + List records = pageInfo.getRecords(); + records.forEach(carInformation -> { + vehicleCacheCarInformationService.put( + vehicleCacheCarInformationService.keyPre()+carInformation.getCarInformationVIN() + ,records); + }); return Result.success(pageInfo); } @@ -116,7 +101,7 @@ public class CarInformationController { vehicleCacheCarInformationAddService.put( vehicleCacheCarInformationAddService - .keyPre()+ObtainRootLogin.obtain(), carInformationAddReq); + .keyPre()+carInformationAddReq.getCarInformationVIN(), carInformationAddReq); return carInformationService.addCarInformation(carInformationAddReq) ?Result.success("添加车辆成功") :Result.error(402,"添加车辆失败"); @@ -169,17 +154,8 @@ public class CarInformationController { @GetMapping("/selectCarInformationIdAndLicensePlate") @Operation(summary = "查询企业车辆 carInformationID 和 carInformationLicensePlate") public Result> selectCarInformationIdAndLicensePlate(){ - List carFenceRespPage = vehicleCacheCarInformationFenceRespService - .get(vehicleCacheCarInformationFenceRespService - .keyPre()+ ObtainRootLogin - .obtain()); - if (CollectionUtils.isEmpty(carFenceRespPage)) { - return Result.success(carFenceRespPage); - } List carInformations = carInformationService.selectBycarInformationIDAndLicensePlate(); - vehicleCacheCarInformationFenceRespService.put( - vehicleCacheCarInformationFenceRespService.keyPre()+ObtainRootLogin.obtain() - ,carInformations); + return Result.success(carInformations); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java index 8a48892..9fff172 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java @@ -1,16 +1,21 @@ package com.muyu.server.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarInformation; import com.muyu.domain.CarType; +import com.muyu.enterprise.cache.car.VehicleCacheCarTypeService; +import com.muyu.server.service.CarInformationService; import com.muyu.server.service.CarTypeService; import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Locale; /** * 车辆类型控制层 @@ -23,10 +28,12 @@ import java.util.List; @RequestMapping("/cartype") @RestController +@AllArgsConstructor public class CarTypeController { - @Autowired - private CarTypeService carTypeService; + private final CarTypeService carTypeService; + private final CarInformationService carInformationService; + private final VehicleCacheCarTypeService vehicleCacheCarTypeService; /** @@ -38,7 +45,16 @@ public class CarTypeController { public Result carTypeList(){ List data = carTypeService.selectcarType(); - + data.forEach(carType -> { + List list = carInformationService.list(new LambdaQueryWrapper() + .eq(CarInformation::getCarInformationType, carType.getCarTypeId())); + list.forEach(carInformation -> { + vehicleCacheCarTypeService + .put(vehicleCacheCarTypeService + .keyPre()+carInformation + .getCarInformationVIN(),carType); + }); + }); return Result.success(data); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java index dad58d1..e4fca7a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java @@ -10,7 +10,7 @@ import com.muyu.domain.resp.FaultCodeTotalListResp; import com.muyu.server.service.FaultCodeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,11 +25,12 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/faultcode") +@AllArgsConstructor @Tag(name = "车辆故障码控制层",description = "从故障信息表中查询数据") public class FaultCodeController { - @Autowired - private FaultCodeService faultCodeService; + private final FaultCodeService faultCodeService; + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java index acbe05f..a779600 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java @@ -59,10 +59,7 @@ public class FaultConditionController { if (faultConditionList.size()>0){ return Result.error("此车辆类型已存在所对应的故障规则,无需重新制定，可在原规则上进行修改"); } - boolean save = faultConditionService.save(FaultCondition.faultConditionadd(faultConditionAddReq)); - if (save){ - faultConditionService.RunCarCondition(); - } + faultConditionService.save(FaultCondition.faultConditionadd(faultConditionAddReq)); return Result.success(null,"规则制定成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java index ced9648..4ad3ddb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java @@ -39,8 +39,4 @@ public interface FaultConditionService extends IService { */ List saveFaultConditionList(); - /** - * 添加缓存 - */ - void RunCarCondition(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java index a66e592..e7380e7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java @@ -9,8 +9,11 @@ import com.muyu.domain.req.*; import com.muyu.domain.resp.CarFenceGroupResp; import com.muyu.domain.resp.CarFenceGroupsResp; import com.muyu.domain.resp.CarFenceResp; +import com.muyu.enterprise.cache.fence.VehicleCacheFenceAddService; +import com.muyu.enterprise.cache.fence.VehicleCacheFenceService; import com.muyu.server.mapper.CarFenceMapper; import com.muyu.server.service.*; +import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +31,7 @@ import java.util.List; */ @Service @Log4j2 +@AllArgsConstructor public class CarFenceServiceImpl extends ServiceImpl implements CarFenceService { @@ -44,6 +48,8 @@ public class CarFenceServiceImpl private CarMiddleSerivce carMiddleSerivce; @Autowired private CarInformationService carInformationService; + private final VehicleCacheFenceService vehicleCacheFenceService; + private final VehicleCacheFenceAddService vehicleCacheFenceAddService; /** * 查询围栏信息 */ @@ -83,8 +89,9 @@ public class CarFenceServiceImpl .toList(); List carFenceList = carFencePage.getRecords(); this.optimizeEntity(carFenceList,carFenceClazzList,carFenceTypeList); + //构建一个新的分页响应对象 - return new Page<>() {{ + Page carFenceRespPage = new Page<>() {{ //从查询结果中获取记录，并使用流式处理将每条记录转换为EtlDataScoreResp对象 List etlDataScoreRespList = carFencePage.getRecords().stream() //使用map操作将EtlDataScore对象转换为EtlDataScoreResp对象 @@ -100,6 +107,17 @@ public class CarFenceServiceImpl //设置分页响应中的每页记录数 setSize(carFencePage.getSize()); }}; + List records = carFenceRespPage.getRecords(); + records.forEach(carFenceResp -> { + List list = carInformationService + .list(new LambdaQueryWrapper() + .eq(CarInformation::getCarInformationFence, carFenceResp.getId())); + list.forEach(carInformation -> { + vehicleCacheFenceService.put(vehicleCacheFenceService.keyPre()+carInformation.getCarInformationVIN(),carFenceResp); + }); + + }); + return carFenceRespPage; } /** @@ -118,6 +136,12 @@ public class CarFenceServiceImpl carMiddleGroup.setFenceGroupId(carFenceGroup.getId()); carMiddleGroupService.save(carMiddleGroup); }); + List list = carInformationService + .list(new LambdaQueryWrapper() + .eq(CarInformation::getCarInformationFence, carFence.getId())); + list.forEach(carInformation -> { + vehicleCacheFenceAddService.put(vehicleCacheFenceAddService.keyPre()+carInformation.getCarInformationVIN(),carFence); + }); return connects; } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java index e944052..98d4dbb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java @@ -12,7 +12,9 @@ import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeListResp; import com.muyu.domain.resp.FaultCodeTotalListResp; import com.muyu.domain.resp.FaultConditionListResp; -import com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService; +import com.muyu.domain.resp.FaultConditionResp; +import com.muyu.enterprise.cache.car.VehicleCacheCarInformationService; +import com.muyu.enterprise.cache.fault.VehicleCacheFaultService; import com.muyu.server.mapper.FaultCodeMapper; import com.muyu.server.service.CarFenceService; import com.muyu.server.service.CarInformationService; @@ -54,7 +56,7 @@ public class FaultCodeServiceImpl extends ServiceImpl wrapper = new MPJLambdaWrapper<>(); - wrapper.select( + MPJLambdaWrapper eq = wrapper.select( FaultCode::getFaultcodeId, FaultCode::getMessageTypeId, FaultCode::getFaultcodeNumber, @@ -64,9 +66,9 @@ public class FaultCodeServiceImpl extends ServiceImpl faultConditionListResps = faultConditionMapper.selectJoinList(FaultConditionListResp.class, wrapper); + //添加故障车辆缓存 + this.CacheFault(faultConditionListResps); return FaultConditionTotalListResp.faultConditionTotalListResp(faultConditionListResps,count); } + private void CacheFault(@NotNull List faultConditionListResps) { + faultConditionListResps.forEach(faultConditionListResp -> { + List list = carInformationService + .list(new LambdaQueryWrapper() + .eq(CarInformation::getCarInformationType, faultConditionListResp.getCarTypeId())); + list.forEach(carInformation -> { + List list1 = faultCodeService.list(new LambdaQueryWrapper() + .eq(FaultCode::getFaultcodeId, faultConditionListResp.getMessageTypeId())); + list1.forEach(faultCode -> { + FaultCodeCache faultCodeCache = new FaultCodeCache(); + faultCodeCache.setCarInformation(carInformation); + faultCodeCache.setFaultCode(faultCode); + FaultLabel faultLabel = new FaultLabel(); + faultLabel.setMessageTypeId(faultConditionListResp.getMessageTypeId()); + faultLabel.setMessageTypeName(faultConditionListResp.getMessageTypeName()); + faultLabel.setMessageTypeCode(faultConditionListResp.getMessageTypeCode()); + faultCodeCache.setFaultLabels(faultLabel); + vehicleCacheFaultCodeAddService.put(vehicleCacheFaultCodeAddService + .keyPre()+carInformation + .getCarInformationVIN(),faultCodeCache); + }); + }); + }); + } + /** * 故障规则添加 判断故障规则是否存在 @@ -90,6 +115,7 @@ public class FaultConditionServiceImpl queryWrapper.eq(FaultCondition::getCarTypeId,faultConditionAddReq.getCarTypeId()) .eq(FaultCondition::getMessageTypeId,faultConditionAddReq.getMessageTypeId()); List list = this.list(queryWrapper); + return list; } @@ -98,67 +124,4 @@ public class FaultConditionServiceImpl List list = this.list(); return list; } - - /** - * 添加缓存 - */ - @Override - public void RunCarCondition() { - List list = this.saveFaultConditionList(); - text(list, carInformationService, carFenceService, warnStrategyService, faultCodeService, faultLabelService, vehicleCacheFaultCodeAddService); - } - - public static void text(List list, CarInformationService carInformationService, CarFenceService carFenceService, WarnStrategyService warnStrategyService, FaultCodeService faultCodeService, FaultLabelService faultLabelService, VehicleCacheFaultCodeAddService vehicleCacheFaultCodeAddService) { - list.forEach(faultCondition -> { - List carInformationList = carInformationService.selectCarInformation(faultCondition.getCarTypeId()); - carInformationList.forEach(carInformation -> { - FaultCodeCache faultCodeCache = new FaultCodeCache(); - if (StringUtils.isNotNull(carInformation.getCarInformationFence())){ - faultCodeCache.setCarFences(carFenceService.CarFenceList(carInformation.getCarInformationFence())); - } - if (StringUtils.isNotNull(carInformation.getCarInformationState())) { - faultCodeCache.setWarnStrategies(warnStrategyService - .selectWarnStrategyById(Long.valueOf(carInformation.getCarInformationState()))); - } - if (StringUtils.isNotNull(faultCondition.getMessageTypeId())) { - faultCodeCache.setFaultCode(faultCodeService.faultCodeList(faultCondition.getMessageTypeId())); - faultCodeCache.setFaultLabels(faultLabelService.faultLabelList(faultCondition.getMessageTypeId())); - } - ArrayList carInformations = new ArrayList<>(); - carInformations.add(carInformation); - faultCodeCache.setCarInformation(carInformations); - vehicleCacheFaultCodeAddService.put(vehicleCacheFaultCodeAddService - .keyPre()+carInformation - .getCarInformationVIN(), faultCodeCache); - }); - }); - } - -// private void faultCache(long messageTypeId, Long faulttypeId,String faultcodeNumber) { -// FaultCodeCache faultCodeCache = new FaultCodeCache(); -// -// //添加故障标签 -// faultCodeCache.getFaultLabels().addAll(faultLabelService.selectFaultCode(messageTypeId)); -// -// //添加车辆 -// List carInformationList = carInformationService.selectCarInformation(faulttypeId); -// faultCodeCache.getCarInformation().addAll(carInformationList); -// -// //添加故障码 -// faultCodeCache.getFaultCode().addAll(this.list(new LambdaQueryWrapper() -// .eq(FaultCode::getFaultcodeNumber, faultcodeNumber)) -// .stream().map(FaultCode::faultCodeBuilder) -// .toList()); -// -// //添加围栏 -// ArrayList carFences1 = new ArrayList<>(); -// carInformationList.forEach(carInformation -> { -// CarFence carFence = carFenceService.selectCarFenceList(carInformation.getCarInformationFence()); -// carFences1.add(carFence); -// }); -// faultCodeCache.getCarFences().addAll(carFences1); -// vehicleCacheFaultCodeAddService.put(vehicleCacheFaultCodeAddService.keyPre() -// + ObtainRootLogin.obtain() -// , faultCodeCache); -// } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/RunCarCondition.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/RunCarCondition.java deleted file mode 100644 index 4b67c08..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/RunCarCondition.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.muyu.server.util; - -import com.muyu.common.core.utils.StringUtils; -import com.muyu.domain.*; -import com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService; -import com.muyu.server.service.*; -import com.muyu.server.service.impl.FaultConditionServiceImpl; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.GetMapping; - -import java.util.ArrayList; -import java.util.List; - -/** - * 登录存储redis缓存 - * @Author：yang - * @Package：com.muyu.server.util - * @Project：cloud-server-8 - * @name：RunCarCondition - * @Date：2024/10/7 19:43 - */ -@Component -@AllArgsConstructor -public class RunCarCondition { - - private final VehicleCacheFaultCodeAddService vehicleCacheFaultCodeAddService; - private final FaultConditionService faultConditionService; - private final CarInformationService carInformationService; - private final CarFenceService carFenceService; - private final WarnStrategyService warnStrategyService; - private final FaultCodeService faultCodeService; - private final FaultLabelService faultLabelService; - - @GetMapping("text") - public void runCarCondition(){ - List list = faultConditionService.saveFaultConditionList(); - FaultConditionServiceImpl.text(list, carInformationService, carFenceService, warnStrategyService, faultCodeService, faultLabelService, vehicleCacheFaultCodeAddService); - } -}