From c5b4edd0d62102bee0e203169f99976a6bab4ad0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:34:37 +0800
Subject: [PATCH] fix: 位置信息提交
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 1 +
screen-api/src/main/java/com/moral/api/entity/Device.java | 5 ++++-
screen-api/src/main/resources/mapper/DeviceMapper.xml | 1 +
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/Device.java b/screen-api/src/main/java/com/moral/api/entity/Device.java
index 401ade5..12992b6 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Device.java
@@ -146,7 +146,10 @@
@TableField(exist = false)
private Version version;
-
+ /*
+ * ������
+ * */
+ private Integer devNum;
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 0707182..0a57a88 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -62,6 +62,7 @@
QueryWrapper<Device> wrapper = new QueryWrapper();
wrapper.eq("monitor_point_id", monitorPointId);
wrapper.eq("is_delete", Constants.NOT_DELETE);
+ wrapper.orderByAsc("dev_num");
return deviceMapper.selectList(wrapper);
}
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 9108824..04fd460 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -26,6 +26,7 @@
<result column="is_delete" property="isDelete"/>
<result column="extend" property="extend"/>
<result column="town_code" property="townCode"/>
+ <result column="dev_num" property="devNum"/>
</resultMap>
<!--���������������������������-->
--
Gitblit v1.8.0