root/liaoNingShunHe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
张江玮
2023-10-31 14:19:39 +08:00
parent 4c370837b7
commit d99febf9c7
7 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
View File

@@ -433,8 +433,8 @@ public class NDCAgvServiceImpl implements NDCAgvService {
@Override
public AgvDto findByCarNumber(String carNumber) {
if (agv.containsKey(String.valueOf(carNumber)) && agv.get(carNumber) != null) {
return agv.get(String.valueOf(carNumber));
if (agv.containsKey(carNumber) && agv.get(carNumber) != null) {
return agv.get(carNumber);
} else {
AgvDto dto = new AgvDto();
dto.setName(carNumber);

10
acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java
View File

@@ -6,8 +6,6 @@ import org.nl.acs.auto.run.AbstractAutoRunnable;
import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.acs.udw.UnifiedDataAccessorFactory;
import org.nl.acs.udw.UnifiedDataAppService;
import org.nl.modules.lucene.service.LuceneExecuteLogService;
import org.nl.modules.lucene.service.dto.LuceneLogDto;
import org.nl.modules.wql.util.SpringContextHolder;
import org.openscada.opc.lib.da.Group;
import org.openscada.opc.lib.da.Item;
@@ -15,8 +13,10 @@ import org.openscada.opc.lib.da.ItemState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.*;
/**
@@ -30,8 +30,6 @@ public class DeviceOpcSynchronizeAutoRun extends AbstractAutoRunnable {
private DeviceAppService deviceAppService;
@Autowired
private OpcServerManageService opcServerManageService;
@Autowired
LuceneExecuteLogService lucene;
static ExecutorService executorService;
public static Map<String, OpcServerManageDto> opcServersConfig;
@@ -208,13 +206,11 @@ public class DeviceOpcSynchronizeAutoRun extends AbstractAutoRunnable {
}
if (!itemCode.endsWith("heartbeat") && !itemCode.endsWith("time")) {
log.warn("{} 信号 {} 发生变更 {} -> {} 信号快照 {}", itemDto.getDevice_code(), itemCode, his, value, sb);
lucene.deviceExecuteLog(new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1), String.valueOf(his), String.valueOf(value)));
}
} else {
if (!itemCode.endsWith("heartbeat") && !itemCode.endsWith("time")) {
log.warn("{} 信号 {} 发生变更 {} -> {}", itemDto.getDevice_code(), itemCode, his, value);
lucene.deviceExecuteLog(new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1), String.valueOf(his), String.valueOf(value)));
}
}
}

9
acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -2,8 +2,6 @@ package org.nl.start.auto.run;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
@@ -39,8 +37,10 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.*;
import java.util.stream.Collectors;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@Slf4j
@Component
@@ -538,7 +538,6 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
acsToWmsService.feedbackTaskStatusToWms(ar);
} catch (Exception e) {
logServer.deviceExecuteLog(device_code, "", "", "AGV取货完成离开后，反馈上位系统失败！");
e.printStackTrace();
}
}
}