wuzudaniu
/
cloud-plus-server
6
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

fix():CarInformation添加实体类 修改其他类的注解

YangPeng 2024-09-30 12:48:15 +08:00
parent 7ae5082c3d
commit aa39403714
8 changed files with 117 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java
View File

@ -1,5 +1,7 @@
package com.muyu.domain; package com.muyu.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
@ -29,6 +31,7 @@ import java.util.Date;
@Tag(name = "bioa") @Tag(name = "bioa")
@TableName(value = "car_fault_message",autoResultMap = true) @TableName(value = "car_fault_message",autoResultMap = true)
public class CarFaultMessage { public class CarFaultMessage {
@TableId(value = "id",type = IdType.AUTO)
private Integer id; private Integer id;
private String sender; private String sender;
private String receiver; private String receiver;

114
cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java 100644
View File

@ -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;
}

2
cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java
View File

@ -45,8 +45,6 @@ public class WarnStrategy extends BaseEntity{
@Excel(name = "报文模版id") @Excel(name = "报文模版id")
private Long msgId; private Long msgId;
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

1
cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java
View File

@ -7,7 +7,6 @@ import com.muyu.domain.resp.MessageValueListResp;
import java.util.List; import java.util.List;
/** /**
* 消息值服务接口 * 消息值服务接口
* * @ClassName MessageValueService * * @ClassName MessageValueService

4
cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java
View File

@ -1,9 +1,5 @@
package com.muyu.service; package com.muyu.service;
/**
*/
/** /**
* 中间表服务接口 * 中间表服务接口
* * @Author：yan * * @Author：yan

102
cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnLogsMapper.xml
View File

@ -1,102 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.mapper.WarnLogsMapper">
<resultMap type="com.muyu.domain.WarnLogs" id="WarnLogsResult">
<result property="id" column="id" />
<result property="vin" column="vin" />
<result property="warnRuleId" column="warn_rule_id" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="maxValue" column="max_value" />
<result property="minValue" column="min_value" />
<result property="avgValue" column="avg_value" />
<result property="medianValue" column="median_value" />
<result property="status" column="status" />
</resultMap>
<sql id="selectWarnLogsVo">
select id, vin, warn_rule_id, start_time, end_time, max_value, min_value, avg_value, median_value, status from warn_logs
</sql>
<select id="selectWarnLogsList" parameterType="com.muyu.domain.WarnLogs" resultMap="WarnLogsResult">
<include refid="selectWarnLogsVo"/>
<where>
<if test="vin != null and vin != ''"> and vin = #{vin}</if>
<if test="warnRuleId != null "> and warn_rule_id = #{warnRuleId}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="maxValue != null "> and max_value = #{maxValue}</if>
<if test="minValue != null "> and min_value = #{minValue}</if>
<if test="avgValue != null "> and avg_value = #{avgValue}</if>
<if test="medianValue != null "> and median_value = #{medianValue}</if>
<if test="status != null "> and status = #{status}</if>
</where>
</select>
<select id="selectWarnLogsById" parameterType="Long" resultMap="WarnLogsResult">
<include refid="selectWarnLogsVo"/>
where id = #{id}
</select>
<insert id="insertWarnLogs" parameterType="com.muyu.domain.WarnLogs" useGeneratedKeys="true" keyProperty="id">
insert into warn_logs
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="vin != null">vin,</if>
<if test="warnRuleId != null">warn_rule_id,</if>
<if test="startTime != null">start_time,</if>
<if test="endTime != null">end_time,</if>
<if test="maxValue != null">max_value,</if>
<if test="minValue != null">min_value,</if>
<if test="avgValue != null">avg_value,</if>
<if test="medianValue != null">median_value,</if>
<if test="status != null">status,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime ！= null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="vin != null">#{vin},</if>
<if test="warnRuleId != null">#{warnRuleId},</if>
<if test="startTime != null">#{startTime},</if>
<if test="endTime != null">#{endTime},</if>
<if test="maxValue != null">#{maxValue},</if>
<if test="minValue != null">#{minValue},</if>
<if test="avgValue != null">#{avgValue},</if>
<if test="medianValue != null">#{medianValue},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateWarnLogs" parameterType="com.muyu.domain.WarnLogs">
update warn_logs
<trim prefix="SET" suffixOverrides=",">
<if test="vin != null">vin = #{vin},</if>
<if test="warnRuleId != null">warn_rule_id = #{warnRuleId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="maxValue != null">max_value = #{maxValue},</if>
<if test="minValue != null">min_value = #{minValue},</if>
<if test="avgValue != null">avg_value = #{avgValue},</if>
<if test="medianValue != null">median_value = #{medianValue},</if>
<if test="status != null">status = #{status},</if>
<if test="updateBy !=null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteWarnLogsById" parameterType="Long">
delete from warn_logs where id = #{id}
</delete>
<delete id="deleteWarnLogsByIds" parameterType="String">
delete from warn_logs where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

92
cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnRuleMapper.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.mapper.WarnRuleMapper">
<resultMap type="com.muyu.domain.WarnRule" id="WarnRuleResult">
<result property="id" column="id" />
<result property="ruleName" column="rule_name" />
<result property="strategyId" column="strategy_id" />
<result property="msgTypeId" column="msg_type_id" />
<result property="slideTime" column="slide_time" />
<result property="slideFrequency" column="slide_frequency" />
<result property="slideMaxValue" column="slide_max_value" />
<result property="slideMinValue" column="slide_min_value" />
</resultMap>
<sql id="selectWarnRuleVo">
select id, rule_name, strategy_id, msg_type_id, slide_time, slide_frequency, max_value, min_value from warn_rule
</sql>
<select id="selectWarnRuleList" parameterType="com.muyu.domain.WarnRule" resultMap="WarnRuleResult">
<include refid="selectWarnRuleVo"/>
<where>
<if test="ruleName != null and ruleName != ''"> and rule_name like concat('%', #{ruleName}, '%')</if>
<if test="strategyId != null "> and strategy_id = #{strategyId}</if>
<if test="msgTypeId != null "> and msg_type_id = #{msgTypeId}</if>
<if test="slideTime != null "> and slide_time = #{slideTime}</if>
<if test="slideFrequency != null "> and slide_frequency = #{slideFrequency}</if>
<if test="maxValue != null "> and max_value = #{maxValue}</if>
<if test="minValue != null "> and min_value = #{minValue}</if>
</where>
</select>
<select id="selectWarnRuleById" parameterType="Long" resultMap="WarnRuleResult">
<include refid="selectWarnRuleVo"/>
where id = #{id}
</select>
<insert id="insertWarnRule" parameterType="com.muyu.domain.WarnRule" useGeneratedKeys="true" keyProperty="id">
insert into warn_rule
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ruleName != null">rule_name,</if>
<if test="strategyId != null">strategy_id,</if>
<if test="msgTypeId != null">msg_type_id,</if>
<if test="slideTime != null">slide_time,</if>
<if test="slideFrequency != null">slide_frequency,</if>
<if test="maxValue != null">max_value,</if>
<if test="minValue != null">min_value,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime ！= null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ruleName != null">#{ruleName},</if>
<if test="strategyId != null">#{strategyId},</if>
<if test="msgTypeId != null">#{msgTypeId},</if>
<if test="slideTime != null">#{slideTime},</if>
<if test="slideFrequency != null">#{slideFrequency},</if>
<if test="maxValue != null">#{maxValue},</if>
<if test="minValue != null">#{minValue},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateWarnRule" parameterType="com.muyu.domain.WarnRule">
update warn_rule
<trim prefix="SET" suffixOverrides=",">
<if test="ruleName != null">rule_name = #{ruleName},</if>
<if test="strategyId != null">strategy_id = #{strategyId},</if>
<if test="msgTypeId != null">msg_type_id = #{msgTypeId},</if>
<if test="slideTime != null">slide_time = #{slideTime},</if>
<if test="slideFrequency != null">slide_frequency = #{slideFrequency},</if>
<if test="maxValue != null">max_value = #{maxValue},</if>
<if test="minValue != null">min_value = #{minValue},</if>
<if test="updateBy !=null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteWarnRuleById" parameterType="Long">
delete from warn_rule where id = #{id}
</delete>
<delete id="deleteWarnRuleByIds" parameterType="String">
delete from warn_rule where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

72
cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnStrategyMapper.xml
View File

@ -1,72 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.mapper.WarnStrategyMapper">
<resultMap type="com.muyu.domain.WarnStrategy" id="WarnStrategyResult">
<result property="id" column="id" />
<result property="sysTypeId" column="sys_type_id" />
<result property="strategyName" column="strategy_name" />
<result property="msgId" column="msg_id" />
</resultMap>
<sql id="selectWarnStrategyVo">
select id, sys_type_id, strategy_name, msg_id from warn_strategy
</sql>
<select id="selectWarnStrategyList" parameterType="com.muyu.domain.WarnStrategy" resultMap="WarnStrategyResult">
<include refid="selectWarnStrategyVo"/>
<where>
<if test="sysTypeId != null "> and sys_type_id = #{sysTypeId}</if>
<if test="strategyName != null and strategyName != ''"> and strategy_name like concat('%', #{strategyName}, '%')</if>
<if test="msgId != null "> and msg_id = #{msgId}</if>
</where>
</select>
<select id="selectWarnStrategyById" parameterType="Long" resultMap="WarnStrategyResult">
<include refid="selectWarnStrategyVo"/>
where id = #{id}
</select>
<insert id="insertWarnStrategy" parameterType="com.muyu.domain.WarnStrategy" useGeneratedKeys="true" keyProperty="id">
insert into warn_strategy
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sysTypeId != null">sys_type_id,</if>
<if test="strategyName != null">strategy_name,</if>
<if test="msgId != null">msg_id,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime ！= null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sysTypeId != null">#{sysTypeId},</if>
<if test="strategyName != null">#{strategyName},</if>
<if test="msgId != null">#{msgId},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateWarnStrategy" parameterType="com.muyu.domain.WarnStrategy">
update warn_strategy
<trim prefix="SET" suffixOverrides=",">
<if test="sysTypeId != null">sys_type_id = #{sysTypeId},</if>
<if test="strategyName != null">strategy_name = #{strategyName},</if>
<if test="msgId != null">msg_id = #{msgId},</if>
<if test="updateBy !=null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteWarnStrategyById" parameterType="Long">
delete from warn_strategy where id = #{id}
</delete>
<delete id="deleteWarnStrategyByIds" parameterType="String">
delete from warn_strategy where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>