From d3ca213c24139361ad9cd91769076ff025019198 Mon Sep 17 00:00:00 2001 From: guo Date: Sun, 18 Feb 2024 17:48:33 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hFormworkMeasureCurrentDataController.java | 2 +- .../HighFormworkMeasureCurrentData.java | 4 ++ .../HighFormworkMeasureCurrentDataMapper.java | 2 +- .../HighFormworkMeasureCurrentDataMapper.xml | 49 ++++++++++--------- ...HighFormworkMeasureCurrentDataService.java | 2 +- ...FormworkMeasureCurrentDataServiceImpl.java | 6 +-- 6 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java index 29a4d3bd4..145e9794f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java @@ -54,7 +54,7 @@ public class HighFormworkMeasureCurrentDataController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), }) @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { + public Result> queryPageList(@RequestBody Map map) { return Result.success(highFormworkMeasureCurrentDataService.selectMeasureCurrentDataPage(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java index f3914c1e4..04eb3264a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.highformwork.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -84,4 +85,7 @@ public class HighFormworkMeasureCurrentData implements Serializable { @ApiModelProperty(value = "报警状态，1正常，2预警，3报警，4离线") private java.lang.Integer alarmState; + @TableField(exist = false) + @ApiModelProperty(value = "测量点名称") + private java.lang.String measurePointName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java index b793f90d1..8de31ccad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface HighFormworkMeasureCurrentDataMapper extends BaseMapper { - List selectMeasureCurrentDataPage(Page page, @Param("param") Map map); + List selectMeasureCurrentDataPage(Page page, @Param("param") Map map); HighFormworkMeasureCurrentData selectNewestHighFormworkMeasureCurrentData(@Param("measurePointNumber") String measurePointNumber, @Param("projectSn") String projectSn); diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml index 57c5994ab..a6b379479 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml @@ -1,37 +1,40 @@ - + select hfmcd.id, + hfmcd.measure_point_number, + hfmcd.project_sn, + DATE_FORMAT(hfmcd.collect_time, '%Y-%m-%d %H:%i:%s') as collect_time, + hfmcd.electric_power, + hfmcd.angle_x_axis, + hfmcd.angle_y_axis, + hfmcd.pressure, + hfmcd.subside, + hfmcd.alarm_state, + hfmcd.pole_axial_force, + hfmcd.horizontal_displacement, + hfmcd.formwork_settlement, + hfmcd.pole_tilt, + hfmcd.foundation_settlement, + hfmp.measure_point_name + from high_formwork_measure_current_data hfmcd + join high_formwork_measure_point hfmp on hfmcd.measure_point_number = hfmp.measure_point_number + where hfmcd.project_sn = #{param.projectSn} - AND collect_time >= CONCAT(DATE_FORMAT(#{param.startTime}, "%Y-%m-%d"), ' 00:00:00') + AND hfmcd.collect_time >= CONCAT(DATE_FORMAT(#{param.startTime}, "%Y-%m-%d"), ' 00:00:00') - and collect_time <= CONCAT(DATE_FORMAT(#{param.endTime}, "%Y-%m-%d"), ' 23:59:59') + and hfmcd.collect_time <= CONCAT(DATE_FORMAT(#{param.endTime}, "%Y-%m-%d"), ' 23:59:59') - and measure_point_number like CONCAT(CONCAT('%', #{param.measurePointNumber}), '%') + and hfmcd.measure_point_number like CONCAT(CONCAT('%', #{param.measurePointNumber}), '%') - and alarm_state = #{param.alarmState} + and hfmcd.alarm_state = #{param.alarmState} - order by collect_time desc + order by hfmcd.collect_time desc