measurementType 字段未发送

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -735,7 +735,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                   } else {
                       jsonObjectData.put("value", value);
                   }
-                  jsonObjectData.put("measurementType",equipmentSpecificIndex.getEquipmentIndexKey());
+                  jsonObjectData.put("measurementType", null == equipmentSpecificIndex.getEquipmentIndexKey() ? "" :equipmentSpecificIndex.getEquipmentIndexKey());
                   jsonObjectData.put("dateTime",date);
                   jsonObjectData.put("quality","0"); // 量测质量码：0 有效，1 无效
                   List<JSONObject> jsonObjects = Arrays.asList(jsonObjectData);

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -41,6 +41,7 @@
 	        wesi.equipment_specific_id AS equipmentSpecificId,
 	        wesi.equipment_index_id AS equipmentIndexId,
 	        wesi.equipment_index_name AS equipmentIndexName,
+	        wesi.equipment_index_key AS equipmentIndexKey,
 	        wesi.value_label AS valueLabel,
 	        wei.type_code AS typeCode,
 	        wei.type_name AS typeName,