From 39f22007d8e10fb8e98e946b163bdcdfe847e0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=96=E5=BE=B7=E4=BA=91?= Date: Thu, 27 Nov 2025 21:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=AF=86=E9=92=A5=E5=92=8CID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-auth.yml | 4 ++-- .../java/com/ruoyi/caltools/controller/DpFlowCalc.java | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-auth.yml b/ruoyi-admin/src/main/resources/application-auth.yml index 2236322..00a91a6 100644 --- a/ruoyi-admin/src/main/resources/application-auth.yml +++ b/ruoyi-admin/src/main/resources/application-auth.yml @@ -2,8 +2,8 @@ oauth: wx: miniapp: - appId: appId - appSecret: appSecret + appId: wx9f9b7d747d261686 + appSecret: b55d707dbe4e98d5db23648694a8ce8e url: https://api.weixin.qq.com/sns/jscode2session pub: appId: appId diff --git a/ruoyi-models/ruoyi-ngtools/src/main/java/com/ruoyi/caltools/controller/DpFlowCalc.java b/ruoyi-models/ruoyi-ngtools/src/main/java/com/ruoyi/caltools/controller/DpFlowCalc.java index 9707471..cc4c13a 100644 --- a/ruoyi-models/ruoyi-ngtools/src/main/java/com/ruoyi/caltools/controller/DpFlowCalc.java +++ b/ruoyi-models/ruoyi-ngtools/src/main/java/com/ruoyi/caltools/controller/DpFlowCalc.java @@ -366,12 +366,14 @@ public class DpFlowCalc { // 6. 计算标况流量（GB/T 21446-2008 式(1)） double Qn = flowProps.getdVFlowf() * (flowProps.getdFpv()*flowProps.getdFpv() * P1 / flowProps.getdPb_M()) * (flowProps.getdTb_M()) / Tf; - flowProps.setdVFlowb(FormatUtil.format(Qn,Optional.of(4))); + flowProps.setdVFlowb(FormatUtil.format(Qn,Optional.of(5))); + + flowProps.setdBk(BkTable()); //标况质量流量 - flowProps.setdMFlowb(FormatUtil.format(flowProps.getdVFlowb() * gasProps.dRhob,Optional.of(4))); + flowProps.setdMFlowb(FormatUtil.format(flowProps.getdVFlowb() * gasProps.dRhob,Optional.of(5))); //标况能量流量 - flowProps.setdEFlowb(FormatUtil.format(flowProps.getdVFlowb() * gasProps.dHhvv,Optional.of(4))); + flowProps.setdEFlowb(FormatUtil.format(flowProps.getdVFlowb() * gasProps.dHhvv,Optional.of(5))); //管道内天然气流速 flowProps.setdVelocityFlow(FormatUtil.format(flowProps.getdVFlowf() / (Math.PI * Math.pow((flowProps.getdPipeD() / 2000), 2)),Optional.of(3))); //压力损失 @@ -887,7 +889,7 @@ public class DpFlowCalc { return returnValue; } - private double BkTable(double temPrk, double tempKj, int tempBkjsff) { + private static double BkTable(double temPrk, double tempKj, int tempBkjsff) { double[] BkTable_x = new double[10]; double[] BkTable_Y = new double[10]; //On Error Resume Next VBConversions Warning: On Error Resume Next not supported in C#