From d693e5f74f564e138504fb910c52c9ae96b7b7be Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 22 九月 2022 13:51:52 +0800
Subject: [PATCH] changes
---
dao/src/main/java/com/sandu/ximon/dao/domain/LightTaskPoleRelation.java | 31 +++++++++++++++++++++++++------
dao/src/main/resources/mapper/LightTaskPoleRelationMapper.xml | 5 ++++-
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightTaskPoleRelation.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LightTaskPoleRelation.java
index e0b21a1..58fcb5b 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightTaskPoleRelation.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LightTaskPoleRelation.java
@@ -1,22 +1,23 @@
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 com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
-import lombok.Data;
/**
* 璺伅浠诲姟鍜岀伅鏉嗗叧绯昏〃
+ *
* @TableName light_task_pole_relation
*/
-@TableName(value ="light_task_pole_relation")
+@TableName(value = "light_task_pole_relation")
@Data
public class LightTaskPoleRelation implements Serializable {
/**
- *
+ *
*/
// @TableId(type = IdType.AUTO)
private Long id;
@@ -41,13 +42,31 @@
*/
private Integer issueStatus;
+
+ /**
+ * mac
+ */
+ @JsonIgnore
+ private String deviceCode;
+
+
+ /**
+ * 绯荤粺瀹氭椂
+ */
+ private String sysScheduled;
+
+ /**
+ * 纭欢瀹氭椂
+ */
+ private String deviceScheduled;
+
/**
* 鍒涘缓鏃堕棿
*/
private LocalDateTime createTime;
/**
- *
+ * 鏇存柊鏃堕棿
*/
private LocalDateTime updateTime;
diff --git a/dao/src/main/resources/mapper/LightTaskPoleRelationMapper.xml b/dao/src/main/resources/mapper/LightTaskPoleRelationMapper.xml
index 274af50..5785954 100644
--- a/dao/src/main/resources/mapper/LightTaskPoleRelationMapper.xml
+++ b/dao/src/main/resources/mapper/LightTaskPoleRelationMapper.xml
@@ -9,6 +9,9 @@
<result property="taskId" column="task_id" jdbcType="BIGINT"/>
<result property="poleId" column="pole_id" jdbcType="BIGINT"/>
<result property="lightAddress" column="light_address" jdbcType="VARCHAR"/>
+ <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
+ <result property="sysScheduled" column="sys_scheduled" jdbcType="VARCHAR"/>
+ <result property="deviceScheduled" column="device_scheduled" jdbcType="VARCHAR"/>
<result property="issueStatus" column="issue_status" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
@@ -27,7 +30,7 @@
light_task_pole_relation t1
LEFT JOIN pole t2 ON t1.pole_id = t2.id
<where>
- t1.task_id = #{taskId}
+ t1.task_id = #{taskId}
</where>
GROUP BY t2.id
</select>
--
Gitblit v1.9.3