From da80ade6689dabad053d9a6af2b52b8ba412f88f Mon Sep 17 00:00:00 2001 From: 25604 Date: Fri, 14 Nov 2025 17:39:18 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E8=92=B8=E6=B1=BD?= =?UTF-8?q?=E6=9C=BA=E8=BF=90=E8=A1=8C=E6=8A=A5=E8=A1=A8=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=B0=B4=E7=AE=B1=E6=8C=87=E4=BB=A4=E7=94=9F=E6=88=90=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mh/common/core/domain/dto/ReportSteamRunParamDTO.java | 2 +- .../mh/common/core/domain/entity/ReportSteamRunParamHis.java | 2 +- .../mh/system/mapper/device/CollectionParamsManageMapper.java | 2 +- .../mh/system/mapper/report/ReportSteamRunParamHisMapper.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mh-common/src/main/java/com/mh/common/core/domain/dto/ReportSteamRunParamDTO.java b/mh-common/src/main/java/com/mh/common/core/domain/dto/ReportSteamRunParamDTO.java index 93eadf1..fcf25d6 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/dto/ReportSteamRunParamDTO.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/dto/ReportSteamRunParamDTO.java @@ -67,7 +67,7 @@ public class ReportSteamRunParamDTO { */ @ExcelProperty(value = {"${deviceType}", "火焰百分比（%）", "火焰百分比（%）"}, index = 4) @ColumnWidth(10) - private String percentFlameIntensity; + private BigDecimal percentFlameIntensity; /** * 液位（%） diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java index f3c64d8..e1c4de4 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java @@ -51,7 +51,7 @@ public class ReportSteamRunParamHis extends BaseEntity implements Serializable { private Integer curStatus; // 运行状态 - @JsonIgnore +// @JsonIgnore @TableField(exist = false) private String runStatus; 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 143a076..63d5446 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 @@ -356,7 +356,7 @@ public interface CollectionParamsManageMapper extends BaseMapper OffLine(); @Select("select * from collection_params_manage cpm " + - " where cpm.system_type = '1' and is_use = 0 " + + " where (cpm.system_type = '1' or cpm.system_type = '6') and is_use = 0 " + " and (param_type= '16' " + " or param_type='18' " + " or param_type = '5' " + diff --git a/mh-system/src/main/java/com/mh/system/mapper/report/ReportSteamRunParamHisMapper.java b/mh-system/src/main/java/com/mh/system/mapper/report/ReportSteamRunParamHisMapper.java index 9c135a8..a41a95d 100644 --- a/mh-system/src/main/java/com/mh/system/mapper/report/ReportSteamRunParamHisMapper.java +++ b/mh-system/src/main/java/com/mh/system/mapper/report/ReportSteamRunParamHisMapper.java @@ -21,7 +21,7 @@ import java.util.List; @Mapper public interface ReportSteamRunParamHisMapper extends BaseMapper { - @Select("call pro_hot_water_run_param(#{curTime,jdbcType=VARCHAR,mode=IN})") + @Select("call pro_steam_run_param(#{curTime,jdbcType=VARCHAR,mode=IN})") @Options(statementType = StatementType.CALLABLE) void execProHotWaterRunParam(@Param("curTime") String curTime);