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 505eb8f..461b189 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -328,13 +328,6 @@ public class StockService { stock.setStatus(0); } - Order order = orderMapper.selectOne(new QueryWrapper() - .eq("street_Id",street.getId()) - .eq("left_right1",stockCheck.getDirection()) - .eq("column1",stock.getColumn()) - .eq("row1",stock.getRow()) - .orderByDesc("into_Stock_Over_Time") - .last("limit 1")); stock.setOveroperationPic("http://" + street.getPlcIp() + ":8007" + "/storeData/" + street.getPlcId() + "/" + stock.getRow() + "/" + stock.getColumn() + "/" + (stock.getDirection() + 2) + ".PNG"); diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java index 44d121d..60b6ad1 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KescEncoder.java @@ -4,18 +4,21 @@ import com.alibaba.fastjson.JSONObject; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; +import lombok.extern.slf4j.Slf4j; import java.nio.charset.StandardCharsets; /** * 昆船JSON版发送 首尾加上 < > */ +@Slf4j public class KescEncoder extends MessageToByteEncoder { @Override protected void encode(ChannelHandlerContext channelHandlerContext, KsecInfo ksecInfo, ByteBuf byteBuf) throws Exception { String body = "<" + JSONObject.toJSONString(ksecInfo) + ">"; + log.info("发送消息:{}",body); byteBuf.writeBytes(body.getBytes(StandardCharsets.UTF_8)); } }