diff --git a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java index a28069b..e29982e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java @@ -39,7 +39,8 @@ public class CheckLogService { .eq(search.getLeftRight() != null && search.getLeftRight() > 0, "`direction`", search.getLeftRight()) .eq(search.getSide() != null && search.getSide() > 0, "`side`", search.getSide()) .eq(search.getRow() != null && search.getRow() > 0, "`row`", search.getRow()) - .eq(search.getColumn() != null && search.getColumn() > 0, "`column`", search.getColumn()); + .eq(search.getColumn() != null && search.getColumn() > 0, "`column`", search.getColumn()) + .orderByDesc("create_time"); List stockChecks = checkLogMapper.selectList(wrapper); for (CheckLog checkLog :stockChecks){ diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index a7c5f54..4586cd8 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -732,7 +732,7 @@ public class PlcService { ksecDataInfo.setLotnum(checkLog.getLotnum()); - KsecInfo ksecInfo = new KsecInfo("KC", "SC", ksecDataInfo); + KsecInfo ksecInfo = new KsecInfo("KC", "E", ksecDataInfo); return ksecInfo; } } diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java index a2dc126..cead4f4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java @@ -107,8 +107,6 @@ public class Decoder extends DelimiterBasedFrameDecoder { } //发送给上位机 - KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo,"SC03"); - KsecNettyClient.write(ksecInfo); CameraDelayTask cameraDelayTask = GetPhotoDelayExecutor.getNext(transmissionPojo.getStreetNumber()); if (cameraDelayTask != null) { TransmissionPojo pojo = new TransmissionPojo(cameraDelayTask.getCommand()); @@ -119,16 +117,15 @@ public class Decoder extends DelimiterBasedFrameDecoder { else if(RETURN_CHECK.equals(transmissionPojo.getHeader())){ //保存数据 plcService.visualCalculationResults(transmissionPojo); - //发送给上位机 - KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo,"SC04"); + KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo,"E"); ksecInfo.getData().setTypeNum(transmissionPojo.getCategory()); ksecInfo.getData().setQuantity(transmissionPojo.getCount()); ksecInfo.getData().setCheckRlt(transmissionPojo.getResult()); - KsecNettyClient.write(ksecInfo); + } } } diff --git a/web/src/main/java/com/zhehekeji/web/service/client/GetPhotoDelayExecutor.java b/web/src/main/java/com/zhehekeji/web/service/client/GetPhotoDelayExecutor.java index c7b600d..b5f6ed6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/GetPhotoDelayExecutor.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/GetPhotoDelayExecutor.java @@ -1,7 +1,12 @@ package com.zhehekeji.web.service.client; +import com.zhehekeji.common.util.SpringContextUtil; +import com.zhehekeji.web.lib.CameraControlModule; import com.zhehekeji.web.lib.CameraDelayTask; import com.zhehekeji.web.lib.TaskDelayExecutor; +import com.zhehekeji.web.service.PlcService; +import com.zhehekeji.web.service.ksec.KsecInfo; +import com.zhehekeji.web.service.ksec.KsecNettyClient; import java.util.Map; import java.util.concurrent.*; @@ -47,12 +52,21 @@ public class GetPhotoDelayExecutor { private static class Consumer implements Runnable { + + @Override public void run() { while (true) { try { - - cameraDelayTasks.remove(cameraDelayTasks.take()); + PlcService plcService = SpringContextUtil.getBean(PlcService.class); + CameraDelayTask cameraDelayTask = cameraDelayTasks.take(); + TransmissionPojo transmissionPojo = new TransmissionPojo(cameraDelayTask.getCommand()); + //发送给上位机 + KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo,"E"); + ksecInfo.getData().setTypeNum(transmissionPojo.getCategory()); + ksecInfo.getData().setQuantity(transmissionPojo.getCount()); + ksecInfo.getData().setCheckRlt(0); + KsecNettyClient.write(ksecInfo); } catch (InterruptedException e) { e.printStackTrace(); } 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 28b372c..faa2c54 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 @@ -29,7 +29,7 @@ public class TransmissionPojo { this.taskId = checkLog.getLotnum(); this.direction = checkLog.getDirection(); this.count = checkLog.getCount(); - this.category = checkLog.getCategory(); + this.category = checkLog.getCategory().split("/")[0]; } public String toString(TransmissionType type) { 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 9571bd7..9cfb14a 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 @@ -67,7 +67,7 @@ public class KsecNettyClient { } catch (InterruptedException e) { e.printStackTrace(); } - while (ksec.getReconnectNum() == -1 || num < ksec.getReconnectNum() && !isConnected) { + while ((ksec.getReconnectNum() == -1 || num < ksec.getReconnectNum()) && !isConnected) { if (channel != null) { channel.close(); } @@ -87,11 +87,6 @@ public class KsecNettyClient { log.error("reconnect error num:{}", num); //关闭当前链接 num++; -// try{ -// Thread.sleep(ksec.getReconnectInterval()); -// }catch (Exception ex){ -// throw new RuntimeException(ex); -// } continue; } isConnected = true;