From 1150bf4cac814e04b7e4d8088fb0d607b23d30f6 Mon Sep 17 00:00:00 2001 From: "3067418132@qq.com" Date: Thu, 30 Apr 2026 17:40:07 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B8=A9=E6=B9=BF=E5=BA=A6=E4=BC=A0?= =?UTF-8?q?=E6=84=9F=E5=99=A8=E8=A7=A3=E6=9E=90=E4=BB=A3=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mh-admin/src/main/resources/application.yml | 2 +- .../java/com/mh/common/utils/AnalysisReceiveOrder485.java | 2 +- .../system/mapper/device/CollectionParamsManageMapper.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mh-admin/src/main/resources/application.yml b/mh-admin/src/main/resources/application.yml index c3ae7c3..44f7920 100644 --- a/mh-admin/src/main/resources/application.yml +++ b/mh-admin/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: prod # 用户配置 user: diff --git a/mh-common/src/main/java/com/mh/common/utils/AnalysisReceiveOrder485.java b/mh-common/src/main/java/com/mh/common/utils/AnalysisReceiveOrder485.java index 372b52e..1e27aa7 100644 --- a/mh-common/src/main/java/com/mh/common/utils/AnalysisReceiveOrder485.java +++ b/mh-common/src/main/java/com/mh/common/utils/AnalysisReceiveOrder485.java @@ -368,7 +368,7 @@ public class AnalysisReceiveOrder485 { BigDecimal bigDecimal = new BigDecimal(data); if (deviceCodeParam.getParamType().equals("12")){ // 温度 - bigDecimal = bigDecimal.multiply(new BigDecimal(550)).divide(new BigDecimal(1650)).subtract(new BigDecimal(40)); + bigDecimal = bigDecimal.multiply(new BigDecimal(165)).divide(new BigDecimal(1650)).subtract(new BigDecimal(40)); } else if (deviceCodeParam.getParamType().equals("35")) { // 湿度 bigDecimal = bigDecimal.multiply(new BigDecimal(100)); diff --git a/mh-system/src/main/java/com/mh/system/mapper/device/CollectionParamsManageMapper.java b/mh-system/src/main/java/com/mh/system/mapper/device/CollectionParamsManageMapper.java index 31490c7..620f628 100644 --- a/mh-system/src/main/java/com/mh/system/mapper/device/CollectionParamsManageMapper.java +++ b/mh-system/src/main/java/com/mh/system/mapper/device/CollectionParamsManageMapper.java @@ -350,16 +350,18 @@ public interface CollectionParamsManageMapper extends BaseMapper OffLine(); @Select("select * from collection_params_manage cpm " + - " where (cpm.system_type = '1' or cpm.system_type = '6') and is_use = 0 " + + " where (cpm.system_type = '1' or cpm.system_type = '6' or cpm.system_type = '0') and is_use = 0 " + " and (param_type= '16' " + " or param_type='18' " + " or param_type = '5' " + " or param_type = '2' " + " or param_type = '10' " + " or param_type = '12' " + + " or param_type = '13' " + + " or param_type = '35' " + " or param_type = '14' " + " or param_type = '11' " + " or param_type = '46' " + - " or param_type = '48')") + " or param_type = '48') and cpm.gateway_id != '99'") List createOrderList(); }