1、修复蒸汽机运行报表以及水箱指令生成；

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;
 
     /**
      * 液位（%）

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;
 

mh-system/src/main/java/com/mh/system/mapper/device/CollectionParamsManageMapper.java

@@ -356,7 +356,7 @@ public interface CollectionParamsManageMapper extends BaseMapper<CollectionParam
     List<String> 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' " +

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<ReportSteamRunParamHis> {
 
-    @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);