From c05ab50c5e1bff4813b1752258ec8f455e411013 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 23 May 2024 13:40:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E6=94=AF=E6=A8=A1=E6=B5=8B=E9=87=8Fbu?= =?UTF-8?q?g=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hFormworkMeasureCurrentDataController.java | 1 - .../HighFormworkMeasureCurrentDataMapper.java | 3 +- .../HighFormworkMeasureCurrentDataMapper.xml | 14 ++++++-- ...ighFormworkPlaneFigureCoordinateMapper.xml | 5 +-- ...mworkPlaneFigureCoordinateServiceImpl.java | 34 +++++++++---------- 5 files changed, 32 insertions(+), 25 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 b01e3a718..8b6b404b8 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 @@ -118,7 +118,6 @@ public class HighFormworkMeasureCurrentDataController { */ @ApiOperation(value = "大屏高支模分页列表查询", notes = "大屏高支模分页列表查询", httpMethod = "POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "measurePointNumber", value = "监测点编号", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "startTime", value = "开始时间，格式2021-05-08", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "endTime", value = "结束时间，格式2021-05-08", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "alarmState", value = "报警状态，1正常，2预警，3报警", paramType = "body", required = false, dataType = "String"), 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 a8e5892e5..1e5f6ba74 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 @@ -6,7 +6,6 @@ import java.util.Map; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.highformwork.entity.vo.BigScreenHighFormworkVo; import com.zhgd.xmgl.modules.highformwork.entity.vo.DataPerHourForTheLastDayVo; import org.apache.ibatis.annotations.Mapper; @@ -26,7 +25,7 @@ public interface HighFormworkMeasureCurrentDataMapper extends BaseMapper selectMeasureCurrentDataPage(Page page, @Param("param") Map map); - HighFormworkMeasureCurrentData selectNewestHighFormworkMeasureCurrentData(@Param("measurePointNumber") String measurePointNumber, @Param("projectSn") String projectSn); + HighFormworkMeasureCurrentData selectNewestHighFormworkMeasureCurrentData(@Param("measurePointNumber") String measurePointNumber, @Param("projectSn") String projectSn, @Param("acquisitionInstrumentNumber") String acquisitionInstrumentNumber); IPage queryBigScreenPageList(Page p, @Param("q") Map map); 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 bb9ce37ee..469b749e6 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 @@ -5,6 +5,7 @@ resultType="com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasureCurrentData"> select hfmcd.id, hfmcd.measure_point_number, + hfmcd.acquisition_instrument_number, hfmcd.project_sn, DATE_FORMAT(hfmcd.collect_time, '%Y-%m-%d %H:%i:%s') as collect_time, hfmcd.electric_power, @@ -20,7 +21,8 @@ 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 + join high_formwork_measure_point hfmp on hfmcd.measure_point_number = hfmp.measure_point_number and + hfmcd.acquisition_instrument_number = hfmp.acquisition_instrument_number where hfmcd.project_sn = #{param.projectSn} AND hfmcd.collect_time >= CONCAT(DATE_FORMAT(#{param.startTime}, "%Y-%m-%d"), ' 00:00:00') @@ -31,6 +33,9 @@ and hfmcd.measure_point_number like CONCAT(CONCAT('%', #{param.measurePointNumber}), '%') + + and hfmcd.acquisition_instrument_number like CONCAT(CONCAT('%', #{param.acquisitionInstrumentNumber}), '%') + and hfmcd.alarm_state = #{param.alarmState} @@ -42,6 +47,7 @@ from high_formwork_measure_current_data where project_sn = #{projectSn} and measure_point_number = #{measurePointNumber} + and acquisition_instrument_number = #{acquisitionInstrumentNumber} order by collect_time desc LIMIT 1 @@ -51,7 +57,8 @@ mp.measure_point_name, mp.measure_point_number FROM high_formwork_measure_current_data cd - INNER JOIN high_formwork_measure_point mp ON mp.measure_point_number = cd.measure_point_number + INNER JOIN high_formwork_measure_point mp ON mp.measure_point_number = cd.measure_point_number and + mp.acquisition_instrument_number = cd.acquisition_instrument_number WHERE cd.project_sn = #{q.projectSn} order by cd.id DESC @@ -69,7 +76,8 @@ ifnull(avg(cd.pole_tilt),0) as pole_tilt, ifnull(avg(cd.foundation_settlement),0) as foundation_settlement from high_formwork_measure_current_data cd - INNER JOIN high_formwork_measure_point mp ON mp.measure_point_number = cd.measure_point_number + INNER JOIN high_formwork_measure_point mp ON mp.measure_point_number = cd.measure_point_number and + cd.acquisition_instrument_number = mp.acquisition_instrument_number where cd.project_sn = #{projectSn} and cd.measure_point_number = #{measurePointNumber} and mp.acquisition_instrument_number = #{acquisitionInstrumentNumber} diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkPlaneFigureCoordinateMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkPlaneFigureCoordinateMapper.xml index b587002f0..f95001dc8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkPlaneFigureCoordinateMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkPlaneFigureCoordinateMapper.xml @@ -3,7 +3,8 @@ @@ -14,4 +15,4 @@ where a.project_sn=#{projectSn} and b.id is null - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureCoordinateServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureCoordinateServiceImpl.java index c2d29b6c8..b111a02a2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureCoordinateServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkPlaneFigureCoordinateServiceImpl.java @@ -19,7 +19,7 @@ import java.util.Map; /** * @Description: 高支模-平面图设备坐标 * @author： pds - * @date： 2021-11-19 + * @date： 2021-11-19 * @version： V1.0 */ @Service @@ -32,22 +32,22 @@ public class HighFormworkPlaneFigureCoordinateServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(HighFormworkPlaneFigureCoordinate::getPlaneFigureId,highFormworkPlaneFigureCoordinate.getPlaneFigureId()) - .eq(HighFormworkPlaneFigureCoordinate::getMeasurePointId,highFormworkPlaneFigureCoordinate.getMeasurePointId()); - HighFormworkPlaneFigureCoordinate oldHighFormworkPlaneFigureCoordinate=highFormworkPlaneFigureCoordinateMapper.selectOne(queryWrapper); - if(oldHighFormworkPlaneFigureCoordinate!=null){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(HighFormworkPlaneFigureCoordinate::getPlaneFigureId, highFormworkPlaneFigureCoordinate.getPlaneFigureId()) + .eq(HighFormworkPlaneFigureCoordinate::getMeasurePointId, highFormworkPlaneFigureCoordinate.getMeasurePointId()); + HighFormworkPlaneFigureCoordinate oldHighFormworkPlaneFigureCoordinate = highFormworkPlaneFigureCoordinateMapper.selectOne(queryWrapper); + if (oldHighFormworkPlaneFigureCoordinate != null) { highFormworkPlaneFigureCoordinate.setId(oldHighFormworkPlaneFigureCoordinate.getId()); highFormworkPlaneFigureCoordinateMapper.updateById(highFormworkPlaneFigureCoordinate); - }else{ + } else { highFormworkPlaneFigureCoordinateMapper.insert(highFormworkPlaneFigureCoordinate); } } @Override public void updateFigureCoordinate(List list) { - if(list!=null&&list.size()>0){ - for (HighFormworkPlaneFigureCoordinate figureCoordinate:list){ + if (list != null && list.size() > 0) { + for (HighFormworkPlaneFigureCoordinate figureCoordinate : list) { highFormworkPlaneFigureCoordinateMapper.updateById(figureCoordinate); } } @@ -55,19 +55,19 @@ public class HighFormworkPlaneFigureCoordinateServiceImpl extends ServiceImpl map) { - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(HighFormworkPlaneFigureCoordinate::getPlaneFigureId, MapUtils.getString(map,"planeFigureId")) - .eq(HighFormworkPlaneFigureCoordinate::getMeasurePointId,MapUtils.getString(map,"measurePointId")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(HighFormworkPlaneFigureCoordinate::getPlaneFigureId, MapUtils.getString(map, "planeFigureId")) + .eq(HighFormworkPlaneFigureCoordinate::getMeasurePointId, MapUtils.getString(map, "measurePointId")); highFormworkPlaneFigureCoordinateMapper.delete(queryWrapper); } @Override public List selectPlaneFigureCoordinateList(Map map) { - List list=highFormworkPlaneFigureCoordinateMapper.selectPlaneFigureCoordinateList(map); - if(list.size()>0){ - for (EntityMap data:list){ - HighFormworkMeasureCurrentData currentData=highFormworkMeasureCurrentDataMapper.selectNewestHighFormworkMeasureCurrentData(MapUtils.getString(data,"measurePointNumber"),MapUtils.getString(data,"projectSn")); - data.put("currentData",currentData); + List list = highFormworkPlaneFigureCoordinateMapper.selectPlaneFigureCoordinateList(map); + if (list.size() > 0) { + for (EntityMap data : list) { + HighFormworkMeasureCurrentData currentData = highFormworkMeasureCurrentDataMapper.selectNewestHighFormworkMeasureCurrentData(MapUtils.getString(data, "measurePointNumber"), MapUtils.getString(data, "projectSn"), MapUtils.getString(data, "acquisitionInstrumentNumber")); + data.put("currentData", currentData); } } return list;