From 24c9043889aa9441be10e781bd6678758cb2f5d8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 03 十一月 2024 20:38:10 +0800
Subject: [PATCH] 优化统计计算代码
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/RealTimeDataService.java | 1 +
smart-man-boot/src/main/resources/dp/dpend.json | 2 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/RealTimeDataService.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/RealTimeDataService.java
index 5524749..a3ec464 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/RealTimeDataService.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/RealTimeDataService.java
@@ -34,6 +34,7 @@
statusJson.put("t", statusDTO.getT());
statusJson.put("v", statusDTO.getV());
+ //瀛樺湪闂锛孌eviceStastus,DeviceStatus_n浼氬嚑涔庡悓鏃惰繃鏉�
long preT = statusDTO.getT();
//鏈�鍚庝竴鏉′笉鍚屽��(v)鐨勬暟鎹�
ProcessParameterVO diffStatusVO = processParamMapper.lastParameterNotEqValue(workstationId, statusDpName, statusDTO.getV());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java
index fcf4c03..476f3f8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java
@@ -81,7 +81,7 @@
double sum = originalData2.stream().mapToDouble((v0) -> {
return v0.getDurationCollect();
}).sum();
- double running = originalData2.stream().filter(e -> e.getRps().equals(4)).collect(Collectors.toList()).stream().mapToDouble(SuperAggregateState::getDurationCollect).sum();
+ double running = originalData2.stream().filter(e -> e.getRps().equals(RpsTypeEnum.T4.getType())).collect(Collectors.toList()).stream().mapToDouble(SuperAggregateState::getDurationCollect).sum();
/*
double running = ((List) originalData2.stream().filter(e -> {
return e.getRps().equals(4);
diff --git a/smart-man-boot/src/main/resources/dp/dpend.json b/smart-man-boot/src/main/resources/dp/dpend.json
index 8753569..1577a2b 100644
--- a/smart-man-boot/src/main/resources/dp/dpend.json
+++ b/smart-man-boot/src/main/resources/dp/dpend.json
@@ -1 +1 @@
-[{"prop":"dpUnit","label":"鍗曚綅"},{"prop":"ruleContent","label":"璁＄畻瑙勫垯","describe":"璁＄畻瑙勫垯鏉ユ簮浜嶽瑙勫垯绠＄悊-璁＄畻瑙勫垯]锛岄�氳繃lua鑴氭湰缂栧啓璁＄畻瑙勫垯锛屽鏁版嵁鐐圭殑鍘熷鏁版嵁杩涜璁＄畻锛岀敓鎴愭柊鐨勬暟鎹偣鍙婃暟鎹偣鍊笺��","sendCode":1,"isReqOptions":true,"type":"option","options":[]},{"prop":"ruleArgs","label":"璁＄畻鍙傛暟","describe":"鏍规嵁璁＄畻瑙勫垯锛屽～鍐欒绠楀弬鏁帮紝澶氫釜璁＄畻鍙傛暟鐢ㄨ嫳鏂団�滐紝鈥濋殧寮�锛涙敞鎰�:dpValue涓洪噰闆嗗埌鐨勫�间笉闇�瑕佸～鍐欍��","sendCode":1},{"prop":"access","isRequired":true,"sendCode":1,"label":"鏉冮檺","describe":"璇诲啓鏉冮檺\\n RO(鍙)锛氬彧鍏佽璇诲彇鐐逛綅鏁版嵁銆乗\nRW(璇�/鍐�)锛氭棦鑳借鍙栨暟鎹篃鑳藉啓鍏ユ暟鎹��","default":"RO","type":"option","options":["RO","RW"]},{"prop":"pollingInterval","isRequired":true,"label":"杞闂撮殧锛坢s锛�","describe":"杞闂撮殧锛坢s锛�","default":1000},{"prop":"keepOriginalValue","isRequired":true,"sendCode":1,"label":"淇濈暀鍘熷鍊�","describe":"淇濈暀鍘熷鍊�","default":true,"type":"boolean"},{"prop":"isSave","isRequired":true,"sendCode":1,"label":"鏄惁瀛樺偍","describe":"鏄惁瀛樺偍","default":true,"type":"boolean"}]
\ No newline at end of file
+[{"prop":"dpUnit","label":"鍗曚綅"},{"prop":"ruleContent","label":"璁＄畻瑙勫垯","describe":"璁＄畻瑙勫垯鏉ユ簮浜嶽瑙勫垯绠＄悊-璁＄畻瑙勫垯]锛岄�氳繃lua鑴氭湰缂栧啓璁＄畻瑙勫垯锛屽鏁版嵁鐐圭殑鍘熷鏁版嵁杩涜璁＄畻锛岀敓鎴愭柊鐨勬暟鎹偣鍙婃暟鎹偣鍊笺��","sendCode":1,"isReqOptions":true,"type":"option","options":["s7status_trans"]},{"prop":"ruleArgs","label":"璁＄畻鍙傛暟","describe":"鏍规嵁璁＄畻瑙勫垯锛屽～鍐欒绠楀弬鏁帮紝澶氫釜璁＄畻鍙傛暟鐢ㄨ嫳鏂団�滐紝鈥濋殧寮�锛涙敞鎰�:dpValue涓洪噰闆嗗埌鐨勫�间笉闇�瑕佸～鍐欍��","sendCode":1},{"prop":"access","isRequired":true,"sendCode":1,"label":"鏉冮檺","describe":"璇诲啓鏉冮檺\\n RO(鍙)锛氬彧鍏佽璇诲彇鐐逛綅鏁版嵁銆乗\nRW(璇�/鍐�)锛氭棦鑳借鍙栨暟鎹篃鑳藉啓鍏ユ暟鎹��","default":"RO","type":"option","options":["RO","RW"]},{"prop":"pollingInterval","isRequired":true,"label":"杞闂撮殧锛坢s锛�","describe":"杞闂撮殧锛坢s锛�","default":1000},{"prop":"keepOriginalValue","isRequired":true,"sendCode":1,"label":"淇濈暀鍘熷鍊�","describe":"淇濈暀鍘熷鍊�","default":true,"type":"boolean"},{"prop":"isSave","isRequired":true,"sendCode":1,"label":"鏄惁瀛樺偍","describe":"鏄惁瀛樺偍","default":true,"type":"boolean"}]
\ No newline at end of file
--
Gitblit v1.9.3