From ffeda063c2db126db08a03c275decaeff167c801 Mon Sep 17 00:00:00 2001
From: Timer <@>
Date: Mon, 23 Mar 2026 22:28:19 +0800
Subject: [PATCH] selectByMPointID/Code

---
 .../java/com/sipai/dao/scada/MPointDao.java     |  8 ++++++++
 .../service/mqtt/impl/MqttServiceImpl.java      |  4 ++--
 .../com/sipai/service/scada/MPointService.java  | 14 ++++++++++++++
 .../service/scada/impl/MPointServiceImpl.java   | 12 ++++++++++++
 .../mybatis/mapper/scada/MPointMapper.xml       | 17 +++++++++++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sipai/dao/scada/MPointDao.java b/src/main/java/com/sipai/dao/scada/MPointDao.java
index 480dd69..ad1d1cc 100644
--- a/src/main/java/com/sipai/dao/scada/MPointDao.java
+++ b/src/main/java/com/sipai/dao/scada/MPointDao.java
@@ -16,4 +16,12 @@ public class MPointDao extends CommDaoImpl<MPoint> {
 	public int updateValueByKey(MPoint t) {
 		return getSqlSession().update("scada.MPointMapper."+Thread.currentThread().getStackTrace()[1].getMethodName(), t);
 	}
+
+	public MPoint selectByMPointID(String mpointid) {
+		return getSqlSession().selectOne("scada.MPointMapper."+Thread.currentThread().getStackTrace()[1].getMethodName(), mpointid);
+	}
+
+	public MPoint selectByMPointCode(String mpointcode) {
+		return getSqlSession().selectOne("scada.MPointMapper."+Thread.currentThread().getStackTrace()[1].getMethodName(), mpointcode);
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/sipai/service/mqtt/impl/MqttServiceImpl.java b/src/main/java/com/sipai/service/mqtt/impl/MqttServiceImpl.java
index 3ea2345..c8edece 100644
--- a/src/main/java/com/sipai/service/mqtt/impl/MqttServiceImpl.java
+++ b/src/main/java/com/sipai/service/mqtt/impl/MqttServiceImpl.java
@@ -581,8 +581,8 @@ public class MqttServiceImpl implements MqttService {
             loggger.debug("已标记未找到，跳过ES查询: key={}", key);
             return null;
         }
-        // 从ES查询
-        MPoint mPoint = mPointService.selectById(unitId, key);
+        // 查询 MPointID
+        MPoint mPoint = mPointService.selectByMPointID(key);
         if (mPoint != null) {
             //添加缓存
             mPointCache.put(key, mPoint);
diff --git a/src/main/java/com/sipai/service/scada/MPointService.java b/src/main/java/com/sipai/service/scada/MPointService.java
index 14c2341..1ff4b17 100644
--- a/src/main/java/com/sipai/service/scada/MPointService.java
+++ b/src/main/java/com/sipai/service/scada/MPointService.java
@@ -19,6 +19,20 @@ import java.util.Map;
 public interface MPointService {
     MPoint selectById(String unitId,String id);
 
+    /**
+     * 根据MPointID查询测点
+     * @param mpointid 测点ID
+     * @return MPoint
+     */
+    MPoint selectByMPointID(String mpointid);
+
+    /**
+     * 根据MPointCode查询测点
+     * @param mpointcode 测点编码
+     * @return MPoint
+     */
+    MPoint selectByMPointCode(String mpointcode);
+
     MPoint selectById4Es(String id);
 
     List<MPoint> selectListByWhere(String wherestr);
diff --git a/src/main/java/com/sipai/service/scada/impl/MPointServiceImpl.java b/src/main/java/com/sipai/service/scada/impl/MPointServiceImpl.java
index b8aab4f..bb3f2d6 100644
--- a/src/main/java/com/sipai/service/scada/impl/MPointServiceImpl.java
+++ b/src/main/java/com/sipai/service/scada/impl/MPointServiceImpl.java
@@ -87,6 +87,18 @@ public class MPointServiceImpl implements MPointService {
         return mPointDao.selectByPrimaryKey(id);
     }
 
+    @DataSourceTypeAnno(DataSourceEnum.SCADA_JSWS)
+    @Override
+    public MPoint selectByMPointID(String mpointid) {
+        return mPointDao.selectByMPointID(mpointid);
+    }
+
+    @DataSourceTypeAnno(DataSourceEnum.SCADA_JSWS)
+    @Override
+    public MPoint selectByMPointCode(String mpointcode) {
+        return mPointDao.selectByMPointCode(mpointcode);
+    }
+
     /**
      * es查询
      *
diff --git a/src/main/resources/mybatis/mapper/scada/MPointMapper.xml b/src/main/resources/mybatis/mapper/scada/MPointMapper.xml
index 2b7a414..e439531 100644
--- a/src/main/resources/mybatis/mapper/scada/MPointMapper.xml
+++ b/src/main/resources/mybatis/mapper/scada/MPointMapper.xml
@@ -77,6 +77,23 @@
     from TB_MeasurePoint
     where ID = #{id,jdbcType=VARCHAR}
   </select>
+
+  <select id="selectByMPointCode" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from TB_MeasurePoint
+    where MPointCode = #{id,jdbcType=VARCHAR}
+    limit 1
+  </select>
+
+  <select id="selectByMPointID" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from TB_MeasurePoint
+    where MPointID = #{id,jdbcType=VARCHAR}
+    limit 1
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from TB_MeasurePoint
     where ID = #{id,jdbcType=VARCHAR}