2024-10-21

1.新增APP设备管理接口调整

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB010.xml

@@ -180,11 +180,26 @@
             a.DEVICE_CODE as "deviceCode",
             a.DEVICE_NAME as "deviceName",
             a.DEVICE_MODEL as "deviceModel",
-            c.LOG_VALUE as "status"
+            ifnull(c.LOG_VALUE, 0) as "status"
         from ${hggpSchema}.HGSB001 a
-        join ${hggpSchema}.HGSB010 c on a.DEVICE_CODE = c.EQUIPMENT_CODE
-        where
-            a.DELETE_FLAG = 0  and DEVICE_STATUS = 1 and c.EQUIPMENT_TYPE = 'STARUS_TYPE'
+        left join (
+            select EQUIPMENT_CODE, LOG_VALUE
+            from ${hggpSchema}.HGSB010 where EQUIPMENT_TYPE = 'STARUS_TYPE'
+            <isNotEmpty prepend=" AND " property="accountCode">
+                ACCOUNT_CODE = #accountCode#
+            </isNotEmpty>
+            <isNotEmpty prepend=" AND " property="date">
+                CREATED_TIME =(
+                    select MAX(CREATED_TIME)
+                    from ${hggpSchema}.HGSB010
+                    where EQUIPMENT_TYPE = 'STARUS_TYPE' and left(CREATED_TIME,8) = #date#
+                )
+            </isNotEmpty>
+        ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
+        where a.DELETE_FLAG = 0  and a.DEVICE_STATUS = 1
+            <isNotEmpty prepend=" AND " property="accountCode">
+                a.ACCOUNT_CODE = #accountCode#
+            </isNotEmpty>
             <isNotEmpty prepend=" AND " property="companyCode">
                 a.COMPANY_CODE = #companyCode#
             </isNotEmpty>
@@ -194,12 +209,6 @@
             <isNotEmpty prepend=" AND " property="deviceCode">
                 a.DEVICE_CODE = #deviceCode#
             </isNotEmpty>
-            <isNotEmpty prepend=" AND " property="date">
-                c.CREATED_TIME =(
-                select MAX(CREATED_TIME) from ${hggpSchema}.HGSB010
-                where EQUIPMENT_TYPE = 'STARUS_TYPE' and left(CREATED_TIME,8) = #date#
-                )
-            </isNotEmpty>
         order by a.DEVICE_CODE
     </select>