高支模测量bug修改

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);

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<List<DataPerHourForTheLastDayVo>> getDataPerHourForTheLastDay(@RequestParam Map<String, Object> map) {

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"),
     })

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;

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
     </select>

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}
     </select>
 
     <select id="countMonitorDynamic" resultType="com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint">
         select hfmp.*,ifnull(timestampdiff(second ,min(hfad.collect_time),max(hfad.collect_time)),0) monitorDurationTime
         from high_formwork_measure_point hfmp
-        left join high_formwork_measure_current_data hfad on hfmp.measure_point_number = hfad.measure_point_number
+        left join high_formwork_measure_current_data hfad on hfmp.measure_point_number = hfad.measure_point_number and
+        hfad.acquisition_instrument_number = hfmp.acquisition_instrument_number
         where hfmp.project_sn=#{projectSn}
-        group by hfmp.measure_point_number
+        group by hfmp.measure_point_number,hfmp.acquisition_instrument_number
     </select>
 </mapper>

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());