优化接收iot数据逻辑处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IdxFeign.java

@@ -31,7 +31,7 @@ public interface IdxFeign {
     ResponseModel<JSONObject> queryDefectByBatchId(@PathVariable(value = "alarmLogId") String alarmLogId);
 
     @RequestMapping(value = "/defect/check/list", method = RequestMethod.POST)
-    JSONObject queryDefectByCodes(@RequestBody(required = false) List<String> codes, @RequestParam String checkId);
+    JSONObject queryDefectByCodes(@RequestBody(required = false) List<String> codes, @RequestParam("checkId") String checkId);
 
     @RequestMapping(value = "/qrcode/scrap/expired/put", method = RequestMethod.GET)
     ResponseModel<JSONObject> handleEquipNotScrapWhenExpired(@RequestParam("equipId") String equipId,

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificIndexMapper.java

@@ -35,6 +35,14 @@ public interface EquipmentSpecificIndexMapper extends BaseMapper<EquipmentSpecif
     List<EquipmentSpecificIndex> getEquipmentSpeIndexBySpeIotCode(String iotCode);
     
     /**
+     * 
+     * @param iotCode
+     * @param indexKey
+     * @return
+     */
+    List<EquipmentSpecificIndex> getEquipmentSpeIndexBySpeIotCodeAndIndexKey(@Param("iotCode") String iotCode, @Param("indexKey") String indexKey);
+
+    /**
      * <pre>
      * @Description: 通过iot_code查询，用于换流站系统的订阅数据
      * </pre>

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

@@ -82,6 +82,57 @@
           and wei.is_iot = true
     </select>
     
+    <select id="getEquipmentSpeIndexBySpeIotCodeAndIndexKey"
+            resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
+        SELECT wesi.id      AS id,
+               wei.name_key AS nameKey,
+               wesi.value AS value,
+	        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,
+	        wei.name AS indexName,
+	        wei.unit AS indexUnitName,
+	        wes.org_code AS orgCode,
+			wes.name AS equipmentSpecificName,
+			ed.equipment_name AS equipmentName,
+			wes.iot_code AS iotCode,
+			wes.code AS specificCode,
+			wei.`name` AS equipmentSpecificIndexName,
+			wei.`value_enum` AS valueEnum,
+			wei.is_trend AS isTrend,
+			wes.qr_code AS qrCode,
+			wesi.update_date AS updateDate,
+			ed.code AS equipmentCode,
+			ed.equipment_id AS equipmentId,
+			ed.id AS equipmentDetailId,
+			wes.code as equipmentSpecificCode,
+			wes.system_id as systemId,
+			wesi.is_alarm as isAlarm,
+			wesi.emergency_level_color as emergencyLevelColor,
+			wesi.emergency_level as emergencyLevel,
+			wesi.emergency_level_describe as emergencyLevelDescribe,
+			TRIM(CONCAT_WS(' ',wes.position,sd.description)) AS location,
+			sd.warehouse_structure_id AS buildId,
+            wes.biz_org_name AS bizOrgName,
+            wes.biz_org_code AS bizOrgCode,
+            wesi.alarm_rule AS alarmRule,
+            wesi.formula
+        FROM
+            wl_equipment_specific_index AS wesi
+            LEFT JOIN wl_equipment_specific AS wes
+        ON wes.id = wesi.equipment_specific_id
+            LEFT JOIN wl_equipment_detail ed ON ed.id = wes.equipment_detail_id
+            LEFT JOIN wl_equipment_index AS wei ON wei.id = wesi.equipment_index_id
+            LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = wes.id
+        WHERE
+            wes.iot_code = #{iotCode}
+          AND wesi.equipment_index_key = #{indexKey}
+    </select>
+
     <select id="getEquipmentSpeIndexByIotCode"
             resultType="com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex">
         SELECT wesi.id      AS id,