upright
/
lxCameraApi
mirror of https://gitlab.hzleaper.com:81/wanghaotian/lxCameraApi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改为算法平台plc连接

Browse Source
联合利华-拍照
LAPTOP-S9HJSOEB\昊天 2 days ago
parent fd3ddb7fea
commit 41157d116c
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File

24
src/main/java/com/example/lxcameraapi/service/s7/S7MultiPlcService.java
Unescape Escape View File

@ -101,7 +101,7 @@ public class S7MultiPlcService {
private final Map<String, PlcReadData> readDataCache = new ConcurrentHashMap<>();
// 上一次读取的托盘码缓存: plcNumber -> 上次托盘码
private final Map<String, String> lastPalletCache = new ConcurrentHashMap<>();
private final Map<String, PlcReadData> lastPalletCache = new ConcurrentHashMap<>();
// 连接池大小
private final int POOL_SIZE = 3;
@ -392,17 +392,24 @@ public class S7MultiPlcService {
plcNumber, data.getPalletNo(), data.getBatchNo(), data.getDate(), data.getSnapFlag());
// 检查托盘号是否需要处理
String lastPallet = lastPalletCache.get(plcNumber);
PlcReadData lastPlcData = lastPalletCache.get(plcNumber);
boolean needProcess = false;
if (data.getSnapFlag() == 0){
// 标记拍照修改
writePhotoResult(plcNumber, (byte) 0);
}else {
if (data.getSnapFlag() == 1 && (lastPallet == null || !lastPallet.equals(data.getPalletNo()))) {
if (data.getSnapFlag() == 1 && (lastPlcData == null || !lastPlcData.getPalletNo().equals(data.getPalletNo()))) {
// 托盘号变化或首次启动
needProcess = true;
}
if (lastPlcData != null && data.getSnapFlag() == 1 && (lastPlcData.getPalletNo().equals(data.getPalletNo()))&& lastPlcData.isValid()) {
// 标记拍照完成
log.info("PLC {} 拍照完成 再次标注", plcNumber);
writePhotoResult(plcNumber, (byte) 1);
}
}
// if (lastPallet == null) {
@ -419,13 +426,17 @@ public class S7MultiPlcService {
// }
if (needProcess) {
lastPalletCache.put(plcNumber, data.getPalletNo());
lastPalletCache.put(plcNumber, data);
// 触发灯
if (config.getLightChannel() != null) {
lightService.pulse(config.getLightChannel(), lightConfig.getDuration(),
lightConfig.getRes(), lightConfig.getIp(), lightConfig.getPort());
}
log.info("PLC {} 托盘号变化: {} -> {}", plcNumber, lastPallet, data.getPalletNo());
if (lastPlcData != null) {
log.info("PLC {} 托盘号变化: {} -> {}", plcNumber, lastPlcData.getPalletNo(), data.getPalletNo());
}else {
log.info("PLC {} 首次启动，托盘号: {}", plcNumber, data.getPalletNo());
}
sleep(500);
@ -457,6 +468,8 @@ public class S7MultiPlcService {
cameraUrl.setPlc(plcNumber);
cameraUrlService.saveOrUpdate(cameraUrl);
readDataCache.get(plcNumber).setValid(true);
// 标记拍照完成
writePhotoResult(plcNumber, (byte) 1);
}
@ -833,6 +846,7 @@ public class S7MultiPlcService {
private byte snapFlag; // 允许拍照标志
private byte photoResult; // 拍照结果
private long updateTime; // 更新时间
private boolean isValid =false; // 是否有效
@Override
public String toString() {

22
src/main/resources/logback-spring.xml
Unescape Escape View File

@ -13,13 +13,12 @@
</encoder>
</appender>
<!-- 系统日志输出 -->
<!-- 系统日志输出（按天+按大小滚动，单文件超过10MB自动切新文件） -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-info.log</file>
<!-- 循环政策：基于时间和大小创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>100MB</maxFileSize>
<maxFileSize>10MB</maxFileSize>
<maxHistory>30</maxHistory>
<totalSizeCap>3GB</totalSizeCap>
</rollingPolicy>
@ -34,13 +33,12 @@
</filter>
</appender>
<!-- 错误日志输出 -->
<!-- 错误日志输出（单文件超过10MB自动切新文件） -->
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 循环政策：基于时间和大小创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>100MB</maxFileSize>
<maxFileSize>10MB</maxFileSize>
<maxHistory>30</maxHistory>
<totalSizeCap>3GB</totalSizeCap>
</rollingPolicy>
@ -55,12 +53,12 @@
</filter>
</appender>
<!-- 相机操作日志 -->
<!-- 相机操作日志（单文件超过10MB自动切新文件） -->
<appender name="camera_log" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/camera.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${log.path}/camera.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>100MB</maxFileSize>
<maxFileSize>10MB</maxFileSize>
<maxHistory>30</maxHistory>
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
@ -70,12 +68,12 @@
</encoder>
</appender>
<!-- 二维码识别日志 -->
<!-- 二维码识别日志（单文件超过10MB自动切新文件） -->
<appender name="qr_log" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/qrcode.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${log.path}/qrcode.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxFileSize>10MB</maxFileSize>
<maxHistory>15</maxHistory>
<totalSizeCap>500MB</totalSizeCap>
</rollingPolicy>
@ -85,12 +83,12 @@
</encoder>
</appender>
<!-- 定时任务日志 -->
<!-- 定时任务日志（单文件超过10MB自动切新文件） -->
<appender name="schedule_log" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/schedule.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${log.path}/schedule.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxFileSize>10MB</maxFileSize>
<maxHistory>30</maxHistory>
<totalSizeCap>500MB</totalSizeCap>
</rollingPolicy>

Write Preview
Loading…
Cancel
Save