upright
/
backend-duoji-monitor
mirror of https://gitlab.hzleaper.com:81/duoji/backend-duoji-monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

队列修改

Browse Source
just-order
LAPTOP-S9HJSOEB\昊天 2 years ago
parent c84b07256b
commit fbc6a27c34
5 changed files with 105 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/java/com/zhehekeji/web/service/InitService.java
Unescape Escape View File

@ -113,7 +113,7 @@ public class InitService implements ApplicationRunner {
} }
TaskDelayExecutor.runMp4DownloadExecutor(); TaskDelayExecutor.runMp4DownloadExecutor();
GetPhotoDelayExecutor.runExecutor(); GetPhotoDelayExecutor.runExecutor(streets);
} }
class LoginThread extends Thread{ class LoginThread extends Thread{

47
web/src/main/java/com/zhehekeji/web/service/PlcService.java
Unescape Escape View File

@ -42,6 +42,8 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.zhehekeji.web.service.client.GetPhotoDelayExecutor.cameraDelayTaskMap;
/** /**
* @Description plc信号指令处理类 * @Description plc信号指令处理类
@ -734,22 +736,25 @@ public class PlcService {
if (lock.tryLock()) { if (lock.tryLock()) {
//队列中没有任务，发送取图指令 //队列中没有任务，发送取图指令
//只采用队列，队列中有数据则自动发送 //只采用队列，队列中有数据则自动发送
if (GetPhotoDelayExecutor.cameraDelayTasks.size() == 0 && ClientChanel.get(dataInfo.getSRMNumber()) != null) { //模拟随行
ClientChanel.get(street.getPlcId()).writeAndFlush(transmissionPojo.toString(TransmissionType.GPS)); if (configProperties.isInventorySimulationFollow()) {
}
String s = (new TransmissionPojo(street, transmissionPojo.getRow(),transmissionPojo.getColumn(),transmissionPojo.getDirection(), "")).toString(TransmissionType.GPS);
//放置到队列中，等待取图返回后删除
GetPhotoDelayExecutor.addCameraDelayTask(street.getPlcId(), s, configProperties.getQueueSpanTime());
}
//放置到队列中，等待取图返回后删除 //放置到队列中，等待取图返回后删除
GetPhotoDelayExecutor.addCameraDelayTask(street.getPlcId(), transmissionPojo.toString(TransmissionType.GPS), configProperties.getQueueSpanTime()); GetPhotoDelayExecutor.addCameraDelayTask(street.getPlcId(), transmissionPojo.toString(TransmissionType.GPS), configProperties.getQueueSpanTime());
} }
if (configProperties.isInventorySimulationFollow()) {
ClientChanel.get(dataInfo.getSRMNumber()).writeAndFlush(
(new TransmissionPojo(street, transmissionPojo.getRow(), transmissionPojo.getColumn(), transmissionPojo.getDirection(), "")).toString(TransmissionType.GPS));
}
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.error("取图命令 error", e); log.error("取图命令 error", e);
} finally { } finally {
lock.unlock(); lock.unlock();
log.info("盘点完成");
} }
// ClientChanel.get(dataInfo.getSRMNumber()).writeAndFlush(); // ClientChanel.get(dataInfo.getSRMNumber()).writeAndFlush();
@ -800,19 +805,23 @@ public class PlcService {
public KsecInfo getKsecDataInfo(TransmissionPojo transmissionPojo, String type) { public KsecInfo getKsecDataInfo(TransmissionPojo transmissionPojo, String type) {
KsecDataInfo ksecDataInfo = new KsecDataInfo(); KsecDataInfo ksecDataInfo = new KsecDataInfo();
CheckLog checkLog = checkLogMapper.selectById(transmissionPojo.getCheckId()); CheckLog checkLog = checkLogMapper.selectById(transmissionPojo.getCheckId());
ksecDataInfo.setLotnum(checkLog.getLotnum()); if(checkLog!=null) {
ksecDataInfo.setSRMNumber(transmissionPojo.getStreetNumber()); ksecDataInfo.setLotnum(checkLog.getLotnum());
ksecDataInfo.setCmdName(type); ksecDataInfo.setSRMNumber(transmissionPojo.getStreetNumber());
ksecDataInfo.setTaskId(checkLog.getTaskId().toString()); ksecDataInfo.setCmdName(type);
ksecDataInfo.setFromDirection(checkLog.getDirection()); ksecDataInfo.setTaskId(checkLog.getTaskId().toString());
ksecDataInfo.setFromColumn(checkLog.getColumn()); ksecDataInfo.setFromDirection(checkLog.getDirection());
ksecDataInfo.setFromRow(checkLog.getRow()); ksecDataInfo.setFromColumn(checkLog.getColumn());
ksecDataInfo.setFromSide(checkLog.getSide()); ksecDataInfo.setFromRow(checkLog.getRow());
ksecDataInfo.setCode(checkLog.getCode()); ksecDataInfo.setFromSide(checkLog.getSide());
ksecDataInfo.setTrayCode(checkLog.getTrayCode()); ksecDataInfo.setCode(checkLog.getCode());
ksecDataInfo.setLotnum(checkLog.getLotnum()); ksecDataInfo.setTrayCode(checkLog.getTrayCode());
ksecDataInfo.setLotnum(checkLog.getLotnum());
}
KsecInfo ksecInfo = new KsecInfo("KC", "E", ksecDataInfo); KsecInfo ksecInfo = new KsecInfo("KC", "E", ksecDataInfo);
return ksecInfo; return ksecInfo;
} }

8
web/src/main/java/com/zhehekeji/web/service/client/Decoder.java
Unescape Escape View File

@ -24,6 +24,8 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static com.zhehekeji.web.service.client.GetPhotoDelayExecutor.cameraDelayTaskMap;
/** /**
* 客户端解码器 连接用 * 客户端解码器 连接用
*/ */
@ -101,6 +103,8 @@ public class Decoder extends DelimiterBasedFrameDecoder {
else if(GET_PHOTO_END.equals(transmissionPojo.getHeader())){ else if(GET_PHOTO_END.equals(transmissionPojo.getHeader())){
if(transmissionPojo.getTaskId() != null && !"0".equals(transmissionPojo.getTaskId())) { if(transmissionPojo.getTaskId() != null && !"0".equals(transmissionPojo.getTaskId())) {
ClientChanel.get(transmissionPojo.getStreetNumber()).writeAndFlush(transmissionPojo.toString(TransmissionType.RTS)); ClientChanel.get(transmissionPojo.getStreetNumber()).writeAndFlush(transmissionPojo.toString(TransmissionType.RTS));
// GetPhotoDelayExecutor.addCameraDelayTask(transmissionPojo.getStreetNumber(), transmissionPojo.toString(TransmissionType.RTS), 3000);
} }
try { try {
Thread.sleep(50L); Thread.sleep(50L);
@ -109,8 +113,8 @@ public class Decoder extends DelimiterBasedFrameDecoder {
} }
//删除队列的拍照数据 //删除队列的拍照数据
GetPhotoDelayExecutor.remove(transmissionPojo.getStreetNumber(),transmissionPojo.toString(TransmissionType.GPS)); GetPhotoDelayExecutor.remove(transmissionPojo.getStreetNumber(),transmissionPojo.toString(TransmissionType.GPS));
//发送给上位机 //读取下一个发送
CameraDelayTask cameraDelayTask = GetPhotoDelayExecutor.getNext(transmissionPojo.getStreetNumber()); CameraDelayTask cameraDelayTask = GetPhotoDelayExecutor.nextOne(transmissionPojo.getStreetNumber(),transmissionPojo.toString(TransmissionType.GPS));
if (cameraDelayTask != null) { if (cameraDelayTask != null) {
TransmissionPojo pojo = new TransmissionPojo(cameraDelayTask.getCommand()); TransmissionPojo pojo = new TransmissionPojo(cameraDelayTask.getCommand());
ClientChanel.get(pojo.getStreetNumber()).writeAndFlush(pojo.toString(TransmissionType.GPS)); ClientChanel.get(pojo.getStreetNumber()).writeAndFlush(pojo.toString(TransmissionType.GPS));

104
web/src/main/java/com/zhehekeji/web/service/client/GetPhotoDelayExecutor.java
Unescape Escape View File

@ -1,23 +1,29 @@
package com.zhehekeji.web.service.client; package com.zhehekeji.web.service.client;
import com.zhehekeji.common.util.SpringContextUtil; import com.zhehekeji.common.util.SpringContextUtil;
import com.zhehekeji.web.entity.Street;
import com.zhehekeji.web.lib.CameraControlModule; import com.zhehekeji.web.lib.CameraControlModule;
import com.zhehekeji.web.lib.CameraDelayTask; import com.zhehekeji.web.lib.CameraDelayTask;
import com.zhehekeji.web.lib.TaskDelayExecutor; import com.zhehekeji.web.lib.TaskDelayExecutor;
import com.zhehekeji.web.service.PlcService; import com.zhehekeji.web.service.PlcService;
import com.zhehekeji.web.service.ksec.KsecInfo; import com.zhehekeji.web.service.ksec.KsecInfo;
import com.zhehekeji.web.service.ksec.KsecNettyClient; import com.zhehekeji.web.service.ksec.KsecNettyClient;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.*; import java.util.concurrent.*;
/** /**
* GetPhotoDelayExecutor类用于管理照片获取的延时任务。 * GetPhotoDelayExecutor类用于管理照片获取的延时任务。
*/ */
@Slf4j
public class GetPhotoDelayExecutor { public class GetPhotoDelayExecutor {
// 延时队列，存放CameraDelayTask任务 // 延时队列，存放CameraDelayTask任务
public static DelayQueue<CameraDelayTask> cameraDelayTasks = new DelayQueue<>(); public static Map<String, DelayQueue<CameraDelayTask>> cameraDelayTaskMap = new ConcurrentHashMap<>();
// 线程池，用于执行延时任务 // 线程池，用于执行延时任务
private static ExecutorService exec = Executors.newFixedThreadPool(1); private static ExecutorService exec = Executors.newFixedThreadPool(10);
/** /**
* 向延时队列中添加一个拍照延时任务。 * 向延时队列中添加一个拍照延时任务。
@ -28,8 +34,23 @@ public class GetPhotoDelayExecutor {
*/ */
public static void addCameraDelayTask(String cameraPlcId, String getPhotoCommand, long time) { public static void addCameraDelayTask(String cameraPlcId, String getPhotoCommand, long time) {
if(cameraDelayTaskMap.get(cameraPlcId)==null || cameraDelayTaskMap.get(cameraPlcId).size() == 0) {
if( ClientChanel.get(cameraPlcId) != null){
log.info("队列中无数据，输出"+getPhotoCommand);
ClientChanel.get(cameraPlcId).writeAndFlush(getPhotoCommand);
}else {
log.info("队列中无数据，未找到通信"+cameraPlcId);
}
}
CameraDelayTask cameraDelayTask = new CameraDelayTask(cameraPlcId, getPhotoCommand, time); CameraDelayTask cameraDelayTask = new CameraDelayTask(cameraPlcId, getPhotoCommand, time);
cameraDelayTasks.add(cameraDelayTask); if(cameraDelayTaskMap.get(cameraPlcId)!=null){
cameraDelayTaskMap.get(cameraPlcId).add(cameraDelayTask);
}else {
cameraDelayTaskMap.put(cameraPlcId,new DelayQueue<>());
cameraDelayTaskMap.get(cameraPlcId).add(cameraDelayTask);
}
} }
/** /**
@ -38,47 +59,57 @@ public class GetPhotoDelayExecutor {
* @param getPhotoCommand 获取巷道编号 * @param getPhotoCommand 获取巷道编号
* @param cameraPlcId 命令行 * @param cameraPlcId 命令行
*/ */
public static void remove(String getPhotoCommand, String cameraPlcId) { public static CameraDelayTask remove(String cameraPlcId, String getPhotoCommand) {
cameraPlcId = cameraPlcId.intern(); cameraPlcId = cameraPlcId.intern();
synchronized (cameraPlcId) { synchronized (cameraPlcId) {
// 将延时队列中的任务转换为数组，便于遍历和移除 // 将延时队列中的任务转换为数组，便于遍历和移除
Object[] cameraDelayTask = cameraDelayTasks.toArray(); Object[] objects = cameraDelayTaskMap.get(cameraPlcId).toArray();
for (Object cameraDelayTask1 : cameraDelayTask) { if(objects.length > 0) {
CameraDelayTask cameraDelayTask2 = (CameraDelayTask) cameraDelayTask1; CameraDelayTask cameraDelayTask = (CameraDelayTask)objects[0];
if (cameraDelayTask2.getCameraPlcId().equals(getPhotoCommand)) {
cameraDelayTasks.remove(cameraDelayTask2); if (cameraDelayTask != null) {
cameraDelayTaskMap.get(cameraPlcId).remove(cameraDelayTask);
return cameraDelayTask;
} }
} }
} }
return null;
} }
/** public static CameraDelayTask nextOne(String cameraPlcId, String getPhotoCommand) {
* 获取延时队列中最早的任务，并将其从队列中移除。 cameraPlcId = cameraPlcId.intern();
* synchronized (cameraPlcId) {
* @param cameraPlcId 相机的PLC编号，该参数未被使用 // 将延时队列中的任务转换为数组，便于遍历和移除
* @return 返回最早的任务，如果队列为空则返回null Object[] objects = cameraDelayTaskMap.get(cameraPlcId).toArray();
*/ if(objects.length > 0) {
public static CameraDelayTask getNext(String cameraPlcId) { CameraDelayTask cameraDelayTask = (CameraDelayTask)objects[0];
Object[] cameraDelayTask = cameraDelayTasks.toArray(); if (cameraDelayTask != null) {
if (cameraDelayTask.length > 0) { return cameraDelayTask;
CameraDelayTask cameraDelayTask2 = (CameraDelayTask) cameraDelayTask[0];
return cameraDelayTask2; }
}
} }
return null; return null;
} }
/** /**
* 启动延时任务的执行器。 * 启动延时任务的执行器。
*/ */
public static void runExecutor() { public static void runExecutor(List<Street> streets ) {
exec.execute(new GetPhotoDelayExecutor.Consumer()); for (Street street: streets){
exec.execute(new GetPhotoDelayExecutor.Consumer(street));
}
} }
/** /**
* Consumer内部类，实现Runnable接口，用于消费延时队列中的任务。 * Consumer内部类，实现Runnable接口，用于消费延时队列中的任务。
*/ */
private static class Consumer implements Runnable { private static class Consumer implements Runnable {
private Street street;
Consumer(Street street){
this.street = street;
}
/** /**
* 无限循环，不断从延时队列中取出任务并执行。 * 无限循环，不断从延时队列中取出任务并执行。
*/ */
@ -89,17 +120,20 @@ public class GetPhotoDelayExecutor {
// 从Spring上下文中获取PlcService实例 // 从Spring上下文中获取PlcService实例
PlcService plcService = SpringContextUtil.getBean(PlcService.class); PlcService plcService = SpringContextUtil.getBean(PlcService.class);
// 从延时队列中获取并移除一个任务 // 从延时队列中获取并移除一个任务
CameraDelayTask cameraDelayTask = cameraDelayTasks.take(); if(cameraDelayTaskMap.get(street.getPlcId())!= null) {
if(cameraDelayTask != null) { CameraDelayTask cameraDelayTask = cameraDelayTaskMap.get(street.getPlcId()).take();
// 构造传输对象，并将任务命令等信息设置进去 if (cameraDelayTask != null) {
TransmissionPojo transmissionPojo = new TransmissionPojo(cameraDelayTask.getCommand()); // 构造传输对象，并将任务命令等信息设置进去
// 调用PLC服务，模拟发送数据到上位机 TransmissionPojo transmissionPojo = new TransmissionPojo(cameraDelayTask.getCommand());
KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo, "E"); // 调用PLC服务，模拟发送数据到上位机
ksecInfo.getData().setTypeNum(transmissionPojo.getCategory()); KsecInfo ksecInfo = plcService.getKsecDataInfo(transmissionPojo, "E");
ksecInfo.getData().setQuantity(transmissionPojo.getCount()); ksecInfo.getData().setTypeNum(transmissionPojo.getCategory());
ksecInfo.getData().setCheckRlt(0); ksecInfo.getData().setQuantity(transmissionPojo.getCount());
// 将信息发送给上位机 ksecInfo.getData().setCheckRlt(0);
KsecNettyClient.write(ksecInfo); // 将信息发送给上位机
if (!transmissionPojo.getTaskId().equals("0"))
KsecNettyClient.write(ksecInfo);
}
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();

2
web/src/main/resources/application-prod.yml
Unescape Escape View File

@ -98,4 +98,4 @@ deleteFileDays: 30
productDoc: "C:/Users/昊天/Desktop/新建 文本文档 (3).txt" productDoc: "C:/Users/昊天/Desktop/新建 文本文档 (3).txt"
inventorySimulationFollow: false inventorySimulationFollow: true
Write Preview
Loading…
Cancel
Save