SAI查询优化

master/src/main/java/com/ruoyi/project/plant/controller/TStaffmgrController.java

@@ -124,7 +124,9 @@ public class TStaffmgrController extends BaseController
         SysUser sysUser = sysUserService.selectUserById(userId);
         String staffId = sysUser.getStaffId();
         TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrByStaffId(staffId);
-        staffmgr.setUserId(userId.toString());
+        if (staffmgr != null) {
+            staffmgr.setUserId(userId.toString());
+        }
         return AjaxResult.success(staffmgr);
     }
 

master/src/main/java/com/ruoyi/project/production/controller/TSaiController.java

@@ -84,26 +84,30 @@ public class TSaiController extends BaseController
         for (TSai sai : tSais) {
             if (sai.getSource().equals("装置") || sai.getSource().equals("督导")) {
                 Long saiLevel = sai.getSaiLevel();
-                if (saiLevel == 1L) {
-                    sum = sum.add(new BigDecimal("1"));
-                }
-                if (saiLevel == 2L) {
-                    sum = sum.add(new BigDecimal("2"));
-                }
-                if (saiLevel == 3L) {
-                    sum = sum.add(new BigDecimal("3"));
+                if (saiLevel != null) {
+                    if (saiLevel == 1L) {
+                        sum = sum.add(new BigDecimal("1"));
+                    }
+                    if (saiLevel == 2L) {
+                        sum = sum.add(new BigDecimal("2"));
+                    }
+                    if (saiLevel == 3L) {
+                        sum = sum.add(new BigDecimal("3"));
+                    }
                 }
             }
             if (sai.getSource().equals("CTS")) {
                 Long saiLevel = sai.getSaiLevel();
-                if (saiLevel == 1L) {
-                    sum2 = sum2.add(new BigDecimal("1"));
-                }
-                if (saiLevel == 2L) {
-                    sum2 = sum2.add(new BigDecimal("2"));
-                }
-                if (saiLevel == 3L) {
-                    sum2 = sum2.add(new BigDecimal("3"));
+                if (saiLevel != null) {
+                    if (saiLevel == 1L) {
+                        sum = sum.add(new BigDecimal("1"));
+                    }
+                    if (saiLevel == 2L) {
+                        sum = sum.add(new BigDecimal("2"));
+                    }
+                    if (saiLevel == 3L) {
+                        sum = sum.add(new BigDecimal("3"));
+                    }
                 }
             }
         }
@@ -135,14 +139,16 @@ public class TSaiController extends BaseController
         for (TSai sai : tSais) {
             if (sai.getSource().equals("装置") || sai.getSource().equals("督导")) {
                 Long saiLevel = sai.getSaiLevel();
-                if (saiLevel == 1L) {
-                    sum = sum.add(new BigDecimal("1"));
-                }
-                if (saiLevel == 2L) {
-                    sum = sum.add(new BigDecimal("2"));
-                }
-                if (saiLevel == 3L) {
-                    sum = sum.add(new BigDecimal("3"));
+                if (saiLevel != null) {
+                    if (saiLevel == 1L) {
+                        sum = sum.add(new BigDecimal("1"));
+                    }
+                    if (saiLevel == 2L) {
+                        sum = sum.add(new BigDecimal("2"));
+                    }
+                    if (saiLevel == 3L) {
+                        sum = sum.add(new BigDecimal("3"));
+                    }
                 }
             }
         }

ui/src/views/monitor/elec/center.vue

@@ -384,20 +384,24 @@ export default {
     initChartDialog() {
       // 基于准备好的dom，初始化echarts实例
       this.chart1 = this.echarts.init(document.getElementById('naturalGasChartDialog'))
-
+      const hourArray = [];
+      const carbonArray = [];
+      let data = this.latest24HourData;
+      for (let i = 0; i < data.length; i++) {
+        if (i % 4 == 0) {
+          let dateString = data[i].pullDate.toString().substr(
+            data[i].pullDate.toString().indexOf("T") + 1, 
+            data[i].pullDate.toString().indexOf(".000") - data[i].pullDate.toString().indexOf("T") - 4);
+          hourArray.push(dateString);
+          carbonArray.push(data[i].carbonRealTime=="#VALUE!"?"0":data[i].carbonRealTime);
+        }
+      }
+      hourArray.reverse();
+      carbonArray.reverse();
       this.chart1.setOption({
         xAxis: {
           type: 'category',
-          data: [
-            '00:00-03:00',
-            '03:00-06:00',
-            '06:00-09:00',
-            '09:00-12:00',
-            '12:00-15:00',
-            '15:00-18:00',
-            '18:00-21:00',
-            '21:00-00:00'
-          ]
+          data: hourArray,
         },
         yAxis: {
           type: 'value',
@@ -405,7 +409,7 @@ export default {
         },
         series: [
           {
-            data: [120, 200, 150, 80, 70, 110, 130],
+            data: carbonArray,
             type: 'line',
             smooth: true,
             symbol: '',