From aa394037145e530a9e774eb4513a4f59a997a886 Mon Sep 17 00:00:00 2001 From: YangPeng <3074487626@qq.com> Date: Mon, 30 Sep 2024 12:48:15 +0800 Subject: [PATCH] =?UTF-8?q?fix():CarInformation=E6=B7=BB=E5=8A=A0=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=20=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/domain/CarFaultMessage.java | 3 + .../java/com/muyu/domain/CarInformation.java | 114 ++++++++++++++++++ .../java/com/muyu/domain/WarnStrategy.java | 2 - .../com/muyu/service/MessageValueService.java | 1 - .../java/com/muyu/service/MiddleService.java | 4 - .../main/resources/mapper/WarnLogsMapper.xml | 102 ---------------- .../main/resources/mapper/WarnRuleMapper.xml | 92 -------------- .../resources/mapper/WarnStrategyMapper.xml | 72 ----------- 8 files changed, 117 insertions(+), 273 deletions(-) create mode 100644 cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java delete mode 100644 cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnLogsMapper.xml delete mode 100644 cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnRuleMapper.xml delete mode 100644 cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnStrategyMapper.xml 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 168efcc..d9b5dca 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 @@ -1,5 +1,7 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.tags.Tag; @@ -29,6 +31,7 @@ import java.util.Date; @Tag(name = "bioa") @TableName(value = "car_fault_message",autoResultMap = true) public class CarFaultMessage { + @TableId(value = "id",type = IdType.AUTO) private Integer id; private String sender; private String receiver; 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 new file mode 100644 index 0000000..430b657 --- /dev/null +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java @@ -0,0 +1,114 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 车辆信息实体类 + * * @className: CarInformation ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/30 12:40 ⏰ + * * @Version: 1.0 + * * @description: + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "车辆信息") +@TableName("car_information") +public class CarInformation { + /** + * 车辆ID + */ + @TableId(value = "car_information_id" , type = IdType.AUTO) + private Long carInformationId; + /** + * 车辆唯一VIN + */ + @Excel(name = "车辆唯一VIN") + private String CarInformationVIN; + /** + * 车牌号 + */ + @Excel(name = "车牌号") + private String carInformationLicensePlate; + /** + * 车辆品牌 + */ + @Excel(name = "车辆品牌") + private String carInformationBrand; + /** + * 车辆颜色 + */ + @Excel(name = "车辆颜色") + private String carInformationColor; + /** + * 车辆驾驶员 + */ + @Excel(name = "车辆驾驶员") + private String carInformationDriver; + /** + * 车检到期日期 + */ + @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + private Date carInformationExamineEnddata; + /** + * 车辆电机厂商 + */ + @Excel(name = "车辆电机厂商") + private String carInformationMotorManufacturer; + /** + * 车辆电机型号 + */ + @Excel(name = "车辆电机型号") + private String carInformationMotorModel; + /** + * 车辆电池厂商 + */ + @Excel(name = "车辆电池厂商") + private String carInformationBatteryManufacturer; + /** + * 车辆电池型号 + */ + @Excel(name = "车辆电池型号") + private String carInformationBatteryModel; + /** + * 车辆电子围栏外键ID + */ + @Excel(name = "车辆电子围栏外键ID") + private Long carInformationFence; + /** + * 车辆类型外键ID + */ + @Excel(name = "车辆类型外键ID") + private Long carInformationType; + /** + * 是否重点车辆 (0否默认 1是 ) + */ + @Excel(name = "是否重点车辆 (0否默认 1是 )") + private Long carInformationFocus; + /** + * 车辆策略id + */ + @Excel(name = "车辆策略id") + private Long carStrategyId; + /** + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + */ + @Excel(name = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中)") + private Long carInformationState; + + +} 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 d246c83..fb37271 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 @@ -45,8 +45,6 @@ public class WarnStrategy extends BaseEntity{ @Excel(name = "报文模版id") private Long msgId; - - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 8e4d218..ee8f733 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 @@ -7,7 +7,6 @@ import com.muyu.domain.resp.MessageValueListResp; import java.util.List; - /** * 消息值服务接口 * * @ClassName MessageValueService diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java index 51d2f74..157e0b0 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java +++ b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java @@ -1,9 +1,5 @@ package com.muyu.service; -/** - - */ - /** * 中间表服务接口 * * @Author：yan diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnLogsMapper.xml b/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnLogsMapper.xml deleted file mode 100644 index ee1f8c8..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnLogsMapper.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - select id, vin, warn_rule_id, start_time, end_time, max_value, min_value, avg_value, median_value, status from warn_logs - - - - - - - - insert into warn_logs - - vin, - warn_rule_id, - start_time, - end_time, - max_value, - min_value, - avg_value, - median_value, - status, - create_by, - create_time, - - - #{vin}, - #{warnRuleId}, - #{startTime}, - #{endTime}, - #{maxValue}, - #{minValue}, - #{avgValue}, - #{medianValue}, - #{status}, - #{createBy}, - #{createTime}, - - - - - update warn_logs - - vin = #{vin}, - warn_rule_id = #{warnRuleId}, - start_time = #{startTime}, - end_time = #{endTime}, - max_value = #{maxValue}, - min_value = #{minValue}, - avg_value = #{avgValue}, - median_value = #{medianValue}, - status = #{status}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from warn_logs where id = #{id} - - - - delete from warn_logs where id in - - #{id} - - - diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnRuleMapper.xml b/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnRuleMapper.xml deleted file mode 100644 index b4af870..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnRuleMapper.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - select id, rule_name, strategy_id, msg_type_id, slide_time, slide_frequency, max_value, min_value from warn_rule - - - - - - - - insert into warn_rule - - rule_name, - strategy_id, - msg_type_id, - slide_time, - slide_frequency, - max_value, - min_value, - create_by, - create_time, - - - #{ruleName}, - #{strategyId}, - #{msgTypeId}, - #{slideTime}, - #{slideFrequency}, - #{maxValue}, - #{minValue}, - #{createBy}, - #{createTime}, - - - - - update warn_rule - - rule_name = #{ruleName}, - strategy_id = #{strategyId}, - msg_type_id = #{msgTypeId}, - slide_time = #{slideTime}, - slide_frequency = #{slideFrequency}, - max_value = #{maxValue}, - min_value = #{minValue}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from warn_rule where id = #{id} - - - - delete from warn_rule where id in - - #{id} - - - diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnStrategyMapper.xml b/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnStrategyMapper.xml deleted file mode 100644 index 556e161..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnStrategyMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - select id, sys_type_id, strategy_name, msg_id from warn_strategy - - - - - - - - insert into warn_strategy - - sys_type_id, - strategy_name, - msg_id, - create_by, - create_time, - - - #{sysTypeId}, - #{strategyName}, - #{msgId}, - #{createBy}, - #{createTime}, - - - - - update warn_strategy - - sys_type_id = #{sysTypeId}, - strategy_name = #{strategyName}, - msg_id = #{msgId}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from warn_strategy where id = #{id} - - - - delete from warn_strategy where id in - - #{id} - - -