diff --git a/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java b/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java index 5f9d5f9e6..1b277d669 100644 --- a/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java +++ b/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java @@ -45,10 +45,12 @@ public class TcpNettyHandler extends SimpleChannelInboundHandler { } finally { highFormworkSupportResponseOk(ctx); } + return; } //有毒气体 if (StringUtils.startsWith(str, "##")) { poisonousGasDevCurrentDataService.addDataFromTcpFor212Protocol(str); + return; } //16进制判断 @@ -57,6 +59,7 @@ public class TcpNettyHandler extends SimpleChannelInboundHandler { if (StringUtils.startsWith(hexString, "7E")) { //有害气体 poisonousGasDevCurrentDataService.addDataFromTcp(hexString.trim()); + return; } } 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 1682182b3..f297589a5 100644 --- a/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java +++ b/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java @@ -266,52 +266,13 @@ public class HighFormworkSupportService { currentData.setAngleXAxis(null); //测点1类型 - String noType = no.substring(no.length() - 1); - if (noType.equals("F")) { - currentData.setPoleAxialForce(String.valueOf(Double.parseDouble(dataMap.get(HighFormworkSupport.GZ_DS1)) / 1000)); - } - if (noType.equals("H")) { - currentData.setHorizontalDisplacement(dataMap.get(HighFormworkSupport.GZ_DS1)); - } - if (noType.equals("V")) { - currentData.setFormworkSettlement(dataMap.get(HighFormworkSupport.GZ_DS1)); - } - if (noType.equals("L")) { - currentData.setPoleTilt(dataMap.get(HighFormworkSupport.GZ_DS1)); - } - if (noType.equals("D")) { - currentData.setFoundationSettlement(dataMap.get(HighFormworkSupport.GZ_DS1)); - } + setCurrentData(no, currentData, dataMap, HighFormworkSupport.GZ_DS1); //测点2类型 - if (StringUtils.isNotBlank(no2)) { - String noType2 = no2.substring(no2.length() - 1); - currentData.setAngleXAxis(null); - if (noType2.equals("L")) { - currentData.setAngleYAxis(dataMap.get(HighFormworkSupport.GZ_DS2)); - } - if (noType2.equals("F")) { - currentData.setPressure(String.valueOf(Double.parseDouble(dataMap.get(HighFormworkSupport.GZ_DS2)) / 1000)); - } - if (noType2.equals("V")) { - currentData.setSubside(dataMap.get(HighFormworkSupport.GZ_DS2)); - } - } + setCurrentData(no2, currentData, dataMap, HighFormworkSupport.GZ_DS2); //测点3类型 - if (StringUtils.isNotBlank(no3)) { - String noType3 = no3.substring(no3.length() - 1); - currentData.setAngleXAxis(null); - if (noType3.equals("L")) { - currentData.setAngleYAxis(dataMap.get(HighFormworkSupport.GZ_DS3)); - } - if (noType3.equals("F")) { - currentData.setPressure(String.valueOf(Double.parseDouble(dataMap.get(HighFormworkSupport.GZ_DS3)) / 1000)); - } - if (noType3.equals("V")) { - currentData.setSubside(dataMap.get(HighFormworkSupport.GZ_DS3)); - } - } + setCurrentData(no3, currentData, dataMap, HighFormworkSupport.GZ_DS3); //设置报警状态 setAlarmStatus(dataMap, currentData); @@ -320,6 +281,27 @@ public class HighFormworkSupportService { return currentData; } + private void setCurrentData(String no, HighFormworkMeasureCurrentData currentData, HashMap dataMap, String gzDs2) { + if (StringUtils.isNotBlank(no)) { + String noType = no.substring(no.length() - 1); + if (noType.equals("F")) { + currentData.setPoleAxialForce(String.valueOf(Double.parseDouble(dataMap.get(gzDs2)) / 1000)); + } + if (noType.equals("H")) { + currentData.setHorizontalDisplacement(dataMap.get(gzDs2)); + } + if (noType.equals("V")) { + currentData.setFormworkSettlement(dataMap.get(gzDs2)); + } + if (noType.equals("L")) { + currentData.setPoleTilt(dataMap.get(gzDs2)); + } + if (noType.equals("D")) { + currentData.setFoundationSettlement(dataMap.get(gzDs2)); + } + } + } + private void setAlarmStatus(HashMap dataMap, HighFormworkMeasureCurrentData currentData) { Integer alarmState = null; if (getAlarmState(dataMap.get(HighFormworkSupport.GZ_ZT1)).equals(3) || @@ -398,8 +380,17 @@ public class HighFormworkSupportService { //预警 insertHighFormworkAlarmData(point, subside, 5, 2); } - } else if (type == 7) { + } else if (type == 6) { Double subside = StringUtils.isNotBlank(currentData.getPoleAxialForce()) ? Double.valueOf(currentData.getPoleAxialForce()) : null; + if (subside != null && alarmValue != null && alarmValue < subside) { + //报警 + insertHighFormworkAlarmData(point, subside, 6, 1); + } else if (subside != null && warningValue != null && warningValue < subside) { + //预警 + insertHighFormworkAlarmData(point, subside, 6, 2); + } + } else if (type == 7) { + Double subside = StringUtils.isNotBlank(currentData.getHorizontalDisplacement()) ? Double.valueOf(currentData.getHorizontalDisplacement()) : null; if (subside != null && alarmValue != null && alarmValue < subside) { //报警 insertHighFormworkAlarmData(point, subside, 7, 1); @@ -408,7 +399,7 @@ public class HighFormworkSupportService { insertHighFormworkAlarmData(point, subside, 7, 2); } } else if (type == 8) { - Double subside = StringUtils.isNotBlank(currentData.getHorizontalDisplacement()) ? Double.valueOf(currentData.getHorizontalDisplacement()) : null; + Double subside = StringUtils.isNotBlank(currentData.getFormworkSettlement()) ? Double.valueOf(currentData.getFormworkSettlement()) : null; if (subside != null && alarmValue != null && alarmValue < subside) { //报警 insertHighFormworkAlarmData(point, subside, 8, 1); @@ -417,7 +408,7 @@ public class HighFormworkSupportService { insertHighFormworkAlarmData(point, subside, 8, 2); } } else if (type == 9) { - Double subside = StringUtils.isNotBlank(currentData.getFormworkSettlement()) ? Double.valueOf(currentData.getFormworkSettlement()) : null; + Double subside = StringUtils.isNotBlank(currentData.getPoleTilt()) ? Double.valueOf(currentData.getPoleTilt()) : null; if (subside != null && alarmValue != null && alarmValue < subside) { //报警 insertHighFormworkAlarmData(point, subside, 9, 1); @@ -426,7 +417,7 @@ public class HighFormworkSupportService { insertHighFormworkAlarmData(point, subside, 9, 2); } } else if (type == 10) { - Double subside = StringUtils.isNotBlank(currentData.getPoleTilt()) ? Double.valueOf(currentData.getPoleTilt()) : null; + Double subside = StringUtils.isNotBlank(currentData.getFoundationSettlement()) ? Double.valueOf(currentData.getFoundationSettlement()) : null; if (subside != null && alarmValue != null && alarmValue < subside) { //报警 insertHighFormworkAlarmData(point, subside, 10, 1); @@ -434,15 +425,6 @@ public class HighFormworkSupportService { //预警 insertHighFormworkAlarmData(point, subside, 10, 2); } - } else if (type == 11) { - Double subside = StringUtils.isNotBlank(currentData.getFoundationSettlement()) ? Double.valueOf(currentData.getFoundationSettlement()) : null; - if (subside != null && alarmValue != null && alarmValue < subside) { - //报警 - insertHighFormworkAlarmData(point, subside, 11, 1); - } else if (subside != null && warningValue != null && warningValue < subside) { - //预警 - insertHighFormworkAlarmData(point, subside, 11, 2); - } } } } 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 d425d558e..d89120557 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 @@ -32,10 +32,10 @@ public class HighFormworkAlarmData implements Serializable { @ApiModelProperty(value = "id") private java.lang.Long id; /** - * 类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降 + * 类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,6.立杆轴力7.水平位移8.模板沉降9.立杆倾斜10.地基沉降 */ - @Excel(name = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降", width = 15) - @ApiModelProperty(value = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降") + @Excel(name = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,6.立杆轴力7.水平位移8.模板沉降9.立杆倾斜10.地基沉降", width = 15) + @ApiModelProperty(value = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,6.立杆轴力7.水平位移8.模板沉降9.立杆倾斜10.地基沉降") private java.lang.Integer type; /** * 监测点ID 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 e45dc04c3..a7c89451f 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,8 +36,8 @@ public class HighFormworkMeasurePointThreshold implements Serializable { @ApiModelProperty(value = "监测点ID") private java.lang.Long measurePointId; - @Excel(name = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降", width = 15) - @ApiModelProperty(value = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降") + @Excel(name = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,6.立杆轴力7.水平位移8.模板沉降9.立杆倾斜10.地基沉降", width = 15) + @ApiModelProperty(value = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,6.立杆轴力7.水平位移8.模板沉降9.立杆倾斜10.地基沉降") private java.lang.Integer type; /** * 预警值 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 d5f5bdd05..e559efbbc 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 @@ -11,7 +11,12 @@ angle_y_axis, pressure, subside, - alarm_state + alarm_state, + pole_axial_force, + horizontal_displacement, + formwork_settlement, + pole_tilt, + foundation_settlement from high_formwork_measure_current_data where project_sn = #{param.projectSn}