diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java index 90eba59..290c475 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java @@ -59,7 +59,7 @@ public class ReportHotWaterController extends BaseController { } @PostMapping("/export") - public void exportExcel(ReportHotWaterParamHis reportHotWaterParamHis, HttpServletResponse response) { + public void exportExcel(@RequestBody ReportHotWaterParamHis reportHotWaterParamHis, HttpServletResponse response) { // 文件名 try { String fileName = "热水热泵运行记录表.xlsx"; diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java index 33e99c7..ea800ac 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java @@ -46,14 +46,14 @@ public class ReportMeterReadingsController extends BaseController { } @PostMapping("/list") - public TableDataInfo list(ReportMeterReadingsHis todayTimestamp) + public TableDataInfo list(@RequestBody ReportMeterReadingsHis todayTimestamp) { List list = meterReadingsHisService.selectList(todayTimestamp); return getDataTable(list); } @PostMapping("/export") - public void exportExcel(ReportMeterReadingsHis reportMeterReadingsHis, HttpServletResponse response) { + public void exportExcel(@RequestBody ReportMeterReadingsHis reportMeterReadingsHis, HttpServletResponse response) { // 文件名 try { String fileName = "节能岛改造每日能耗统计表"+ DateUtils.dateToString(reportMeterReadingsHis.getTodayTimestamp(), "yyyyMMdd")+".xlsx"; diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java index db6eea6..759791b 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java @@ -55,7 +55,7 @@ public class ReportSteamController extends BaseController { } @PostMapping("/export") - public void exportExcel(ReportSteamRunParamHis reportSteamRunParamHis, HttpServletResponse response) { + public void exportExcel(@RequestBody ReportSteamRunParamHis reportSteamRunParamHis, HttpServletResponse response) { // 文件名 try { String fileName = "蒸汽机运行记录表.xlsx"; diff --git a/mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java b/mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java index 17ffcf8..d36c505 100644 --- a/mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java +++ b/mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java @@ -41,7 +41,7 @@ public class ReportSysController extends BaseController { } @PostMapping("/list") - public TableDataInfo list(ReportSysRunParamHis reportSysRunParamHis) + public TableDataInfo list(@RequestBody ReportSysRunParamHis reportSysRunParamHis) { if (reportSysRunParamHis.getPageNum() != 0) { PageHelper.startPage(reportSysRunParamHis.getPageNum(), reportSysRunParamHis.getPageSize()); @@ -57,7 +57,7 @@ public class ReportSysController extends BaseController { } @PostMapping("/export") - public void exportExcel(ReportSysRunParamHis reportSysRunParamHis, HttpServletResponse response) { + public void exportExcel(@RequestBody ReportSysRunParamHis reportSysRunParamHis, HttpServletResponse response) { // 文件名 try { String fileName = "系统参数运行日志报表.xlsx"; diff --git a/mh-common/src/main/java/com/mh/common/core/domain/dto/ReportHeatingRunParamDTO.java b/mh-common/src/main/java/com/mh/common/core/domain/dto/ReportHeatingRunParamDTO.java index 6803993..df94b4a 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/dto/ReportHeatingRunParamDTO.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/dto/ReportHeatingRunParamDTO.java @@ -48,31 +48,37 @@ public class ReportHeatingRunParamDTO { @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "运行状态"}, index = 1) private String runStatusBoilerOne; + /** + * 设定温度 + */ + @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "设定温度(℃)"}, index = 2) + @ColumnWidth(10) + private BigDecimal tempSetBoilerOne; /** * 出水温度 */ - @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "出水温度(℃)"}, index = 2) + @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "出水温度(℃)"}, index = 3) @ColumnWidth(10) private BigDecimal tempOutBoilerOne; /** * 回水温度 */ - @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "回水温度(℃)"}, index = 3) + @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "回水温度(℃)"}, index = 4) @ColumnWidth(10) private BigDecimal tempInBoilerOne; /** * 炉水温度 */ - @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "炉水温度(℃)"}, index = 4) + @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "炉水温度(℃)"}, index = 5) @ColumnWidth(10) private BigDecimal tempWaterBoilerOne; /** * 烟道温度（℃） */ - @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "烟道温度(℃)"}, index = 5) + @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "烟道温度(℃)"}, index = 6) @ColumnWidth(10) private BigDecimal tempFlueGasBoilerOne; @@ -80,34 +86,41 @@ public class ReportHeatingRunParamDTO { * 当前状态 */ @ColumnWidth(10) - @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "运行状态"}, index = 6) + @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "运行状态"}, index = 7) private String runStatusBoilerTwo; + /** + * 设定温度 + */ + @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "设定温度(℃)"}, index = 8) + @ColumnWidth(10) + private BigDecimal tempSetBoilerTwo; + /** * 出水温度 */ - @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "出水温度(℃)"}, index = 7) + @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "出水温度(℃)"}, index = 9) @ColumnWidth(10) private BigDecimal tempOutBoilerTwo; /** * 回水温度 */ - @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "回水温度(℃)"}, index = 8) + @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "回水温度(℃)"}, index = 10) @ColumnWidth(10) private BigDecimal tempInBoilerTwo; /** * 炉水温度 */ - @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "炉水温度(℃)"}, index = 9) + @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "炉水温度(℃)"}, index = 11) @ColumnWidth(10) private BigDecimal tempWaterBoilerTwo; /** * 烟道温度（℃） */ - @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "烟道温度(℃)"}, index = 10) + @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "烟道温度(℃)"}, index = 12) @ColumnWidth(10) private BigDecimal tempFlueGasBoilerTwo; @@ -115,51 +128,51 @@ public class ReportHeatingRunParamDTO { * 当前状态 */ @ColumnWidth(10) - @ExcelProperty(value = {"${deviceType}", "1号采暖泵", "运行状态"}, index = 11) + @ExcelProperty(value = {"${deviceType}", "1号采暖泵", "运行状态"}, index = 13) private String runStatusPumpOne; /** * 频率 */ @ColumnWidth(10) - @ExcelProperty(value = {"${deviceType}", "1号采暖泵", "频率(Hz)"}, index = 12) + @ExcelProperty(value = {"${deviceType}", "1号采暖泵", "频率(Hz)"}, index = 14) private BigDecimal frequencyPumpOne; /** * 当前状态 */ @ColumnWidth(10) - @ExcelProperty(value = {"${deviceType}", "2号采暖泵", "运行状态"}, index = 13) + @ExcelProperty(value = {"${deviceType}", "2号采暖泵", "运行状态"}, index = 15) private String runStatusPumpTwo; /** * 频率 */ @ColumnWidth(10) - @ExcelProperty(value = {"${deviceType}", "2号采暖泵", "频率(Hz)"}, index = 14) + @ExcelProperty(value = {"${deviceType}", "2号采暖泵", "频率(Hz)"}, index = 16) private BigDecimal frequencyPumpTwo; /** * 当前状态 */ @ColumnWidth(10) - @ExcelProperty(value = {"${deviceType}", "3号采暖泵", "运行状态"}, index = 15) + @ExcelProperty(value = {"${deviceType}", "3号采暖泵", "运行状态"}, index = 17) private String runStatusPumpThree; /** * 频率 */ @ColumnWidth(10) - @ExcelProperty(value = {"${deviceType}", "3号采暖泵", "频率(Hz)"}, index = 16) + @ExcelProperty(value = {"${deviceType}", "3号采暖泵", "频率(Hz)"}, index = 18) private BigDecimal frequencyPumpThree; // 巡查记录人 - @ExcelProperty(value = {"${deviceType}", "巡查记录人", "巡查记录人"}, index = 17) + @ExcelProperty(value = {"${deviceType}", "巡查记录人", "巡查记录人"}, index = 19) @ColumnWidth(20) private String recorder; // 备注信息 - @ExcelProperty(value = {"${deviceType}", "备注", "备注"}, index = 18) + @ExcelProperty(value = {"${deviceType}", "备注", "备注"}, index = 20) @ColumnWidth(20) private String remark; diff --git a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java index ad4e0b4..677d63d 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java +++ b/mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java @@ -54,6 +54,10 @@ public class ReportHeatingRunParamHis extends BaseEntity { @TableField("temp_out_boiler_one") private BigDecimal tempOutBoilerOne; // 精度要求高时使用BigDecimal + // 锅炉1设定温度（℃） + @TableField("temp_set_boiler_one") + private BigDecimal tempSetBoilerOne; // 精度要求高时使用BigDecimal + // 锅炉1回水温度（℃） @TableField("temp_in_boiler_one") private BigDecimal tempInBoilerOne; @@ -74,6 +78,10 @@ public class ReportHeatingRunParamHis extends BaseEntity { @TableField(exist = false) private String runStatusBoilerTwo; + // 锅炉2设定温度（℃） + @TableField("temp_set_boiler_two") + private BigDecimal tempSetBoilerTwo; // 精度要求高时使用BigDecimal + // 锅炉2出水温度（℃） @TableField("temp_out_boiler_two") private BigDecimal tempOutBoilerTwo; diff --git a/sql/2025新增.sql b/sql/2025新增.sql index a28df2f..4652421 100644 --- a/sql/2025新增.sql +++ b/sql/2025新增.sql @@ -403,30 +403,38 @@ COMMENT ON COLUMN public.report_hot_water_param_his.remark IS '异常情况备 COMMENT ON COLUMN public.report_hot_water_param_his.create_time IS '记录生成时间（含时区信息）'; -- 采暖系统运行记录报表 +-- public.report_heating_run_param_his definition + +-- Drop table + +-- DROP TABLE public.report_heating_run_param_his; + CREATE TABLE public.report_heating_run_param_his ( - id varchar(36) NOT NULL ,-- 自增主键 - cur_date date NULL ,-- 日期 - cur_time varchar(20) NULL ,-- 时间 - classes varchar(50) NULL ,-- 班次 - cur_status_boiler_one int NULL ,-- 当前状态℃ - temp_out_boiler_one numeric(24, 2) NULL ,-- 出水温度 - temp_in_boiler_one numeric(24, 2) NULL ,-- 回水温度 - temp_water_boiler_one numeric(24, 2) NULL ,-- 炉水温度 - temp_flue_gas_boiler_one numeric(24, 2) NULL ,-- 烟道温度℃ - cur_status_boiler_two int NULL ,-- 当前状态℃ - temp_out_boiler_two numeric(24, 2) NULL ,-- 出水温度 - temp_in_boiler_two numeric(24, 2) NULL ,-- 回水温度 - temp_water_boiler_two numeric(24, 2) NULL ,-- 炉水温度 - temp_flue_gas_boiler_two numeric(24, 2) NULL ,-- 烟道温度℃ - cur_status_pump_one int null, -- 1号采暖泵运行状态 - frequency_pump_one numeric(24,2) null, -- 1号采暖泵当前频率 - cur_status_pump_two int null, -- 2号采暖泵运行状态 - frequency_pump_two numeric(24,2) null, -- 2号采暖泵当前频率 - cur_status_pump_three int null, -- 3号采暖泵运行状态 - frequency_pump_three numeric(24,2) null, -- 3号采暖泵当前频率 - recorder varchar(50) null, -- 巡查记录人 - remark varchar(200) null, -- 备注 - create_date timestamp default now(), -- 创建时间 + id varchar(36) NOT NULL, + cur_date date NULL, + cur_time varchar(20) NULL, + classes varchar(50) NULL, + cur_status_boiler_one int4 NULL, + temp_out_boiler_one numeric(24, 2) NULL, + temp_in_boiler_one numeric(24, 2) NULL, + temp_water_boiler_one numeric(24, 2) NULL, + temp_flue_gas_boiler_one numeric(24, 2) NULL, + cur_status_boiler_two int4 NULL, + temp_out_boiler_two numeric(24, 2) NULL, + temp_in_boiler_two numeric(24, 2) NULL, + temp_water_boiler_two numeric(24, 2) NULL, + temp_flue_gas_boiler_two numeric(24, 2) NULL, + cur_status_pump_one int4 NULL, + frequency_pump_one numeric(24, 2) NULL, + cur_status_pump_two int4 NULL, + frequency_pump_two numeric(24, 2) NULL, + cur_status_pump_three int4 NULL, + frequency_pump_three numeric(24, 2) NULL, + recorder varchar(50) NULL, + remark varchar(200) NULL, + create_date timestamp DEFAULT now() NULL, + temp_set_boiler_one numeric(24, 2) NULL, + temp_set_boiler_two numeric(24, 2) NULL, CONSTRAINT report_heating_run_param_his_pkey PRIMARY KEY (id) ); CREATE INDEX idx_report_heating_run_param_his_cur_date ON public.report_heating_run_param_his USING btree (cur_date); @@ -457,4 +465,6 @@ COMMENT ON COLUMN public.report_heating_run_param_his.cur_status_pump_three IS ' COMMENT ON COLUMN public.report_heating_run_param_his.frequency_pump_three IS '3号采暖泵当前频率（Hz）'; COMMENT ON COLUMN public.report_heating_run_param_his.recorder IS '巡查记录人（操作员姓名）'; COMMENT ON COLUMN public.report_heating_run_param_his.remark IS '备注（异常情况描述）'; -COMMENT ON COLUMN public.report_heating_run_param_his.create_date IS '记录创建时间（默认当前时间）'; \ No newline at end of file +COMMENT ON COLUMN public.report_heating_run_param_his.create_date IS '记录创建时间（默认当前时间）'; +COMMENT ON COLUMN public.report_heating_run_param_his.temp_set_boiler_one IS '锅炉1温度设置（℃）'; +COMMENT ON COLUMN public.report_heating_run_param_his.temp_set_boiler_two IS '锅炉2温度设置（℃）'; \ No newline at end of file