From 50b462ae600881dae82db6480e984ffd2e8f8d5f Mon Sep 17 00:00:00 2001 From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com> Date: Tue, 8 Oct 2024 18:13:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?find()=E6=9B=B4=E6=96=B0pom=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-car-gateway/pom.xml | 6 ------ 1 file changed, 6 deletions(-) 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 From 36c1f661b6a6a0cb66d438d6012f6c9e24592dc4 Mon Sep 17 00:00:00 2001 From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com> Date: Tue, 8 Oct 2024 19:05:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?find()=E6=95=85=E9=9A=9C=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/domain/FaultCodeCache.java | 5 +++++ .../controller/FaultConditionController.java | 5 ++++- .../server/service/FaultConditionService.java | 7 +++++-- .../server/service/FaultLabelService.java | 5 +++++ .../impl/FaultConditionServiceImpl.java | 17 +++++++++++----- .../service/impl/FaultLabelServiceImpl.java | 20 +++++++++++++++++++ .../com/muyu/server/util/RunCarCondition.java | 6 ++++++ 7 files changed, 57 insertions(+), 8 deletions(-) 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 9bd7900..76076d9 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 @@ -43,4 +43,9 @@ public class FaultCodeCache { */ private List faultCode; + /** + * 故障标签 + */ + private FaultLabel faultLabels; + } 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 83932cb..acbe05f 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,7 +59,10 @@ public class FaultConditionController { if (faultConditionList.size()>0){ return Result.error("此车辆类型已存在所对应的故障规则,无需重新制定，可在原规则上进行修改"); } - faultConditionService.saveFaultCondition(FaultCondition.faultConditionadd(faultConditionAddReq)); + boolean save = faultConditionService.save(FaultCondition.faultConditionadd(faultConditionAddReq)); + if (save){ + faultConditionService.RunCarCondition(); + } 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 aee9c89..ced9648 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 @@ -33,11 +33,14 @@ public interface FaultConditionService extends IService { */ List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); - void saveFaultCondition(FaultCondition faultCondition); - /** * 故障规则查询 * @return */ List saveFaultConditionList(); + + /** + * 添加缓存 + */ + void RunCarCondition(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java index 78162b4..6dbeed9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java @@ -43,4 +43,9 @@ public interface FaultLabelService extends IService { */ Integer delfaultlabel(Integer messageTypeId); + /** + * 查询报文 + * @param messageTypeId + */ + FaultLabel faultLabelList(long messageTypeId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java index cbefa8e..4af5d6a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java @@ -13,6 +13,8 @@ import com.muyu.domain.resp.FaultLogListResp; import com.muyu.server.mapper.FaultConditionMapper; import com.muyu.server.service.FaultConditionService; import com.muyu.server.util.ObtainRootLogin; +import com.muyu.server.util.RunCarCondition; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,12 +31,14 @@ import java.util.List; */ @Service +@AllArgsConstructor public class FaultConditionServiceImpl extends ServiceImpl implements FaultConditionService { @Autowired private FaultConditionMapper faultConditionMapper; + private final RunCarCondition runCarCondition; @@ -85,16 +89,19 @@ public class FaultConditionServiceImpl return list; } - @Override - public void saveFaultCondition(FaultCondition faultCondition) { - - } - @Override public List saveFaultConditionList() { return this.list().stream().map(FaultCondition::faultConditionBuilder).toList(); } + /** + * 添加缓存 + */ + @Override + public void RunCarCondition() { + runCarCondition.text(); + } + // private void faultCache(long messageTypeId, Long faulttypeId,String faultcodeNumber) { // FaultCodeCache faultCodeCache = new FaultCodeCache(); // diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java index 0c608b1..c63b4ab 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java @@ -78,4 +78,24 @@ public class FaultLabelServiceImpl extends ServiceImpl list = this.list(new LambdaQueryWrapper().eq(StringUtils.isNotNull(messageTypeId), + FaultLabel::getMessageTypeId, messageTypeId)).stream().toList(); + FaultLabel faultLabel1 = new FaultLabel(); + if (!list.isEmpty()){ + list.forEach(faultLabel -> { + faultLabel1.setMessageTypeId(faultLabel.getMessageTypeId()); + faultLabel1.setMessageTypeName(faultLabel.getMessageTypeName()); + faultLabel1.setMessageTypeCode(faultLabel.getMessageTypeCode()); + faultLabel1.setMessageTypeBelongs(faultLabel.getMessageTypeBelongs()); + }); + } + return faultLabel1; + } + } 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 index d00d53d..a2293f3 100644 --- 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 @@ -30,9 +30,14 @@ public class RunCarCondition implements ApplicationRunner { private final CarFenceService carFenceService; private final WarnStrategyService warnStrategyService; private final FaultCodeService faultCodeService; + private final FaultLabelService faultLabelService; @Override public void run(ApplicationArguments args) throws Exception { + text(); + } + + public void text() { List list = faultConditionService.saveFaultConditionList(); list.forEach(faultCondition -> { List carInformationList = carInformationService.selectCarInformation(faultCondition.getCarTypeId()); @@ -47,6 +52,7 @@ public class RunCarCondition implements ApplicationRunner { } if (StringUtils.isNotNull(faultCondition.getMessageTypeId())) { faultCodeCache.setFaultCode(faultCodeService.faultCodeList(faultCondition.getMessageTypeId())); + faultCodeCache.setFaultLabels(faultLabelService.faultLabelList(faultCondition.getMessageTypeId())); } ArrayList carInformations = new ArrayList<>(); carInformations.add(carInformation);