修改三维告警初始化jiekou

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

@@ -61,7 +61,7 @@
             wsi.update_date DESC
     </select>
     <select id="getInitAlarm" resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo">
-        SELECT
+       <!--  SELECT
         concat( wes.id ) AS id,
         concat( wes.id ) AS equipmentSpecificId,
         wes.`name`,
@@ -88,7 +88,24 @@
             </foreach>
         </if>
         ORDER BY
-        wes.realtime_iot_index_update_date DESC
+        wes.realtime_iot_index_update_date DESC -->
+        SELECT
+			esa.equipment_specific_id as id,
+			esa.equipment_specific_id as equipmentSpecificId,
+			esa.equipment_specific_name as name,
+			es.`code`,
+			esa.equipment_index_id as equipmentIndexId,
+			esa.equipment_specific_index_key as name_key,
+			esa.equipment_specific_index_name equipmentIndexName,
+			esa.equipment_specific_index_value as `value`,
+			 'equip' AS type,
+			 esa.type as typeCode,
+				es.iot_code as iotCode
+		FROM
+			wl_equipment_specific_alarm esa,wl_equipment_specific es 
+		WHERE
+			esa.`status` = 1 AND esa.equipment_specific_id = es.id
+			ORDER BY esa.update_date DESC
     </select>
     <select id="countEquipIndexAndValueOfNum" resultType="map">
         SELECT

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

@@ -225,7 +225,7 @@
                         wlesi.`value`     `status`,
                         wles.code,
                         wlesi.update_date changeDate,
-                        CONCAT(ed.NAME, ' ', wlei.NAME,
+                        CONCAT(ed.NAME, ' ', wlei.NAME,IF(wlesi.`value`='true',' 开',' 合'),
                                IF((ISNULL(ws.full_name) AND ISNULL(sd.description)), '', CONCAT(
                                        '【',
                                        IFNULL(ws.full_name, ''),