From 19e4e016c240a620eb7318129b1e4816b8033232 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 22 May 2024 19:05:46 +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 --- .../netty/tcp/service/HighFormworkSupportService.java | 1 + .../HighFormworkMeasureCurrentDataController.java | 1 + .../controller/HighFormworkMeasurePointController.java | 2 +- .../entity/HighFormworkMeasureCurrentData.java | 7 +++++++ .../xml/HighFormworkMeasureCurrentDataMapper.xml | 2 ++ .../mapper/xml/HighFormworkMeasurePointMapper.xml | 10 ++++++---- src/main/java/com/zhgd/xmgl/task/HighFormworkTask.java | 1 + 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java b/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java index 3cd5b76ef..887a85db8 100644 --- a/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java +++ b/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java @@ -232,6 +232,7 @@ public class HighFormworkSupportService { //测点编号后缀为测点类型识别：F-立杆轴力（单位为牛）、H-水平位移（单位为mm）、V-模板沉降（单位为mm）、L-立杆倾斜（单位为°）、D-地基沉降；,例如测点 0001L表示测点类型为立杆倾斜； HighFormworkMeasureCurrentData currentData = new HighFormworkMeasureCurrentData(); currentData.setMeasurePointNumber(point.getMeasurePointNumber()); + currentData.setAcquisitionInstrumentNumber(point.getAcquisitionInstrumentNumber()); currentData.setProjectSn(point.getProjectSn()); currentData.setElectricPower(null); currentData.setAngleXAxis(null); 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 e251d4eba..bde206855 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 @@ -134,6 +134,7 @@ public class HighFormworkMeasureCurrentDataController { @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "measurePointNumber", value = "监测点编号", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "acquisitionInstrumentNumber", value = "采集仪编号（联瑞科-终端编号）", paramType = "query", required = true, dataType = "String"), }) @GetMapping(value = "/recent/day") public Result> getDataPerHourForTheLastDay(@RequestParam Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasurePointController.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasurePointController.java index ce21dd162..c608c4b9e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasurePointController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasurePointController.java @@ -118,7 +118,7 @@ public class HighFormworkMeasurePointController { return Result.success(highFormworkMeasurePointService.selectMeasurePointInfo(map)); } - @ApiOperation(value = "统计烟感报警数据", notes = "统计烟感报警数据", httpMethod = "POST") + @ApiOperation(value = "统计", notes = "统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) 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 a59668039..ca81e353e 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 @@ -85,6 +85,13 @@ public class HighFormworkMeasureCurrentData implements Serializable { @ApiModelProperty(value = "报警状态，1正常，2预警，3报警，4离线") private java.lang.Integer alarmState; + /** + * 采集仪编号 + */ + @Excel(name = "采集仪编号", width = 15) + @ApiModelProperty(value = "采集仪编号") + private java.lang.String acquisitionInstrumentNumber; + @TableField(exist = false) @ApiModelProperty(value = "测量点名称") private java.lang.String measurePointName; 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 73026b4f8..bb9ce37ee 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 @@ -69,8 +69,10 @@ 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 where cd.project_sn = #{projectSn} and cd.measure_point_number = #{measurePointNumber} + and mp.acquisition_instrument_number = #{acquisitionInstrumentNumber} and cd.collect_time >= DATE_SUB(NOW(), INTERVAL 24 hour) group by time diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml index 366fbb56a..800714011 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml @@ -60,18 +60,20 @@ resultType="com.zhgd.xmgl.modules.highformwork.entity.vo.CountHighFormworkMeasurePointVo"> select count(distinct hfmp.id) totalPointNum, count(distinct hfad.measure_point_id) alarmPointNum, - count(distinct hfmcd.measure_point_number) monitoringPointNum + count(distinct hfmcd.measure_point_number,hfmcd.acquisition_instrument_number) monitoringPointNum from high_formwork_measure_point hfmp left join high_formwork_alarm_data hfad on hfmp.id = hfad.measure_point_id - left join high_formwork_measure_current_data hfmcd on hfmcd.measure_point_number = hfmp.measure_point_number + left join high_formwork_measure_current_data hfmcd on hfmcd.measure_point_number = hfmp.measure_point_number and + hfmcd.acquisition_instrument_number = hfmp.acquisition_instrument_number where hfmp.project_sn=#{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/task/HighFormworkTask.java b/src/main/java/com/zhgd/xmgl/task/HighFormworkTask.java index bb8365246..fe596859b 100644 --- a/src/main/java/com/zhgd/xmgl/task/HighFormworkTask.java +++ b/src/main/java/com/zhgd/xmgl/task/HighFormworkTask.java @@ -53,6 +53,7 @@ public class HighFormworkTask { HighFormworkMeasureCurrentData highFormworkMeasureCurrentData=new HighFormworkMeasureCurrentData(); highFormworkMeasureCurrentData.setProjectSn(point.getProjectSn()); highFormworkMeasureCurrentData.setMeasurePointNumber(point.getMeasurePointNumber()); + highFormworkMeasureCurrentData.setAcquisitionInstrumentNumber(point.getAcquisitionInstrumentNumber()); Integer alarmState=1; if(data1!=null){ highFormworkMeasureCurrentData.setAngleXAxis(data1.getDataValue());