yangys
2024-11-03 24c9043889aa9441be10e781bd6678758cb2f5d8
优化统计计算代码
已修改3个文件
5 ■■■■■ 文件已修改
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/RealTimeDataService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/utils/EifficiencyUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smart-man-boot/src/main/resources/dp/dpend.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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());
            
            //存在问题,DeviceStastus,DeviceStatus_n会几乎同时过来
            long preT = statusDTO.getT();
            //最后一条不同值(v)的数据
            ProcessParameterVO diffStatusVO = processParamMapper.lastParameterNotEqValue(workstationId, statusDpName, statusDTO.getV());
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);
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":"轮询间隔(ms)","describe":"轮询间隔(ms)","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"}]
[{"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":"轮询间隔(ms)","describe":"轮询间隔(ms)","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"}]