From 5994bf155080bea36851ef729ea220b9ae985595 Mon Sep 17 00:00:00 2001 From: YangPeng <3074487626@qq.com> Date: Sat, 28 Sep 2024 18:21:09 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E6=A1=A3,=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3=20contr?= =?UTF-8?q?oller=20=E5=92=8C=20service=20=E5=92=8C=20domain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/fault/domain/FaultLog.java | 6 +- .../muyu/fault/domain/message/Message.java | 4 +- .../fault/domain/message/MessageSendReq.java | 4 +- .../fault/domain/req/FaultLogListReq.java | 6 +- .../fault/domain/resp/FaultLogListResp.java | 6 +- .../muyu/controller/FaultRuleController.java | 6 + .../controller/SysCarFaultController.java | 1 - .../muyu/controller/SysTypeController.java | 3 + .../java/com/muyu/domain/CarFaultMessage.java | 44 ++++-- .../java/com/muyu/domain/CarFaultRule.java | 78 +++++++-- .../main/java/com/muyu/domain/CarFence.java | 21 ++- .../java/com/muyu/domain/CarFenceClazz.java | 19 ++- .../java/com/muyu/domain/CarFenceType.java | 20 ++- .../java/com/muyu/domain/CarInformation.java | 36 +++-- .../main/java/com/muyu/domain/CarMiddle.java | 23 +-- .../main/java/com/muyu/domain/CarType.java | 23 ++- .../main/java/com/muyu/domain/FaultCode.java | 30 ++-- .../java/com/muyu/domain/FaultCondition.java | 24 ++- .../main/java/com/muyu/domain/FaultLabel.java | 20 ++- .../main/java/com/muyu/domain/FaultLog.java | 23 ++- .../java/com/muyu/domain/FaultReport.java | 18 ++- .../main/java/com/muyu/domain/FaultRule.java | 27 +++- .../main/java/com/muyu/domain/FaultType.java | 19 ++- .../com/muyu/domain/FenceAndGroupMiddle.java | 17 +- .../main/java/com/muyu/domain/FenceGroup.java | 18 ++- .../main/java/com/muyu/domain/MessageDao.java | 29 +++- .../java/com/muyu/domain/MessageService.java | 57 ------- .../java/com/muyu/domain/MessageTemplate.java | 18 ++- .../java/com/muyu/domain/MessageValue.java | 21 ++- .../src/main/java/com/muyu/domain/SysCar.java | 13 +- .../java/com/muyu/domain/SysCarFault.java | 32 ++-- .../main/java/com/muyu/domain/SysCarType.java | 17 +- .../main/java/com/muyu/domain/WarnLevel.java | 6 +- .../main/java/com/muyu/domain/WarnLogs.java | 32 ++-- .../main/java/com/muyu/domain/WarnRule.java | 21 +-- .../java/com/muyu/domain/WarnStrategy.java | 11 +- .../java/com/muyu/domain/message/Message.java | 9 ++ .../com/muyu/domain/message/MessageReq.java | 10 +- .../muyu/domain/message/MessageSendReq.java | 12 +- .../java/com/muyu/domain/message/User.java | 11 +- .../domain/message/message/MessageReq.java | 9 +- .../message/message/MessageSendReq.java | 14 +- .../com/muyu/domain/message/message/User.java | 12 +- .../java/com/muyu/domain/req/CarFenceAdd.java | 17 ++ .../com/muyu/domain/req/CarFenceGroup.java | 10 +- .../java/com/muyu/domain/req/CarFenceReq.java | 6 + .../com/muyu/domain/req/FaultCodeAddReq.java | 20 +++ .../com/muyu/domain/req/FaultCodeListReq.java | 12 +- .../com/muyu/domain/req/FaultCodeUpdReq.java | 26 ++- .../muyu/domain/req/FaultConditionAddReq.java | 15 ++ .../domain/req/FaultConditionListReq.java | 13 ++ .../muyu/domain/req/FaultConditionUpdReq.java | 18 ++- .../com/muyu/domain/req/FaultLogListReq.java | 10 ++ .../domain/req/MessageTemplateAddReq.java | 7 + .../muyu/domain/req/MessageValueAddReq.java | 14 ++ .../com/muyu/domain/req/MessageValueReq.java | 4 + .../main/java/com/muyu/domain/req/SysCar.java | 17 +- .../com/muyu/domain/resp/CarFenceResq.java | 11 ++ .../muyu/domain/resp/FaultCodeListResp.java | 17 ++ .../domain/resp/FaultCodeTotalListResp.java | 9 +- .../domain/resp/FaultConditionListResp.java | 16 ++ .../resp/FaultConditionTotalListResp.java | 5 + .../muyu/domain/resp/FaultLogListResp.java | 14 ++ .../domain/resp/FaultLogTotalListResp.java | 5 + .../domain/resp/MessageTemplateListResp.java | 9 ++ .../domain/resp/MessageValueListResp.java | 12 ++ .../java/com/muyu/domain/resp/SysCarResp.java | 15 +- .../java/com/muyu/domain/vo/FaultCodeVo.java | 23 +-- .../com/muyu/service/FaultTypeService.java | 15 ++ .../com/muyu/service/FenceGroupService.java | 4 + .../com/muyu/service/MessageValueService.java | 9 ++ .../java/com/muyu/service/SysTypeService.java | 4 + .../impl/CarFenceServiceMybaitsImpl.java | 5 + .../service/impl/FaultLabelServiceImpl.java | 1 - .../service/impl/FenceGroupServiceImpl.java | 4 + .../impl/MessageTemplateServiceImpl.java | 3 + .../service/impl/MessageValueServiceImpl.java | 9 ++ .../muyu/service/impl/SysTypeServiceImpl.java | 4 + ...PureElectricCarFaultDetectionStrategy.java | 148 ------------------ 79 files changed, 885 insertions(+), 476 deletions(-) delete mode 100644 cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageService.java diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java index f3269f2..2be245f 100644 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java +++ b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java @@ -4,7 +4,7 @@ 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 com.muyu.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -48,13 +48,13 @@ public class FaultLog { * 开始报警时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") + @Excel(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") private Date startwarningTime; /** * 结束报警时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") + @Excel(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") private Date endwarningTime; /** * 故障码 diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java index b7028e0..bfcca6c 100644 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java +++ b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java @@ -4,7 +4,7 @@ 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 com.muyu.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -55,7 +55,7 @@ public class Message { * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "Date") + @Excel(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "Date") private Date createTime; /** * 登录人Id diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java index d310016..7e90572 100644 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java +++ b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; -import io.swagger.v3.oas.annotations.media.Schema; +import com.muyu.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -49,6 +49,6 @@ public class MessageSendReq { * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "String") + @Excel(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "String") private Date createTime; } diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java index aa5fba9..9bc7697 100644 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java +++ b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java @@ -1,7 +1,7 @@ package com.muyu.fault.domain.req; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -36,13 +36,13 @@ public class FaultLogListReq { * 开始报警时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") + @Excel(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") private Date startwarningTime; /** * 结束报警时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") + @Excel(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") private Date endwarningTime; /** diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java index 84057b7..d0bfaa2 100644 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java +++ b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java @@ -3,7 +3,7 @@ package com.muyu.fault.domain.resp; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.fault.domain.FaultLog; -import io.swagger.v3.oas.annotations.media.Schema; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -45,13 +45,13 @@ public class FaultLogListResp { * 开始报警时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") + @Excel(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") private Date startwarningTime; /** * 结束报警时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") + @Excel(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") private Date endwarningTime; /** * 故障码 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java index 4f2f45c..5f1b91c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java @@ -42,6 +42,12 @@ public class FaultRuleController { return Result.success(checkfaults); } + /** + * 故障参数匹配检查 + * + * @param carFaultRule + * @return + */ @PostMapping("/cheakfaults") @Operation(summary = "故障参数匹配检查",description = "获取报文数据与故障参数进行比较") diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java index d48d25c..5b3f287 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java @@ -33,7 +33,6 @@ public class SysCarFaultController extends BaseController /** * 查询车辆故障列表 */ - @GetMapping("/list") public Result> list(SysCarFault sysCarFault) { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java index 79286d8..e9b2b90 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java @@ -30,6 +30,9 @@ public class SysTypeController extends BaseController { private SysTypeService sysTypeService; + /** + * 查询车辆类型列表 + */ @GetMapping("/list") public Result> list() { startPage(); diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java index d9b5dca..2dda0a3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -13,32 +15,56 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -/** - * @Author：yan - * @Package：com.muyu.car.domain - * @Project：plues - * @name：CarFaultMessage - * @Date：2024/9/25 23:45 - */ - /** * 车辆故障信息实体类 + * * @Author：yan + * * @Package：com.muyu.car.domain + * * @Project：plues + * * @name：CarFaultMessage + * * @Date：2024/9/25 23:45 */ @Data @AllArgsConstructor @NoArgsConstructor @Builder -@Tag(name = "bioa") +@Tag(name = "车辆故障信息实体类",description = "车辆故障信息实体类") @TableName(value = "car_fault_message",autoResultMap = true) public class CarFaultMessage { @TableId(value = "id",type = IdType.AUTO) + @Schema(name = "id") + /** + * id + */ private Integer id; + @Schema(name = "sender") + /** + * 发送者 + */ private String sender; + @Schema(name = "receiver") + /** + * 接收者 + */ private String receiver; + @Schema(name = "content") + /** + * 消息内容 + */ private String content; + @Schema(name = "status") + /** + * 消息状态 + */ private Integer status; @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + /** + * 创建时间 + */ private Date createTime; + @Schema(name = "userId") + /** + * 登录人Id + */ private Integer userId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java index 5d39d91..7c5503d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java @@ -1,209 +1,267 @@ 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.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: + */ /** - * 车辆故障规则实体类 + * 车辆故障规则实体类 + * * @className: CarFaultRule ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:06 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder -public class CarFaultRule {/** - * VIN码VIN码VIN码 - */ -private String vin; +@TableName(value = "car_fault_rule",autoResultMap = true) +@Tag(name = "车辆故障规则") +public class CarFaultRule { + /** + * VIN码VIN码VIN码 + */ + @TableId(value = "规则Id",type = IdType.AUTO) + @Schema(name = "车辆VIN码") + private Long vin; /** * 时间戳时间戳时间戳 */ + @Schema(name = "车辆类型Id") private long timestamp; /** * 经度经度经度 */ + @Schema(name = "车速") private double longitude; /** * 纬度纬度纬度 */ + @Schema(name = "总电流") private double latitude; /** * 车速车速车速 */ + @Schema(name = "绝缘电阻") private double speed; /** * 总里程总里程总里程 */ + @Schema(name = "加速踏板行程值") private long TM; /** * 总电压总电压总电压 */ + @Schema(name = "制动踏板行程值") private double TV; /** * 总电流总电流总电流 */ + @Schema(name = "燃料消耗率") private double CC; /** * 绝缘电阻绝缘电阻绝缘电阻 */ + @Schema(name = "电机控制器温度") private double IR; /** * 档位档位档位 */ + @Schema(name = "电机转速") private String GP; /** * 加速踏板行程值加速踏板行程值加速踏板行程值 */ + @Schema(name = "电机转矩") private double APTV; /** * 制动踏板行程值制动踏板行程值制动踏板行程值 */ + @Schema(name = "电机温度") private double BPTV; /** * 燃料消耗率燃料消耗率燃料消耗率 */ + @Schema(name = "电机电压") private double SFC; /** * 电机控制器温度电机控制器温度电机控制器温度 */ + @Schema(name = "电机电流") private double MCT; /** * 电机转速电机转速电机转速 */ + @Schema(name = "动力电池剩余电量SOC") private int MS; /** * 电机转矩电机转矩电机转矩 */ + @Schema(name = "当前状态允许的最大反馈功率") private double MTO; /** * 电机温度电机温度电机温度 */ + @Schema(name = "当前状态允许最大放电功率") private double MTE; /** * 电机电压电机电压电机电压 */ + @Schema(name = "BMS自检计数器") private double MV; /** * 电机电流电机电流电机电流 */ + @Schema(name = "动力电池充放电电流") private double MC; /** * 动力电池剩余电量SOC动力电池剩余电量SOC动力电池剩余电量SOC */ + @Schema(name = "动力电池负载端总电压V3") private double PBRSOC; /** * 当前状态允许的最大反馈功率当前状态允许的最大反馈功率当前状态允许的最大反馈功率 */ + @Schema(name = "单次最大电压") private double MACSFP; /** * 当前状态允许最大放电功率当前状态允许最大放电功率当前状态允许最大放电功率 */ + @Schema(name = "单体电池最低电压") private double CSATMDP; /** * BMS自检计数器BMS自检计数器BMS自检计数器 */ + @Schema(name = "单体电池最高温度") private int BMS; /** * 动力电池充放电电流动力电池充放电电流动力电池充放电电流 */ + @Schema(name = "单体电池最低温度") private double CADC; /** * 动力电池负载端总电压V3动力电池负载端总电压V3动力电池负载端总电压V3 */ + @Schema(name = "动力电池可用容量") private double PBLETVV3; /** * 单次最大电压单次最大电压单次最大电压 */ + @Schema(name = "总里程") private double SMV; /** * 单体电池最低电压单体电池最低电压单体电池最低电压 */ + @Schema(name = "总电压") private double MVOAB; /** * 单体电池最高温度单体电池最高温度单体电池最高温度 */ + @Schema(name = "车辆状态") private double MAXBT; /** * 单体电池最低温度单体电池最低温度单体电池最低温度 */ + @Schema(name = "充电状态") private double MINBT; /** * 动力电池可用容量动力电池可用容量动力电池可用容量 */ + @Schema(name = "运行状态") private double PBAC; /** * 车辆状态车辆状态车辆状态 */ + @Schema(name = "SOC") private String VS; /** * 充电状态充电状态充电状态 */ + @Schema(name = "可充电储能装置工作状态") private String CS; /** * 运行状态运行状态运行状态 */ + @Schema(name = "EAS") private String RS; /** * SOCSOCSOC */ + @Schema(name = "PTC") private double SOC; /** * 可充电储能装置工作状态可充电储能装置工作状态可充电储能装置工作状态 */ + @Schema(name = "EPS") private String RESDWC; /** * EASEASEAS */ + @Schema(name = "ABS") private String EAS; /** * PTCPTCPTC */ + @Schema(name = "MCU") private String PTC; /** * EPSEPSEPS */ + @Schema(name = "动力电池加热状态") private String EPS; /** * ABSABSABS */ + @Schema(name = "动力电池当前状态") private String ABS; /** * MCUMCUMCU */ + @Schema(name = "动力电池保温状态") private String MCU; /** * 动力电池加热状态动力电池加热状态动力电池加热状态 */ + @Schema(name = "DCDC") private String PBHS; /** * 动力电池当前状态动力电池当前状态动力电池当前状态 */ + @Schema(name = "CHG") private String PBCS; /** * 动力电池保温状态动力电池保温状态动力电池保温状态 */ + @Schema(name = "校验位") private String PBIS; /** * DCDCDCDCDCDC */ + @Schema(name = "截止位") private String DCDC; /** * CHGCHGCHG */ + @Schema(name = "") private String CHG; /** * 校验位校验位校验位 */ + @Schema(name = "") private byte CHB; /** * 截止位截止位截止位 */ + @Schema(name = "") private byte CUB; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java index c3ff1c6..e7e22c3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; 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 io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -14,16 +15,13 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -/** - * @Author：yang - * @Package：com.muyu.domain - * @Project：cloud-electronic - * @name：CarFence - * @Date：2024/9/17 16:08 - */ - /** * 车辆电子围栏类 + * * @Author：yang + * * @Package：com.muyu.domain + * * @Project：cloud-electronic + * * @name：CarFence + * * @Date：2024/9/17 16:08 */ @Data @AllArgsConstructor @@ -41,28 +39,34 @@ public class CarFence { /** * 围栏名称 */ + @Schema(name = "围栏名称") private String name; /** * 业务类型ID */ + @Schema(name = "业务类型ID") private Integer clazzId; /** * 业务类型名称 */ + @Schema(name = "业务类型名称") @TableField(exist = false) private String clazzName; /** * 围栏类型ID */ + @Schema(name = "围栏类型ID") private Integer typeId; /** * 围栏类型名称 */ + @Schema(name = "围栏类型名称") @TableField(exist = false) private String typeName; /** * 围栏经纬度 */ + @Schema(name = "围栏经纬度") private String fenceText; /** * 围栏开始时间 @@ -85,6 +89,7 @@ public class CarFence { /** * 中间表ID */ + @Schema(name = "中间表ID") private Integer middleId; public static CarFence carFenceBuild(CarFence carFence) { return CarFence.builder() diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java index 88bc9c6..110d565 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java @@ -1,22 +1,22 @@ 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.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Author：yang - * @Package：com.muyu.domain - * @Project：cloud-electronic - * @name：CarFenceClazz - * @Date：2024/9/17 16:41 - */ - /** * 车辆电子围栏业务类型 + * * @Author：yang + * * @Package：com.muyu.domain + * * @Project：cloud-electronic + * * @name：CarFenceClazz + * * @Date：2024/9/17 16:41 */ @Data @AllArgsConstructor @@ -28,10 +28,13 @@ public class CarFenceClazz { /** * 业务类型ID */ + @TableId(value = "clazz_id",type = IdType.AUTO) + @Schema(name = "业务类型ID") private Integer clazzId; /** * 业务类型名称 */ + @Schema(name = "业务类型名称") private String clazzName; public static CarFenceClazz carFenceClazzBuild(CarFenceClazz carFenceClazz) { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java index 3963da3..db08cf6 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java @@ -1,22 +1,23 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Author：yang - * @Package：com.muyu.domain - * @Project：cloud-electronic - * @name：Type - * @Date：2024/9/17 16:40 - */ - /** * 车辆电子围栏类型 + * * @Author：yang + * * @Package：com.muyu.domain + * * @Project：cloud-electronic + * * @name：Type + * * @Date：2024/9/17 16:40 */ @Data @AllArgsConstructor @@ -28,10 +29,13 @@ public class CarFenceType { /** * 围栏类型ID */ + @TableId(value = "type_id" ,type = IdType.AUTO) + @Schema(name = "围栏类型ID") private Integer typeId; /** * 围栏类型名称 */ + @Schema(name = "围栏类型名称") private String typeName; public static CarFenceType carFenceTypeBuild(CarFenceType carFenceType) { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java index 430b657..71f32bf 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -32,82 +32,84 @@ public class CarInformation { * 车辆ID */ @TableId(value = "car_information_id" , type = IdType.AUTO) + @Schema(name = "车辆ID") private Long carInformationId; /** * 车辆唯一VIN */ - @Excel(name = "车辆唯一VIN") + @Schema(name = "车辆唯一VIN") private String CarInformationVIN; /** * 车牌号 */ - @Excel(name = "车牌号") + @Schema(name = "车牌号") private String carInformationLicensePlate; /** * 车辆品牌 */ - @Excel(name = "车辆品牌") + @Schema(name = "车辆品牌") private String carInformationBrand; /** * 车辆颜色 */ - @Excel(name = "车辆颜色") + @Schema(name = "车辆颜色") private String carInformationColor; /** * 车辆驾驶员 */ - @Excel(name = "车辆驾驶员") + @Schema(name = "车辆驾驶员") private String carInformationDriver; /** * 车检到期日期 */ - @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") +// @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") +// @Schema(name = "车检到期日期") private Date carInformationExamineEnddata; /** * 车辆电机厂商 */ - @Excel(name = "车辆电机厂商") + @Schema(name = "车辆电机厂商") private String carInformationMotorManufacturer; /** * 车辆电机型号 */ - @Excel(name = "车辆电机型号") + @Schema(name = "车辆电机型号") private String carInformationMotorModel; /** * 车辆电池厂商 */ - @Excel(name = "车辆电池厂商") + @Schema(name = "车辆电池厂商") private String carInformationBatteryManufacturer; /** * 车辆电池型号 */ - @Excel(name = "车辆电池型号") + @Schema(name = "车辆电池型号") private String carInformationBatteryModel; /** * 车辆电子围栏外键ID */ - @Excel(name = "车辆电子围栏外键ID") + @Schema(name = "车辆电子围栏外键ID") private Long carInformationFence; /** * 车辆类型外键ID */ - @Excel(name = "车辆类型外键ID") + @Schema(name = "车辆类型外键ID") private Long carInformationType; /** * 是否重点车辆 (0否默认 1是 ) */ - @Excel(name = "是否重点车辆 (0否默认 1是 )") + @Schema(name = "是否重点车辆 (0否默认 1是 )") private Long carInformationFocus; /** * 车辆策略id */ - @Excel(name = "车辆策略id") + @Schema(name = "车辆策略id") private Long carStrategyId; /** * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) */ - @Excel(name = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中)") + @Schema(name = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中)") private Long carInformationState; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java index 4370aaa..b6beba6 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java @@ -1,23 +1,24 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Author：yan - * @Package：com.muyu.car.domain - * @Project：plues - * @name：CarMiddle - * @Date：2024/9/25 20:25 - * 围栏组和围栏中间表 - */ - /** * 围栏组和围栏中间表 + * * @Author：yan + * * @Package：com.muyu.car.domain + * * @Project：plues + * * @name：CarMiddle + * * @Date：2024/9/25 20:25 + * * 围栏组和围栏中间表 */ @Data @AllArgsConstructor @@ -29,14 +30,18 @@ public class CarMiddle { /** * 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @Schema(name = "主键") private Integer id; /** * 围栏id */ + @Schema(name = "围栏id") private Integer carFenceId; /** * 围栏组id */ + @Schema(name = "围栏组id") private Integer carGroupId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java index 3ef559a..c5e436f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java @@ -1,38 +1,45 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @className: CarType ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:01 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 车辆类型实体类 + * * @className: CarType ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:01 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_type",autoResultMap = true) +@Tag(name = "车辆类型管理") public class CarType { /** * 车辆类型ID */ + @TableId(value = "car_type_id",type = IdType.AUTO) + @Schema(name = "车辆类型ID") private long carTypeId; /** * 车辆类型名 */ + @Schema(name = "车辆类型名") private String carTypeName; /** * 车辆规则外键ID */ + @Schema(name = "车辆规则外键ID") private long carTypeRules; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java index ddcf8f1..3f5bfd0 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java @@ -3,63 +3,75 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; import com.muyu.domain.req.FaultCodeAddReq; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @className: FaultCode ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:21 ⏰ - * @Version: 1.0 - * @description: + */ /** * 故障码实体类 + * * @className: FaultCode ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:21 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_faultcode", autoResultMap = true) +@Tag(name = "故障码管理") public class FaultCode { /** * 故障码Id */ @TableId(value = "faultcode_id", type = IdType.AUTO) + @Schema(name = "故障码Id") private long faultcodeId; /** * 故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** * 故障组 */ + @Schema(name = "故障组") private String faultGroup; /** * 故障位 */ + @Schema(name = "故障位") private String faultBit; /** * 故障值 */ + @Schema(name = "故障值") private String faultValue; /** * 是否警告 */ + @Schema(name = "是否警告") private Integer isWarning; - private String faulttypeName; - private String messageTypeName; - private String messageTypeCode; - private String messageTypeBelongs; +// private String faulttypeName; +// private String messageTypeName; +// private String messageTypeCode; +// private String messageTypeBelongs; public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq) { return FaultCode.builder() diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java index e22a6a0..3ca99a1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionUpdReq; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -13,55 +15,61 @@ import lombok.experimental.SuperBuilder; import java.math.BigDecimal; import java.util.function.Supplier; -/** - * @className: FaultCondition ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:07 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 故障规则表 + * * @className: FaultCondition ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:07 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_condition",autoResultMap = true) +@Tag(name = "故障规则管理") public class FaultCondition { /** * 故障规则表Id */ @TableId(value = "carcondition_id",type = IdType.AUTO) + @Schema(name = "故障规则表Id") private long carconditionId; /** * 车辆类型Id */ + @Schema(name = "车辆类型Id") private long carTypeId; /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障条件 */ + @Schema(name = "故障条件") private String faultconditionIdentification; /** * 故障规则参数 */ + @Schema(name = "故障规则参数") private BigDecimal faultconditionParameter; /** * 车辆类型名称 */ + @Schema(name = "车辆类型名称") private String carTypeName; /** * 故障名称 */ + @Schema(name = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(name = "报文编码") private String messageTypeCode; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java index 2965a2d..3c59288 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java @@ -3,45 +3,49 @@ 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.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @className: FaultLabel ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:07 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 报文标签 + * * @className: FaultLabel ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:07 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_label",autoResultMap = true) +@Tag(name = "报文标签管理") public class FaultLabel { /** *自增主键 */ @TableId(value = "message_type_id",type = IdType.AUTO) + @Schema(name = "自增主键") private String messageTypeId; /** *报文编码 */ + @Schema(name = "报文编码") private String messageTypeCode; /** *报文名称 */ + @Schema(name = "报文名称") private String messageTypeName; /** *报文所属类别 */ + @Schema(name = "报文所属类别") private String messageTypeBelongs; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java index 7feaaf8..b426308 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java @@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,21 +15,19 @@ import lombok.experimental.SuperBuilder; import java.util.Date; -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 故障日志实体类 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障日志实体类 */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@Tag(name = "故障日志实体类",description = "故障日志实体类") @TableName(value = "car_fault_log",autoResultMap = true) public class FaultLog { @@ -34,18 +35,22 @@ public class FaultLog { * 故障日志Id */ @TableId(value = "log_id",type = IdType.AUTO) + @Schema(name = "故障日志Id") private long logId; /** * 故障码Id */ + @Schema(name = "故障码Id") private long faultcodeId; /** * 车辆Id */ + @Schema(name = "车辆Id") private long carInformationId; /** * 车辆VIN */ + @Schema(name = "车辆VIN") private String carVin; /** * 开始报警时间 @@ -62,10 +67,12 @@ public class FaultLog { /** * 故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** * 车辆vin */ + @Schema(name = "车辆vin") private String carInformationVIN; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java index d824830..4d59e6b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java @@ -1,25 +1,27 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @className: FaultReport ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:05 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 车辆故障报告 + * * @className: FaultReport ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:05 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName("fault_report") +@Tag(name = "车辆故障报告") public class FaultReport { + private String VehicleType; private String FaultDescription; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java index 6c57556..3ce7cd2 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java @@ -1,6 +1,10 @@ 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.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -8,61 +12,68 @@ import lombok.experimental.SuperBuilder; import java.math.BigDecimal; -/** - * @className: FaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:05 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 故障触发条件 + * * @className: FaultRule ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:05 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_condition",autoResultMap = true) +@Tag(name = "故障触发条件") public class FaultRule { /** * 触发条件Id */ + @TableId(value = "condition_id",type = IdType.AUTO) + @Schema(name = "触发条件Id") private long conditionId; /** * 故障码Id */ + @Schema(name = "故障码Id") private long faultcodeId; /** * 触发条件描述 */ + @Schema(name = "触发条件描述") private String conditionContent; /** * 单个参数的阈值 */ + @Schema(name = "单个参数的阈值") private BigDecimal singleThreshold; /** * 区间参数的阈值的最小值 */ + @Schema(name = "区间参数的阈值的最小值") private BigDecimal minThreshold; /** * 区间参数的阈值的最大值 */ + @Schema(name = "区间参数的阈值的最大值") private BigDecimal maxThreshold; /** * 触发条件是否激活 */ + @Schema(name = "触发条件是否激活") private Integer isActive; /** * 车辆数据值 */ + @Schema(name = "车辆数据值") private BigDecimal Threshold; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java index 4ea6aef..620161d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java @@ -3,35 +3,38 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @className: FaultType ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:04 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 故障类型实体类 + * * @className: FaultType ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:04 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_type",autoResultMap = true) +@Tag(name = "故障类型管理") public class FaultType { /** *故障类型Id */ @TableId(value = "faulttype_id",type = IdType.AUTO) + @Schema(name = "故障类型Id") private long faulttypeId; /** *故障类型名称 */ + @Schema(name = "故障类型名称") private String faulttypeName; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java index 939e99a..d3add19 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java @@ -3,22 +3,20 @@ 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.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Author：yan - * @Package：com.muyu.car.domain - * @Project：plues - * @name：FenceAndGroupMiddle - * @Date：2024/9/22 09:59 - */ - /** * 车辆电子围栏中间表 + * * @Author：yan + * * @Package：com.muyu.car.domain + * * @Project：plues + * * @name：FenceAndGroupMiddle + * * @Date：2024/9/22 09:59 */ @Data @AllArgsConstructor @@ -31,14 +29,17 @@ public class FenceAndGroupMiddle { * id */ @TableId(value = "id",type = IdType.AUTO) + @Schema(name = "id") private Integer id; /** * 围栏id */ + @Schema(name = "围栏id") private Integer carId; /** * 围栏组id */ + @Schema(name = "围栏组id") private Integer groupId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java index d55021c..22d51d5 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java @@ -3,22 +3,21 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Author：yan - * @Package：com.muyu.car.domain - * @Project：cars - * @name：FenceGroup - * @Date：2024/9/21 20:45 - */ - /** * 围栏组实体类 + * * @Author：yan + * * @Package：com.muyu.car.domain + * * @Project：cars + * * @name：FenceGroup + * * @Date：2024/9/21 20:45 */ @Data @AllArgsConstructor @@ -31,14 +30,17 @@ public class FenceGroup { * id */ @TableId(value = "group_id",type = IdType.AUTO) + @Schema(name = "围栏组id") private Integer groupId; /** * 围栏组名称 */ + @Schema(name = "围栏组名称") private String groupName; /** * 围栏组状态 */ + @Schema(name = "围栏组状态") private Integer groupStates; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java index c95dbce..a88e533 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java @@ -1,24 +1,37 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; import com.muyu.domain.message.Message; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.sql.Connection; import java.sql.PreparedStatement; -/** - * @className: MessageDao ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:58 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 消息dao + * * @className: MessageDao ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 20:58 ⏰ + * * @Version: 1.0 + * * @description:消息dao */ +@TableName(value = "car_fault_message" , autoResultMap = true) +@SuperBuilder +@Builder +@NoArgsConstructor @Data +@Tag(name = "消息模块") public class MessageDao { + @TableId(value = "id", type = IdType.AUTO) + @Schema(name = "消息id") private Connection connection; public MessageDao(Connection connection){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageService.java deleted file mode 100644 index 3a5fcf2..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageService.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.muyu.domain; - -import com.muyu.domain.message.Message; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; - -/** - * @className: MessageService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:01 ⏰ - * @Version: 1.0 - * @description: 业务逻辑层将负责实现消息的发送逻辑 - */ - -/** - * 业务逻辑层将负责实现消息的发送逻辑 - */ -public class MessageService { - private MessageDao messageDao; - - public MessageService(MessageDao messageDao){ - this.messageDao=messageDao; - } - - public void sendMessage(String content,String sender,String receiver){ - - // 定义一个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()); - - - Message message = new Message(); - message.setContent(content); - message.setSender(sender); - message.setReceiver(receiver); - message.setCreateTime(date); - - try { - messageDao.sendMessage(message); - } catch (Exception e) { - e.printStackTrace(); - } - - } -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java index 4fb37fe..f3d2ff3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java @@ -3,23 +3,23 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; import com.muyu.domain.req.MessageTemplateAddReq; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @ClassName MessageTemplate - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 - */ - /** * 报文模版实体类 + * * @ClassName MessageTemplate + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ @Data @SuperBuilder @@ -27,22 +27,26 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "message_template", autoResultMap = true) +@Tag(name = "报文模版管理") public class MessageTemplate extends BaseEntity { /** * 报文模版主键 */ @TableId(value = "message_template_id", type = IdType.AUTO) + @Schema(title = "报文模版主键") private String messageTemplateId; /** * 报文模版名称 */ + @Schema(name = "报文模版名称") private String messageTemplateName; /** * 报文模版描述 */ + @Schema(name = "报文模版描述") private String messageTemplateDescribe; /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java index 0f0f7f0..390dbcc 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java @@ -5,21 +5,20 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.req.MessageValueAddReq; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @ClassName MessageValue - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 - */ - /** * 报文数据 + * * @ClassName MessageValue + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ @Data @SuperBuilder @@ -27,42 +26,50 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "message_value", autoResultMap = true) +@Tag(name = "报文数据") public class MessageValue extends BaseEntity { /** * 报文数据主键 */ @TableId(value = "message_id", type = IdType.AUTO) + @Schema(title = "报文数据主键") private Long messageId; /** * 模版主键 */ + @Schema(name = "模版主键") private Long templateId; /** * 报文类别 */ + @Schema(name = "报文类别") private String messageType; /** * 报文编码 */ + @Schema(name = "报文编码") private String messageCode; /** * 报文标签 */ + @Schema(name = "报文标签") private String messageLabel; /** * 起始下标 */ + @Schema(name = "起始下标") private Integer messageStartIndex; /** * 终止下标 */ + @Schema(name = "终止下标") private Integer messageEndIndex; public static MessageValue addBuild(MessageValueAddReq messageValueAddReq){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java index 6b1e2c9..4a5017c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,34 +27,43 @@ import org.apache.commons.lang3.builder.ToStringStyle; @NoArgsConstructor @AllArgsConstructor @TableName(value = "sys_car", autoResultMap = true) +@Tag(name = "车辆基础信息") public class SysCar extends BaseEntity{ /** 自增主键 */ - @TableId( type = IdType.AUTO) + @TableId( type = IdType.AUTO , value = "id" ) private Long id; /** 车辆VIN码 */ + @Schema(name = "车辆VIN码") private String carVin; /** 车辆车牌号 */ + @Schema(name = "车辆车牌号") private String carPlate; /** 车辆品牌 */ + @Schema(name = "车辆品牌") private String carBrand; /** 车辆型号 */ + @Schema(name = "车辆型号") private String carModel; /** 车辆类型 */ + @Schema(name = "车辆类型") private Integer carType; /** 策略ID */ + @Schema(name = "策略ID") private Integer warnStrategy; /** 围栏组编码 */ + @Schema(name = "围栏组编码") private String groupCode; /** 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) */ + @Schema(name = "启用状态") private Integer state; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java index 3344565..78a0987 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java @@ -3,8 +3,9 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -12,7 +13,6 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 车辆故障对象 sys_car_fault - * * @author Yang鹏 * @date 2024-09-18 */ @@ -23,56 +23,58 @@ import org.apache.commons.lang3.builder.ToStringStyle; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@TableName("sys_car_fault") +@TableName(value = "sys_car_fault", autoResultMap = true) +@Tag(name = "车辆故障对象") public class SysCarFault extends BaseEntity{ private static final long serialVersionUID = 1L; /** 自增主键 */ - @TableId( type = IdType.AUTO) + @TableId( type = IdType.AUTO,value = "id") + @Schema(name = "自增主键") private Long id; /** 车辆故障编码; */ - @Excel(name = "车辆故障编码;") + @Schema(name = "车辆故障编码;") private String faultCode; /** 车辆故障名称 */ - @Excel(name = "车辆故障名称") + @Schema(name = "车辆故障名称") private String faultName; /** 车辆故障类型 */ - @Excel(name = "车辆故障类型") + @Schema(name = "车辆故障类型") private String faultType; /** 故障VIN编码 */ - @Excel(name = "故障VIN编码") + @Schema(name = "故障VIN编码") private String carVin; /** 车辆故障标签 */ - @Excel(name = "车辆故障标签") + @Schema(name = "车辆故障标签") private String faultLabel; /** 车辆故障位 */ - @Excel(name = "车辆故障位") + @Schema(name = "车辆故障位") private String faultBit; /** 车辆故障值 */ - @Excel(name = "车辆故障值") + @Schema(name = "车辆故障值") private String faultValue; /** 故障级别; */ - @Excel(name = "故障级别;") + @Schema(name = "故障级别;") private String faultWarn; /** 报警状态（Y.是，N.否） */ - @Excel(name = "报警状态", readConverterExp = "Y=.是，N.否") + @Schema(name = "报警状态") private String warnStatus; /** 故障描述信息 */ - @Excel(name = "故障描述信息") + @Schema(name = "故障描述信息") private String faultDesc; /** 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) */ - @Excel(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") + @Schema(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") private String state; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java index 59abf51..c11eaa5 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java @@ -4,21 +4,20 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -/** - * @ClassName SysCarType - * @Description TODO - * @Author Li HD - * @Date 2024/9/22 15:48 - */ - /** * 车辆类型实体类 + * *@ClassName SysCarType + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/22 15:48 */ @EqualsAndHashCode(callSuper = true) @Data @@ -26,20 +25,24 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @TableName(value = "sys_car_type", autoResultMap = true) +@Tag(name = "车辆类型管理") public class SysCarType extends BaseEntity { /** * 车辆类型主键 */ @TableId(value = "id", type = IdType.AUTO) + @Schema(name = "车辆类型主键") private String id; /** * 车辆类型名称 */ + @Schema(name = "车辆类型名称") private String sysTypeName; /** * 报文模版外键 */ + @Schema(name = "报文模版外键") private String messageTemplateId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java index 3105c2a..2dd6a8a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java @@ -1,7 +1,11 @@ package com.muyu.domain; /** - * WarnLevel + * WarnLevel枚举类 + * *@ClassName WarnLevel + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/22 15:48 */ public enum WarnLevel { LOW, MEDIUM, HIGH diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java index 9976bc9..d696513 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java @@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,11 +17,12 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; /** * 预警日志对象 warn_logs - * * @author muyu * @date 2024-09-20 */ @@ -29,49 +33,53 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @TableName("warn_logs") +@Tag(name = "预警日志管理") public class WarnLogs extends BaseEntity{ private static final long serialVersionUID = 1L; /** 预警日志id */ @TableId( type = IdType.AUTO) + @Schema(name = "id") private Long id; /** 车辆vin码 */ - @Excel(name = "车辆vin码") + @Schema(name = "车辆vin码") private String vin; /** 规则id */ - @Excel(name = "规则id") + @Schema(name = "规则id") private Long warnRuleId; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @Schema(name = "开始时间") private Date startTime; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @Schema(name = "结束时间") private Date endTime; /** 最大值 */ - @Excel(name = "最大值") + @Schema(name = "最大值") private Long maxValue; /** 最小值 */ - @Excel(name = "最小值") + @Schema(name = "最小值") private Long minValue; /** 平均值 */ - @Excel(name = "平均值") + @Schema(name = "平均值") private Long avgValue; /** 中位数 */ - @Excel(name = "中位数") + @Schema(name = "中位数") private Long medianValue; /** 是否发送预警 */ - @Excel(name = "是否发送预警") + @Schema(name = "是否发送预警") private Long status; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java index fda51f9..d572703 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,7 +16,6 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** * 预警规则对象 warn_rule - * * @author muyu * @date 2024-09-20 */ @@ -26,42 +27,44 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @TableName("warn_rule") +@Tag(name = "预警规则管理") public class WarnRule extends BaseEntity{ private static final long serialVersionUID = 1L; /** 规则id */ @TableId( type = IdType.AUTO) + @Schema(name = "规则id") private Long id; /** 规则名称 */ - @Excel(name = "规则名称") + @Schema(name = "规则名称") private String ruleName; /** 策略id */ - @Excel(name = "策略id") + @Schema(name = "策略id") private Long strategyId; /** 报文数据类型id */ - @Excel(name = "报文数据类型id") + @Schema(name = "报文数据类型id") private String msgTypeId; /** 滑窗时间 */ - @Excel(name = "滑窗时间") + @Schema(name = "滑窗时间") private Long slideTime; /** 滑窗频率 */ - @Excel(name = "滑窗频率") + @Schema(name = "滑窗频率") private String slideFrequency; /** 数据频率名称 */ - @Excel(name = "数据频率名称") + @Schema(name = "数据频率名称") private String slideData; /** 最大值 */ - @Excel(name = "数据频率最大值") + @Schema(name = "数据频率最大值") private Long slideMaxNum; /** 最小值 */ - @Excel(name = "数据频率最小值") + @Schema(name = "数据频率最小值") private Long slideMinNum; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java index fb37271..def2c90 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java @@ -3,8 +3,9 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,23 +27,25 @@ import org.apache.commons.lang3.builder.ToStringStyle; @NoArgsConstructor @AllArgsConstructor @TableName("warn_strategy") +@Tag(name = "预警策略管理") public class WarnStrategy extends BaseEntity{ private static final long serialVersionUID = 1L; /** 策略id */ @TableId( type = IdType.AUTO) + @Schema(title = "策略id") private Long id; /** 车辆类型id */ - @Excel(name = "车辆类型id") + @Schema(name = "车辆类型id") private Long sysTypeId; /** 策略名称 */ - @Excel(name = "策略名称") + @Schema(name = "策略名称") private String strategyName; /** 报文模版id */ - @Excel(name = "报文模版id") + @Schema(name = "报文模版id") private Long msgId; @Override diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java index 9df0391..4d656a6 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -29,6 +32,7 @@ import java.util.Date; @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_message",autoResultMap = true) +@Tag(name = "消息管理") public class Message { /** * id @@ -39,21 +43,25 @@ public class Message { /** * 发送者 */ + @Schema(description = "消息发送者",defaultValue = "admin",type = "String") private String sender; /** * 接收者 */ + @Schema(description = "消息接收者",defaultValue = "admin",type = "String") private String receiver; /** * 消息内容 */ + @Schema(description = "消息内容",defaultValue = "你好，我是admin",type = "String") private String content; /** * 消息状态 */ + @Schema(description = "消息状态",defaultValue = "0",type = "Integer") private Integer status; /** @@ -65,6 +73,7 @@ public class Message { /** * 登录人Id */ + @Schema(description = "登录人Id",defaultValue = "1",type = "Long") private long userId; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java index 3d861df..18fae8f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java @@ -2,8 +2,13 @@ package com.muyu.domain.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -24,15 +29,18 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName(value = "message_req" ,autoResultMap = true) +@Tag(name = "消息请求参数") public class MessageReq { /** * 消息状态 */ @TableId(type = IdType.AUTO,value = "status") + @Schema(name = "消息状态") private Integer status; /** * 登录人Id */ - @Excel(name = "登录人Id") + @Schema(name = "登录人Id") private long userId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java index 1a157f4..97f03a2 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java @@ -2,9 +2,12 @@ package com.muyu.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 com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -24,27 +27,30 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "message_send_req" ,autoResultMap = true) +@Tag(name = "消息发送请求参数") public class MessageSendReq { /** * 发送者 */ @TableId(type = IdType.AUTO,value = "id") + @Schema(name = "发送者") private String sender; /** * 接收者 */ - @Excel(name = "接收者") + @Schema(name = "接收者") private String receiver; /** * 消息内容 */ - @Excel(name = "消息内容") + @Schema(name = "消息内容") private String content; /** * 登录人Id */ - @Excel(name = "登录人Id") + @Schema(name = "登录人Id") private long userId; /** * 创建时间 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java index c1847ea..25bb6cb 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java @@ -2,8 +2,12 @@ package com.muyu.domain.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -23,20 +27,23 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName(value = "user", autoResultMap = true) +@Tag(name = "用户") public class User { /** * 用户id */ @TableId(value = "id", type = IdType.AUTO) + @Schema(title = "用户id") private Integer id; /** * 用户名 */ - @Excel(name = "用户名") + @Schema(name = "用户名") private String username; /** * 邮箱 */ - @Excel(name="邮箱") + @Schema(name="邮箱") private String email; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java index f04ea5e..afef867 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java @@ -2,8 +2,12 @@ package com.muyu.domain.message.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -20,15 +24,18 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName(value = "message_req",autoResultMap = true) +@Tag(name = "消息请求参数") public class MessageReq { /** * 消息状态 */ @TableId(type = IdType.AUTO,value = "status") + @Schema(name = "消息状态") private Integer status; /** * 登录人Id */ - @Excel(name = "登录人Id") + @Schema(name = "登录人Id") private long userId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java index 9e630a2..d4c0122 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java @@ -2,13 +2,17 @@ package com.muyu.domain.message.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 com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Date; @@ -24,27 +28,29 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "message_send_req",autoResultMap = true) +@Tag(name = "消息发送请求参数") public class MessageSendReq { /** * 发送者 */ - @TableId(type = IdType.AUTO,value = "id") + @Schema(name = "发送者") private String sender; /** * 接收者 */ - @Excel(name = "接收者") + @Schema(name = "接收者") private String receiver; /** * 消息内容 */ - @Excel(name = "消息内容") + @Schema(name = "消息内容") private String content; /** * 登录人Id */ - @Excel(name = "登录人Id") + @Schema(name = "登录人Id") private long userId; /** * 创建时间 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java index 9b13691..2e7ade4 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java @@ -2,8 +2,12 @@ package com.muyu.domain.message.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -19,7 +23,9 @@ import lombok.experimental.SuperBuilder; @Data @AllArgsConstructor @NoArgsConstructor -@SuperBuilder +@Tag(name = "用户实体类") +@TableName("user") +@Builder public class User { /** * 用户id @@ -29,11 +35,11 @@ public class User { /** * 用户名 */ - @Excel(name = "用户名") + @Schema(name = "用户名") private String username; /** * 邮箱 */ - @Excel(name="邮箱") + @Schema(name="邮箱") private String email; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java index 4dd59ed..eaef938 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java @@ -3,10 +3,16 @@ package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -24,38 +30,48 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor +@Builder +@TableName(value = "car_fence_add", autoResultMap = true) +@Tag(name = "围栏添加") public class CarFenceAdd { /** * 围栏主键 */ @TableId(value = "id",type = IdType.AUTO) + @Schema(title = "围栏主键") private Integer id; /** * 围栏名称 */ + @Schema(name = "围栏名称") private String name; /** * 业务类型ID */ + @Schema(name = "业务类型ID") private Integer clazzId; /** * 业务类型名称 */ + @Schema(name = "业务类型名称") @TableField(exist = false) private String clazzName; /** * 围栏类型ID */ + @Schema(name = "围栏类型ID") private Integer typeId; /** * 围栏类型名称 */ + @Schema(name = "围栏类型名称") @TableField(exist = false) private String typeName; /** * 围栏经纬度 */ + @Schema(name = "围栏经纬度") private String fenceText; /** * 围栏开始时间 @@ -78,5 +94,6 @@ public class CarFenceAdd { /** * 中间表ID */ + @Schema(name = "中间表ID") private Integer middleId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java index 393d917..12451bd 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java @@ -2,12 +2,16 @@ package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Date; @@ -24,14 +28,16 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -@Builder - +@SuperBuilder +@TableName(value = "car_fence_group", autoResultMap = true) +@Tag(name = "围栏组") public class CarFenceGroup { /** * 围栏主键 */ @TableId(value = "id",type = IdType.AUTO) + @Schema(name = "围栏主键", type = "Integer", defaultValue = "0", description = "围栏主键") private Integer id; /** * 围栏名称 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java index fa4bbde..88f7de4 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java @@ -1,5 +1,7 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -21,19 +23,23 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Tag(name = "车辆电子围栏响应参数") +@TableName(value = "car_fence_group", autoResultMap = true) public class CarFenceReq { /** * 围栏名称 */ + @Schema(title = "围栏名称", type = "String", description = "围栏名称") private String name; /** * 业务类型ID */ + @Schema(title = "业务类型ID", type = "String", description = "业务类型ID") private String clazzId; /** * 围栏类型ID */ + @Schema(title = "围栏类型ID", type = "String", description = "围栏类型ID") private String typeName; /** * 当前页 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java index 291f1c9..8285aae 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java @@ -1,5 +1,11 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,52 +25,66 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_code_add_req", autoResultMap = true) +@Tag(name = "故障检测") public class FaultCodeAddReq { /** *故障名称Id */ + @Schema(description = "故障名称Id") + @TableId(value = "message_type_id", type = IdType.AUTO) private long messageTypeId; /** * 故障名称 */ + @Schema(description = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(description = "报文编码") private String messageTypeCode; /** * 故障码 */ + @Schema(description = "故障码") private String faultcodeNumber; /** * 故障分类Id */ + @Schema(description = "故障分类Id") private long faulttypeId; /** * 是否产生报警 */ + @Schema(description = "是否产生报警") private Integer isWarning; /** * 故障描述 */ + @Schema(description = "故障描述") private String faultContent; /** *故障组 */ + @Schema(description = "故障组") private String faultGroup; /** *故障位 */ + @Schema(description = "故障位") private String faultBit; /** *故障值 */ + @Schema(name = "故障值") private String faultValue; /** *报文所属类别 */ + @Schema(name = "报文所属类别") private String messageTypeBelongs; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java index 0af3cc6..6095883 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java @@ -1,10 +1,14 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @className: FaultLog ️✈️ @@ -21,23 +25,29 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@Builder +@SuperBuilder +@TableName(value = "fault_code_add_req", autoResultMap = true) +@Tag(name = "故障码列表请求对象") public class FaultCodeListReq { /** *故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** *故障位 */ + @Schema(name = "故障位") private String faultBit; /** * 页码，从1开始 */ + @Schema(name = "页码") private Integer pageNum=1; /** * 每页大小 */ + @Schema(name = "每页大小") private Integer pageSize=10; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java index a3863d8..e17e311 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java @@ -1,9 +1,15 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @className: FaultLog ️✈️ @@ -19,60 +25,76 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@Builder +@SuperBuilder +@TableName(value = "fault_code_upd_req", autoResultMap = true) +@Tag(name = "故障码更新请求参数") public class FaultCodeUpdReq { /** *故障码Id */ + @TableId(value = "faultcode_id", type = IdType.AUTO) + @Schema(title = "故障码Id") private long faultcodeId; /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障名称 */ + @Schema(name = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(name = "报文编码") private String messageTypeCode; /** * 故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** * 故障分类Id */ + @Schema(name = "故障分类Id") private long faulttypeId; /** * 是否产生报警 */ + @Schema(name = "是否产生报警") private Integer isWarning; /** * 故障描述 */ + @Schema(name = "故障描述") private String faultContent; /** *故障状态 */ + @Schema(name = "故障状态") private Integer faultStatus; /** *故障组 */ + @Schema(name = "故障组") private String faultGroup; /** *故障位 */ + @Schema(name = "故障位") private String faultBit; /** *故障值 */ + @Schema(name = "故障值") private String faultValue; /** *报文所属类别 */ + @Schema(name = "报文所属类别") private String messageTypeBelongs; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java index 2bd4fd5..beb3a9a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java @@ -1,9 +1,16 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.math.BigDecimal; @@ -22,26 +29,34 @@ import java.math.BigDecimal; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_condition", autoResultMap = true) +@Tag(name = "故障规则添加请求对象") public class FaultConditionAddReq { /** * 故障规则表Id */ + @TableId(value = "id", type = IdType.AUTO) + @Schema(title = "故障规则表Id") private long carconditionId; /** * 车辆类型Id */ + @Schema(name = "车辆类型Id") private long carTypeId; /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障条件 */ + @Schema(name = "故障条件") private String faultconditionIdentification; /** * 故障规则参数 */ + @Schema(name = "故障规则参数") private BigDecimal faultconditionParameter; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java index 5e7be6c..284a2ee 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java @@ -1,10 +1,16 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @className: FaultLog ️✈️ @@ -21,23 +27,30 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_code_add_req", autoResultMap = true) +@Tag(name = "故障规则列表请求对象") public class FaultConditionListReq { /** * 车辆类型Id */ + @TableId(value = "car_type_id", type = IdType.INPUT) + @Schema (description = "车辆类型Id") private long carTypeId; /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 页码，从1开始 */ + @Schema(name = "页码") private Integer pageNum=1; /** * 每页大小 */ + @Schema(name = "每页大小") private Integer pageSize=10; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java index c103ea6..377c32f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java @@ -1,9 +1,17 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.math.BigDecimal; @@ -21,26 +29,34 @@ import java.math.BigDecimal; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_condition", autoResultMap = true) +@Tag(name = "故障规则修改请求对象") public class FaultConditionUpdReq { /** * 故障规则表Id */ + @TableId(value = "carcondition_id", type = IdType.ASSIGN_ID) + @Schema(name = "故障规则表Id") private long carconditionId; /** * 车辆类型Id */ + @Schema(name = "车辆类型Id") private long carTypeId; - /** + /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障条件 */ + @Schema(name = "故障条件") private String faultconditionIdentification; /** * 故障规则参数 */ + @Schema(name = "故障规则参数") private BigDecimal faultconditionParameter; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java index 1ebbbae..37edf81 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java @@ -1,12 +1,18 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Date; @@ -26,15 +32,19 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_log",autoResultMap = true) public class FaultLogListReq { /** * 故障码Id */ + @TableId(value = "type", type = IdType.AUTO) + @Schema(description = "故障码Id",example = "1") private long faultcodeId; /** * 车辆VIN */ + @Schema(name = "车辆VIN") private String carVin; /** * 开始报警时间 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java index d67413a..993c202 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java @@ -1,10 +1,14 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @ClassName MessageTemplateAddReq @@ -21,15 +25,18 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Tag(name = "新增报文模版请求参数", description = "根据入参进行报文模版的添加") +@TableName("message_template") public class MessageTemplateAddReq { /** * 报文模版名称 */ + @Schema(name = "报文模版名称") private String messageTemplateName; /** * 报文模版描述 */ + @Schema(name = "报文模版描述") private String messageTemplateDescribe; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java index ba54aaf..546fb59 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java @@ -1,10 +1,16 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @ClassName MessageValueAddReq @@ -21,35 +27,43 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Tag(name = "新增报文数据请求参数", description = "根据入参进行报文数据的添加") +@TableName(value = "message_value", autoResultMap = true) public class MessageValueAddReq { /** * 模版主键 */ + @TableId(value = "template_id",type = IdType.INPUT) + @Schema(description = "模版主键") private Long templateId; /** * 报文类别 */ + @Schema(name = "报文类别") private String messageType; /** * 报文编码 */ + @Schema(name = "报文编码") private String messageCode; /** * 报文标签 */ + @Schema(name = "报文标签") private String messageLabel; /** * 起始下标 */ + @Schema(name = "起始下标") private Integer messageStartIndex; /** * 终止下标 */ + @Schema(name = "终止下标") private Integer messageEndIndex; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java index 34dd07b..3f8ed65 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java @@ -1,11 +1,14 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @ClassName MessageValueReq @@ -22,6 +25,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Tag(name = "报文数据请求参数", description = "根据入参进行报文数据的查询") +@TableName(value = "message_value_req",autoResultMap = true) public class MessageValueReq { /** 报文模版主键 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java index 6d1e819..feef684 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java @@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -25,34 +24,44 @@ import org.apache.commons.lang3.builder.ToStringStyle; @NoArgsConstructor @AllArgsConstructor @TableName(value = "sys_car", autoResultMap = true) +@Tag(name = "车辆基础信息对象") public class SysCar extends BaseEntity{ /** 自增主键 */ @TableId( type = IdType.AUTO) + @Schema(title = "自增主键") private Long id; /** 车辆VIN码 */ + @Schema(title = "车辆VIN码") private String carVin; /** 车辆车牌号 */ + @Schema(title = "车辆车牌号") private String carPlate; /** 车辆品牌 */ + @Schema(title = "车辆品牌") private String carBrand; /** 车辆型号 */ + @Schema(title = "车辆型号") private String carModel; /** 车辆类型 */ + @Schema(title = "车辆类型") private Integer carType; /** 策略ID */ + @Schema(title = "策略ID") private Integer warnStrategy; /** 围栏组编码 */ + @Schema(title = "围栏组编码") private String groupCode; /** 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) */ +@Schema(title = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中)") private Integer state; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java index 4af39b0..aa0a866 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java @@ -1,8 +1,11 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.domain.CarFence; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -34,34 +37,42 @@ public class CarFenceResq { /** * 围栏主键 */ + @TableId(value = "id",type = IdType.AUTO) + @Schema(description = "围栏主键") private Integer id; /** * 围栏名称 */ + @Schema(description = "围栏名称") private String name; /** * 业务类型名 */ + @Schema(description = "业务类型名") private String clazzName; /** * 围栏类型名 */ + @Schema(description = "围栏类型名") private String typeName; /** * 围栏开始时间 */ + @Schema(description = "围栏开始时间") @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date fenceStart; /** * 围栏结束时间 */ + @Schema(description = "围栏结束时间") @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date fenceEnd; /** * 创建时间 */ + @Schema(description = "创建时间") @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date fenceCreate; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java index 90c7d17..c11bae5 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java @@ -1,6 +1,10 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.vo.FaultCodeVo; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -21,51 +25,64 @@ import lombok.Data; @Builder @AllArgsConstructor @Tag(name="故障码信息响应对象",description = "故障码查询的响应结果") +@TableName(value = "fault_code_list_resp", autoResultMap = true) public class FaultCodeListResp { /** *故障码Id */ + @TableId(value = "faultcode_id", type = IdType.AUTO) + @Schema(description = "故障码Id",example = "1") private long faultcodeId; /** *故障名称Id */ + @Schema(description = "故障名称Id",example = "1") private long messageTypeId; /** *故障码 */ + @Schema(description = "故障码",example = "P0001") private String faultcodeNumber; /** *故障组 */ + @Schema(description = "故障组",example = "1") private String faultGroup; /** *故障位 */ + @Schema(description = "故障位",example = "1") private String faultBit; /** *故障值 */ + @Schema(description = "故障值",example = "1") private String faultValue; /** *是否警告 */ + @Schema(description = "是否警告",example = "1") private Integer isWarning; /** *故障类型名称 */ + @Schema(description = "故障类型名称",example = "1") private String faulttypeName; /** * 故障名称 */ + @Schema(description = "故障名称",example = "1") private String messageTypeName; /** * 报文编码 */ + @Schema(description = "报文编码",example = "1") private String messageTypeCode; /** *报文所属类别 */ + @Schema(description = "报文所属类别",example = "1") private String messageTypeBelongs; /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java index c6439c5..c286fd8 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java @@ -1,5 +1,7 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -23,11 +25,16 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Tag(name="数据总数列表",description = "数据和总数的响应") +@TableName(value = "fault_code",autoResultMap = true) public class FaultCodeTotalListResp { - + @Schema(name = "数据列表") private List faultCodeListRespList; + /** + * 总数 + */ + @Schema(name = "总数") private long total; public static FaultCodeTotalListResp faultCodeTotalListResp(List faultCodeListRespList,long total){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java index 8a9a94b..646259c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java @@ -1,11 +1,16 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.FaultCondition; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @@ -23,39 +28,50 @@ import java.math.BigDecimal; @Builder @AllArgsConstructor @Tag(name="故障规则信息响应对象",description = "故障规则查询的响应结果") +@NoArgsConstructor +@TableName(value = "car_fault_condition",autoResultMap = true) public class FaultConditionListResp { /** * 故障规则表Id */ + @TableId(value = "carcondition_id",type = IdType.AUTO) + @Schema(description = "故障规则表Id") private long carconditionId; /** * 车辆类型Id */ + @Schema(description = "车辆类型Id") private long carTypeId; /** *故障名称Id */ + @Schema(description = "故障名称Id") private long messageTypeId; /** * 故障条件 */ + @Schema(description = "故障条件") private String faultconditionIdentification; /** * 故障规则参数 */ + @Schema(description = "故障规则参数") private BigDecimal faultconditionParameter; /** * 车辆类型名称 */ + @Schema(description = "车辆类型名称") private String carTypeName; /** * 故障名称 */ + @Schema(description = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(description = "报文编码") private String messageTypeCode; /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java index 717739f..cd5d162 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java @@ -1,5 +1,7 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -24,10 +26,13 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Tag(name="故障规则数据总数列表",description = "数据和总数的响应") +@TableName(value = "fault_condition",autoResultMap = true) public class FaultConditionTotalListResp { + @Schema(description = "故障规则数据列表") private List faultConditionListRespList; + @Schema(description = "故障规则数据总数") private long total; public static FaultConditionTotalListResp faultConditionTotalListResp(List faultConditionListRespList,long total){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java index 4c155dd..c307a7b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java @@ -1,12 +1,17 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.domain.FaultLog; +import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @@ -25,24 +30,31 @@ import java.util.Date; @Builder @AllArgsConstructor @Tag(name="故障日志信息响应对象",description = "故障日志的响应结果") +@NoArgsConstructor +@TableName(value = "car_fault_log",autoResultMap = true) public class FaultLogListResp { /** * 故障日志Id */ + @TableId(value = "log_id",type = IdType.AUTO) + @Schema(description = "故障日志Id",example = "1") private long logId; /** * 故障码Id */ + @Schema(name = "故障码Id") private long faultcodeId; /** * 车辆Id */ + @Schema(name = "车辆Id") private long carInformationId; /** * 车辆VIN */ + @Schema(name = "车辆VIN") private String carVin; /** * 开始报警时间 @@ -59,10 +71,12 @@ public class FaultLogListResp { /** * 故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** * 车辆vin */ + @Schema(name = "车辆vin") private String carInformationVIN; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java index 7543e00..0626794 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java @@ -1,5 +1,7 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -24,10 +26,13 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Tag(name="故障日志数据总数列表",description = "数据和总数的响应") +@TableName(value = "fault_log",autoResultMap = true) public class FaultLogTotalListResp { + @Schema(description = "故障日志列表") private List faultLogListRespList; + @Schema(description = "总数") private long total; public static FaultLogTotalListResp faultLogTotalListResp(List faultLogListRespList,long total){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java index 21cdb9c..388a58e 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java @@ -1,6 +1,10 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.MessageTemplate; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -22,21 +26,26 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Tag(name = "报文模版列表", description = "负责报文模版管理列表的相应数据") +@TableName(value = "message_template", autoResultMap = true) public class MessageTemplateListResp { /** * 报文模版主键 */ + @Schema(description = "报文模版主键") + @TableId(value = "message_template_id", type = IdType.AUTO) private String messageTemplateId; /** * 报文模版名称 */ + @Schema(description = "报文模版名称") private String messageTemplateName; /** * 报文模版描述 */ + @Schema(description = "报文模版描述") private String messageTemplateDescribe; /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java index d8c1a5a..a613905 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java @@ -1,6 +1,10 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.MessageValue; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -22,36 +26,44 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Tag(name = "报文数据列表", description = "负责报文数据管理列表的相应数据") +@TableName(value = "message_value", autoResultMap = true) public class MessageValueListResp { /** * 报文数据主键 */ + @TableId(value = "message_id", type = IdType.AUTO) + @Schema(description = "报文数据主键",example = "1") private Long messageId; /** * 报文类别 */ + @Schema(description = "报文类别",example = "1") private String messageType; /** * 报文编码 */ + @Schema(description = "报文编码",example = "1") private String messageCode; /** * 报文标签 */ + @Schema(description = "报文标签",example = "1") private String messageLabel; /** * 起始下标 */ + @Schema(description = "起始下标",example = "1") private Integer messageStartIndex; /** * 终止下标 */ + @Schema(description = "终止下标",example = "1") private Integer messageEndIndex; public static MessageValueListResp valueBuild(MessageValue messageValue){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java index 51f0479..33f046f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java @@ -2,6 +2,8 @@ package com.muyu.domain.resp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -23,57 +25,68 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Tag(name = "车辆类型信息", description = "车辆类型") +@TableName(value = "sys_car", autoResultMap = true) public class SysCarResp { /** * 自增主键 */ - @TableId(type = IdType.AUTO) + @Schema(description = "自增主键") + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 车辆VIN码 */ + @Schema(description = "车辆VIN码") private String carVin; /** * 车辆车牌号 */ + @Schema(description = "车辆车牌号") private String carPlate; /** * 车辆品牌 */ + @Schema(description = "车辆品牌") private String carBrand; /** * 车辆型号 */ + @Schema(description = "车辆型号") private String carModel; /** * 车辆类型 */ + @Schema(description = "车辆类型") private Integer carType; /** * 车辆类型名称 */ + @Schema(description = "车辆类型名称") private String sysTypeName; /** * 策略ID */ + @Schema(description = "策略ID") private Integer warnStrategy; /** * 围栏组编码 */ + @Schema(description = "围栏组编码") private String groupCode; /** * 启用状态 */ + @Schema(description = "启用状态") private Integer state; @Override diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java index 4caf5fc..b668cb7 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java @@ -1,44 +1,49 @@ package com.muyu.domain.vo; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.FaultCode; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; - -/** - * @className: FaultCodeVo ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:18 ⏰ - * @Version: 1.0 - * @description: - */ - /** * 故障代码VO + * * @className: FaultCodeVo ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:18 ⏰ + * * @Version: 1.0 + * * @description: */ @EqualsAndHashCode(callSuper = true) @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName(value = "car_faultcode", autoResultMap = true) +@Tag(name = "故障代码") public class FaultCodeVo extends FaultCode { /** *故障类型名称 */ + @Schema(description = "故障类型名称") private String faulttypeName; /** * 故障名称 */ + @Schema(description = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(description = "报文编码") private String messageTypeCode; /** *报文所属类别 */ + @Schema(description = "报文所属类别") private String messageTypeBelongs; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java index b808d31..d4e7791 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java @@ -25,9 +25,24 @@ public interface FaultTypeService extends IService { */ List select(); + /** + * 故障码分类新增 + * @param faultType + * @return + */ Integer add(FaultType faultType); + /** + * 故障码分类修改 + * @param faultType + * @return + */ Integer update(FaultType faultType); + /** + * 故障码分类删除 + * @param id + * @return + */ Integer delete(Integer id); } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java index deeee67..085d485 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java @@ -14,5 +14,9 @@ import java.util.List; * * @Date：2024/9/21 20:53 */ public interface FenceGroupService extends IService { + /** + * 围栏组列表 + * @return + */ List fenceGroupList(); } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java index ee8f733..4cc6854 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java @@ -15,8 +15,17 @@ import java.util.List; * * @Date 2024/9/19 */ public interface MessageValueService extends IService { + /** + * 查询消息值列表 + * @param messageValueReq + * @return + */ List findAll(MessageValueReq messageValueReq); + /** + * 测试 + * @param str + */ void test(String str); } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java index a36a133..af89808 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java @@ -18,6 +18,10 @@ import java.util.List; */ public interface SysTypeService extends IService { + /** + * 查询所有车辆类型 + * @return 车辆类型集合 + */ List selectSysTypeList(); } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java index 526a4b8..9a60f37 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java @@ -27,6 +27,11 @@ public class CarFenceServiceMybaitsImpl implements CarFenceServiceMybaits { private CarFenceServiceMybaitsMapper carFenceServiceMybaitsMapper; + /** + * 添加多对多围栏组 + * @param fenceGroupId + * @param carFenceId + */ @Override public void add(Integer fenceGroupId, List carFenceId) { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java index 9546acc..fade30b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java @@ -23,7 +23,6 @@ public class FaultLabelServiceImpl extends ServiceImpl fenceGroupList() { List list = this.list(); diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java index 1431f73..0efa970 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java @@ -20,6 +20,9 @@ public class MessageTemplateServiceImpl extends ServiceImpl implements MessageTemplateService { + /** + * 注入消息模板Mapper + */ @Resource private MessageTemplateMapper messageTemplateMapper; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java index 465229c..c9c19cb 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java @@ -25,6 +25,11 @@ public class MessageValueServiceImpl extends ServiceImpl implements MessageValueService { + /** + * 查询所有消息值 + * @param messageValueReq + * @return + */ @Override public List findAll(MessageValueReq messageValueReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -49,6 +54,10 @@ public class MessageValueServiceImpl .toList(); } + /** + * 测试 + * @param str + */ @Override public void test(String str) { JSONObject entries = new JSONObject(); diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java index 623075b..c0e47fd 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java @@ -24,6 +24,10 @@ public class SysTypeServiceImpl @Resource private SysTypeMapper sysTypeMapper; + /** + * 查询车辆类型列表 + * @return + */ @Override public List selectSysTypeList() { return sysTypeMapper.selectSysList(); diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java index 5a720fa..c4c88d7 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java @@ -43,154 +43,6 @@ public class PureElectricCarFaultDetectionStrategy implements FaultDetectionStra if (carFaultRule.getIR()>100000){ return new FaultReport("纯电车","绝缘电阻过高,请注意"); } -// //检测加速踏板行程值 -// if (carFaultRule.getAPTV()){ -// -// } -// //检测制动踏板行程值 -// if (carFaultRule.getBPTV()){ -// -// } -// //检测燃料消耗率 -// if (carFaultRule.getSFC()){ -// -// } -// //检测电机控制器温度 -// if (carFaultRule.getMCT()){ -// -// } -// //检测电机转速 -// if (carFaultRule.getMS()){ -// -// } -// //检测电机转矩 -// if (carFaultRule.getMTO()){ -// -// } -// //检测电机温度 -// if (carFaultRule.getMTE()){ -// -// } -// //检测电机电压 -// if (carFaultRule.getMV()){ -// -// } -// //检测电机电流 -// if (carFaultRule.getMC()){ -// -// } -// //检测动力电池剩余电量SOC -// if (carFaultRule.getPBRSOC()){ -// -// } -// //检测当前状态允许的最大反馈功率 -// if (carFaultRule.getMACSFP()){ -// -// } -// //检测当前状态允许最大放电功率 -// if (carFaultRule.getCSATMDP()) { -// -// } -// //检测BMS自检计数器 -// if (carFaultRule.getBMS()) { -// -// } -// //检测动力电池充放电电流 -// if (carFaultRule.getCADC()) { -// -// } -// //检测动力电池负载端总电压V3 -// if (carFaultRule.getPBLETVV3()) { -// -// } -// //检测单次最大电压 -// if (carFaultRule.getSMV()) { -// -// } -// //检测单体电池最低电压 -// if (carFaultRule.getMVOAB()) { -// -// } -// //检测单体电池最高温度 -// if (carFaultRule.getMAXBT()) { -// -// } -// //检测单体电池最低温度 -// if (carFaultRule.getMINBT()) { -// -// } -// //检测动力电池可用容量 -// if (carFaultRule.getPBAC()) { -// -// } -// //检测车辆状态 -// if (carFaultRule.getVS()) { -// -// } -// //检测充电状态 -// if (carFaultRule.getCS()) { -// -// } -// //检测运行状态 -// if (carFaultRule.getRS()) { -// -// } -// //检测SOC -// if (carFaultRule.getSOC()) { -// -// } -// //检测可充电储能装置工作状态 -// if (carFaultRule.getRESDWC()) { -// -// } -// //检测驱动电机状态 -// if (carFaultRule.getEAS()) { -// -// } -// //检测定位是否有效 -// if (carFaultRule.getPTC()) { -// -// } -// //检测EAS -// if (carFaultRule.getEPS()) { -// -// } -// //检测PTC -// if (carFaultRule.getABS()) { -// -// } -// //检测EPS -// if (carFaultRule.getMCU()) { -// -// } -// //检测ABS -// if (carFaultRule.getPBHS()) { -// -// } -// //检测MCU -// if (carFaultRule.getPBCS()) { -// -// } -// //检测动力电池加热状态 -// if (carFaultRule.getPBIS()) { -// -// } -// //检测动力电池当前状态 -// if (carFaultRule.getDCDC()) { -// -// } -// //检测动力电池保温状态 -// if (carFaultRule.getCHG()) { -// -// } -// //检测DCDC -// if (carFaultRule.getCHB()) { -// -// } -// //检测CHG -// if (carFaultRule.getCUB()) { -// -// } return null; } }