Merge branch 'dev_upgrade' of…

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -826,6 +826,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             specificIndexVo.setName(name);
             specificIndexVo.setCode(protalData.getPointNo());
             specificIndexVo.setType("patrol");
+            specificIndexVo.setTypeCode("patrol");
             specificIndexVo.setNameKey("patrol");
             if ("2".equals(nodeState) || "3".equals(nodeState)) {
                 specificIndexVo.setValue("true");

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific_index.xml

@@ -70,10 +70,12 @@
         wes.realtime_iot_index_key AS name_key,
         wes.realtime_iot_index_name AS equipmentIndexName,
         wes.realtime_iot_index_value AS `value`,
-        'equip' AS type
+        'equip' AS type,
+		ei.type_code as typeCode,
+		wes.iot_code as iotCode
         FROM
         wl_equipment_specific wes
-        LEFT JOIN wl_equipment_index ei ON ei.id = wes.realtime_iot_es_index_id
+        LEFT JOIN wl_equipment_index ei ON ei.id = wes.realtime_iot_index_id
         WHERE
         ei.is_iot = 1
         <if test="value != null and value != ''">

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_p_point.xml

@@ -26,6 +26,7 @@
         p.point_no AS `code`,
         'patrol' AS type,
         'patrol' AS nameKey,
+        'patrol' AS typeCode,
         CASE
         WHEN p.`status` = '2' THEN
         'true'