From 2c487a8242468d48fe0099a2a07d2c74d6576b2a Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 24 Jan 2024 21:07:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OracleResultServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java index 5a5c428ee..26ec75b00 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java @@ -778,24 +778,24 @@ public class OracleResultServiceImpl implements OracleResultService { break; case 56: //三相总有功功率 - harmonicHistoryData=HistoryDataMapper.getDataHarmpowerP_t(historyParam); - break; - case 57: - //三相总无功功率 if(type==0) { - harmonicHistoryData=HistoryDataMapper.getDataHarmpowerQ_t(historyParam); + harmonicHistoryData=HistoryDataMapper.getDataHarmpowerP_t(historyParam); }else{ harmonicHistoryData =ztHarmonicHistoryP(historyParam,3); } break; - case 58: - //三相总视在功率 + case 57: + //三相总无功功率 if(type==0) { - harmonicHistoryData=HistoryDataMapper.getDataHarmpowerS_t(historyParam); + harmonicHistoryData=HistoryDataMapper.getDataHarmpowerQ_t(historyParam); }else{ harmonicHistoryData =ztHarmonicHistoryP(historyParam,4); } break; + case 58: + //三相总视在功率 + harmonicHistoryData=HistoryDataMapper.getDataHarmpowerS_t(historyParam); + break; case 59: //视在功率因数 if(type==0) {