From 5a7ae811b4c78346099328bac970f0276f5f7f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 22 Jan 2024 09:22:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=8D=E4=B8=BA=E5=A4=B1=E8=B4=A5=E5=88=99?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=88=90=E5=8A=9F=E6=9D=A5=202.tcpinfo?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/pojo/stock/StockCheckSearch.java | 1 + .../main/java/com/zhehekeji/web/service/StockService.java | 1 - .../zhehekeji/web/service/client/TransmissionPojo.java | 2 +- .../com/zhehekeji/web/service/ksec/KsecNettyClient.java | 8 ++++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java index 9c39a74..b5e937e 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockCheckSearch.java @@ -11,6 +11,7 @@ public class StockCheckSearch { @NotEmpty(message = "巷道标识符不能为空") @ApiModelProperty("巷道标识符") + private String SRMNumber; @NotNull(message = "行不能为空") diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index 47942ed..968a59f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -338,7 +338,6 @@ public class StockService { if(stock.getCheckPic()!=null){ stock.setCheckPics(stock.getCheckPic().split(";")); - } return stock; } diff --git a/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java b/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java index faa2c54..50d7e11 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/TransmissionPojo.java @@ -61,7 +61,7 @@ public class TransmissionPojo { this.count = Integer.valueOf(dataArray[6]); } if (dataArray.length > 7) { - this.result = Integer.valueOf(dataArray[7]); + this.result = Integer.parseInt(dataArray[7])==0 ?0:1; this.picsPath = dataArray[8].split(";"); } diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java index 9cfb14a..832640c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java @@ -9,15 +9,20 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import java.net.InetSocketAddress; @Slf4j @Component public class KsecNettyClient { + + static final Logger tcpLogger = LoggerFactory.getLogger("tcp"); private static EventLoopGroup group = new NioEventLoopGroup(); @Resource private PlcService plcService; @@ -101,6 +106,9 @@ public class KsecNettyClient { public static void write(KsecInfo ksecInfo){ if(channel != null){ channel.writeAndFlush(ksecInfo); + InetSocketAddress socketAddress = (InetSocketAddress) channel.remoteAddress(); + String clientIp = socketAddress.getAddress().getHostAddress(); + tcpLogger.info("write kesc data:{} channel:{}",ksecInfo,clientIp); }else { log.error(" no connected upPc"); }