admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

高支模添加水平倾斜

Browse Source
This commit is contained in:
guoshengxiong 2025-11-05 15:48:55 +08:00
parent 53b53ec691
commit 722d52c6b8
9 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java
View File

@ -276,38 +276,49 @@ public class HighFormworkSupportService {
if (StringUtils.isNotBlank(no)) {
String noType = no.substring(no.length() - 1);
String f = "F";
String val = dataMap.get(gzDs2);
if (f.equals(noType)) {
currentData.setPoleAxialForce(String.valueOf(Double.parseDouble(dataMap.get(gzDs2))));
currentData.setPoleAxialForce(String.valueOf(Double.parseDouble(val)));
}
String h = "H";
if (h.equals(noType)) {
currentData.setHorizontalDisplacement(dataMap.get(gzDs2));
currentData.setHorizontalDisplacement(val);
}
String v = "V";
if (v.equals(noType)) {
currentData.setFormworkSettlement(dataMap.get(gzDs2));
currentData.setFormworkSettlement(val);
}
String l = "L";
if (l.equals(noType)) {
currentData.setPoleTilt(dataMap.get(gzDs2));
currentData.setPoleTilt(val);
}
String d = "D";
if (d.equals(noType)) {
currentData.setFoundationSettlement(dataMap.get(gzDs2));
currentData.setFoundationSettlement(val);
}
String s = "S";
if (s.equals(noType)) {
currentData.setHorizontalTilt(val);
}
}
}
private void setAlarmStatus(HashMap<String, String> dataMap, HighFormworkMeasureCurrentData currentData) {
Integer alarmState = null;
if (getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT1)).equals(HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode()) ||
getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT2)).equals(HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode()) ||
getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT3)).equals(HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode())) {
if (Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT1)), HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT2)), HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT3)), HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT4)), HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT5)), HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT6)), HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode())) {
//报警
alarmState = HighFormworkMeasureCurrentDataAlarmStateEnum.ALARM.getCode();
} else if (getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT1)).equals(HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode()) ||
getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT2)).equals(HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode()) ||
getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT3)).equals(HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode())) {
} else if (Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT1)), HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT2)), HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT3)), HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT4)), HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT5)), HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode()) ||
Objects.equals(getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT6)), HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode())) {
//预警
alarmState = HighFormworkMeasureCurrentDataAlarmStateEnum.PRE_ALARM.getCode();
} else {

2
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java
View File

@ -31,7 +31,7 @@ public class HighFormworkAlarmData implements Serializable {
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
@ApiModelProperty(value = "类型：1立杆轴力2水平位移3模板沉降4立杆倾斜5地基沉降")
@ApiModelProperty(value = "类型：1立杆轴力2水平位移3模板沉降4立杆倾斜5地基沉降6水平倾斜")
private java.lang.Integer type;
/**
* 监测点ID

7
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java
View File

@ -51,22 +51,26 @@ public class HighFormworkMeasureCurrentData implements Serializable {
/**X轴倾角（°）*/
@Excel(name = "X轴倾角（°）", width = 15)
@ApiModelProperty(value="X轴倾角（°）")
@Deprecated
private java.lang.String angleXAxis ;
/**Y轴倾角（°）*/
@Excel(name = "Y轴倾角（°）", width = 15)
@ApiModelProperty(value = "Y轴倾角（°）")
@Deprecated
private java.lang.String angleYAxis;
/**
* 压力（kN）
*/
@Excel(name = "压力（kN）", width = 15)
@ApiModelProperty(value = "压力（kN）")
@Deprecated
private java.lang.String pressure;
/**
* 沉降（mm）
*/
@Excel(name = "沉降（mm）", width = 15)
@ApiModelProperty(value = "沉降（mm）")
@Deprecated
private java.lang.String subside;
@ApiModelProperty(value = "立杆轴力")
private java.lang.String poleAxialForce;
@ -91,7 +95,8 @@ public class HighFormworkMeasureCurrentData implements Serializable {
@Excel(name = "采集仪编号", width = 15)
@ApiModelProperty(value = "采集仪编号")
private java.lang.String acquisitionInstrumentNumber;
@ApiModelProperty(value = "水平倾斜")
private java.lang.String horizontalTilt;
@TableField(exist = false)
@ApiModelProperty(value = "测量点名称")
private java.lang.String measurePointName;

12
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java
View File

@ -1,16 +1,14 @@
package com.zhgd.xmgl.modules.highformwork.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
/**
* @Description: 高支模-测量点报警预警阀值
* @author： pds
@ -36,7 +34,7 @@ public class HighFormworkMeasurePointThreshold implements Serializable {
@ApiModelProperty(value = "监测点ID")
private java.lang.Long measurePointId;
@ApiModelProperty(value = "类型：1立杆轴力2水平位移3模板沉降4立杆倾斜5地基沉降")
@ApiModelProperty(value = "类型：1立杆轴力2水平位移3模板沉降4立杆倾斜5地基沉降6水平倾斜")
private java.lang.Integer type;
/**
* 预警值

2
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java
View File

@ -25,4 +25,6 @@ public class DataPerHourForTheLastDayVo {
private java.lang.String poleTilt;
@ApiModelProperty(value = "地基沉降")
private java.lang.String foundationSettlement;
@ApiModelProperty(value = "水平倾斜")
private java.lang.String horizontalTilt;
}

4
src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
View File

@ -19,6 +19,7 @@
hfmcd.formwork_settlement,
hfmcd.pole_tilt,
hfmcd.foundation_settlement,
hfmcd.horizontal_tilt,
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 and
@ -74,7 +75,8 @@
ifnull(avg(cd.horizontal_displacement),0) as horizontal_displacement,
ifnull(avg(cd.formwork_settlement),0) as formwork_settlement,
ifnull(avg(cd.pole_tilt),0) as pole_tilt,
ifnull(avg(cd.foundation_settlement),0) as foundation_settlement
ifnull(avg(cd.foundation_settlement),0) as foundation_settlement,
ifnull(avg(cd.horizontal_tilt),0) as horizontal_tilt
from high_formwork_measure_current_data cd
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

11
src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkAlarmDataServiceImpl.java
View File

@ -140,6 +140,17 @@ public class HighFormworkAlarmDataServiceImpl extends ServiceImpl<HighFormworkAl
insertHighFormworkAlarmData(point, subside, 5, 2);
isWarn = true;
}
} else if (type == 6) {
Double horizontalTilt = StringUtils.isNotBlank(currentData.getHorizontalTilt()) ? Double.valueOf(currentData.getHorizontalTilt()) : null;
if (horizontalTilt != null && alarmValue != null && alarmValue < horizontalTilt) {
//报警
insertHighFormworkAlarmData(point, horizontalTilt, 6, 1);
isAlarm = true;
} else if (horizontalTilt != null && warningValue != null && warningValue < horizontalTilt) {
//预警
insertHighFormworkAlarmData(point, horizontalTilt, 6, 2);
isWarn = true;
}
}
}
}

3
src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
View File

@ -1,12 +1,10 @@
package com.zhgd.xmgl.modules.highformwork.service.impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasureCurrentData;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePointThreshold;
@ -190,6 +188,7 @@ public class HighFormworkMeasureCurrentDataServiceImpl extends ServiceImpl<HighF
vo.setFormworkSettlement("0");
vo.setPoleTilt("0");
vo.setFoundationSettlement("0");
vo.setHorizontalTilt("0");
}
rtList.add(vo);
}

3
src/main/java/com/zhgd/xmgl/task/HighFormworkTask.java
View File

@ -169,8 +169,11 @@ public class HighFormworkTask {
}
currentData.setPoleAxialForce(Convert.toStr(poleAxialForce));
currentData.setHorizontalDisplacement(data.getString("spanX" + no));
currentData.setPoleTilt(data.getString("dipY" + no));
currentData.setFoundationSettlement(data.getString("spanY" + no));
currentData.setFormworkSettlement(data.getString("down" + no));
currentData.setAcquisitionInstrumentNumber(point.getAcquisitionInstrumentNumber());
currentData.setHorizontalTilt(data.getString("dipX" + no));
dataService.save(currentData);
highFormworkAlarmDataService.addAlarmData(point, currentData);
}