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

rev

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-08-28 20:27:16 +08:00
parent 7a2e4e18ce
commit 33b546032f
6 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
View File

@@ -236,6 +236,13 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
this.setApplySucess(false);
message = null;
}
JSONObject param = new JSONObject();
param.put("device_code", this.device_code);
param.put("mode", Math.min(mode, 3));
param.put("device_name", this.getDevice().getDevice_name());
param.put("device_type", "1");
param.put("product_area", paramService.findByCode("productArea").getValue());
acsToWmsService.sendDeviceStatus(param);
}
if (move != last_move) {
if (move == 0) {
@@ -254,6 +261,15 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
dto.setError_info(ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
JSONObject param = new JSONObject();
param.put("device_code", this.device_code);
param.put("error", error);
param.put("error_msg", error == 0 ? "" : ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
param.put("device_name", this.getDevice().getDevice_name());
param.put("device_type", "1");
param.put("product_area", paramService.findByCode("productArea").getValue());
acsToWmsService.sendDeviceStatus(param);
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (plcbarcode_length != last_plcbarcode_length) {

6
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -549,12 +549,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AddressDto addressDto = addressService.findByCode("sendDeviceStatus");
String methods_url = addressDto.getMethods_url();
String url = wmsUrl + methods_url;
// log.info("sendDeviceStatus - 请求参数 {}", param);
HttpRequest
log.info("sendDeviceStatus - 请求参数 {}", param);
HttpResponse response = HttpRequest
.post(url)
.body(param.toString())
.execute();
// log.info("sendDeviceStatus - 返回参数 {}", response.body());
log.info("sendDeviceStatus - 返回参数 {}", response.body());
}
} catch (Throwable ignored) {

11
acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
View File

@@ -4,9 +4,11 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.acs.udw.UnifiedDataAccessorFactory;
import org.nl.acs.udw.UnifiedDataAppService;
import org.nl.modules.wql.util.SpringContextHolder;
import org.openscada.opc.lib.da.*;
import java.util.*;
@@ -25,6 +27,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
private int all_null;
private Map<String, OpcItemDto> itemSearchCache;
public DeviceOpcProtocolRunable() {
this.error_num = 0;
this.all_null = 0;
@@ -80,6 +83,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
private void runOld() {
OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService .class);
while (true) {
start:
try {
@@ -93,9 +97,10 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
log.trace("清理server...");
}
this.server = OpcServerUtl.getServerWithOutException(this.OpcServer.getOpc_host(), this.OpcServer.getCls_id(), this.OpcServer.getUser(), this.OpcServer.getPassword(), this.OpcServer.getDomain());
this.server.addStateListener(this);
group = this.server.addGroup();
group =opcServerService.getServer(this.getOpcServer().getOpc_code());
// this.server = OpcServerUtl.getServerWithOutException(this.OpcServer.getOpc_host(), this.OpcServer.getCls_id(), this.OpcServer.getUser(), this.OpcServer.getPassword(), this.OpcServer.getDomain());
// this.server.addStateListener(this);
// group = this.server.addGroup();
List<String> itemsString = new ArrayList();
Iterator var3 = this.protocols.iterator();

4
acs/nladmin-ui/.env.development
View File

@@ -1,8 +1,8 @@
ENV = 'development'
# 接口地址
VUE_APP_BASE_API = 'http://localhost:8010'
VUE_APP_WS_API = 'ws://localhost:8010'
VUE_APP_BASE_API = 'http://localhost:8011'
VUE_APP_WS_API = 'ws://localhost:8011'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true

4
acs/nladmin-ui/.env.production
View File

@@ -2,6 +2,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
VUE_APP_BASE_API = 'http://10.1.3.90:8011'
VUE_APP_BASE_API = 'http://10.1.3.94:8011'
# 如果接口是 http 形式， wss 需要改为 ws
VUE_APP_WS_API = 'ws://10.1.3.90:8011'
VUE_APP_WS_API = 'ws://10.1.3.94:8011'

4
acs/nladmin-ui/public/config.js
View File

@@ -1,9 +1,9 @@
window.g = {
dev: {
VUE_APP_BASE_API: 'http://127.0.0.1:8010'
VUE_APP_BASE_API: 'http://127.0.0.1:8011'
},
prod: {
VUE_APP_BASE_API: 'http://127.0.0.1:8010'
VUE_APP_BASE_API: 'http://127.0.0.1:8011'
}