diff --git a/src/main/java/com/zhgd/netty/tcp/constant/HighFormworkSupport.java b/src/main/java/com/zhgd/netty/tcp/constant/HighFormworkSupport.java index d926dfbd1..9e8c67956 100644 --- a/src/main/java/com/zhgd/netty/tcp/constant/HighFormworkSupport.java +++ b/src/main/java/com/zhgd/netty/tcp/constant/HighFormworkSupport.java @@ -120,6 +120,43 @@ public interface HighFormworkSupport { * 测点状态3 */ public static final String GZ_ZT3 = "GZ_ZT3"; + /** + * 测点编号4 + */ + public static final String GZ_CJ4 = "GZ_CJ4"; + /** + * 测点数据4 + */ + public static final String GZ_DS4 = "GZ_DS4"; + /** + * 测点状态4 + */ + public static final String GZ_ZT4 = "GZ_ZT4"; + /** + * 测点编号5 + */ + public static final String GZ_CJ5 = "GZ_CJ5"; + /** + * 测点数据5 + */ + public static final String GZ_DS5 = "GZ_DS5"; + /** + * 测点状态5 + */ + public static final String GZ_ZT5 = "GZ_ZT5"; + /** + * 测点编号6 + */ + public static final String GZ_CJ6 = "GZ_CJ6"; + /** + * 测点数据6 + */ + public static final String GZ_DS6 = "GZ_DS6"; + /** + * 测点状态6 + */ + public static final String GZ_ZT6 = "GZ_ZT6"; + /** * 状态 */ 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 04fdbd020..84f53454b 100644 --- a/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java +++ b/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java @@ -190,7 +190,10 @@ public class HighFormworkSupportService { String no = dataMap.get(HighFormworkSupport.GZ_CJ1); String no2 = dataMap.get(HighFormworkSupport.GZ_CJ2); String no3 = dataMap.get(HighFormworkSupport.GZ_CJ3); - List list = Stream.of(no, no2, no3).filter(Objects::nonNull).collect(Collectors.toList()); + String no4 = dataMap.get(HighFormworkSupport.GZ_CJ4); + String no5 = dataMap.get(HighFormworkSupport.GZ_CJ5); + String no6 = dataMap.get(HighFormworkSupport.GZ_CJ6); + List list = Stream.of(no, no2, no3, no4, no5, no6).filter(StringUtils::isNotBlank).collect(Collectors.toList()); //保存设备 Map noMap = list.stream().collect(Collectors.toMap(x -> x, x -> x)); if (noMap.size() != existDevices.size() || !existDevices.stream().allMatch(key -> { @@ -208,7 +211,7 @@ public class HighFormworkSupportService { } } - HighFormworkMeasureCurrentData currentData = getAndSaveHighFormworkMeasureCurrentData(dataMap, no, no2, no3, point); + HighFormworkMeasureCurrentData currentData = getAndSaveHighFormworkMeasureCurrentData(dataMap, no, no2, no3, no4, no5, no6, point); //插入报警/预警数据 addAlarmData(point, currentData); @@ -234,7 +237,7 @@ public class HighFormworkSupportService { return null; } - private HighFormworkMeasureCurrentData getAndSaveHighFormworkMeasureCurrentData(HashMap dataMap, String no, String no2, String no3, HighFormworkMeasurePoint point) { + private HighFormworkMeasureCurrentData getAndSaveHighFormworkMeasureCurrentData(HashMap dataMap, String no, String no2, String no3, String no4, String no5, String no6, HighFormworkMeasurePoint point) { //测点编号后缀为测点类型识别：F-立杆轴力（单位为牛）、H-水平位移（单位为mm）、V-模板沉降（单位为mm）、L-立杆倾斜（单位为°）、D-地基沉降；,例如测点 0001L表示测点类型为立杆倾斜； HighFormworkMeasureCurrentData currentData = new HighFormworkMeasureCurrentData(); currentData.setMeasurePointNumber(point.getMeasurePointNumber()); @@ -251,6 +254,9 @@ public class HighFormworkSupportService { //测点3类型 setCurrentData(no3, currentData, dataMap, HighFormworkSupport.GZ_DS3); + setCurrentData(no4, currentData, dataMap, HighFormworkSupport.GZ_DS4); + setCurrentData(no5, currentData, dataMap, HighFormworkSupport.GZ_DS5); + setCurrentData(no6, currentData, dataMap, HighFormworkSupport.GZ_DS6); //设置报警状态 setAlarmStatus(dataMap, currentData); @@ -263,38 +269,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 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 { @@ -376,6 +393,17 @@ public class HighFormworkSupportService { 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; + } } } } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java index 84a5d264c..0351fea4c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java @@ -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 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 1477be733..4961fffd0 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 @@ -91,7 +91,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; diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java index b91c247b8..32b02c238 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java @@ -36,7 +36,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; /** * 预警值