From 5edc2a8c05d4233915ba3030f630def64a11eb5d Mon Sep 17 00:00:00 2001 From: WeiRan <2392355487@qq.com> Date: Sun, 22 Sep 2024 22:22:48 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=95=85=E9=9A=9C=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/faultmanage/domain/CarType.java | 36 +++++ .../cloud/faultmanage/domain/FaultCode.java | 4 +- .../faultmanage/domain/FaultCondition.java | 88 +++++++++++++ .../cloud/faultmanage/domain/FaultLabel.java | 25 ++-- .../faultmanage/domain/message/Message.java | 68 ++++++++++ .../domain/message/MessageReq.java | 29 +++++ .../domain/message/MessageSendReq.java | 48 +++++++ .../domain/req/FaultCodeAddReq.java | 15 ++- .../domain/req/FaultCodeUpdReq.java | 14 +- .../domain/req/FaultConditionAddReq.java | 44 +++++++ .../domain/req/FaultConditionListReq.java | 42 ++++++ .../domain/req/FaultConditionUpdReq.java | 44 +++++++ .../domain/resp/FaultCodeListResp.java | 20 ++- .../domain/resp/FaultConditionListResp.java | 75 +++++++++++ .../resp/FaultConditionTotalListResp.java | 36 +++++ .../faultmanage/domain/vo/FaultCodeVO.java | 12 +- .../controller/CarTypeController.java | 35 +++++ .../controller/FaultCodeController.java | 8 +- .../controller/FaultConditionController.java | 88 +++++++++++++ .../FaultDetectionStrategyController.java | 18 +++ .../controller/FaultRuleController.java | 5 + .../controller/MessageController.java | 74 +++++++++++ .../faultmanage/mapper/CarTypeMapper.java | 16 +++ .../faultmanage/mapper/FaultCodeMapper.java | 9 +- .../mapper/FaultConditionMapper.java | 26 ++++ .../faultmanage/mapper/MessageMapper.java | 22 ++++ .../faultmanage/service/CarTypeService.java | 22 ++++ .../faultmanage/service/FaultCodeService.java | 4 +- .../service/FaultConditionService.java | 35 +++++ .../faultmanage/service/FaultRuleService.java | 4 + .../faultmanage/service/MessageService.java | 49 +++++++ .../service/impl/CarTypeServiceImpl.java | 36 +++++ .../service/impl/FaultCodeServiceImpl.java | 15 +-- .../impl/FaultConditionServiceImpl.java | 70 ++++++++++ .../service/impl/FaultRuleServiceImpl.java | 10 ++ .../service/impl/MessageServiceImpl.java | 123 ++++++++++++++++++ .../mapper/faultcode/FaultCodeMapper.xml | 46 +++---- .../mapper/faultcode/FaultConditionMapper.xml | 56 ++++++++ .../mapper/faultcode/MessageMapper.xml | 16 +++ 39 files changed, 1318 insertions(+), 69 deletions(-) create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarType.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCondition.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/Message.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageReq.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageSendReq.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionAddReq.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionListReq.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionUpdReq.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionListResp.java create mode 100644 cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionTotalListResp.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/CarTypeController.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultConditionController.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultDetectionStrategyController.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/MessageController.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/CarTypeMapper.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultConditionMapper.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/MessageMapper.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/CarTypeService.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultConditionService.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/MessageService.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/CarTypeServiceImpl.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultConditionServiceImpl.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/MessageServiceImpl.java create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultConditionMapper.xml create mode 100644 cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/MessageMapper.xml diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarType.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarType.java new file mode 100644 index 0000000..38ef7f5 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarType.java @@ -0,0 +1,36 @@ +package com.muyu.cloud.faultmanage.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain + * @Project：cloud-server-8 + * @name：CarType + * @Date：2024/9/21 19:01 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName(value = "car_type",autoResultMap = true) +public class CarType { + + /** + * 车辆类型ID + */ + private long carTypeId; + /** + * 车辆类型名 + */ + private String carTypeName; + /** + * 车辆规则外键ID + */ + private long carTypeRules; + +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCode.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCode.java index 9703030..44a2d9b 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCode.java +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCode.java @@ -35,7 +35,7 @@ public class FaultCode { /** *故障名称Id */ - private long faultlabelId; + private long messageTypeId; /** *故障码 */ @@ -62,7 +62,7 @@ public class FaultCode { public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq){ return FaultCode.builder() .faultcodeId(0) - .faultlabelId(faultCodeAddReq.getFaultlabelId()) + .messageTypeId(faultCodeAddReq.getMessageTypeId()) .faultcodeNumber(faultCodeAddReq.getFaultcodeNumber()) .faultGroup(faultCodeAddReq.getFaultGroup()) .faultBit(faultCodeAddReq.getFaultBit()) diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCondition.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCondition.java new file mode 100644 index 0000000..a379e9f --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCondition.java @@ -0,0 +1,88 @@ +package com.muyu.cloud.faultmanage.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionAddReq; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionUpdReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; +import java.util.function.Supplier; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain + * @Project：cloud-server-8 + * @name：FaultCondition + * @Date：2024/9/21 19:51 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName(value = "car_fault_condition",autoResultMap = true) +public class FaultCondition { + /** + * 故障规则表Id + */ + @TableId(value = "carcondition_id",type = IdType.AUTO) + private long carconditionId; + /** + * 车辆类型Id + */ + private long carTypeId; + /** + *故障名称Id + */ + private long messageTypeId; + /** + * 故障条件 + */ + private String faultconditionIdentification; + /** + * 故障规则参数 + */ + private BigDecimal faultconditionParameter; + /** + * 车辆类型名称 + */ + private String carTypeName; + /** + * 故障名称 + */ + private String messageTypeName; + /** + * 报文编码 + */ + private String messageTypeCode; + + + public static FaultCondition faultConditionadd(FaultConditionAddReq faultConditionAddReq){ + return FaultCondition.builder() + .carTypeId(faultConditionAddReq.getCarTypeId()) + .messageTypeId(faultConditionAddReq.getMessageTypeId()) + .faultconditionIdentification(faultConditionAddReq.getFaultconditionIdentification()) + .faultconditionParameter(faultConditionAddReq.getFaultconditionParameter()) + .build(); + } + + public static FaultCondition faultConditionupd(FaultConditionUpdReq faultConditionUpdReq, Supplier idSupplier){ + return FaultCondition.builder() + .carconditionId(faultConditionUpdReq.getCarconditionId()) + .carTypeId(faultConditionUpdReq.getCarTypeId()) + .messageTypeId(faultConditionUpdReq.getMessageTypeId()) + .faultconditionIdentification(faultConditionUpdReq.getFaultconditionIdentification()) + .faultconditionParameter(faultConditionUpdReq.getFaultconditionParameter()) + .build(); + } + + + + + +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLabel.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLabel.java index 26b0eae..a3d5740 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLabel.java +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLabel.java @@ -1,5 +1,7 @@ package com.muyu.cloud.faultmanage.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; @@ -24,25 +26,24 @@ import lombok.experimental.SuperBuilder; @TableName(value = "car_fault_label",autoResultMap = true) public class FaultLabel { /** - *故障标签Id + *自增主键 */ - private long faultlabelId; + @TableId(value = "message_type_id",type = IdType.AUTO) + private String messageTypeId; /** - *故障名称 + *报文编码 */ - private String faultlabelName; + private String messageTypeCode; /** - *故障类型Id + *报文名称 */ - private long faulttypeId; + private String messageTypeName; /** - *故障状态 + *报文所属类别 */ - private Integer faultStatus; - /** - *故障描述 - */ - private String faultContent; + private String messageTypeBelongs; + + diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/Message.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/Message.java new file mode 100644 index 0000000..e619074 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/Message.java @@ -0,0 +1,68 @@ +package com.muyu.cloud.faultmanage.domain.message; + +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 io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain.message + * @Project：cloud-server-8 + * @name：Message + * @Date：2024/9/22 10:40 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName(value = "car_fault_message",autoResultMap = true) +public class Message { + /** + * id + */ + @TableId(value = "id",type = IdType.AUTO) + private long id; + + /** + * 发送者 + */ + private String sender; + + /** + * 接收者 + */ + private String receiver; + + /** + * 消息内容 + */ + private String content; + + /** + * 消息状态 + */ + private Integer status; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "Date") + private Date createTime; + /** + * 登录人Id + */ + private long userId; + + + + +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageReq.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageReq.java new file mode 100644 index 0000000..eecc393 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageReq.java @@ -0,0 +1,29 @@ +package com.muyu.cloud.faultmanage.domain.message; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain.message + * @Project：cloud-server-8 + * @name：MessageReq + * @Date：2024/9/22 11:00 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class MessageReq { + /** + * 消息状态 + */ + private Integer status; + /** + * 登录人Id + */ + private long userId; +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageSendReq.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageSendReq.java new file mode 100644 index 0000000..290f3b7 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageSendReq.java @@ -0,0 +1,48 @@ +package com.muyu.cloud.faultmanage.domain.message; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain.message + * @Project：cloud-server-8 + * @name：MessageReq + * @Date：2024/9/22 11:00 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class MessageSendReq { + /** + * 发送者 + */ + private String sender; + /** + * 接收者 + */ + private String receiver; + + /** + * 消息内容 + */ + private String content; + /** + * 登录人Id + */ + private long userId; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "String") + private Date createTime; +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeAddReq.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeAddReq.java index 84f6f89..e15db16 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeAddReq.java +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeAddReq.java @@ -21,13 +21,18 @@ import lombok.experimental.SuperBuilder; public class FaultCodeAddReq { /** - * 故障标签Id + *故障名称Id */ - private long faultlabelId; + private long messageTypeId; /** * 故障名称 */ - private String faultlabelName; + private String messageTypeName; + /** + * 报文编码 + */ + private String messageTypeCode; + /** * 故障码 */ @@ -56,6 +61,10 @@ public class FaultCodeAddReq { *故障值 */ private String faultValue; + /** + *报文所属类别 + */ + private String messageTypeBelongs; } diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeUpdReq.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeUpdReq.java index e626593..2b3a4b5 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeUpdReq.java +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeUpdReq.java @@ -26,13 +26,17 @@ public class FaultCodeUpdReq { */ private long faultcodeId; /** - * 故障标签Id + *故障名称Id */ - private long faultlabelId; + private long messageTypeId; /** * 故障名称 */ - private String faultlabelName; + private String messageTypeName; + /** + * 报文编码 + */ + private String messageTypeCode; /** * 故障码 */ @@ -65,6 +69,10 @@ public class FaultCodeUpdReq { *故障值 */ private String faultValue; + /** + *报文所属类别 + */ + private String messageTypeBelongs; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionAddReq.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionAddReq.java new file mode 100644 index 0000000..5e41668 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionAddReq.java @@ -0,0 +1,44 @@ +package com.muyu.cloud.faultmanage.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain.req + * @Project：cloud-server-8 + * @name：FaultConditionAddReq + * @Date：2024/9/21 21:02 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class FaultConditionAddReq { + /** + * 故障规则表Id + */ + private long carconditionId; + /** + * 车辆类型Id + */ + private long carTypeId; + /** + *故障名称Id + */ + private long messageTypeId; + /** + * 故障条件 + */ + private String faultconditionIdentification; + /** + * 故障规则参数 + */ + private BigDecimal faultconditionParameter; + +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionListReq.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionListReq.java new file mode 100644 index 0000000..c45393e --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionListReq.java @@ -0,0 +1,42 @@ +package com.muyu.cloud.faultmanage.domain.req; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain.req + * @Project：cloud-server-8 + * @name：FaultCondition + * @Date：2024/9/21 20:02 + */ +@Tag(name = "故障规则列表请求对象") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class FaultConditionListReq { + + + /** + * 车辆类型Id + */ + private long carTypeId; + /** + *故障名称Id + */ + private long messageTypeId; + /** + * 页码，从1开始 + */ + private Integer pageNum=1; + /** + * 每页大小 + */ + private Integer pageSize=10; +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionUpdReq.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionUpdReq.java new file mode 100644 index 0000000..80e198d --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionUpdReq.java @@ -0,0 +1,44 @@ +package com.muyu.cloud.faultmanage.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain.req + * @Project：cloud-server-8 + * @name：FaultConditionUpdReq + * @Date：2024/9/22 9:38 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class FaultConditionUpdReq { + + /** + * 故障规则表Id + */ + private long carconditionId; + /** + * 车辆类型Id + */ + private long carTypeId; + /** + *故障名称Id + */ + private long messageTypeId; + /** + * 故障条件 + */ + private String faultconditionIdentification; + /** + * 故障规则参数 + */ + private BigDecimal faultconditionParameter; +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeListResp.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeListResp.java index c596a75..c0b79b8 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeListResp.java +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeListResp.java @@ -28,7 +28,7 @@ public class FaultCodeListResp { /** *故障名称Id */ - private long faultlabelId; + private long messageTypeId; /** *故障码 */ @@ -54,9 +54,17 @@ public class FaultCodeListResp { */ private String faulttypeName; /** - *故障名称 + * 故障名称 */ - private String faultlabelName; + private String messageTypeName; + /** + * 报文编码 + */ + private String messageTypeCode; + /** + *报文所属类别 + */ + private String messageTypeBelongs; /** * 数据库对象构建为返回结果对象 @@ -66,14 +74,16 @@ public class FaultCodeListResp { public static FaultCodeListResp faultCodeListResp(FaultCodeVO faultCodeVO){ return FaultCodeListResp.builder() .faultcodeId(faultCodeVO.getFaultcodeId()) - .faultlabelId(faultCodeVO.getFaultlabelId()) + .messageTypeId(faultCodeVO.getMessageTypeId()) .faultcodeNumber(faultCodeVO.getFaultcodeNumber()) .faultGroup(faultCodeVO.getFaultGroup()) .faultBit(faultCodeVO.getFaultBit()) .faultValue(faultCodeVO.getFaultValue()) .isWarning(faultCodeVO.getIsWarning()) .faulttypeName(faultCodeVO.getFaulttypeName()) - .faultlabelName(faultCodeVO.getFaultlabelName()) + .messageTypeName(faultCodeVO.getMessageTypeName()) + .messageTypeCode(faultCodeVO.getMessageTypeCode()) + .messageTypeBelongs(faultCodeVO.getMessageTypeBelongs()) .build(); } } diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionListResp.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionListResp.java new file mode 100644 index 0000000..bdbcef0 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionListResp.java @@ -0,0 +1,75 @@ +package com.muyu.cloud.faultmanage.domain.resp; + +import com.muyu.cloud.faultmanage.domain.FaultCondition; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain.resp + * @Project：cloud-server-8 + * @name：FaultConditionResp + * @Date：2024/9/21 19:59 + */ + +@Data +@Builder +@AllArgsConstructor +@Tag(name="故障规则信息响应对象",description = "故障规则查询的响应结果") +public class FaultConditionListResp { + + /** + * 故障规则表Id + */ + private long carconditionId; + /** + * 车辆类型Id + */ + private long carTypeId; + /** + *故障名称Id + */ + private long messageTypeId; + /** + * 故障条件 + */ + private String faultconditionIdentification; + /** + * 故障规则参数 + */ + private BigDecimal faultconditionParameter; + /** + * 车辆类型名称 + */ + private String carTypeName; + /** + * 故障名称 + */ + private String messageTypeName; + /** + * 报文编码 + */ + private String messageTypeCode; + + /** + * 数据库对象构建为返回结果对象 + * @param faultCondition + * @return + */ + public static FaultConditionListResp faultConditionListResp(FaultCondition faultCondition){ + return FaultConditionListResp.builder() + .carconditionId(faultCondition.getCarconditionId()) + .carTypeId(faultCondition.getCarTypeId()) + .messageTypeId(faultCondition.getMessageTypeId()) + .faultconditionParameter(faultCondition.getFaultconditionParameter()) + .faultconditionIdentification(faultCondition.getFaultconditionIdentification()) + .carTypeName(faultCondition.getCarTypeName()) + .messageTypeName(faultCondition.getMessageTypeName()) + .messageTypeCode(faultCondition.getMessageTypeCode()) + .build(); + } +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionTotalListResp.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionTotalListResp.java new file mode 100644 index 0000000..fe96e27 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionTotalListResp.java @@ -0,0 +1,36 @@ +package com.muyu.cloud.faultmanage.domain.resp; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.domain.resp + * @Project：cloud-server-8 + * @name：FaultConditionTotalListResp + * @Date：2024/9/21 20:00 + */ + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@Tag(name="故障规则数据总数列表",description = "数据和总数的响应") +public class FaultConditionTotalListResp { + + private List faultConditionListRespList; + + private long total; + + public static FaultConditionTotalListResp faultConditionTotalListResp(List faultConditionListRespList,long total){ + FaultConditionTotalListResp faultConditionTotalListResp = new FaultConditionTotalListResp(); + faultConditionTotalListResp.setFaultConditionListRespList(faultConditionListRespList); + faultConditionTotalListResp.setTotal(total); + return faultConditionTotalListResp; + } +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/vo/FaultCodeVO.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/vo/FaultCodeVO.java index 64789a0..a0f5a15 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/vo/FaultCodeVO.java +++ b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/vo/FaultCodeVO.java @@ -25,9 +25,17 @@ public class FaultCodeVO extends FaultCode { */ private String faulttypeName; /** - *故障名称 + * 故障名称 */ - private String faultlabelName; + private String messageTypeName; + /** + * 报文编码 + */ + private String messageTypeCode; + /** + *报文所属类别 + */ + private String messageTypeBelongs; } diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/CarTypeController.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/CarTypeController.java new file mode 100644 index 0000000..807c671 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/CarTypeController.java @@ -0,0 +1,35 @@ +package com.muyu.cloud.faultmanage.controller; + +import com.muyu.cloud.faultmanage.service.CarTypeService; +import com.muyu.common.core.domain.Result; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.controller + * @Project：cloud-server-8 + * @name：CarTypeController + * @Date：2024/9/21 19:01 + */ +@RequestMapping("/cartype") +@RestController +public class CarTypeController { + + @Autowired + private CarTypeService carTypeService; + + + /** + * 车辆类型 + * @return + */ + @PostMapping("/list") + @Operation(summary = "车辆类型",description = "车辆类型信息") + public Result carTypeList(){ + return Result.success(carTypeService.selectcarType()); + } +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultCodeController.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultCodeController.java index 8b13a11..49a06cd 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultCodeController.java +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultCodeController.java @@ -81,13 +81,13 @@ public class FaultCodeController { /** * 删除故障码 - * @param faultcodeId + * @param messageTypeId * @return */ - @PostMapping("/faultcodedel/{faultcodeId}") + @PostMapping("/faultcodedel/{messageTypeId}") @Operation(summary = "删除故障码",description = "删除故障码信息") - public Result delfaultcode(@PathVariable("faultcodeId") Integer faultcodeId){ - faultCodeService.del(faultcodeId); + public Result delfaultcode(@PathVariable("messageTypeId") Integer messageTypeId){ + faultCodeService.del(messageTypeId); return Result.success(null,"删除成功"); } diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultConditionController.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultConditionController.java new file mode 100644 index 0000000..4a93e99 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultConditionController.java @@ -0,0 +1,88 @@ +package com.muyu.cloud.faultmanage.controller; + +import com.muyu.cloud.faultmanage.domain.FaultCondition; +import com.muyu.cloud.faultmanage.domain.FaultRule; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionAddReq; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionUpdReq; +import com.muyu.cloud.faultmanage.service.FaultConditionService; +import com.muyu.cloud.faultmanage.service.FaultRuleService; +import com.muyu.common.core.domain.Result; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.controller + * @Project：cloud-server-8 + * @name：FaultRuleController + * @Date：2024/9/19 22:10 + */ + +/** + * 故障检测 + */ +@RestController +@RequestMapping("/faultcondition") +public class FaultConditionController { + + @Autowired + private FaultConditionService faultConditionService; + + + /** + * 故障规则 + * @param faultConditionListReq + * @return + */ + @PostMapping("/list") + @Operation(summary = "故障规则列表展示",description = "故障规则列表展示") + public Result getfaultrulelist(@RequestBody @Validated FaultConditionListReq faultConditionListReq){ + return Result.success(faultConditionService.getfaultrulelist(faultConditionListReq)); + } + + + /** + * 故障规则添加 + * @param faultConditionAddReq + * @return + */ + @PostMapping("/faultconditionadd") + @Operation(summary = "添加规则",description = "添加故障规则") + public Result faultconditionadd(@RequestBody FaultConditionAddReq faultConditionAddReq){ + //判断车辆类型是否已存在所对应的故障规则 + List faultConditionList = faultConditionService.selectBytypeAndlabel(faultConditionAddReq); + if (faultConditionList.size()>0){ + return Result.error("此车辆类型已存在所对应的故障规则,无需重新制定，可在原规则上进行修改"); + } + faultConditionService.save(FaultCondition.faultConditionadd(faultConditionAddReq)); + return Result.success(null,"规则制定成功"); + } + + /** + * 故障规则修改 + * @param + * @param faultConditionUpdReq + * @return + */ + @PostMapping("/faultconditionupd") + @Operation(summary = "修改规则",description = "修改故障规则") + public Result faultconditionupd( + @RequestBody @Validated FaultConditionUpdReq faultConditionUpdReq){ + faultConditionService.updateById(FaultCondition.faultConditionupd(faultConditionUpdReq,()->faultConditionUpdReq.getCarconditionId())); + return Result.success(null,"规则修改成功"); + } + + + @PostMapping("/faultconditiondel/{carconditionId}") + @Operation(summary = "删除规则",description = "删除故障规则") + public Result faultconditiondel(@PathVariable("carconditionId") long carconditionId){ + faultConditionService.removeById(carconditionId); + return Result.success(null,"规则删除成功"); + } +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultDetectionStrategyController.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultDetectionStrategyController.java new file mode 100644 index 0000000..af20a62 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultDetectionStrategyController.java @@ -0,0 +1,18 @@ +package com.muyu.cloud.faultmanage.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.controller + * @Project：cloud-server-8 + * @name：FaultDetectionStrategyController + * @Date：2024/9/21 14:18 + */ +@RestController +@RequestMapping("/faultdetectionstrategy") +public class FaultDetectionStrategyController { + + +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultRuleController.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultRuleController.java index be9ffc6..6db39f0 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultRuleController.java +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultRuleController.java @@ -1,6 +1,8 @@ package com.muyu.cloud.faultmanage.controller; +import com.muyu.cloud.faultmanage.domain.FaultCondition; import com.muyu.cloud.faultmanage.domain.FaultRule; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; import com.muyu.cloud.faultmanage.service.FaultRuleService; import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; @@ -39,4 +41,7 @@ public class FaultRuleController { String checkfaults = faultRuleService.checkfaults(faultRule); return Result.success(checkfaults); } + + + } diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/MessageController.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/MessageController.java new file mode 100644 index 0000000..dcb5097 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/MessageController.java @@ -0,0 +1,74 @@ +package com.muyu.cloud.faultmanage.controller; + +import com.muyu.cloud.faultmanage.domain.message.Message; +import com.muyu.cloud.faultmanage.domain.message.MessageReq; +import com.muyu.cloud.faultmanage.domain.message.MessageSendReq; +import com.muyu.cloud.faultmanage.service.MessageService; +import com.muyu.common.core.domain.Result; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.controller + * @Project：cloud-server-8 + * @name：MessageController + * @Date：2024/9/22 10:56 + */ +@RestController +@RequestMapping("/message") +public class MessageController { + + @Autowired + private MessageService messageService; + + /** + * 消息发送 + * @param messageSendReq + * @return + */ + @PostMapping("/sendmessage") + @Operation(summary = "发送消息",description = "站内信消息发送") + public Result sendmessage(@Validated MessageSendReq messageSendReq, HttpServletRequest request){ + messageService.sendmessage(messageSendReq,request); + return Result.success(null,"发送成功"); + } + + /** + * 消息查看 + * @param messageReq + * @param + * @return + */ + @PostMapping("/messagelist") + @Operation(summary = "消息查看(能根据登录人新的信息查看当前登录人的消息栏)",description = "消息查看") + public Result selectmessage(@Validated @RequestBody MessageReq messageReq){ + return Result.success(messageService.selectmessage(messageReq)); + } + + /** + * 查看消息改变状态 + * @param message + * @return + */ + @PostMapping("/changestatus") + @Operation(summary = "状态改变",description = "状态改变") + public Result changestatus(@RequestBody Message message){ + messageService.changestatus(message); + return Result.success(null,"成功"); + } + + + @PostMapping("/unread") + @Operation(summary = "查看未读的消息",description = "查看未读的消息") + public Result unread(){ + return Result.success(messageService.unread()); + } + +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/CarTypeMapper.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/CarTypeMapper.java new file mode 100644 index 0000000..0f9b4b5 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/CarTypeMapper.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.faultmanage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.faultmanage.domain.CarType; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.mapper + * @Project：cloud-server-8 + * @name：CarTypeMapper + * @Date：2024/9/21 19:06 + */ +@Mapper +public interface CarTypeMapper extends BaseMapper { +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultCodeMapper.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultCodeMapper.java index 8b1ec40..e395eae 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultCodeMapper.java +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultCodeMapper.java @@ -27,7 +27,7 @@ public interface FaultCodeMapper extends BaseMapper { //新增故障码 - FaultLabel selectfaultName(@Param("faultlabelName") String faultlabelName); + FaultLabel selectfaultName(@Param("messageTypeName") String messageTypeName); FaultCode selectfaultCode(@Param("faultcodeNumber") String faultcodeNumber); Integer insertfaultlabel(FaultCodeAddReq faultCodeAddReq); Integer insertfaultcode(FaultCodeAddReq faultCodeAddReq); @@ -37,8 +37,7 @@ public interface FaultCodeMapper extends BaseMapper { Integer updfaultcode(FaultCodeUpdReq faultCodeUpdReq); - //删除故障码 - FaultCode findByfaultcodeId(@Param("faultcodeId") Integer faultcodeId); - Integer delfaultcode(@Param("faultcodeId") Integer faultcodeId); - Integer delfaultlabel(@Param("faultlabelId") long faultlabelId); + + Integer delfaultcode(@Param("messageTypeId") long messageTypeId); + Integer delfaultlabel(@Param("messageTypeId") long messageTypeId); } diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultConditionMapper.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultConditionMapper.java new file mode 100644 index 0000000..6a4a19d --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultConditionMapper.java @@ -0,0 +1,26 @@ +package com.muyu.cloud.faultmanage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.faultmanage.domain.FaultCondition; +import com.muyu.cloud.faultmanage.domain.FaultRule; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionAddReq; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.mapper + * @Project：cloud-server-8 + * @name：FaultRuleMapper + * @Date：2024/9/19 22:11 + */ +@Mapper +public interface FaultConditionMapper extends BaseMapper { + + List selectfaultconditionlist(FaultConditionListReq faultConditionListReq); + + + List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/MessageMapper.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/MessageMapper.java new file mode 100644 index 0000000..adfe32d --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/MessageMapper.java @@ -0,0 +1,22 @@ +package com.muyu.cloud.faultmanage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.faultmanage.domain.message.Message; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.mapper + * @Project：cloud-server-8 + * @name：MessageMapper + * @Date：2024/9/22 11:54 + */ +@Mapper +public interface MessageMapper extends BaseMapper { + void changestatus(Message message); + + List unread(); + +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/CarTypeService.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/CarTypeService.java new file mode 100644 index 0000000..bf7cd66 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/CarTypeService.java @@ -0,0 +1,22 @@ +package com.muyu.cloud.faultmanage.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.cloud.faultmanage.domain.CarType; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.service + * @Project：cloud-server-8 + * @name：CarTypeService + * @Date：2024/9/21 19:08 + */ +public interface CarTypeService extends IService { + + /** + * 车辆类型 + * @return + */ + List selectcarType(); +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultCodeService.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultCodeService.java index 267dc69..e0055e4 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultCodeService.java +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultCodeService.java @@ -50,8 +50,8 @@ public interface FaultCodeService extends IService { /** * 删除故障码 - * @param faultcodeId + * @param messageTypeId * @return */ - void del(Integer faultcodeId); + void del(Integer messageTypeId); } diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultConditionService.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultConditionService.java new file mode 100644 index 0000000..3bbd6fc --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultConditionService.java @@ -0,0 +1,35 @@ +package com.muyu.cloud.faultmanage.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.cloud.faultmanage.domain.FaultCondition; +import com.muyu.cloud.faultmanage.domain.FaultRule; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionAddReq; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; +import com.muyu.cloud.faultmanage.domain.resp.FaultConditionTotalListResp; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.service.impl + * @Project：cloud-server-8 + * @name：FaultRuleService + * @Date：2024/9/19 22:10 + */ +public interface FaultConditionService extends IService { + + + /** + * 故障规则 + * @param faultConditionListReq + * @return + */ + FaultConditionTotalListResp getfaultrulelist(FaultConditionListReq faultConditionListReq); + + /** + * 故障规则添加 + * @param faultConditionAddReq + * @return + */ + List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultRuleService.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultRuleService.java index d419d86..4c870ba 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultRuleService.java +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultRuleService.java @@ -1,7 +1,10 @@ package com.muyu.cloud.faultmanage.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.cloud.faultmanage.domain.FaultCondition; import com.muyu.cloud.faultmanage.domain.FaultRule; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; +import com.muyu.cloud.faultmanage.domain.resp.FaultConditionTotalListResp; /** * @Author：weiran @@ -18,4 +21,5 @@ public interface FaultRuleService extends IService { */ String checkfaults(FaultRule faultRule); + } diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/MessageService.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/MessageService.java new file mode 100644 index 0000000..79bb9e3 --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/MessageService.java @@ -0,0 +1,49 @@ +package com.muyu.cloud.faultmanage.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.cloud.faultmanage.domain.message.Message; +import com.muyu.cloud.faultmanage.domain.message.MessageReq; +import com.muyu.cloud.faultmanage.domain.message.MessageSendReq; +import jakarta.servlet.http.HttpServletRequest; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.service + * @Project：cloud-server-8 + * @name：MessageService + * @Date：2024/9/22 10:57 + */ +public interface MessageService extends IService { + + /** + * 消息发送 + * @param messageSendReq + * @return + */ + void sendmessage(MessageSendReq messageSendReq, HttpServletRequest request); + + /** + * 消息查看 + * @param messageReq + * @param + * @return + */ + List selectmessage(MessageReq messageReq); + + + /** + * 查看消息改变状态 + * @param message + * @return + */ + void changestatus(Message message); + + + /** + * 查看未读的消息 + * @return + */ + List unread(); +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/CarTypeServiceImpl.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/CarTypeServiceImpl.java new file mode 100644 index 0000000..d00cc4f --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/CarTypeServiceImpl.java @@ -0,0 +1,36 @@ +package com.muyu.cloud.faultmanage.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.faultmanage.domain.CarType; +import com.muyu.cloud.faultmanage.mapper.CarTypeMapper; +import com.muyu.cloud.faultmanage.service.CarTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.faultmanage.service.impl + * @Project：cloud-server-8 + * @name：CarTypeServiceImpl + * @Date：2024/9/21 19:08 + */ +@Service +public class CarTypeServiceImpl extends ServiceImpl implements CarTypeService { + + @Autowired + private CarTypeMapper carTypeMapper; + + /** + * 车辆类型 + * @return + */ + @Override + public List selectcarType() { + LambdaQueryWrapper carTypeLambdaQueryWrapper = new LambdaQueryWrapper<>(); + List list = this.list(carTypeLambdaQueryWrapper); + return list; + } +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultCodeServiceImpl.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultCodeServiceImpl.java index 733233a..d8ff4cc 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultCodeServiceImpl.java +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultCodeServiceImpl.java @@ -83,8 +83,8 @@ public class FaultCodeServiceImpl extends ServiceImpl implements FaultConditionService { + + @Autowired + private FaultConditionMapper faultConditionMapper; + + + + /** + * 故障规则 + * @param faultConditionListReq + * @return + */ + @Override + public FaultConditionTotalListResp getfaultrulelist(FaultConditionListReq faultConditionListReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + long count = this.count(queryWrapper); + int offset = (faultConditionListReq.getPageNum() - 1) * faultConditionListReq.getPageSize(); + faultConditionListReq.setPageNum(offset); + + List selectfaultconditionlist = faultConditionMapper.selectfaultconditionlist(faultConditionListReq); + List faultConditionListRespList = selectfaultconditionlist.stream() + .map(FaultConditionListResp::faultConditionListResp) + .toList(); + return FaultConditionTotalListResp.faultConditionTotalListResp(faultConditionListRespList,count); + } + + + /** + * 故障规则添加 判断故障规则是否存在 + * @param faultConditionAddReq + * @return + */ + @Override + public List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq) { + List faultConditionList = faultConditionMapper.selectBytypeAndlabel(faultConditionAddReq); + return faultConditionList; + } +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java index 0f8321a..75062b2 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java @@ -2,13 +2,21 @@ package com.muyu.cloud.faultmanage.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.faultmanage.domain.FaultCondition; import com.muyu.cloud.faultmanage.domain.FaultRule; +import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; +import com.muyu.cloud.faultmanage.domain.resp.FaultCodeListResp; +import com.muyu.cloud.faultmanage.domain.resp.FaultCodeTotalListResp; +import com.muyu.cloud.faultmanage.domain.resp.FaultConditionTotalListResp; +import com.muyu.cloud.faultmanage.domain.vo.FaultCodeVO; import com.muyu.cloud.faultmanage.mapper.FaultRuleMapper; import com.muyu.cloud.faultmanage.service.FaultRuleService; +import com.muyu.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.Collections; import java.util.List; /** @@ -60,4 +68,6 @@ public class FaultRuleServiceImpl extends ServiceImpl implements MessageService { + @Autowired + private TokenService tokenService; + @Autowired + private HttpServletRequest request; + @Autowired + private MessageMapper messageMapper; + /** + * 消息发送 + * @param messageSendReq + * @return + */ + @Override + public void sendmessage(MessageSendReq messageSendReq, HttpServletRequest request) { + String token = SecurityUtils.getToken();// 获取当前Token + LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户 + if (loginUser == null) { + throw new RuntimeException("用户未登录或Token无效"); + } + Long userid = loginUser.getUserid(); + messageSendReq.setUserId(userid); + + // 定义一个DateTimeFormatter对象，用于格式化日期时间为yyyy-MM-dd HH:mm:ss + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + // 获取当前日期和时间 + LocalDateTime now = LocalDateTime.now(); + // 使用formatter格式化当前日期和时间 + String formattedDateTime = now.format(formatter); + // 使用formatter将字符串解析回LocalDateTime + LocalDateTime parsedDateTime = LocalDateTime.parse(formattedDateTime, formatter); + // 然后按照上面的步骤将LocalDateTime转换为Date + ZonedDateTime zdt = parsedDateTime.atZone(ZoneId.systemDefault()); + Date date = Date.from(zdt.toInstant()); + // 现在date是一个包含了字符串中日期和时间的Date对象 + messageSendReq.setCreateTime(date); + + + + } + + + /** + * 消息查看 + * @param messageReq + * @param + * @return + */ + @Override + public List selectmessage(MessageReq messageReq) { + String token = SecurityUtils.getToken();// 获取当前Token + LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户 + if (loginUser == null) { + throw new RuntimeException("用户未登录或Token无效"); + } + Long userid = loginUser.getUserid(); + messageReq.setUserId(userid); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(messageReq.getStatus())), +// Message::getStatus,messageReq.getStatus()); +// queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(messageReq.getUserId())), +// Message::getUserId,messageReq.getUserId()); + if (messageReq.getStatus() != null) { + queryWrapper.eq(Message::getStatus, messageReq.getStatus()); + } + queryWrapper.eq(Message::getUserId, messageReq.getUserId()); + List list = this.list(queryWrapper); + return list; + } + + /** + * 查看消息改变状态 + * @param message + * @return + */ + @Override + public void changestatus(Message message) { + messageMapper.changestatus(message); + } + + /** + * 查看未读的消息 + * @return + */ + @Override + public List unread() { + return messageMapper.unread(); + } + + +} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultCodeMapper.xml b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultCodeMapper.xml index 28cafbd..10c94a9 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultCodeMapper.xml +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultCodeMapper.xml @@ -6,32 +6,32 @@ - + - + + + SELECT car_faultcode.faultcode_id, - car_fault_label.faulttype_id, - car_fault_label.faultlabel_id, + car_faultcode.message_type_id, + car_fault_label.message_type_code, car_faultcode.faultcode_number, - car_fault_type.faulttype_name, car_faultcode.fault_group, car_faultcode.fault_bit, car_faultcode.fault_value, - car_fault_label.faultlabel_name, + car_fault_label.message_type_name, car_faultcode.is_warning FROM car_faultcode - LEFT JOIN car_fault_label ON car_faultcode.faultlabel_id = car_fault_label.faultlabel_id - LEFT JOIN car_fault_type ON car_fault_label.faulttype_id = car_fault_type.faulttype_id + LEFT JOIN car_fault_label ON car_faultcode.message_type_id = car_fault_label.message_type_id @@ -52,35 +52,35 @@ - + INSERT INTO `eight`.`car_fault_label` - (`faultlabel_id`, `faultlabel_name`, `faulttype_id`, `fault_status`, `fault_content`) VALUES - (0, #{faultlabelName}, #{faulttypeId}, 0, #{faultContent}); + (`message_type_id`, `message_type_code`, `message_type_name`, `message_type_belongs`) VALUES + (0, #{messageTypeCode}, #{messageTypeName}, '车辆基础'); INSERT INTO `eight`.`car_faultcode` - (`faultcode_id`, `faultlabel_id`, `faultcode_number`, `fault_group`, `fault_bit`, `fault_value`, `is_warning`) VALUES - (0, #{faultlabelId}, #{faultcodeNumber}, #{faultGroup}, #{faultBit}, #{faultValue}, #{isWarning}); + (`faultcode_id`, `message_type_id`, `faultcode_number`, `fault_group`, `fault_bit`, `fault_value`, `is_warning`) VALUES + (0, #{messageTypeId}, #{faultcodeNumber}, #{faultGroup}, #{faultBit}, #{faultValue}, #{isWarning}); + - UPDATE `eight`.`car_fault_label` - SET `faultlabel_name` = #{faultlabelName}, - `faulttype_id` = #{faulttypeId}, - `fault_status` = #{faultStatus}, - `fault_content` = #{faultContent} - WHERE `faultlabel_id`= #{faultlabelId}; + UPDATE `eight`.`car_fault_label` + SET `message_type_code` = #{messageTypeCode}, + `message_type_name` = #{messageTypeName}, + `message_type_belongs` =#{messageTypeBelongs} + WHERE `message_type_id` = #{messageTypeId}; UPDATE `eight`.`car_faultcode` - SET `faultlabel_id` = #{faultlabelId}, + SET `message_type_id` = #{messageTypeId}, `faultcode_number` = #{faultcodeNumber}, `fault_group` = #{faultGroup}, `fault_bit` = #{faultBit}, @@ -94,9 +94,9 @@ select * from car_faultcode where faultcode_id=#{faultcodeId} - delete from car_faultcode where faultcode_id=#{faultcodeId} + delete from car_faultcode where message_type_id=#{messageTypeId} - delete from car_fault_label where faultlabel_id=#{faultlabelId} + delete from car_fault_label where message_type_id=#{messageTypeId} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultConditionMapper.xml b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultConditionMapper.xml new file mode 100644 index 0000000..4b9cd4b --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultConditionMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + SELECT + car_fault_condition.*, + car_type.car_type_name, + car_fault_label.message_type_name, + car_fault_label.message_type_code + FROM + car_fault_condition + LEFT JOIN car_type ON car_fault_condition.car_type_id = car_type.car_type_id + LEFT JOIN car_fault_label ON car_fault_condition.message_type_id = car_fault_label.message_type_id + + + + + + + + + diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/MessageMapper.xml b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/MessageMapper.xml new file mode 100644 index 0000000..25866ef --- /dev/null +++ b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/MessageMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + update car_fault_message set status=1 where id=#{id} + + +