From c6dc1f36df069c97fd5f8187a26cc592b496bab5 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 10 十二月 2021 15:58:39 +0800
Subject: [PATCH] fix
---
dao/src/main/resources/mapper/AirEquipmentMapper.xml | 19 ++++++---
dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java | 15 ++++---
dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java | 49 ++++++++++++++++++++----
3 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
index 70d6e38..4b5fcaf 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
@@ -1,23 +1,56 @@
package com.sandu.ximon.dao.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import lombok.Data;
+/**
+ * 澶ф皵璁惧
+ * @TableName air_equipment
+ */
+@TableName(value ="air_equipment")
@Data
public class AirEquipment implements Serializable {
+ /**
+ *
+ */
@TableId(type = IdType.AUTO)
private Long id;
- //鎵�灞炵伅鏉�
+ /**
+ * 鎵�灞炵伅鏉�
+ */
private String belongTo;
- //澶ф皵璁惧鐘舵��:鍦ㄧ嚎:1/绂荤嚎:0
- private int equipmentState;
- //鎺ュ叆鏃堕棿
+
+ /**
+ * 澶ф皵璁惧鐘舵��:鍦ㄧ嚎:1/绂荤嚎:0
+ */
+ private Integer equipmentState;
+
+ /**
+ * 鎺ュ叆鏃堕棿
+ */
private LocalDateTime createTime;
- //鎵�灞炰汉
+
+ /**
+ * 鎵�灞炰汉
+ */
private Long userId;
-}
+
+ /**
+ * 鐏潌ID
+ */
+ private String lightPoleId;
+
+ /**
+ * MAC鍦板潃
+ */
+ private String mac;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
index c1bc7f2..237fa37 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirEquipmentMapper.java
@@ -1,12 +1,15 @@
package com.sandu.ximon.dao.mapper;
-import com.sandu.common.domain.BaseMapper;
-import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.AirEquipment;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import java.util.List;
-
-@Mapper
+/**
+ * @Entity com.sandu.ximon.dao.domain.AirEquipment
+ */
public interface AirEquipmentMapper extends BaseMapper<AirEquipment> {
+
}
+
+
+
+
diff --git a/dao/src/main/resources/mapper/AirEquipmentMapper.xml b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
index 3d5c182..f6f0f9a 100644
--- a/dao/src/main/resources/mapper/AirEquipmentMapper.xml
+++ b/dao/src/main/resources/mapper/AirEquipmentMapper.xml
@@ -5,11 +5,18 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirEquipmentMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirEquipment">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
- <result property="equipmentState" column="equipment_state" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="userId" column="user_id" jdbcType="BIGINT"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="belongTo" column="belong_to" jdbcType="VARCHAR"/>
+ <result property="equipmentState" column="equipment_state" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="userId" column="user_id" jdbcType="BIGINT"/>
+ <result property="lightPoleId" column="light_pole_id" jdbcType="VARCHAR"/>
+ <result property="mac" column="mac" jdbcType="VARCHAR"/>
</resultMap>
-</mapper>
\ No newline at end of file
+ <sql id="Base_Column_List">
+ id,belong_to,equipment_state,
+ create_time,user_id,light_pole_id,
+ mac
+ </sql>
+</mapper>
--
Gitblit v1.9.3