diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
index 0d72544..b1f62b6 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.dto.device.DeviceCtnbDTO;
 import com.casic.missiles.frame.base.BirmmBaseFrame;
@@ -48,6 +49,13 @@
         byte[] frameBytes = getFrameStringFromData(dataMap);
         log.info("上行HEX字节消息帧：{}", HexUtils.toHexString(frameBytes).toUpperCase());
 
+        // 从AEP平台推送的消息中获取deviceId和productId
+        String deviceId = StrUtil.toString(dataMap.get("deviceId"));
+        String productId = StrUtil.toString(dataMap.get("productId"));
+
+        // TODO-LIST
+        // AEP平台的产品MasterApiKey从产品信息中获取
+
         // 工厂类创建frame对象
         BirmmBaseFrame birmmFrame = defaultService.doFrameParse(frameBytes);
         if (birmmFrame != null) {
@@ -80,7 +88,7 @@
 
                 DeviceCtnbDTO device = deviceService.getCtnbViewByDevCode(birmmFrame.getDevCode());
                 if (ObjectUtil.isNotEmpty(device)) {
-                    AepCommandSend aepCommandSend = new AepCommandSend(device.getCtnbDeviceId(), device.getCtnbProductId(), device.getCtnbMasterKey());
+                    AepCommandSend aepCommandSend = new AepCommandSend(deviceId, productId, device.getCtnbMasterKey());
 
                     try {
                         retCode = aepCommandSend.handleAndReply(replyMessage, hasProfile);

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
index 0d72544..b1f62b6 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.dto.device.DeviceCtnbDTO;
 import com.casic.missiles.frame.base.BirmmBaseFrame;
@@ -48,6 +49,13 @@
         byte[] frameBytes = getFrameStringFromData(dataMap);
         log.info("上行HEX字节消息帧：{}", HexUtils.toHexString(frameBytes).toUpperCase());
 
+        // 从AEP平台推送的消息中获取deviceId和productId
+        String deviceId = StrUtil.toString(dataMap.get("deviceId"));
+        String productId = StrUtil.toString(dataMap.get("productId"));
+
+        // TODO-LIST
+        // AEP平台的产品MasterApiKey从产品信息中获取
+
         // 工厂类创建frame对象
         BirmmBaseFrame birmmFrame = defaultService.doFrameParse(frameBytes);
         if (birmmFrame != null) {
@@ -80,7 +88,7 @@
 
                 DeviceCtnbDTO device = deviceService.getCtnbViewByDevCode(birmmFrame.getDevCode());
                 if (ObjectUtil.isNotEmpty(device)) {
-                    AepCommandSend aepCommandSend = new AepCommandSend(device.getCtnbDeviceId(), device.getCtnbProductId(), device.getCtnbMasterKey());
+                    AepCommandSend aepCommandSend = new AepCommandSend(deviceId, productId, device.getCtnbMasterKey());
 
                     try {
                         retCode = aepCommandSend.handleAndReply(replyMessage, hasProfile);
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
index 11b5a01..ff34926 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.casic.missiles.enums.BirmmDeviceTypeEnums;
 import com.casic.missiles.enums.BirmmFrameAttributeEnums;
@@ -97,18 +98,8 @@
 
             log.debug("上行帧结构字段解析结果：[长度:{}],[设备编号:{}],[通信方式:{}],[目标节点地址:{}],[PDUType:{}],[序号:{}]", length, devCode, commType, destAddr, pduType, seq);
 
-            // 解密
-            // TODO-LIST
-            // 密钥根据设备编号获取
-            SafeStrategy safeStrategy;
-            if (deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-                safeStrategy = SpringContextUtil.getBean(Sm4.class);
-            } else {
-                safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-            }
-
+            // 获取加解密方式并解密
+            SafeStrategy safeStrategy = getDeviceEncipherType(devCode);
             byte[] plainBytes = safeStrategy.decryption(tagListStr);
             String plainTagListStr = HexUtils.toHexString(plainBytes).toUpperCase();
 
@@ -417,18 +408,8 @@
         frame.append(baseReply.getPduType());
         frame.append(baseReply.getSequence());
 
-        // 加密
-        // TODO-LIST
-        // 密钥根据设备编号获取
-        SafeStrategy safeStrategy;
-        if (baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-            safeStrategy = SpringContextUtil.getBean(Sm4.class);
-        } else {
-            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-        }
-
+        // 获取加解密方式并对消息进行加密
+        SafeStrategy safeStrategy = getDeviceEncipherType(baseReply.getDevCode());
         byte[] tagBytes = safeStrategy.encryption(plainTagListStr);
         frame.append(HexUtils.toHexString(tagBytes).toUpperCase());
 
@@ -616,4 +597,35 @@
         latestConfig.setStatus(3); // 配置中
         configService.updateById(latestConfig);
     }
+
+    private SafeStrategy getDeviceEncipherType(String deviceCode) {
+        // 获取加解密方式
+        String encipherType = deviceService.getDeviceEncipherTypeByDeviceCode(deviceCode);
+        if (StrUtil.isEmpty(encipherType)) {
+            switch (BirmmDeviceTypeEnums.toType(deviceCode.substring(0, 2))) {
+                case METHANE:
+                case INTG_METHANE:
+                case SENTINEL:
+                case WELL:
+                    encipherType = "3";
+                    break;
+
+                default:
+                    encipherType = "2";
+                    break;
+            }
+
+            log.debug("根据设备编号[{}]没有找到加密方式，通过设备类型获取默认加密方式为：{}", deviceCode, encipherType);
+        }
+
+        // 加密
+        SafeStrategy safeStrategy;
+        if (encipherType.equalsIgnoreCase("3")) {
+            safeStrategy = SpringContextUtil.getBean(Sm4.class);
+        } else {
+            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
+        }
+
+        return safeStrategy;
+    }
 }

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
index 0d72544..b1f62b6 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.dto.device.DeviceCtnbDTO;
 import com.casic.missiles.frame.base.BirmmBaseFrame;
@@ -48,6 +49,13 @@
         byte[] frameBytes = getFrameStringFromData(dataMap);
         log.info("上行HEX字节消息帧：{}", HexUtils.toHexString(frameBytes).toUpperCase());
 
+        // 从AEP平台推送的消息中获取deviceId和productId
+        String deviceId = StrUtil.toString(dataMap.get("deviceId"));
+        String productId = StrUtil.toString(dataMap.get("productId"));
+
+        // TODO-LIST
+        // AEP平台的产品MasterApiKey从产品信息中获取
+
         // 工厂类创建frame对象
         BirmmBaseFrame birmmFrame = defaultService.doFrameParse(frameBytes);
         if (birmmFrame != null) {
@@ -80,7 +88,7 @@
 
                 DeviceCtnbDTO device = deviceService.getCtnbViewByDevCode(birmmFrame.getDevCode());
                 if (ObjectUtil.isNotEmpty(device)) {
-                    AepCommandSend aepCommandSend = new AepCommandSend(device.getCtnbDeviceId(), device.getCtnbProductId(), device.getCtnbMasterKey());
+                    AepCommandSend aepCommandSend = new AepCommandSend(deviceId, productId, device.getCtnbMasterKey());
 
                     try {
                         retCode = aepCommandSend.handleAndReply(replyMessage, hasProfile);
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
index 11b5a01..ff34926 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.casic.missiles.enums.BirmmDeviceTypeEnums;
 import com.casic.missiles.enums.BirmmFrameAttributeEnums;
@@ -97,18 +98,8 @@
 
             log.debug("上行帧结构字段解析结果：[长度:{}],[设备编号:{}],[通信方式:{}],[目标节点地址:{}],[PDUType:{}],[序号:{}]", length, devCode, commType, destAddr, pduType, seq);
 
-            // 解密
-            // TODO-LIST
-            // 密钥根据设备编号获取
-            SafeStrategy safeStrategy;
-            if (deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-                safeStrategy = SpringContextUtil.getBean(Sm4.class);
-            } else {
-                safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-            }
-
+            // 获取加解密方式并解密
+            SafeStrategy safeStrategy = getDeviceEncipherType(devCode);
             byte[] plainBytes = safeStrategy.decryption(tagListStr);
             String plainTagListStr = HexUtils.toHexString(plainBytes).toUpperCase();
 
@@ -417,18 +408,8 @@
         frame.append(baseReply.getPduType());
         frame.append(baseReply.getSequence());
 
-        // 加密
-        // TODO-LIST
-        // 密钥根据设备编号获取
-        SafeStrategy safeStrategy;
-        if (baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-            safeStrategy = SpringContextUtil.getBean(Sm4.class);
-        } else {
-            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-        }
-
+        // 获取加解密方式并对消息进行加密
+        SafeStrategy safeStrategy = getDeviceEncipherType(baseReply.getDevCode());
         byte[] tagBytes = safeStrategy.encryption(plainTagListStr);
         frame.append(HexUtils.toHexString(tagBytes).toUpperCase());
 
@@ -616,4 +597,35 @@
         latestConfig.setStatus(3); // 配置中
         configService.updateById(latestConfig);
     }
+
+    private SafeStrategy getDeviceEncipherType(String deviceCode) {
+        // 获取加解密方式
+        String encipherType = deviceService.getDeviceEncipherTypeByDeviceCode(deviceCode);
+        if (StrUtil.isEmpty(encipherType)) {
+            switch (BirmmDeviceTypeEnums.toType(deviceCode.substring(0, 2))) {
+                case METHANE:
+                case INTG_METHANE:
+                case SENTINEL:
+                case WELL:
+                    encipherType = "3";
+                    break;
+
+                default:
+                    encipherType = "2";
+                    break;
+            }
+
+            log.debug("根据设备编号[{}]没有找到加密方式，通过设备类型获取默认加密方式为：{}", deviceCode, encipherType);
+        }
+
+        // 加密
+        SafeStrategy safeStrategy;
+        if (encipherType.equalsIgnoreCase("3")) {
+            safeStrategy = SpringContextUtil.getBean(Sm4.class);
+        } else {
+            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
+        }
+
+        return safeStrategy;
+    }
 }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
new file mode 100644
index 0000000..7ec9224
--- /dev/null
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
@@ -0,0 +1,198 @@
+package com.casic.missiles.frame.methane;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.enums.BirmmDataBizTypeEnums;
+import com.casic.missiles.enums.BirmmTagTypeEnums;
+import com.casic.missiles.frame.base.BirmmBaseFrame;
+import com.casic.missiles.frame.base.BirmmBaseTag;
+import com.casic.missiles.frame.tag.biz.CellTag;
+import com.casic.missiles.frame.tag.biz.DateTag;
+import com.casic.missiles.frame.tag.biz.SensorStateTag;
+import com.casic.missiles.frame.tag.biz.UploadTag;
+import com.casic.missiles.frame.tag.signal.PCITag;
+import com.casic.missiles.frame.tag.signal.RSRPTag;
+import com.casic.missiles.frame.tag.signal.SNRTag;
+import com.casic.missiles.util.BytesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component("LGTrapRequest")
+@Scope("prototype")
+@Slf4j
+public class LGTrapRequestFrame extends BirmmBaseFrame {
+
+    List<MethaneBizData> bizDataList;
+    final String MESSAGE_TYPE = "Data";
+    final String DEV_TYPE = "LG";
+    final String BIZ_TYPE = DEV_TYPE + MESSAGE_TYPE;
+
+    @Override
+    public JSONObject toJSON() {
+        JSONObject json = super.toJSON();
+        json.put("devType", DEV_TYPE);
+        json.put("mType", MESSAGE_TYPE);
+
+        JSONObject body = new JSONObject();
+        body.put("bType", BIZ_TYPE);
+        body.put("logtime", getLogTime().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+        if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+            CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+            body.put("cell", cellTag.getCellVal());
+        }
+        if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+            PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+            body.put("pci", pciTag.getPci());
+        }
+        if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+            RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+            body.put("rsrp", rsrpTag.getRsrp());
+        }
+        if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+            SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+            body.put("snr", snrTag.getSnr());
+        }
+
+        // 业务数据
+        if (bizDataList != null) {
+            JSONArray datas = new JSONArray();
+            for (MethaneBizData bizData : bizDataList) {
+                datas.add(bizData.toJSON());
+            }
+            body.put("datas", datas);
+        }
+
+        json.put("mBody", body);
+
+        return json;
+    }
+
+    @Override
+    public boolean needPushToApplication() {
+        return true;
+    }
+
+    @Override
+    public List<Map<String, Object>> convertToBizDataList() {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (bizDataList != null) {
+            for (MethaneBizData data : bizDataList) {
+                Map<String, Object> bizData = new HashMap<>();
+                bizData.put("bizType", String.valueOf(data.getBizType()));
+                bizData.put("value", String.format("%.3f", data.getValue()));
+                bizData.put("uptime", data.getUptime());
+
+                // 电量
+                if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+                    CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+                    bizData.put("cell", cellTag.getCellVal());
+                }
+
+                // 信号质量
+                if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+                    PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+                    bizData.put("pci", pciTag.getPci());
+                }
+                if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+                    RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+                    bizData.put("rsrp", rsrpTag.getRsrp());
+                }
+                if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+                    SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+                    bizData.put("snr", snrTag.getSnr());
+                }
+
+                resultList.add(bizData);
+            }
+        }
+
+        return resultList;
+    }
+
+    @Override
+    public void doParseBizTag() {
+        if (getTagList().containsKey(UploadTag.class.getSimpleName())) {
+            handleUploadTag();
+        }
+
+        if (getTagList().containsKey(SensorStateTag.class.getSimpleName())) {
+            handleSensorStateTag();
+        }
+    }
+
+    private void handleUploadTag() {
+        List<BirmmBaseTag> tags = getTagList().get(UploadTag.class.getSimpleName());
+
+        bizDataList = new ArrayList<>();
+
+        for (BirmmBaseTag tag : tags) {
+            UploadTag uploadTag = (UploadTag) tag;
+            // 检查oid是否符合要求 能取到bizType 采集周期 采集开始时间
+            boolean isValid = uploadTag.checkOid();
+            if (isValid) {
+                // 找到DateTag 取出其中的日期
+                if ( !getTagList().containsKey(DateTag.class.getSimpleName()) ) {
+                    continue;
+                }
+                DateTag dateTag = (DateTag) getTagList().get(DateTag.class.getSimpleName()).get(0);
+                uploadTag.setStartDate(dateTag.getDate());
+
+                // 如果日期Tag无效则不解析业务类的Tag
+                if (!dateTag.isValid()) {
+                    continue;
+                }
+
+                uploadTag.setDataTypeLen(BirmmDataBizTypeEnums.toType(uploadTag.getBizType()).getLen()); // 根据业务类型设置数据类型的字节数
+
+                int count = uploadTag.getValueStr().length() / (uploadTag.getDataTypeLen() * 2); // 1个字节用两个hex字符表示
+                LocalDateTime start = uploadTag.getStartTime();
+                for (int i = 0; i < count; i++) {
+                    MethaneBizData bizData = new MethaneBizData();
+
+                    bizData.setBizType(uploadTag.getBizType());
+                    bizData.setUptime(start);
+
+                    String hexReversStr = BytesUtil.reverseHexString(uploadTag.getValueStr().substring(i * uploadTag.getDataTypeLen() * 2, (i + 1) * uploadTag.getDataTypeLen() * 2));
+                    switch (BirmmDataBizTypeEnums.toType(uploadTag.getBizType())) {
+                        case TYPE_GAS_CONCENTRATION:
+                        case TYPE_TEMPERATURE:
+                            bizData.setValue(BytesUtil.hexStringToFloat(hexReversStr)); // 转成浮点数
+                            break;
+
+                        case TYPE_WELL_STATE:
+                        case TYPE_INUNDATE_STATE:
+                            bizData.setStateValue(hexReversStr);
+                            break;
+                    }
+
+                    bizDataList.add(bizData);
+
+                    // 加上时间间隔
+                    start = start.plusMinutes(uploadTag.getInterval());
+                }
+            }
+        }
+    }
+
+    private void handleSensorStateTag() {
+        List<BirmmBaseTag> tags = getTagList().get(SensorStateTag.class.getSimpleName());
+        for (BirmmBaseTag tag : tags) {
+            SensorStateTag sensorStateTag = (SensorStateTag) tag;
+            if (sensorStateTag.getOid().equals(BirmmTagTypeEnums.SENSOR_STATE_1_TAG.getOid())) {
+                // 甲烷传感器状态
+                log.debug("甲烷传感器状态：{}", sensorStateTag.getValueStr().equals("00") ? "正常" : "异常");
+            }
+
+            // TODO-LIST
+            // 传感器状态异常时需要上报异常事件
+        }
+    }
+}

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
index 0d72544..b1f62b6 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.dto.device.DeviceCtnbDTO;
 import com.casic.missiles.frame.base.BirmmBaseFrame;
@@ -48,6 +49,13 @@
         byte[] frameBytes = getFrameStringFromData(dataMap);
         log.info("上行HEX字节消息帧：{}", HexUtils.toHexString(frameBytes).toUpperCase());
 
+        // 从AEP平台推送的消息中获取deviceId和productId
+        String deviceId = StrUtil.toString(dataMap.get("deviceId"));
+        String productId = StrUtil.toString(dataMap.get("productId"));
+
+        // TODO-LIST
+        // AEP平台的产品MasterApiKey从产品信息中获取
+
         // 工厂类创建frame对象
         BirmmBaseFrame birmmFrame = defaultService.doFrameParse(frameBytes);
         if (birmmFrame != null) {
@@ -80,7 +88,7 @@
 
                 DeviceCtnbDTO device = deviceService.getCtnbViewByDevCode(birmmFrame.getDevCode());
                 if (ObjectUtil.isNotEmpty(device)) {
-                    AepCommandSend aepCommandSend = new AepCommandSend(device.getCtnbDeviceId(), device.getCtnbProductId(), device.getCtnbMasterKey());
+                    AepCommandSend aepCommandSend = new AepCommandSend(deviceId, productId, device.getCtnbMasterKey());
 
                     try {
                         retCode = aepCommandSend.handleAndReply(replyMessage, hasProfile);
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
index 11b5a01..ff34926 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.casic.missiles.enums.BirmmDeviceTypeEnums;
 import com.casic.missiles.enums.BirmmFrameAttributeEnums;
@@ -97,18 +98,8 @@
 
             log.debug("上行帧结构字段解析结果：[长度:{}],[设备编号:{}],[通信方式:{}],[目标节点地址:{}],[PDUType:{}],[序号:{}]", length, devCode, commType, destAddr, pduType, seq);
 
-            // 解密
-            // TODO-LIST
-            // 密钥根据设备编号获取
-            SafeStrategy safeStrategy;
-            if (deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-                safeStrategy = SpringContextUtil.getBean(Sm4.class);
-            } else {
-                safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-            }
-
+            // 获取加解密方式并解密
+            SafeStrategy safeStrategy = getDeviceEncipherType(devCode);
             byte[] plainBytes = safeStrategy.decryption(tagListStr);
             String plainTagListStr = HexUtils.toHexString(plainBytes).toUpperCase();
 
@@ -417,18 +408,8 @@
         frame.append(baseReply.getPduType());
         frame.append(baseReply.getSequence());
 
-        // 加密
-        // TODO-LIST
-        // 密钥根据设备编号获取
-        SafeStrategy safeStrategy;
-        if (baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-            safeStrategy = SpringContextUtil.getBean(Sm4.class);
-        } else {
-            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-        }
-
+        // 获取加解密方式并对消息进行加密
+        SafeStrategy safeStrategy = getDeviceEncipherType(baseReply.getDevCode());
         byte[] tagBytes = safeStrategy.encryption(plainTagListStr);
         frame.append(HexUtils.toHexString(tagBytes).toUpperCase());
 
@@ -616,4 +597,35 @@
         latestConfig.setStatus(3); // 配置中
         configService.updateById(latestConfig);
     }
+
+    private SafeStrategy getDeviceEncipherType(String deviceCode) {
+        // 获取加解密方式
+        String encipherType = deviceService.getDeviceEncipherTypeByDeviceCode(deviceCode);
+        if (StrUtil.isEmpty(encipherType)) {
+            switch (BirmmDeviceTypeEnums.toType(deviceCode.substring(0, 2))) {
+                case METHANE:
+                case INTG_METHANE:
+                case SENTINEL:
+                case WELL:
+                    encipherType = "3";
+                    break;
+
+                default:
+                    encipherType = "2";
+                    break;
+            }
+
+            log.debug("根据设备编号[{}]没有找到加密方式，通过设备类型获取默认加密方式为：{}", deviceCode, encipherType);
+        }
+
+        // 加密
+        SafeStrategy safeStrategy;
+        if (encipherType.equalsIgnoreCase("3")) {
+            safeStrategy = SpringContextUtil.getBean(Sm4.class);
+        } else {
+            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
+        }
+
+        return safeStrategy;
+    }
 }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
new file mode 100644
index 0000000..7ec9224
--- /dev/null
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
@@ -0,0 +1,198 @@
+package com.casic.missiles.frame.methane;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.enums.BirmmDataBizTypeEnums;
+import com.casic.missiles.enums.BirmmTagTypeEnums;
+import com.casic.missiles.frame.base.BirmmBaseFrame;
+import com.casic.missiles.frame.base.BirmmBaseTag;
+import com.casic.missiles.frame.tag.biz.CellTag;
+import com.casic.missiles.frame.tag.biz.DateTag;
+import com.casic.missiles.frame.tag.biz.SensorStateTag;
+import com.casic.missiles.frame.tag.biz.UploadTag;
+import com.casic.missiles.frame.tag.signal.PCITag;
+import com.casic.missiles.frame.tag.signal.RSRPTag;
+import com.casic.missiles.frame.tag.signal.SNRTag;
+import com.casic.missiles.util.BytesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component("LGTrapRequest")
+@Scope("prototype")
+@Slf4j
+public class LGTrapRequestFrame extends BirmmBaseFrame {
+
+    List<MethaneBizData> bizDataList;
+    final String MESSAGE_TYPE = "Data";
+    final String DEV_TYPE = "LG";
+    final String BIZ_TYPE = DEV_TYPE + MESSAGE_TYPE;
+
+    @Override
+    public JSONObject toJSON() {
+        JSONObject json = super.toJSON();
+        json.put("devType", DEV_TYPE);
+        json.put("mType", MESSAGE_TYPE);
+
+        JSONObject body = new JSONObject();
+        body.put("bType", BIZ_TYPE);
+        body.put("logtime", getLogTime().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+        if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+            CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+            body.put("cell", cellTag.getCellVal());
+        }
+        if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+            PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+            body.put("pci", pciTag.getPci());
+        }
+        if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+            RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+            body.put("rsrp", rsrpTag.getRsrp());
+        }
+        if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+            SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+            body.put("snr", snrTag.getSnr());
+        }
+
+        // 业务数据
+        if (bizDataList != null) {
+            JSONArray datas = new JSONArray();
+            for (MethaneBizData bizData : bizDataList) {
+                datas.add(bizData.toJSON());
+            }
+            body.put("datas", datas);
+        }
+
+        json.put("mBody", body);
+
+        return json;
+    }
+
+    @Override
+    public boolean needPushToApplication() {
+        return true;
+    }
+
+    @Override
+    public List<Map<String, Object>> convertToBizDataList() {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (bizDataList != null) {
+            for (MethaneBizData data : bizDataList) {
+                Map<String, Object> bizData = new HashMap<>();
+                bizData.put("bizType", String.valueOf(data.getBizType()));
+                bizData.put("value", String.format("%.3f", data.getValue()));
+                bizData.put("uptime", data.getUptime());
+
+                // 电量
+                if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+                    CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+                    bizData.put("cell", cellTag.getCellVal());
+                }
+
+                // 信号质量
+                if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+                    PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+                    bizData.put("pci", pciTag.getPci());
+                }
+                if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+                    RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+                    bizData.put("rsrp", rsrpTag.getRsrp());
+                }
+                if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+                    SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+                    bizData.put("snr", snrTag.getSnr());
+                }
+
+                resultList.add(bizData);
+            }
+        }
+
+        return resultList;
+    }
+
+    @Override
+    public void doParseBizTag() {
+        if (getTagList().containsKey(UploadTag.class.getSimpleName())) {
+            handleUploadTag();
+        }
+
+        if (getTagList().containsKey(SensorStateTag.class.getSimpleName())) {
+            handleSensorStateTag();
+        }
+    }
+
+    private void handleUploadTag() {
+        List<BirmmBaseTag> tags = getTagList().get(UploadTag.class.getSimpleName());
+
+        bizDataList = new ArrayList<>();
+
+        for (BirmmBaseTag tag : tags) {
+            UploadTag uploadTag = (UploadTag) tag;
+            // 检查oid是否符合要求 能取到bizType 采集周期 采集开始时间
+            boolean isValid = uploadTag.checkOid();
+            if (isValid) {
+                // 找到DateTag 取出其中的日期
+                if ( !getTagList().containsKey(DateTag.class.getSimpleName()) ) {
+                    continue;
+                }
+                DateTag dateTag = (DateTag) getTagList().get(DateTag.class.getSimpleName()).get(0);
+                uploadTag.setStartDate(dateTag.getDate());
+
+                // 如果日期Tag无效则不解析业务类的Tag
+                if (!dateTag.isValid()) {
+                    continue;
+                }
+
+                uploadTag.setDataTypeLen(BirmmDataBizTypeEnums.toType(uploadTag.getBizType()).getLen()); // 根据业务类型设置数据类型的字节数
+
+                int count = uploadTag.getValueStr().length() / (uploadTag.getDataTypeLen() * 2); // 1个字节用两个hex字符表示
+                LocalDateTime start = uploadTag.getStartTime();
+                for (int i = 0; i < count; i++) {
+                    MethaneBizData bizData = new MethaneBizData();
+
+                    bizData.setBizType(uploadTag.getBizType());
+                    bizData.setUptime(start);
+
+                    String hexReversStr = BytesUtil.reverseHexString(uploadTag.getValueStr().substring(i * uploadTag.getDataTypeLen() * 2, (i + 1) * uploadTag.getDataTypeLen() * 2));
+                    switch (BirmmDataBizTypeEnums.toType(uploadTag.getBizType())) {
+                        case TYPE_GAS_CONCENTRATION:
+                        case TYPE_TEMPERATURE:
+                            bizData.setValue(BytesUtil.hexStringToFloat(hexReversStr)); // 转成浮点数
+                            break;
+
+                        case TYPE_WELL_STATE:
+                        case TYPE_INUNDATE_STATE:
+                            bizData.setStateValue(hexReversStr);
+                            break;
+                    }
+
+                    bizDataList.add(bizData);
+
+                    // 加上时间间隔
+                    start = start.plusMinutes(uploadTag.getInterval());
+                }
+            }
+        }
+    }
+
+    private void handleSensorStateTag() {
+        List<BirmmBaseTag> tags = getTagList().get(SensorStateTag.class.getSimpleName());
+        for (BirmmBaseTag tag : tags) {
+            SensorStateTag sensorStateTag = (SensorStateTag) tag;
+            if (sensorStateTag.getOid().equals(BirmmTagTypeEnums.SENSOR_STATE_1_TAG.getOid())) {
+                // 甲烷传感器状态
+                log.debug("甲烷传感器状态：{}", sensorStateTag.getValueStr().equals("00") ? "正常" : "异常");
+            }
+
+            // TODO-LIST
+            // 传感器状态异常时需要上报异常事件
+        }
+    }
+}
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
index 8456016..d1b45eb 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
@@ -13,6 +13,7 @@
     LocalDateTime uptime;
     int bizType;
     float value;
+    String stateValue;
 
     @Override
     public String toString() {
@@ -21,7 +22,18 @@
 
     public JSONObject toJSON() {
         JSONObject json = new JSONObject();
-        json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+        switch (BirmmDataBizTypeEnums.toType(bizType)) {
+            case TYPE_GAS_CONCENTRATION:
+            case TYPE_TEMPERATURE:
+                // 气体浓度和温度为浮点数，保留3位小数
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+                break;
+            case TYPE_WELL_STATE:
+            case TYPE_INUNDATE_STATE:
+                // 水浸状态和震动状态为开关量，直接显示
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), stateValue);
+        }
+
         json.put("uptime", uptime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
         return json;
     }

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
index 0d72544..b1f62b6 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.dto.device.DeviceCtnbDTO;
 import com.casic.missiles.frame.base.BirmmBaseFrame;
@@ -48,6 +49,13 @@
         byte[] frameBytes = getFrameStringFromData(dataMap);
         log.info("上行HEX字节消息帧：{}", HexUtils.toHexString(frameBytes).toUpperCase());
 
+        // 从AEP平台推送的消息中获取deviceId和productId
+        String deviceId = StrUtil.toString(dataMap.get("deviceId"));
+        String productId = StrUtil.toString(dataMap.get("productId"));
+
+        // TODO-LIST
+        // AEP平台的产品MasterApiKey从产品信息中获取
+
         // 工厂类创建frame对象
         BirmmBaseFrame birmmFrame = defaultService.doFrameParse(frameBytes);
         if (birmmFrame != null) {
@@ -80,7 +88,7 @@
 
                 DeviceCtnbDTO device = deviceService.getCtnbViewByDevCode(birmmFrame.getDevCode());
                 if (ObjectUtil.isNotEmpty(device)) {
-                    AepCommandSend aepCommandSend = new AepCommandSend(device.getCtnbDeviceId(), device.getCtnbProductId(), device.getCtnbMasterKey());
+                    AepCommandSend aepCommandSend = new AepCommandSend(deviceId, productId, device.getCtnbMasterKey());
 
                     try {
                         retCode = aepCommandSend.handleAndReply(replyMessage, hasProfile);
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
index 11b5a01..ff34926 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.casic.missiles.enums.BirmmDeviceTypeEnums;
 import com.casic.missiles.enums.BirmmFrameAttributeEnums;
@@ -97,18 +98,8 @@
 
             log.debug("上行帧结构字段解析结果：[长度:{}],[设备编号:{}],[通信方式:{}],[目标节点地址:{}],[PDUType:{}],[序号:{}]", length, devCode, commType, destAddr, pduType, seq);
 
-            // 解密
-            // TODO-LIST
-            // 密钥根据设备编号获取
-            SafeStrategy safeStrategy;
-            if (deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-                safeStrategy = SpringContextUtil.getBean(Sm4.class);
-            } else {
-                safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-            }
-
+            // 获取加解密方式并解密
+            SafeStrategy safeStrategy = getDeviceEncipherType(devCode);
             byte[] plainBytes = safeStrategy.decryption(tagListStr);
             String plainTagListStr = HexUtils.toHexString(plainBytes).toUpperCase();
 
@@ -417,18 +408,8 @@
         frame.append(baseReply.getPduType());
         frame.append(baseReply.getSequence());
 
-        // 加密
-        // TODO-LIST
-        // 密钥根据设备编号获取
-        SafeStrategy safeStrategy;
-        if (baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-            safeStrategy = SpringContextUtil.getBean(Sm4.class);
-        } else {
-            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-        }
-
+        // 获取加解密方式并对消息进行加密
+        SafeStrategy safeStrategy = getDeviceEncipherType(baseReply.getDevCode());
         byte[] tagBytes = safeStrategy.encryption(plainTagListStr);
         frame.append(HexUtils.toHexString(tagBytes).toUpperCase());
 
@@ -616,4 +597,35 @@
         latestConfig.setStatus(3); // 配置中
         configService.updateById(latestConfig);
     }
+
+    private SafeStrategy getDeviceEncipherType(String deviceCode) {
+        // 获取加解密方式
+        String encipherType = deviceService.getDeviceEncipherTypeByDeviceCode(deviceCode);
+        if (StrUtil.isEmpty(encipherType)) {
+            switch (BirmmDeviceTypeEnums.toType(deviceCode.substring(0, 2))) {
+                case METHANE:
+                case INTG_METHANE:
+                case SENTINEL:
+                case WELL:
+                    encipherType = "3";
+                    break;
+
+                default:
+                    encipherType = "2";
+                    break;
+            }
+
+            log.debug("根据设备编号[{}]没有找到加密方式，通过设备类型获取默认加密方式为：{}", deviceCode, encipherType);
+        }
+
+        // 加密
+        SafeStrategy safeStrategy;
+        if (encipherType.equalsIgnoreCase("3")) {
+            safeStrategy = SpringContextUtil.getBean(Sm4.class);
+        } else {
+            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
+        }
+
+        return safeStrategy;
+    }
 }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
new file mode 100644
index 0000000..7ec9224
--- /dev/null
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
@@ -0,0 +1,198 @@
+package com.casic.missiles.frame.methane;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.enums.BirmmDataBizTypeEnums;
+import com.casic.missiles.enums.BirmmTagTypeEnums;
+import com.casic.missiles.frame.base.BirmmBaseFrame;
+import com.casic.missiles.frame.base.BirmmBaseTag;
+import com.casic.missiles.frame.tag.biz.CellTag;
+import com.casic.missiles.frame.tag.biz.DateTag;
+import com.casic.missiles.frame.tag.biz.SensorStateTag;
+import com.casic.missiles.frame.tag.biz.UploadTag;
+import com.casic.missiles.frame.tag.signal.PCITag;
+import com.casic.missiles.frame.tag.signal.RSRPTag;
+import com.casic.missiles.frame.tag.signal.SNRTag;
+import com.casic.missiles.util.BytesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component("LGTrapRequest")
+@Scope("prototype")
+@Slf4j
+public class LGTrapRequestFrame extends BirmmBaseFrame {
+
+    List<MethaneBizData> bizDataList;
+    final String MESSAGE_TYPE = "Data";
+    final String DEV_TYPE = "LG";
+    final String BIZ_TYPE = DEV_TYPE + MESSAGE_TYPE;
+
+    @Override
+    public JSONObject toJSON() {
+        JSONObject json = super.toJSON();
+        json.put("devType", DEV_TYPE);
+        json.put("mType", MESSAGE_TYPE);
+
+        JSONObject body = new JSONObject();
+        body.put("bType", BIZ_TYPE);
+        body.put("logtime", getLogTime().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+        if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+            CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+            body.put("cell", cellTag.getCellVal());
+        }
+        if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+            PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+            body.put("pci", pciTag.getPci());
+        }
+        if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+            RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+            body.put("rsrp", rsrpTag.getRsrp());
+        }
+        if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+            SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+            body.put("snr", snrTag.getSnr());
+        }
+
+        // 业务数据
+        if (bizDataList != null) {
+            JSONArray datas = new JSONArray();
+            for (MethaneBizData bizData : bizDataList) {
+                datas.add(bizData.toJSON());
+            }
+            body.put("datas", datas);
+        }
+
+        json.put("mBody", body);
+
+        return json;
+    }
+
+    @Override
+    public boolean needPushToApplication() {
+        return true;
+    }
+
+    @Override
+    public List<Map<String, Object>> convertToBizDataList() {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (bizDataList != null) {
+            for (MethaneBizData data : bizDataList) {
+                Map<String, Object> bizData = new HashMap<>();
+                bizData.put("bizType", String.valueOf(data.getBizType()));
+                bizData.put("value", String.format("%.3f", data.getValue()));
+                bizData.put("uptime", data.getUptime());
+
+                // 电量
+                if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+                    CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+                    bizData.put("cell", cellTag.getCellVal());
+                }
+
+                // 信号质量
+                if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+                    PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+                    bizData.put("pci", pciTag.getPci());
+                }
+                if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+                    RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+                    bizData.put("rsrp", rsrpTag.getRsrp());
+                }
+                if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+                    SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+                    bizData.put("snr", snrTag.getSnr());
+                }
+
+                resultList.add(bizData);
+            }
+        }
+
+        return resultList;
+    }
+
+    @Override
+    public void doParseBizTag() {
+        if (getTagList().containsKey(UploadTag.class.getSimpleName())) {
+            handleUploadTag();
+        }
+
+        if (getTagList().containsKey(SensorStateTag.class.getSimpleName())) {
+            handleSensorStateTag();
+        }
+    }
+
+    private void handleUploadTag() {
+        List<BirmmBaseTag> tags = getTagList().get(UploadTag.class.getSimpleName());
+
+        bizDataList = new ArrayList<>();
+
+        for (BirmmBaseTag tag : tags) {
+            UploadTag uploadTag = (UploadTag) tag;
+            // 检查oid是否符合要求 能取到bizType 采集周期 采集开始时间
+            boolean isValid = uploadTag.checkOid();
+            if (isValid) {
+                // 找到DateTag 取出其中的日期
+                if ( !getTagList().containsKey(DateTag.class.getSimpleName()) ) {
+                    continue;
+                }
+                DateTag dateTag = (DateTag) getTagList().get(DateTag.class.getSimpleName()).get(0);
+                uploadTag.setStartDate(dateTag.getDate());
+
+                // 如果日期Tag无效则不解析业务类的Tag
+                if (!dateTag.isValid()) {
+                    continue;
+                }
+
+                uploadTag.setDataTypeLen(BirmmDataBizTypeEnums.toType(uploadTag.getBizType()).getLen()); // 根据业务类型设置数据类型的字节数
+
+                int count = uploadTag.getValueStr().length() / (uploadTag.getDataTypeLen() * 2); // 1个字节用两个hex字符表示
+                LocalDateTime start = uploadTag.getStartTime();
+                for (int i = 0; i < count; i++) {
+                    MethaneBizData bizData = new MethaneBizData();
+
+                    bizData.setBizType(uploadTag.getBizType());
+                    bizData.setUptime(start);
+
+                    String hexReversStr = BytesUtil.reverseHexString(uploadTag.getValueStr().substring(i * uploadTag.getDataTypeLen() * 2, (i + 1) * uploadTag.getDataTypeLen() * 2));
+                    switch (BirmmDataBizTypeEnums.toType(uploadTag.getBizType())) {
+                        case TYPE_GAS_CONCENTRATION:
+                        case TYPE_TEMPERATURE:
+                            bizData.setValue(BytesUtil.hexStringToFloat(hexReversStr)); // 转成浮点数
+                            break;
+
+                        case TYPE_WELL_STATE:
+                        case TYPE_INUNDATE_STATE:
+                            bizData.setStateValue(hexReversStr);
+                            break;
+                    }
+
+                    bizDataList.add(bizData);
+
+                    // 加上时间间隔
+                    start = start.plusMinutes(uploadTag.getInterval());
+                }
+            }
+        }
+    }
+
+    private void handleSensorStateTag() {
+        List<BirmmBaseTag> tags = getTagList().get(SensorStateTag.class.getSimpleName());
+        for (BirmmBaseTag tag : tags) {
+            SensorStateTag sensorStateTag = (SensorStateTag) tag;
+            if (sensorStateTag.getOid().equals(BirmmTagTypeEnums.SENSOR_STATE_1_TAG.getOid())) {
+                // 甲烷传感器状态
+                log.debug("甲烷传感器状态：{}", sensorStateTag.getValueStr().equals("00") ? "正常" : "异常");
+            }
+
+            // TODO-LIST
+            // 传感器状态异常时需要上报异常事件
+        }
+    }
+}
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
index 8456016..d1b45eb 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
@@ -13,6 +13,7 @@
     LocalDateTime uptime;
     int bizType;
     float value;
+    String stateValue;
 
     @Override
     public String toString() {
@@ -21,7 +22,18 @@
 
     public JSONObject toJSON() {
         JSONObject json = new JSONObject();
-        json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+        switch (BirmmDataBizTypeEnums.toType(bizType)) {
+            case TYPE_GAS_CONCENTRATION:
+            case TYPE_TEMPERATURE:
+                // 气体浓度和温度为浮点数，保留3位小数
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+                break;
+            case TYPE_WELL_STATE:
+            case TYPE_INUNDATE_STATE:
+                // 水浸状态和震动状态为开关量，直接显示
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), stateValue);
+        }
+
         json.put("uptime", uptime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
         return json;
     }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
index 450a755..f39f166 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
@@ -16,6 +16,7 @@
     private int bizType;
     private int interval;
     private int startMin;
+    private int dataTypeLen;
     private LocalDateTime startTime;
 
     @Override

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
index 0d72544..b1f62b6 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.dto.device.DeviceCtnbDTO;
 import com.casic.missiles.frame.base.BirmmBaseFrame;
@@ -48,6 +49,13 @@
         byte[] frameBytes = getFrameStringFromData(dataMap);
         log.info("上行HEX字节消息帧：{}", HexUtils.toHexString(frameBytes).toUpperCase());
 
+        // 从AEP平台推送的消息中获取deviceId和productId
+        String deviceId = StrUtil.toString(dataMap.get("deviceId"));
+        String productId = StrUtil.toString(dataMap.get("productId"));
+
+        // TODO-LIST
+        // AEP平台的产品MasterApiKey从产品信息中获取
+
         // 工厂类创建frame对象
         BirmmBaseFrame birmmFrame = defaultService.doFrameParse(frameBytes);
         if (birmmFrame != null) {
@@ -80,7 +88,7 @@
 
                 DeviceCtnbDTO device = deviceService.getCtnbViewByDevCode(birmmFrame.getDevCode());
                 if (ObjectUtil.isNotEmpty(device)) {
-                    AepCommandSend aepCommandSend = new AepCommandSend(device.getCtnbDeviceId(), device.getCtnbProductId(), device.getCtnbMasterKey());
+                    AepCommandSend aepCommandSend = new AepCommandSend(deviceId, productId, device.getCtnbMasterKey());
 
                     try {
                         retCode = aepCommandSend.handleAndReply(replyMessage, hasProfile);
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
index 11b5a01..ff34926 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.casic.missiles.enums.BirmmDeviceTypeEnums;
 import com.casic.missiles.enums.BirmmFrameAttributeEnums;
@@ -97,18 +98,8 @@
 
             log.debug("上行帧结构字段解析结果：[长度:{}],[设备编号:{}],[通信方式:{}],[目标节点地址:{}],[PDUType:{}],[序号:{}]", length, devCode, commType, destAddr, pduType, seq);
 
-            // 解密
-            // TODO-LIST
-            // 密钥根据设备编号获取
-            SafeStrategy safeStrategy;
-            if (deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-                safeStrategy = SpringContextUtil.getBean(Sm4.class);
-            } else {
-                safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-            }
-
+            // 获取加解密方式并解密
+            SafeStrategy safeStrategy = getDeviceEncipherType(devCode);
             byte[] plainBytes = safeStrategy.decryption(tagListStr);
             String plainTagListStr = HexUtils.toHexString(plainBytes).toUpperCase();
 
@@ -417,18 +408,8 @@
         frame.append(baseReply.getPduType());
         frame.append(baseReply.getSequence());
 
-        // 加密
-        // TODO-LIST
-        // 密钥根据设备编号获取
-        SafeStrategy safeStrategy;
-        if (baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-            safeStrategy = SpringContextUtil.getBean(Sm4.class);
-        } else {
-            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-        }
-
+        // 获取加解密方式并对消息进行加密
+        SafeStrategy safeStrategy = getDeviceEncipherType(baseReply.getDevCode());
         byte[] tagBytes = safeStrategy.encryption(plainTagListStr);
         frame.append(HexUtils.toHexString(tagBytes).toUpperCase());
 
@@ -616,4 +597,35 @@
         latestConfig.setStatus(3); // 配置中
         configService.updateById(latestConfig);
     }
+
+    private SafeStrategy getDeviceEncipherType(String deviceCode) {
+        // 获取加解密方式
+        String encipherType = deviceService.getDeviceEncipherTypeByDeviceCode(deviceCode);
+        if (StrUtil.isEmpty(encipherType)) {
+            switch (BirmmDeviceTypeEnums.toType(deviceCode.substring(0, 2))) {
+                case METHANE:
+                case INTG_METHANE:
+                case SENTINEL:
+                case WELL:
+                    encipherType = "3";
+                    break;
+
+                default:
+                    encipherType = "2";
+                    break;
+            }
+
+            log.debug("根据设备编号[{}]没有找到加密方式，通过设备类型获取默认加密方式为：{}", deviceCode, encipherType);
+        }
+
+        // 加密
+        SafeStrategy safeStrategy;
+        if (encipherType.equalsIgnoreCase("3")) {
+            safeStrategy = SpringContextUtil.getBean(Sm4.class);
+        } else {
+            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
+        }
+
+        return safeStrategy;
+    }
 }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
new file mode 100644
index 0000000..7ec9224
--- /dev/null
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
@@ -0,0 +1,198 @@
+package com.casic.missiles.frame.methane;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.enums.BirmmDataBizTypeEnums;
+import com.casic.missiles.enums.BirmmTagTypeEnums;
+import com.casic.missiles.frame.base.BirmmBaseFrame;
+import com.casic.missiles.frame.base.BirmmBaseTag;
+import com.casic.missiles.frame.tag.biz.CellTag;
+import com.casic.missiles.frame.tag.biz.DateTag;
+import com.casic.missiles.frame.tag.biz.SensorStateTag;
+import com.casic.missiles.frame.tag.biz.UploadTag;
+import com.casic.missiles.frame.tag.signal.PCITag;
+import com.casic.missiles.frame.tag.signal.RSRPTag;
+import com.casic.missiles.frame.tag.signal.SNRTag;
+import com.casic.missiles.util.BytesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component("LGTrapRequest")
+@Scope("prototype")
+@Slf4j
+public class LGTrapRequestFrame extends BirmmBaseFrame {
+
+    List<MethaneBizData> bizDataList;
+    final String MESSAGE_TYPE = "Data";
+    final String DEV_TYPE = "LG";
+    final String BIZ_TYPE = DEV_TYPE + MESSAGE_TYPE;
+
+    @Override
+    public JSONObject toJSON() {
+        JSONObject json = super.toJSON();
+        json.put("devType", DEV_TYPE);
+        json.put("mType", MESSAGE_TYPE);
+
+        JSONObject body = new JSONObject();
+        body.put("bType", BIZ_TYPE);
+        body.put("logtime", getLogTime().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+        if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+            CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+            body.put("cell", cellTag.getCellVal());
+        }
+        if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+            PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+            body.put("pci", pciTag.getPci());
+        }
+        if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+            RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+            body.put("rsrp", rsrpTag.getRsrp());
+        }
+        if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+            SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+            body.put("snr", snrTag.getSnr());
+        }
+
+        // 业务数据
+        if (bizDataList != null) {
+            JSONArray datas = new JSONArray();
+            for (MethaneBizData bizData : bizDataList) {
+                datas.add(bizData.toJSON());
+            }
+            body.put("datas", datas);
+        }
+
+        json.put("mBody", body);
+
+        return json;
+    }
+
+    @Override
+    public boolean needPushToApplication() {
+        return true;
+    }
+
+    @Override
+    public List<Map<String, Object>> convertToBizDataList() {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (bizDataList != null) {
+            for (MethaneBizData data : bizDataList) {
+                Map<String, Object> bizData = new HashMap<>();
+                bizData.put("bizType", String.valueOf(data.getBizType()));
+                bizData.put("value", String.format("%.3f", data.getValue()));
+                bizData.put("uptime", data.getUptime());
+
+                // 电量
+                if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+                    CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+                    bizData.put("cell", cellTag.getCellVal());
+                }
+
+                // 信号质量
+                if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+                    PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+                    bizData.put("pci", pciTag.getPci());
+                }
+                if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+                    RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+                    bizData.put("rsrp", rsrpTag.getRsrp());
+                }
+                if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+                    SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+                    bizData.put("snr", snrTag.getSnr());
+                }
+
+                resultList.add(bizData);
+            }
+        }
+
+        return resultList;
+    }
+
+    @Override
+    public void doParseBizTag() {
+        if (getTagList().containsKey(UploadTag.class.getSimpleName())) {
+            handleUploadTag();
+        }
+
+        if (getTagList().containsKey(SensorStateTag.class.getSimpleName())) {
+            handleSensorStateTag();
+        }
+    }
+
+    private void handleUploadTag() {
+        List<BirmmBaseTag> tags = getTagList().get(UploadTag.class.getSimpleName());
+
+        bizDataList = new ArrayList<>();
+
+        for (BirmmBaseTag tag : tags) {
+            UploadTag uploadTag = (UploadTag) tag;
+            // 检查oid是否符合要求 能取到bizType 采集周期 采集开始时间
+            boolean isValid = uploadTag.checkOid();
+            if (isValid) {
+                // 找到DateTag 取出其中的日期
+                if ( !getTagList().containsKey(DateTag.class.getSimpleName()) ) {
+                    continue;
+                }
+                DateTag dateTag = (DateTag) getTagList().get(DateTag.class.getSimpleName()).get(0);
+                uploadTag.setStartDate(dateTag.getDate());
+
+                // 如果日期Tag无效则不解析业务类的Tag
+                if (!dateTag.isValid()) {
+                    continue;
+                }
+
+                uploadTag.setDataTypeLen(BirmmDataBizTypeEnums.toType(uploadTag.getBizType()).getLen()); // 根据业务类型设置数据类型的字节数
+
+                int count = uploadTag.getValueStr().length() / (uploadTag.getDataTypeLen() * 2); // 1个字节用两个hex字符表示
+                LocalDateTime start = uploadTag.getStartTime();
+                for (int i = 0; i < count; i++) {
+                    MethaneBizData bizData = new MethaneBizData();
+
+                    bizData.setBizType(uploadTag.getBizType());
+                    bizData.setUptime(start);
+
+                    String hexReversStr = BytesUtil.reverseHexString(uploadTag.getValueStr().substring(i * uploadTag.getDataTypeLen() * 2, (i + 1) * uploadTag.getDataTypeLen() * 2));
+                    switch (BirmmDataBizTypeEnums.toType(uploadTag.getBizType())) {
+                        case TYPE_GAS_CONCENTRATION:
+                        case TYPE_TEMPERATURE:
+                            bizData.setValue(BytesUtil.hexStringToFloat(hexReversStr)); // 转成浮点数
+                            break;
+
+                        case TYPE_WELL_STATE:
+                        case TYPE_INUNDATE_STATE:
+                            bizData.setStateValue(hexReversStr);
+                            break;
+                    }
+
+                    bizDataList.add(bizData);
+
+                    // 加上时间间隔
+                    start = start.plusMinutes(uploadTag.getInterval());
+                }
+            }
+        }
+    }
+
+    private void handleSensorStateTag() {
+        List<BirmmBaseTag> tags = getTagList().get(SensorStateTag.class.getSimpleName());
+        for (BirmmBaseTag tag : tags) {
+            SensorStateTag sensorStateTag = (SensorStateTag) tag;
+            if (sensorStateTag.getOid().equals(BirmmTagTypeEnums.SENSOR_STATE_1_TAG.getOid())) {
+                // 甲烷传感器状态
+                log.debug("甲烷传感器状态：{}", sensorStateTag.getValueStr().equals("00") ? "正常" : "异常");
+            }
+
+            // TODO-LIST
+            // 传感器状态异常时需要上报异常事件
+        }
+    }
+}
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
index 8456016..d1b45eb 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
@@ -13,6 +13,7 @@
     LocalDateTime uptime;
     int bizType;
     float value;
+    String stateValue;
 
     @Override
     public String toString() {
@@ -21,7 +22,18 @@
 
     public JSONObject toJSON() {
         JSONObject json = new JSONObject();
-        json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+        switch (BirmmDataBizTypeEnums.toType(bizType)) {
+            case TYPE_GAS_CONCENTRATION:
+            case TYPE_TEMPERATURE:
+                // 气体浓度和温度为浮点数，保留3位小数
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+                break;
+            case TYPE_WELL_STATE:
+            case TYPE_INUNDATE_STATE:
+                // 水浸状态和震动状态为开关量，直接显示
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), stateValue);
+        }
+
         json.put("uptime", uptime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
         return json;
     }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
index 450a755..f39f166 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
@@ -16,6 +16,7 @@
     private int bizType;
     private int interval;
     private int startMin;
+    private int dataTypeLen;
     private LocalDateTime startTime;
 
     @Override
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
index bd4b1d1..34a90d2 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
@@ -64,9 +64,6 @@
                 bizData.put("bizType", String.valueOf(data.getBizType()));
                 bizData.put("value", data.getValue());
                 bizData.put("uptime", data.getUptime());
-//                bizData.setBizType(String.valueOf(data.getBizType()));
-//                bizData.setValue(data.getValue());
-//                bizData.setUptime(data.getUptime());
 
                 resultList.add(bizData);
             }

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
index 0d72544..b1f62b6 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.dto.device.DeviceCtnbDTO;
 import com.casic.missiles.frame.base.BirmmBaseFrame;
@@ -48,6 +49,13 @@
         byte[] frameBytes = getFrameStringFromData(dataMap);
         log.info("上行HEX字节消息帧：{}", HexUtils.toHexString(frameBytes).toUpperCase());
 
+        // 从AEP平台推送的消息中获取deviceId和productId
+        String deviceId = StrUtil.toString(dataMap.get("deviceId"));
+        String productId = StrUtil.toString(dataMap.get("productId"));
+
+        // TODO-LIST
+        // AEP平台的产品MasterApiKey从产品信息中获取
+
         // 工厂类创建frame对象
         BirmmBaseFrame birmmFrame = defaultService.doFrameParse(frameBytes);
         if (birmmFrame != null) {
@@ -80,7 +88,7 @@
 
                 DeviceCtnbDTO device = deviceService.getCtnbViewByDevCode(birmmFrame.getDevCode());
                 if (ObjectUtil.isNotEmpty(device)) {
-                    AepCommandSend aepCommandSend = new AepCommandSend(device.getCtnbDeviceId(), device.getCtnbProductId(), device.getCtnbMasterKey());
+                    AepCommandSend aepCommandSend = new AepCommandSend(deviceId, productId, device.getCtnbMasterKey());
 
                     try {
                         retCode = aepCommandSend.handleAndReply(replyMessage, hasProfile);
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
index 11b5a01..ff34926 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.casic.missiles.enums.BirmmDeviceTypeEnums;
 import com.casic.missiles.enums.BirmmFrameAttributeEnums;
@@ -97,18 +98,8 @@
 
             log.debug("上行帧结构字段解析结果：[长度:{}],[设备编号:{}],[通信方式:{}],[目标节点地址:{}],[PDUType:{}],[序号:{}]", length, devCode, commType, destAddr, pduType, seq);
 
-            // 解密
-            // TODO-LIST
-            // 密钥根据设备编号获取
-            SafeStrategy safeStrategy;
-            if (deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-                safeStrategy = SpringContextUtil.getBean(Sm4.class);
-            } else {
-                safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-            }
-
+            // 获取加解密方式并解密
+            SafeStrategy safeStrategy = getDeviceEncipherType(devCode);
             byte[] plainBytes = safeStrategy.decryption(tagListStr);
             String plainTagListStr = HexUtils.toHexString(plainBytes).toUpperCase();
 
@@ -417,18 +408,8 @@
         frame.append(baseReply.getPduType());
         frame.append(baseReply.getSequence());
 
-        // 加密
-        // TODO-LIST
-        // 密钥根据设备编号获取
-        SafeStrategy safeStrategy;
-        if (baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-            safeStrategy = SpringContextUtil.getBean(Sm4.class);
-        } else {
-            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-        }
-
+        // 获取加解密方式并对消息进行加密
+        SafeStrategy safeStrategy = getDeviceEncipherType(baseReply.getDevCode());
         byte[] tagBytes = safeStrategy.encryption(plainTagListStr);
         frame.append(HexUtils.toHexString(tagBytes).toUpperCase());
 
@@ -616,4 +597,35 @@
         latestConfig.setStatus(3); // 配置中
         configService.updateById(latestConfig);
     }
+
+    private SafeStrategy getDeviceEncipherType(String deviceCode) {
+        // 获取加解密方式
+        String encipherType = deviceService.getDeviceEncipherTypeByDeviceCode(deviceCode);
+        if (StrUtil.isEmpty(encipherType)) {
+            switch (BirmmDeviceTypeEnums.toType(deviceCode.substring(0, 2))) {
+                case METHANE:
+                case INTG_METHANE:
+                case SENTINEL:
+                case WELL:
+                    encipherType = "3";
+                    break;
+
+                default:
+                    encipherType = "2";
+                    break;
+            }
+
+            log.debug("根据设备编号[{}]没有找到加密方式，通过设备类型获取默认加密方式为：{}", deviceCode, encipherType);
+        }
+
+        // 加密
+        SafeStrategy safeStrategy;
+        if (encipherType.equalsIgnoreCase("3")) {
+            safeStrategy = SpringContextUtil.getBean(Sm4.class);
+        } else {
+            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
+        }
+
+        return safeStrategy;
+    }
 }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
new file mode 100644
index 0000000..7ec9224
--- /dev/null
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
@@ -0,0 +1,198 @@
+package com.casic.missiles.frame.methane;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.enums.BirmmDataBizTypeEnums;
+import com.casic.missiles.enums.BirmmTagTypeEnums;
+import com.casic.missiles.frame.base.BirmmBaseFrame;
+import com.casic.missiles.frame.base.BirmmBaseTag;
+import com.casic.missiles.frame.tag.biz.CellTag;
+import com.casic.missiles.frame.tag.biz.DateTag;
+import com.casic.missiles.frame.tag.biz.SensorStateTag;
+import com.casic.missiles.frame.tag.biz.UploadTag;
+import com.casic.missiles.frame.tag.signal.PCITag;
+import com.casic.missiles.frame.tag.signal.RSRPTag;
+import com.casic.missiles.frame.tag.signal.SNRTag;
+import com.casic.missiles.util.BytesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component("LGTrapRequest")
+@Scope("prototype")
+@Slf4j
+public class LGTrapRequestFrame extends BirmmBaseFrame {
+
+    List<MethaneBizData> bizDataList;
+    final String MESSAGE_TYPE = "Data";
+    final String DEV_TYPE = "LG";
+    final String BIZ_TYPE = DEV_TYPE + MESSAGE_TYPE;
+
+    @Override
+    public JSONObject toJSON() {
+        JSONObject json = super.toJSON();
+        json.put("devType", DEV_TYPE);
+        json.put("mType", MESSAGE_TYPE);
+
+        JSONObject body = new JSONObject();
+        body.put("bType", BIZ_TYPE);
+        body.put("logtime", getLogTime().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+        if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+            CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+            body.put("cell", cellTag.getCellVal());
+        }
+        if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+            PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+            body.put("pci", pciTag.getPci());
+        }
+        if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+            RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+            body.put("rsrp", rsrpTag.getRsrp());
+        }
+        if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+            SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+            body.put("snr", snrTag.getSnr());
+        }
+
+        // 业务数据
+        if (bizDataList != null) {
+            JSONArray datas = new JSONArray();
+            for (MethaneBizData bizData : bizDataList) {
+                datas.add(bizData.toJSON());
+            }
+            body.put("datas", datas);
+        }
+
+        json.put("mBody", body);
+
+        return json;
+    }
+
+    @Override
+    public boolean needPushToApplication() {
+        return true;
+    }
+
+    @Override
+    public List<Map<String, Object>> convertToBizDataList() {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (bizDataList != null) {
+            for (MethaneBizData data : bizDataList) {
+                Map<String, Object> bizData = new HashMap<>();
+                bizData.put("bizType", String.valueOf(data.getBizType()));
+                bizData.put("value", String.format("%.3f", data.getValue()));
+                bizData.put("uptime", data.getUptime());
+
+                // 电量
+                if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+                    CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+                    bizData.put("cell", cellTag.getCellVal());
+                }
+
+                // 信号质量
+                if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+                    PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+                    bizData.put("pci", pciTag.getPci());
+                }
+                if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+                    RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+                    bizData.put("rsrp", rsrpTag.getRsrp());
+                }
+                if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+                    SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+                    bizData.put("snr", snrTag.getSnr());
+                }
+
+                resultList.add(bizData);
+            }
+        }
+
+        return resultList;
+    }
+
+    @Override
+    public void doParseBizTag() {
+        if (getTagList().containsKey(UploadTag.class.getSimpleName())) {
+            handleUploadTag();
+        }
+
+        if (getTagList().containsKey(SensorStateTag.class.getSimpleName())) {
+            handleSensorStateTag();
+        }
+    }
+
+    private void handleUploadTag() {
+        List<BirmmBaseTag> tags = getTagList().get(UploadTag.class.getSimpleName());
+
+        bizDataList = new ArrayList<>();
+
+        for (BirmmBaseTag tag : tags) {
+            UploadTag uploadTag = (UploadTag) tag;
+            // 检查oid是否符合要求 能取到bizType 采集周期 采集开始时间
+            boolean isValid = uploadTag.checkOid();
+            if (isValid) {
+                // 找到DateTag 取出其中的日期
+                if ( !getTagList().containsKey(DateTag.class.getSimpleName()) ) {
+                    continue;
+                }
+                DateTag dateTag = (DateTag) getTagList().get(DateTag.class.getSimpleName()).get(0);
+                uploadTag.setStartDate(dateTag.getDate());
+
+                // 如果日期Tag无效则不解析业务类的Tag
+                if (!dateTag.isValid()) {
+                    continue;
+                }
+
+                uploadTag.setDataTypeLen(BirmmDataBizTypeEnums.toType(uploadTag.getBizType()).getLen()); // 根据业务类型设置数据类型的字节数
+
+                int count = uploadTag.getValueStr().length() / (uploadTag.getDataTypeLen() * 2); // 1个字节用两个hex字符表示
+                LocalDateTime start = uploadTag.getStartTime();
+                for (int i = 0; i < count; i++) {
+                    MethaneBizData bizData = new MethaneBizData();
+
+                    bizData.setBizType(uploadTag.getBizType());
+                    bizData.setUptime(start);
+
+                    String hexReversStr = BytesUtil.reverseHexString(uploadTag.getValueStr().substring(i * uploadTag.getDataTypeLen() * 2, (i + 1) * uploadTag.getDataTypeLen() * 2));
+                    switch (BirmmDataBizTypeEnums.toType(uploadTag.getBizType())) {
+                        case TYPE_GAS_CONCENTRATION:
+                        case TYPE_TEMPERATURE:
+                            bizData.setValue(BytesUtil.hexStringToFloat(hexReversStr)); // 转成浮点数
+                            break;
+
+                        case TYPE_WELL_STATE:
+                        case TYPE_INUNDATE_STATE:
+                            bizData.setStateValue(hexReversStr);
+                            break;
+                    }
+
+                    bizDataList.add(bizData);
+
+                    // 加上时间间隔
+                    start = start.plusMinutes(uploadTag.getInterval());
+                }
+            }
+        }
+    }
+
+    private void handleSensorStateTag() {
+        List<BirmmBaseTag> tags = getTagList().get(SensorStateTag.class.getSimpleName());
+        for (BirmmBaseTag tag : tags) {
+            SensorStateTag sensorStateTag = (SensorStateTag) tag;
+            if (sensorStateTag.getOid().equals(BirmmTagTypeEnums.SENSOR_STATE_1_TAG.getOid())) {
+                // 甲烷传感器状态
+                log.debug("甲烷传感器状态：{}", sensorStateTag.getValueStr().equals("00") ? "正常" : "异常");
+            }
+
+            // TODO-LIST
+            // 传感器状态异常时需要上报异常事件
+        }
+    }
+}
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
index 8456016..d1b45eb 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
@@ -13,6 +13,7 @@
     LocalDateTime uptime;
     int bizType;
     float value;
+    String stateValue;
 
     @Override
     public String toString() {
@@ -21,7 +22,18 @@
 
     public JSONObject toJSON() {
         JSONObject json = new JSONObject();
-        json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+        switch (BirmmDataBizTypeEnums.toType(bizType)) {
+            case TYPE_GAS_CONCENTRATION:
+            case TYPE_TEMPERATURE:
+                // 气体浓度和温度为浮点数，保留3位小数
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+                break;
+            case TYPE_WELL_STATE:
+            case TYPE_INUNDATE_STATE:
+                // 水浸状态和震动状态为开关量，直接显示
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), stateValue);
+        }
+
         json.put("uptime", uptime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
         return json;
     }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
index 450a755..f39f166 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
@@ -16,6 +16,7 @@
     private int bizType;
     private int interval;
     private int startMin;
+    private int dataTypeLen;
     private LocalDateTime startTime;
 
     @Override
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
index bd4b1d1..34a90d2 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
@@ -64,9 +64,6 @@
                 bizData.put("bizType", String.valueOf(data.getBizType()));
                 bizData.put("value", data.getValue());
                 bizData.put("uptime", data.getUptime());
-//                bizData.setBizType(String.valueOf(data.getBizType()));
-//                bizData.setValue(data.getValue());
-//                bizData.setUptime(data.getUptime());
 
                 resultList.add(bizData);
             }
diff --git a/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDataBizTypeEnums.java b/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDataBizTypeEnums.java
index 3d4bf8e..c7772eb 100644
--- a/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDataBizTypeEnums.java
+++ b/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDataBizTypeEnums.java
@@ -9,10 +9,11 @@
  */
 @Getter
 public enum BirmmDataBizTypeEnums {
-	TYPE_LIQUID_LEVEL("level", 3),
-	TYPE_GAS_CONCENTRATION("gas", 5),
-	TYPE_WELL_STATE("state", 7),
-	TYPE_TEMPERATURE("temperature", 8);
+	TYPE_LIQUID_LEVEL("level", 3, 4), // 液位值
+	TYPE_GAS_CONCENTRATION("gas", 5, 4), // 燃气浓度
+	TYPE_WELL_STATE("state", 7, 1), // 井盖翻转状态/震动状态
+	TYPE_TEMPERATURE("temperature", 8, 4), // 温度
+	TYPE_INUNDATE_STATE("inundate", 12,1); // 水浸开关状态
 
 
 	/**
@@ -25,9 +26,15 @@
 	 */
 	private final int value;
 
-	BirmmDataBizTypeEnums(String name, int value) {
+	/**
+	 * 单个数据字节数
+	 */
+	private final int len;
+
+	BirmmDataBizTypeEnums(String name, int value, int len) {
 		this.name = name;
 		this.value = value;
+		this.len = len;
 	}
 
 	public static BirmmDataBizTypeEnums toType(int bizType) {

diff --git a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
index bbb027f..b004896 100644
--- a/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
+++ b/casic-iot-dao/src/main/java/com/casic/missiles/mapper/DeviceMapper.java
@@ -41,4 +41,6 @@
     @Select("SELECT id FROM `device`  where valid=1 and devcode= #{devCode} limit 1")
     Long getDeviceIdByDevCode(@Param("devCode") String devCode);
 
+    String getDeviceEncipherType(@Param("devCode") String devCode);
+
 }
diff --git a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
index f29c109..41eae00 100644
--- a/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/DeviceMapper.xml
@@ -21,7 +21,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         id, devcode, device_type, unit, name, product_id, status, imei, create_time, create_user_id
+        </if>
     </sql>
 
 
@@ -140,4 +142,13 @@
             devcode = #{devCode}
     </select>
 
+    <select id="getDeviceEncipherType" resultType="java.lang.String">
+        SELECT
+            encipher_type
+        FROM device d
+            JOIN product_info p ON d.product_id = p.id
+        WHERE
+            d.devcode = #{devCode}
+    </select>
+
 </mapper>
diff --git a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
index a841252..f812b88 100644
--- a/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
+++ b/casic-iot-dao/src/main/resources/mapper/ProductInfoMapper.xml
@@ -17,7 +17,9 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
+        <if test="true"> /* 仅用于关闭编译器的校验错误提示 */
         Id, name, access_type, encipher_type, protocol_type, model, descn, product_type, owners, CreatorName, create_time, create_user_id
+        </if>
     </sql>
 
     <select id="selectMaxNo" resultType="java.lang.Long">
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
index 895f027..16fcccb 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/IDeviceService.java
@@ -31,6 +31,8 @@
 
     Device getDeviceByDeviceCode(String deviceCode);
 
+    String getDeviceEncipherTypeByDeviceCode(String deviceCode);
+
     ReturnDTO addDevice(Device deviceGroup);
 
     ReturnDTO updateDevice(Device deviceGroup);
diff --git a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
index 54837d8..b2c6db3 100644
--- a/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
+++ b/casic-iot-service/src/main/java/com/casic/missiles/service/impl/DeviceServiceImpl.java
@@ -132,7 +132,17 @@
         QueryWrapper<Device> query = new QueryWrapper<>();
         query.eq("devcode", deviceCode);
         query.eq("valid", "1");
-        return getOne(query);
+        List<Device> deviceList = list(query);
+        if (!deviceList.isEmpty()) {
+            return getOne(query);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getDeviceEncipherTypeByDeviceCode(String deviceCode) {
+        return baseMapper.getDeviceEncipherType(deviceCode);
     }
 
     @Override
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
index 0d72544..b1f62b6 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/controller/GeneralDataReceiver.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.casic.missiles.dto.device.DeviceCtnbDTO;
 import com.casic.missiles.frame.base.BirmmBaseFrame;
@@ -48,6 +49,13 @@
         byte[] frameBytes = getFrameStringFromData(dataMap);
         log.info("上行HEX字节消息帧：{}", HexUtils.toHexString(frameBytes).toUpperCase());
 
+        // 从AEP平台推送的消息中获取deviceId和productId
+        String deviceId = StrUtil.toString(dataMap.get("deviceId"));
+        String productId = StrUtil.toString(dataMap.get("productId"));
+
+        // TODO-LIST
+        // AEP平台的产品MasterApiKey从产品信息中获取
+
         // 工厂类创建frame对象
         BirmmBaseFrame birmmFrame = defaultService.doFrameParse(frameBytes);
         if (birmmFrame != null) {
@@ -80,7 +88,7 @@
 
                 DeviceCtnbDTO device = deviceService.getCtnbViewByDevCode(birmmFrame.getDevCode());
                 if (ObjectUtil.isNotEmpty(device)) {
-                    AepCommandSend aepCommandSend = new AepCommandSend(device.getCtnbDeviceId(), device.getCtnbProductId(), device.getCtnbMasterKey());
+                    AepCommandSend aepCommandSend = new AepCommandSend(deviceId, productId, device.getCtnbMasterKey());
 
                     try {
                         retCode = aepCommandSend.handleAndReply(replyMessage, hasProfile);
diff --git a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
index 11b5a01..ff34926 100644
--- a/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
+++ b/sensorhub-core/src/main/java/com/casic/missiles/service/impl/GeneralServiceImpl.java
@@ -4,6 +4,7 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.casic.missiles.enums.BirmmDeviceTypeEnums;
 import com.casic.missiles.enums.BirmmFrameAttributeEnums;
@@ -97,18 +98,8 @@
 
             log.debug("上行帧结构字段解析结果：[长度:{}],[设备编号:{}],[通信方式:{}],[目标节点地址:{}],[PDUType:{}],[序号:{}]", length, devCode, commType, destAddr, pduType, seq);
 
-            // 解密
-            // TODO-LIST
-            // 密钥根据设备编号获取
-            SafeStrategy safeStrategy;
-            if (deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                    deviceType.equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-                safeStrategy = SpringContextUtil.getBean(Sm4.class);
-            } else {
-                safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-            }
-
+            // 获取加解密方式并解密
+            SafeStrategy safeStrategy = getDeviceEncipherType(devCode);
             byte[] plainBytes = safeStrategy.decryption(tagListStr);
             String plainTagListStr = HexUtils.toHexString(plainBytes).toUpperCase();
 
@@ -417,18 +408,8 @@
         frame.append(baseReply.getPduType());
         frame.append(baseReply.getSequence());
 
-        // 加密
-        // TODO-LIST
-        // 密钥根据设备编号获取
-        SafeStrategy safeStrategy;
-        if (baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.METHANE.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.SENTINEL.getValue()) ||
-                baseReply.getDeviceType().equalsIgnoreCase(BirmmDeviceTypeEnums.WELL.getValue())) {
-            safeStrategy = SpringContextUtil.getBean(Sm4.class);
-        } else {
-            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
-        }
-
+        // 获取加解密方式并对消息进行加密
+        SafeStrategy safeStrategy = getDeviceEncipherType(baseReply.getDevCode());
         byte[] tagBytes = safeStrategy.encryption(plainTagListStr);
         frame.append(HexUtils.toHexString(tagBytes).toUpperCase());
 
@@ -616,4 +597,35 @@
         latestConfig.setStatus(3); // 配置中
         configService.updateById(latestConfig);
     }
+
+    private SafeStrategy getDeviceEncipherType(String deviceCode) {
+        // 获取加解密方式
+        String encipherType = deviceService.getDeviceEncipherTypeByDeviceCode(deviceCode);
+        if (StrUtil.isEmpty(encipherType)) {
+            switch (BirmmDeviceTypeEnums.toType(deviceCode.substring(0, 2))) {
+                case METHANE:
+                case INTG_METHANE:
+                case SENTINEL:
+                case WELL:
+                    encipherType = "3";
+                    break;
+
+                default:
+                    encipherType = "2";
+                    break;
+            }
+
+            log.debug("根据设备编号[{}]没有找到加密方式，通过设备类型获取默认加密方式为：{}", deviceCode, encipherType);
+        }
+
+        // 加密
+        SafeStrategy safeStrategy;
+        if (encipherType.equalsIgnoreCase("3")) {
+            safeStrategy = SpringContextUtil.getBean(Sm4.class);
+        } else {
+            safeStrategy = SpringContextUtil.getBean(TeaUtilsX.class);
+        }
+
+        return safeStrategy;
+    }
 }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
new file mode 100644
index 0000000..7ec9224
--- /dev/null
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/LGTrapRequestFrame.java
@@ -0,0 +1,198 @@
+package com.casic.missiles.frame.methane;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.casic.missiles.enums.BirmmDataBizTypeEnums;
+import com.casic.missiles.enums.BirmmTagTypeEnums;
+import com.casic.missiles.frame.base.BirmmBaseFrame;
+import com.casic.missiles.frame.base.BirmmBaseTag;
+import com.casic.missiles.frame.tag.biz.CellTag;
+import com.casic.missiles.frame.tag.biz.DateTag;
+import com.casic.missiles.frame.tag.biz.SensorStateTag;
+import com.casic.missiles.frame.tag.biz.UploadTag;
+import com.casic.missiles.frame.tag.signal.PCITag;
+import com.casic.missiles.frame.tag.signal.RSRPTag;
+import com.casic.missiles.frame.tag.signal.SNRTag;
+import com.casic.missiles.util.BytesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component("LGTrapRequest")
+@Scope("prototype")
+@Slf4j
+public class LGTrapRequestFrame extends BirmmBaseFrame {
+
+    List<MethaneBizData> bizDataList;
+    final String MESSAGE_TYPE = "Data";
+    final String DEV_TYPE = "LG";
+    final String BIZ_TYPE = DEV_TYPE + MESSAGE_TYPE;
+
+    @Override
+    public JSONObject toJSON() {
+        JSONObject json = super.toJSON();
+        json.put("devType", DEV_TYPE);
+        json.put("mType", MESSAGE_TYPE);
+
+        JSONObject body = new JSONObject();
+        body.put("bType", BIZ_TYPE);
+        body.put("logtime", getLogTime().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+        if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+            CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+            body.put("cell", cellTag.getCellVal());
+        }
+        if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+            PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+            body.put("pci", pciTag.getPci());
+        }
+        if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+            RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+            body.put("rsrp", rsrpTag.getRsrp());
+        }
+        if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+            SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+            body.put("snr", snrTag.getSnr());
+        }
+
+        // 业务数据
+        if (bizDataList != null) {
+            JSONArray datas = new JSONArray();
+            for (MethaneBizData bizData : bizDataList) {
+                datas.add(bizData.toJSON());
+            }
+            body.put("datas", datas);
+        }
+
+        json.put("mBody", body);
+
+        return json;
+    }
+
+    @Override
+    public boolean needPushToApplication() {
+        return true;
+    }
+
+    @Override
+    public List<Map<String, Object>> convertToBizDataList() {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (bizDataList != null) {
+            for (MethaneBizData data : bizDataList) {
+                Map<String, Object> bizData = new HashMap<>();
+                bizData.put("bizType", String.valueOf(data.getBizType()));
+                bizData.put("value", String.format("%.3f", data.getValue()));
+                bizData.put("uptime", data.getUptime());
+
+                // 电量
+                if (getTagList().containsKey(CellTag.class.getSimpleName())) {
+                    CellTag cellTag = (CellTag) getTagList().get(CellTag.class.getSimpleName()).get(0);
+                    bizData.put("cell", cellTag.getCellVal());
+                }
+
+                // 信号质量
+                if (getTagList().containsKey(PCITag.class.getSimpleName())) {
+                    PCITag pciTag = (PCITag) getTagList().get(PCITag.class.getSimpleName()).get(0);
+                    bizData.put("pci", pciTag.getPci());
+                }
+                if (getTagList().containsKey(RSRPTag.class.getSimpleName())) {
+                    RSRPTag rsrpTag = (RSRPTag) getTagList().get(RSRPTag.class.getSimpleName()).get(0);
+                    bizData.put("rsrp", rsrpTag.getRsrp());
+                }
+                if (getTagList().containsKey(SNRTag.class.getSimpleName())) {
+                    SNRTag snrTag = (SNRTag) getTagList().get(SNRTag.class.getSimpleName()).get(0);
+                    bizData.put("snr", snrTag.getSnr());
+                }
+
+                resultList.add(bizData);
+            }
+        }
+
+        return resultList;
+    }
+
+    @Override
+    public void doParseBizTag() {
+        if (getTagList().containsKey(UploadTag.class.getSimpleName())) {
+            handleUploadTag();
+        }
+
+        if (getTagList().containsKey(SensorStateTag.class.getSimpleName())) {
+            handleSensorStateTag();
+        }
+    }
+
+    private void handleUploadTag() {
+        List<BirmmBaseTag> tags = getTagList().get(UploadTag.class.getSimpleName());
+
+        bizDataList = new ArrayList<>();
+
+        for (BirmmBaseTag tag : tags) {
+            UploadTag uploadTag = (UploadTag) tag;
+            // 检查oid是否符合要求 能取到bizType 采集周期 采集开始时间
+            boolean isValid = uploadTag.checkOid();
+            if (isValid) {
+                // 找到DateTag 取出其中的日期
+                if ( !getTagList().containsKey(DateTag.class.getSimpleName()) ) {
+                    continue;
+                }
+                DateTag dateTag = (DateTag) getTagList().get(DateTag.class.getSimpleName()).get(0);
+                uploadTag.setStartDate(dateTag.getDate());
+
+                // 如果日期Tag无效则不解析业务类的Tag
+                if (!dateTag.isValid()) {
+                    continue;
+                }
+
+                uploadTag.setDataTypeLen(BirmmDataBizTypeEnums.toType(uploadTag.getBizType()).getLen()); // 根据业务类型设置数据类型的字节数
+
+                int count = uploadTag.getValueStr().length() / (uploadTag.getDataTypeLen() * 2); // 1个字节用两个hex字符表示
+                LocalDateTime start = uploadTag.getStartTime();
+                for (int i = 0; i < count; i++) {
+                    MethaneBizData bizData = new MethaneBizData();
+
+                    bizData.setBizType(uploadTag.getBizType());
+                    bizData.setUptime(start);
+
+                    String hexReversStr = BytesUtil.reverseHexString(uploadTag.getValueStr().substring(i * uploadTag.getDataTypeLen() * 2, (i + 1) * uploadTag.getDataTypeLen() * 2));
+                    switch (BirmmDataBizTypeEnums.toType(uploadTag.getBizType())) {
+                        case TYPE_GAS_CONCENTRATION:
+                        case TYPE_TEMPERATURE:
+                            bizData.setValue(BytesUtil.hexStringToFloat(hexReversStr)); // 转成浮点数
+                            break;
+
+                        case TYPE_WELL_STATE:
+                        case TYPE_INUNDATE_STATE:
+                            bizData.setStateValue(hexReversStr);
+                            break;
+                    }
+
+                    bizDataList.add(bizData);
+
+                    // 加上时间间隔
+                    start = start.plusMinutes(uploadTag.getInterval());
+                }
+            }
+        }
+    }
+
+    private void handleSensorStateTag() {
+        List<BirmmBaseTag> tags = getTagList().get(SensorStateTag.class.getSimpleName());
+        for (BirmmBaseTag tag : tags) {
+            SensorStateTag sensorStateTag = (SensorStateTag) tag;
+            if (sensorStateTag.getOid().equals(BirmmTagTypeEnums.SENSOR_STATE_1_TAG.getOid())) {
+                // 甲烷传感器状态
+                log.debug("甲烷传感器状态：{}", sensorStateTag.getValueStr().equals("00") ? "正常" : "异常");
+            }
+
+            // TODO-LIST
+            // 传感器状态异常时需要上报异常事件
+        }
+    }
+}
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
index 8456016..d1b45eb 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/methane/MethaneBizData.java
@@ -13,6 +13,7 @@
     LocalDateTime uptime;
     int bizType;
     float value;
+    String stateValue;
 
     @Override
     public String toString() {
@@ -21,7 +22,18 @@
 
     public JSONObject toJSON() {
         JSONObject json = new JSONObject();
-        json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+        switch (BirmmDataBizTypeEnums.toType(bizType)) {
+            case TYPE_GAS_CONCENTRATION:
+            case TYPE_TEMPERATURE:
+                // 气体浓度和温度为浮点数，保留3位小数
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), String.format("%.3f", value));
+                break;
+            case TYPE_WELL_STATE:
+            case TYPE_INUNDATE_STATE:
+                // 水浸状态和震动状态为开关量，直接显示
+                json.put(BirmmDataBizTypeEnums.toType(bizType).getName(), stateValue);
+        }
+
         json.put("uptime", uptime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
         return json;
     }
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
index 450a755..f39f166 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/tag/biz/UploadTag.java
@@ -16,6 +16,7 @@
     private int bizType;
     private int interval;
     private int startMin;
+    private int dataTypeLen;
     private LocalDateTime startTime;
 
     @Override
diff --git a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
index bd4b1d1..34a90d2 100644
--- a/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
+++ b/sensorhub-service-birmm/src/main/java/com/casic/missiles/frame/well/WellTrapRequestFrame.java
@@ -64,9 +64,6 @@
                 bizData.put("bizType", String.valueOf(data.getBizType()));
                 bizData.put("value", data.getValue());
                 bizData.put("uptime", data.getUptime());
-//                bizData.setBizType(String.valueOf(data.getBizType()));
-//                bizData.setValue(data.getValue());
-//                bizData.setUptime(data.getUptime());
 
                 resultList.add(bizData);
             }
diff --git a/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDataBizTypeEnums.java b/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDataBizTypeEnums.java
index 3d4bf8e..c7772eb 100644
--- a/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDataBizTypeEnums.java
+++ b/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDataBizTypeEnums.java
@@ -9,10 +9,11 @@
  */
 @Getter
 public enum BirmmDataBizTypeEnums {
-	TYPE_LIQUID_LEVEL("level", 3),
-	TYPE_GAS_CONCENTRATION("gas", 5),
-	TYPE_WELL_STATE("state", 7),
-	TYPE_TEMPERATURE("temperature", 8);
+	TYPE_LIQUID_LEVEL("level", 3, 4), // 液位值
+	TYPE_GAS_CONCENTRATION("gas", 5, 4), // 燃气浓度
+	TYPE_WELL_STATE("state", 7, 1), // 井盖翻转状态/震动状态
+	TYPE_TEMPERATURE("temperature", 8, 4), // 温度
+	TYPE_INUNDATE_STATE("inundate", 12,1); // 水浸开关状态
 
 
 	/**
@@ -25,9 +26,15 @@
 	 */
 	private final int value;
 
-	BirmmDataBizTypeEnums(String name, int value) {
+	/**
+	 * 单个数据字节数
+	 */
+	private final int len;
+
+	BirmmDataBizTypeEnums(String name, int value, int len) {
 		this.name = name;
 		this.value = value;
+		this.len = len;
 	}
 
 	public static BirmmDataBizTypeEnums toType(int bizType) {
diff --git a/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDeviceTypeEnums.java b/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDeviceTypeEnums.java
index 1282614..91011d1 100644
--- a/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDeviceTypeEnums.java
+++ b/sensorhub-support/src/main/java/com/casic/missiles/enums/BirmmDeviceTypeEnums.java
@@ -11,7 +11,7 @@
 public enum BirmmDeviceTypeEnums {
 	METHANE("4", "Methane", "31"), // 燃气智能监测终端
 	WELL("6", "Well", "41"), // 井盖
-	LIQUID_GAS("25", "", "32"), // 燃液一体化设备
+	INTG_METHANE("25", "LG", "32"), // 燃气一体化设备
 	SENTINEL("28", "Sentinel", "34"), // 管盯
 	METHANE_BIZ("32", "", "33"), // 商用燃气
 	DEFAULT("", "", "");