2024-10-19 设备驾驶舱接口调整

src/main/java/com/baosight/hpjx/hp/bi/sql/HPBI003.xml

@@ -34,13 +34,27 @@
             a.DEVICE_CODE as "deviceCode",
             a.DEVICE_NAME as "deviceName",
             a.DEVICE_MODEL as "deviceModel",
-            case when c.LOG_VALUE = 3 || c.LOG_VALUE = 5 || c.LOG_VALUE = 6 then '关机' else '开机' end as status
+            ifnull(c.LOG_VALUE, 0) as "status"
         from ${hpjxSchema}.t_hpsb003 a
-        join ${hpjxSchema}.t_hpsb002 c on a.DEVICE_CODE = c.EQUIPMENT_CODE
+        left join (
+            select EQUIPMENT_CODE, LOG_VALUE
+            from ${hpjxSchema}.t_hpsb002 where EQUIPMENT_TYPE = 'STARUS_TYPE'
+            <isNotEmpty prepend=" AND " property="companyCode">
+                COMPANY_CODE = #companyCode#
+            </isNotEmpty>
+            <isNotEmpty prepend=" AND " property="date">
+                CREATED_TIME =(
+                    select MAX(CREATED_TIME) from ${hpjxSchema}.t_hpsb002
+                    where EQUIPMENT_TYPE = 'STARUS_TYPE' and left(CREATED_TIME,8) = #date#
+                    <isNotEmpty prepend=" AND " property="companyCode">
+                        COMPANY_CODE = #companyCode#
+                    </isNotEmpty>
+                )
+            </isNotEmpty>
+        ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
         where
             a.DELETE_FLAG = 0
             and DEVICE_STATUS = 1
-            and c.EQUIPMENT_TYPE = 'STARUS_TYPE'
             <isNotEmpty prepend=" AND " property="companyCode">
                 a.COMPANY_CODE = #companyCode#
             </isNotEmpty>
@@ -50,13 +64,6 @@
             <isNotEmpty prepend=" AND " property="deviceCode">
                 a.DEVICE_CODE = #deviceCode#
             </isNotEmpty>
-            <isNotEmpty prepend=" AND " property="date">
-                c.CREATED_TIME =(
-                    select MAX(CREATED_TIME) from hpjx.t_hpsb002
-                    where EQUIPMENT_TYPE = 'STARUS_TYPE' and left(CREATED_TIME,8) = #date#
-                )
-
-            </isNotEmpty>
         order by a.DEVICE_CODE
     </select>