coolcare-lite-scada-component 4.0.10 → 4.0.11

package/es/element/ElePointValue/PropsSet/StatisticsPropsSet/index.js

@@ -71,6 +71,12 @@ var StatisticsPropsSet = function StatisticsPropsSet() {
     }, {
       label: '本年',
       value: 1
+    }, {
+      label: '本日',
+      value: 2
+    }, {
+      label: '本周',
+      value: 3
     }]
   })));
 };

package/es/element/ElePointValue/index.js

@@ -47,6 +47,8 @@ export var defaultConfig = {
       isShow: true
     },
     value: {},
+    valueType: 0,
+    valueDate: 0,
     events: [{
       type: 'click',
       action: 'show-point-history'

package/es/pages/display/Player/index.js

@@ -31,10 +31,54 @@ import ModalFanDevicePoint from "../../../components/ModalFanDevicePoint";
 import emitter from "../../../utils/events";
 import { GetDeviceIndicator, GetDevicePoint } from "../../../services/gateway/Device";
 import "./index.css";
-import { GetTdIndicatorAggregateData } from "../../../services/gateway/Point";
+import { GetTdIndicatorAggregateData, GetTdIndicatorHistoryData } from "../../../services/gateway/Point";
 import dayjs from 'dayjs';
 import { GetEnergyByMeterList } from "../../../services/energy";
 import ModalChangePointValue from "../../../components/ModalChangePointValue";
+var DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+var HISTORY_DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm';
+var getIndicatorHistoryTotalValue = function getIndicatorHistoryTotalValue(indicatorDataList) {
+  var valueList = (indicatorDataList || []).filter(function (item) {
+    return Number.isFinite(item === null || item === void 0 ? void 0 : item.val);
+  });
+  if (!valueList.length) {
+    return 0;
+  }
+  return valueList.reduce(function (sum, item) {
+    return sum + Number(item.val);
+  }, 0);
+};
+var getStatisticsTimeRange = function getStatisticsTimeRange() {
+  var dateType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var now = dayjs();
+  switch (dateType) {
+    case 2:
+      return {
+        startTime: now.startOf('day').format(DATE_TIME_FORMAT),
+        endTime: now.endOf('day').format(DATE_TIME_FORMAT)
+      };
+    case 3:
+      {
+        var dayOfWeek = now.day();
+        var startOfWeek = now.startOf('day').subtract(dayOfWeek === 0 ? 6 : dayOfWeek - 1, 'day');
+        return {
+          startTime: startOfWeek.format(DATE_TIME_FORMAT),
+          endTime: startOfWeek.add(6, 'day').endOf('day').format(DATE_TIME_FORMAT)
+        };
+      }
+    case 1:
+      return {
+        startTime: now.startOf('year').format(DATE_TIME_FORMAT),
+        endTime: now.endOf('year').format(DATE_TIME_FORMAT)
+      };
+    case 0:
+    default:
+      return {
+        startTime: now.startOf('month').format(DATE_TIME_FORMAT),
+        endTime: now.endOf('month').format(DATE_TIME_FORMAT)
+      };
+  }
+};
 var Player = function Player(_ref) {
   var _jsonConfig$pageConfi;
   var jsonConfig = _ref.jsonConfig,
@@ -354,12 +398,6 @@ var Player = function Player(_ref) {
                   scadaId: scadaId
                 }
               });
-              console.log('[186]-index.tsx', onEvent, {
-                event: 'freedom-scene-switch',
-                payload: {
-                  scadaId: scadaId
-                }
-              });
             case 1:
               return _context5.a(2);
           }
@@ -478,7 +516,7 @@ var Player = function Player(_ref) {
         clearInterval(timer);
       }
     };
-  }, [query, jsonConfig, mittMeta]);
+  }, [query, jsonConfig, mittMeta, RefreshFrequency]);
   useEffect(function () {}, [query, jsonConfig, mittMeta]);
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
@@ -549,10 +587,11 @@ var Player = function Player(_ref) {
     }();
     var fetchDeviceSpecialPoint = /*#__PURE__*/function () {
       var _ref1 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(ids, dateType) {
-        var res, pointList;
+        var _getStatisticsTimeRan, startTime, endTime, res, pointList;
         return _regenerator().w(function (_context9) {
           while (1) switch (_context9.n) {
             case 0:
+              _getStatisticsTimeRan = getStatisticsTimeRange(dateType), startTime = _getStatisticsTimeRan.startTime, endTime = _getStatisticsTimeRan.endTime;
               _context9.n = 1;
               return GetTdIndicatorAggregateData(ids.map(function (v) {
                 var productNo = {
@@ -565,8 +604,8 @@ var Player = function Player(_ref) {
                   indicatorNo: "".concat(str[0], "_").concat(str[1], "_").concat(productNo[str[0]]),
                   aggregateType: 3,
                   timeQuantumList: [{
-                    startDate: dayjs().startOf(dateType == 0 ? 'month' : 'year').format('YYYY-MM-DD 00:00:00'),
-                    endDate: dayjs().endOf(dateType == 0 ? 'month' : 'year').format('YYYY-MM-DD 23:59:59')
+                    startDate: startTime,
+                    endDate: endTime
                   }]
                 };
               }));
@@ -595,16 +634,68 @@ var Player = function Player(_ref) {
         return _ref1.apply(this, arguments);
       };
     }();
-    var fetchEnergyByMeterList = /*#__PURE__*/function () {
-      var _ref10 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(type, ids, dateType) {
+    var fetchIndicatorSpecialPoint = /*#__PURE__*/function () {
+      var _ref10 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(ids, dateType) {
+        var _getStatisticsTimeRan2, startTime, endTime, res, pointList;
         return _regenerator().w(function (_context0) {
           while (1) switch (_context0.n) {
             case 0:
+              _getStatisticsTimeRan2 = getStatisticsTimeRange(dateType), startTime = _getStatisticsTimeRan2.startTime, endTime = _getStatisticsTimeRan2.endTime;
+              _context0.n = 1;
+              return GetTdIndicatorHistoryData({
+                indicatorNoList: ids,
+                timeQuantum: {
+                  startDate: dayjs(startTime).format(HISTORY_DATE_TIME_FORMAT),
+                  endDate: dayjs(endTime).format(HISTORY_DATE_TIME_FORMAT)
+                },
+                interval: 0
+              });
+            case 1:
+              res = _context0.v;
+              if (res.success) {
+                _context0.n = 2;
+                break;
+              }
+              message.error('璁惧鐐逛綅鏁版嵁鑾峰彇澶辫触');
+              return _context0.a(2);
+            case 2:
+              pointList = res.data || [];
+              pointList.forEach(function (v, index) {
+                var indicatorNo = v.indicatorNo || ids[index];
+                var totalValue = getIndicatorHistoryTotalValue(v.indicatorDataList);
+                emitter.emit("point-update-".concat(indicatorNo, "-").concat(mittMeta.namespace), _objectSpread(_objectSpread({}, v), {}, {
+                  aggregateDataList: [{
+                    val: totalValue,
+                    ts: endTime
+                  }],
+                  indicatorData: {
+                    val: totalValue,
+                    ts: endTime
+                  },
+                  updateTime: endTime
+                }));
+              });
+            case 3:
+              return _context0.a(2);
+          }
+        }, _callee0);
+      }));
+      return function fetchIndicatorSpecialPoint(_x1, _x10) {
+        return _ref10.apply(this, arguments);
+      };
+    }();
+    var fetchEnergyByMeterList = /*#__PURE__*/function () {
+      var _ref11 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(type, ids, dateType) {
+        var _getStatisticsTimeRan3, startTime, endTime;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
+            case 0:
+              _getStatisticsTimeRan3 = getStatisticsTimeRange(dateType), startTime = _getStatisticsTimeRan3.startTime, endTime = _getStatisticsTimeRan3.endTime;
               GetEnergyByMeterList({
                 dataType: type,
                 meterIdList: ids,
-                startDateTime: dayjs().startOf(dateType == 0 ? 'month' : 'year').format('YYYY-MM-DD 00:00:00'),
-                endDateTime: dayjs().endOf(dateType == 0 ? 'month' : 'year').format('YYYY-MM-DD 23:59:59'),
+                startDateTime: startTime,
+                endDateTime: endTime,
                 dateType: 2
               }).then(function (res) {
                 if (res.success) {
@@ -614,15 +705,16 @@ var Player = function Player(_ref) {
                 }
               });
             case 1:
-              return _context0.a(2);
+              return _context1.a(2);
           }
-        }, _callee0);
+        }, _callee1);
       }));
-      return function fetchEnergyByMeterList(_x1, _x10, _x11) {
-        return _ref10.apply(this, arguments);
+      return function fetchEnergyByMeterList(_x11, _x12, _x13) {
+        return _ref11.apply(this, arguments);
       };
     }();
-    var timer;
+    var pointTimer;
+    var indicatorTimer;
     var specialPointTimer;
     var meterPointTimer;
     if (query.scene === 'freedom' && jsonConfig) {
@@ -670,59 +762,89 @@ var Player = function Player(_ref) {
       });
       if (pointIds.length > 0) {
         fetchDevicePoints(pointIds);
-        timer = setInterval(function () {
+        pointTimer = setInterval(function () {
           fetchDevicePoints(pointIds);
         }, RefreshFrequency);
       }
       if (indicator.length > 0) {
         fetchDeviceIndicator(indicator);
-        timer = setInterval(function () {
+        indicatorTimer = setInterval(function () {
           fetchDeviceIndicator(indicator);
         }, RefreshFrequency);
       }
       if (specialPoint.length) {
-        var monthPoint = specialPoint.filter(function (item) {
-          return item.data.valueDate == 0;
-        }).map(function (item) {
-          return item.data.pointList[0].pointId;
-        });
-        var yaerPoint = specialPoint.filter(function (item) {
-          return item.data.valueDate == 1;
-        }).map(function (item) {
-          return item.data.pointList[0].pointId;
-        });
-        monthPoint.length && fetchDeviceSpecialPoint(monthPoint, 0);
-        yaerPoint.length && fetchDeviceSpecialPoint(yaerPoint, 1);
-        specialPointTimer = setInterval(function () {
-          monthPoint.length && fetchDeviceSpecialPoint(monthPoint, 0);
-          yaerPoint.length && fetchDeviceSpecialPoint(yaerPoint, 1);
-        }, RefreshFrequency);
+        var statisticsDateList = _toConsumableArray(new Set(specialPoint.map(function (item) {
+          var _item$data$valueDate;
+          return (_item$data$valueDate = item.data.valueDate) !== null && _item$data$valueDate !== void 0 ? _item$data$valueDate : 0;
+        })));
+        var fetchSpecialPoints = function fetchSpecialPoints() {
+          statisticsDateList.forEach(function (dateType) {
+            var pointIds = specialPoint.filter(function (item) {
+              var _item$data$valueDate2;
+              return ((_item$data$valueDate2 = item.data.valueDate) !== null && _item$data$valueDate2 !== void 0 ? _item$data$valueDate2 : 0) === dateType;
+            }).filter(function (item) {
+              var _item$data$pointList$;
+              return ((_item$data$pointList$ = item.data.pointList[0]) === null || _item$data$pointList$ === void 0 ? void 0 : _item$data$pointList$.valueType) !== 'indicator';
+            }).map(function (item) {
+              var _item$data$pointList$2;
+              return (_item$data$pointList$2 = item.data.pointList[0]) === null || _item$data$pointList$2 === void 0 ? void 0 : _item$data$pointList$2.pointId;
+            }).filter(Boolean);
+            var indicatorNos = specialPoint.filter(function (item) {
+              var _item$data$valueDate3;
+              return ((_item$data$valueDate3 = item.data.valueDate) !== null && _item$data$valueDate3 !== void 0 ? _item$data$valueDate3 : 0) === dateType;
+            }).filter(function (item) {
+              var _item$data$pointList$3;
+              return ((_item$data$pointList$3 = item.data.pointList[0]) === null || _item$data$pointList$3 === void 0 ? void 0 : _item$data$pointList$3.valueType) === 'indicator';
+            }).map(function (item) {
+              var _item$data$pointList$4;
+              return (_item$data$pointList$4 = item.data.pointList[0]) === null || _item$data$pointList$4 === void 0 ? void 0 : _item$data$pointList$4.indicatorNo;
+            }).filter(Boolean);
+            if (pointIds.length > 0) {
+              fetchDeviceSpecialPoint(pointIds, dateType);
+            }
+            if (indicatorNos.length > 0) {
+              fetchIndicatorSpecialPoint(indicatorNos, dateType);
+            }
+          });
+        };
+        fetchSpecialPoints();
+        specialPointTimer = setInterval(fetchSpecialPoints, RefreshFrequency);
       }
       if (virtual.length) {
         var dataType = _toConsumableArray(new Set(virtual.map(function (item) {
-          return item.data.pointList[0].dataType;
-        })));
+          var _item$data$pointList$5;
+          return (_item$data$pointList$5 = item.data.pointList[0]) === null || _item$data$pointList$5 === void 0 ? void 0 : _item$data$pointList$5.dataType;
+        }).filter(Boolean)));
         var valueDate = _toConsumableArray(new Set(virtual.map(function (item) {
-          return item.data.valueDate;
+          var _item$data$valueDate4;
+          return (_item$data$valueDate4 = item.data.valueDate) !== null && _item$data$valueDate4 !== void 0 ? _item$data$valueDate4 : 0;
         })));
-        dataType.forEach(function (type) {
-          valueDate.forEach(function (date) {
-            var ids = virtual.filter(function (item) {
-              return item.data.pointList[0].dataType == type && item.data.valueDate == date;
-            }).map(function (item) {
-              return item.data.pointList[0].meterId;
+        var fetchVirtualPoints = function fetchVirtualPoints() {
+          dataType.forEach(function (type) {
+            valueDate.forEach(function (date) {
+              var ids = virtual.filter(function (item) {
+                var _item$data$pointList$6, _item$data$valueDate5;
+                return ((_item$data$pointList$6 = item.data.pointList[0]) === null || _item$data$pointList$6 === void 0 ? void 0 : _item$data$pointList$6.dataType) == type && ((_item$data$valueDate5 = item.data.valueDate) !== null && _item$data$valueDate5 !== void 0 ? _item$data$valueDate5 : 0) === date;
+              }).map(function (item) {
+                var _item$data$pointList$7;
+                return (_item$data$pointList$7 = item.data.pointList[0]) === null || _item$data$pointList$7 === void 0 ? void 0 : _item$data$pointList$7.meterId;
+              }).filter(Boolean);
+              if (ids.length > 0) {
+                fetchEnergyByMeterList(type, ids, date);
+              }
             });
-            ids.length && fetchEnergyByMeterList(type, ids, date);
-            meterPointTimer = setInterval(function () {
-              ids.length && fetchEnergyByMeterList(type, ids, date);
-            }, RefreshFrequency);
           });
-        });
+        };
+        fetchVirtualPoints();
+        meterPointTimer = setInterval(fetchVirtualPoints, RefreshFrequency);
       }
     }
     return function () {
-      if (timer) {
-        clearInterval(timer);
+      if (pointTimer) {
+        clearInterval(pointTimer);
+      }
+      if (indicatorTimer) {
+        clearInterval(indicatorTimer);
       }
       if (specialPointTimer) {
         clearInterval(specialPointTimer);
@@ -731,7 +853,7 @@ var Player = function Player(_ref) {
         clearInterval(meterPointTimer);
       }
     };
-  }, [query, jsonConfig, mittMeta]);
+  }, [query, jsonConfig, mittMeta, RefreshFrequency]);
   useEffect(function () {
     var graph = graphRef.current;
     if (jsonConfig && graph && query) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "4.0.10",
+  "version": "4.0.11",
   "scripts": {
     "start": "cross-env PORT=8000 UMI_ENV=prod umi dev",
     "build:prod": "cross-env UMI_ENV=prod umi build",