设备驾驶舱数据修复

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

@@ -31,32 +31,39 @@
 
     <select id="queryBySbStatus" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
         select
-            a.DEVICE_CODE as "deviceCode",
-            a.DEVICE_NAME as "deviceName",
-            a.DEVICE_MODEL as "deviceModel",
-            c.LOG_VALUE as status
+        a.DEVICE_CODE as "deviceCode",
+        a.DEVICE_NAME as "deviceName",
+        a.DEVICE_MODEL as "deviceModel",
+        ifnull(c.LOG_VALUE, 0) as "status"
         from ${hpjxSchema}.t_hpsb003 a
-        join ${hpjxSchema}.t_hpsb002 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 ${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">
-                a.COMPANY_CODE = #companyCode#
-            </isNotEmpty>
-            <isNotEmpty prepend=" AND " property="factoryCode">
-                a.FACTORY_CODE = #factoryCode#
-            </isNotEmpty>
-            <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#
-                )
-
+                COMPANY_CODE = #companyCode#
             </isNotEmpty>
+            )
+        </isNotEmpty>
+        ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
+        where
+        a.DELETE_FLAG = 0
+        and DEVICE_STATUS = 1
+        <isNotEmpty prepend=" AND " property="companyCode">
+            a.COMPANY_CODE = #companyCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            a.FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="deviceCode">
+            a.DEVICE_CODE = #deviceCode#
+        </isNotEmpty>
         order by a.DEVICE_CODE
     </select>
 

src/main/webapp/HP/BI/HPBI004.jsp

@@ -271,18 +271,23 @@
             this.setOption2();
 
 
+            // var _this = this;
+            // setTimeout(function() {
+            //     _this.initPage();
+            // }, 60000);
+
             setTimeout(function() {
-                this.init();
+                 window.location.reload();
             }, 60000);
         },
         methods: {
-            init(){
-                this.getYesterdayDateFormatted();
-                this.queryCompanyInfo();
-                this.queryBySbStatus();
-                this.querySbYes();
-                this.querySbNo();
-            },
+            // initPage(){
+            //     this.getYesterdayDateFormatted();
+            //     this.queryCompanyInfo();
+            //     this.queryBySbStatus();
+            //     this.querySbYes();
+            //     this.querySbNo();
+            // },
             formatTime(currentTime) {
                 const formattedTime =
                     currentTime.getFullYear() +