From 81cc670158fceaef38be06d806f5430e42bac59b Mon Sep 17 00:00:00 2001
From: lisai <lisai17@sina.com>
Date: Sun, 24 Jul 2022 01:13:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=9B=BE=E7=89=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/whdc/zhdbaqapi/mapper/DeviceInfoMapper.java |  8 ++++++++
 .../service/impl/DeviceInfoServiceimpl.java         |  2 +-
 src/main/resources/mapper/DeviceInfoMapper.xml      | 13 +++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/whdc/zhdbaqapi/mapper/DeviceInfoMapper.java b/src/main/java/com/whdc/zhdbaqapi/mapper/DeviceInfoMapper.java
index c51efba..d162d81 100644
--- a/src/main/java/com/whdc/zhdbaqapi/mapper/DeviceInfoMapper.java
+++ b/src/main/java/com/whdc/zhdbaqapi/mapper/DeviceInfoMapper.java
@@ -15,6 +15,14 @@ import java.util.Set;
  * @date 2022-07-21 23:40
  */
 public interface DeviceInfoMapper extends BaseMapper<DeviceInfo> {
+
+    /**
+     * TODO: SKETCH_MAP 的数据类型是 text，不知道为啥非要 IFNULL(SKETCH_MAP, '') SKETCH_MAP 这样处理一下才能正常查询到结果
+     * @param id
+     * @return
+     */
+    DeviceInfo get(Integer id);
+
     /**
      * 返回查询
      *
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceInfoServiceimpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceInfoServiceimpl.java
index c7ad067..d962519 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceInfoServiceimpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceInfoServiceimpl.java
@@ -29,7 +29,7 @@ import java.util.*;
 public class DeviceInfoServiceimpl extends ServiceImpl<DeviceInfoMapper, DeviceInfo> implements IDeviceInfoService {
     @Override
     public DeviceInfo get(Integer id) {
-        return baseMapper.selectById(id);
+        return baseMapper.get(id);
     }
 
     @Override
diff --git a/src/main/resources/mapper/DeviceInfoMapper.xml b/src/main/resources/mapper/DeviceInfoMapper.xml
index b1df251..c44b98e 100644
--- a/src/main/resources/mapper/DeviceInfoMapper.xml
+++ b/src/main/resources/mapper/DeviceInfoMapper.xml
@@ -2,6 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.whdc.zhdbaqapi.mapper.DeviceInfoMapper">
 
+    <select id="get" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo">
+        SELECT
+        ID,STATION_CODE,DEVICE_ID,CHANNEL_NUM,TEMPERATURE_K,START_TEMPERATURE,CALIBRATION_COEFFICIENT,INITIAL_READING,
+        PROJECT_NAME,REMARK,SUPERVISOR,CREATION_TIME,MODIFICATION_TIME,DEL,IFNULL(SKETCH_MAP, '') SKETCH_MAP,CREATE_DATE,BURIED_PERSONNEL,
+        CHECK_PERSONNEL,TECHNICAL_DIRECTOR,TAILWATER_LEVEL,HEADWATER_LEVEL,WEATHER,AIR_PRESSURE,AIR_TEMPERATURE,
+        EMBEDDING_DATE,EMBEDDING_FINISH_READING,ZERO_PRESSURE_READINGS,END_READINGS,START_READINGS,DRAFT,READINGS,
+        DAM_WHEELBASE,COLUMN_NO,EMBEDDING_ELEVATION,CABLE_LENGTH_MARK,CABLE_LENGTH,RESISTANCE,RANGE,SENSOR_COEFFICIENT,
+        MANUFACTURER,MEASURING_PROBE_NO,STEADY_WATER_LEVEL,INITIAL_WATER_LEVEL,DRILLING_SIZE,DRILLING_NO,PRESSURE,
+        RECENT_DATA,LATEST_REPORTING_TIME,CROSS_SECTION,DAM,MOUNTING_HEIGHT,
+        INSTALLATION_POSITION_Z,INSTALLATION_POSITION_Y,INSTALLATION_POSITION_X
+        FROM DEVICE_INFO WHERE ID=#{id}
+    </select>
+
     <select id="list" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo">
         SELECT ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM FROM DEVICE_INFO
         WHERE DEL = 0