add:自动门
This commit is contained in:
@@ -55,5 +55,19 @@ public class XianGongAgvController {
|
|||||||
return new ResponseEntity<>(agvService.releaseBlockGroup(requestParam), HttpStatus.OK);
|
return new ResponseEntity<>(agvService.releaseBlockGroup(requestParam), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping ("/controlDoor")
|
||||||
|
@Log("请求开/关自动门")
|
||||||
|
@ApiOperation("请求开/关自动门")
|
||||||
|
public ResponseEntity<JSONObject> controlDoor(@RequestBody JSONObject requestParam) {
|
||||||
|
return new ResponseEntity<>(agvService.controlDoor(requestParam), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping ("/doorStateList")
|
||||||
|
@Log("查询自动门状态")
|
||||||
|
@ApiOperation("查询自动门状态")
|
||||||
|
public ResponseEntity<JSONObject> doorStateList(@RequestBody JSONObject requestParam) {
|
||||||
|
return new ResponseEntity<>(agvService.doorStateList(requestParam), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -174,4 +174,36 @@ public interface XianGongAgvService {
|
|||||||
*/
|
*/
|
||||||
public <T> UnifiedResponse<T> sendOrderStopToXZ(JSONObject requestParam);
|
public <T> UnifiedResponse<T> sendOrderStopToXZ(JSONObject requestParam);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 请求开/关自动门
|
||||||
|
* @param requestParam {
|
||||||
|
* doorName: 自动门id,
|
||||||
|
* state: 0-关门,1-开门
|
||||||
|
* }
|
||||||
|
* @return JSONObject:{
|
||||||
|
* result:0-成功,
|
||||||
|
* message: 操作成功
|
||||||
|
* }
|
||||||
|
*/
|
||||||
|
public JSONObject controlDoor(JSONObject requestParam);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询门状态
|
||||||
|
* @param requestParam: {
|
||||||
|
* doorNameList:["自动门id"]
|
||||||
|
* }
|
||||||
|
* @return JSONObject: {
|
||||||
|
* result: 0
|
||||||
|
* message: 操作成功
|
||||||
|
* data : [
|
||||||
|
* {
|
||||||
|
* doorName: 设备id
|
||||||
|
* state: 门状态:2-门完全打开 3-门正在打开中
|
||||||
|
* msg: 状态异常时提示
|
||||||
|
* timestamp:时间戳
|
||||||
|
* }
|
||||||
|
* ]
|
||||||
|
* }
|
||||||
|
*/
|
||||||
|
public JSONObject doorStateList(JSONObject requestParam);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import org.nl.acs.agv.server.AgvWaitUtil;
|
|||||||
import org.nl.acs.agv.server.XianGongAgvService;
|
import org.nl.acs.agv.server.XianGongAgvService;
|
||||||
import org.nl.acs.agv.server.dto.AgvDto;
|
import org.nl.acs.agv.server.dto.AgvDto;
|
||||||
import org.nl.acs.config.AcsConfig;
|
import org.nl.acs.config.AcsConfig;
|
||||||
|
import org.nl.acs.device_driver.basedriver.standard_autodoor.StandardAutodoorDeviceDriver;
|
||||||
import org.nl.acs.device_driver.basedriver.standard_conveyor_control.StandardCoveyorControlDeviceDriver;
|
import org.nl.acs.device_driver.basedriver.standard_conveyor_control.StandardCoveyorControlDeviceDriver;
|
||||||
import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
|
import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
|
||||||
import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver;
|
import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver;
|
||||||
@@ -984,6 +985,95 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
|
|||||||
return xgHttpUtil.sendPostRequest(path, json);
|
return xgHttpUtil.sendPostRequest(path, json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public JSONObject controlDoor(JSONObject requestParam) {
|
||||||
|
log.info("仙工AGV请求开/关自动门,请求参数 - {}", requestParam);
|
||||||
|
JSONObject result = new JSONObject();
|
||||||
|
|
||||||
|
String doorName = requestParam.getString("doorName");
|
||||||
|
Device device = deviceAppService.findDeviceByCode(doorName);
|
||||||
|
if (ObjectUtil.isEmpty(device)) {
|
||||||
|
throw new BadRequestException("设备号 " + doorName + " 不存在!");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 0-关门,1-开门
|
||||||
|
String state = requestParam.getString("state");
|
||||||
|
StandardAutodoorDeviceDriver driver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
|
||||||
|
|
||||||
|
if (state.equals("1")) {
|
||||||
|
// 给自动门写开门
|
||||||
|
String[] key = {"toOpen"};
|
||||||
|
Integer[] value = {1};
|
||||||
|
driver.writing(Arrays.asList(key),Arrays.asList(value));
|
||||||
|
|
||||||
|
// 判断是否在打开
|
||||||
|
if (driver.getToOpen() == 1) {
|
||||||
|
result.put("result", 0);
|
||||||
|
result.put("message", "操作成功");
|
||||||
|
} else {
|
||||||
|
result.put("result", -1);
|
||||||
|
result.put("message", "操作失败:电气信号未改变!");
|
||||||
|
}
|
||||||
|
} else if (state.equals("0")) {
|
||||||
|
// 给自动门写关门
|
||||||
|
String[] key = {"toClose"};
|
||||||
|
Integer[] value = {1};
|
||||||
|
driver.writing(Arrays.asList(key),Arrays.asList(value));
|
||||||
|
|
||||||
|
// 判断是否在打开
|
||||||
|
if (driver.getToClose() == 1) {
|
||||||
|
result.put("result", 0);
|
||||||
|
result.put("message", "操作成功");
|
||||||
|
} else {
|
||||||
|
result.put("result", -1);
|
||||||
|
result.put("message", "操作失败:电气信号未改变!");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
result.put("result", -1);
|
||||||
|
result.put("message", "操作失败:下发参数有误!");
|
||||||
|
}
|
||||||
|
|
||||||
|
log.info("仙工AGV请求开/关自动门,返回参数 - {}", result);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public JSONObject doorStateList(JSONObject requestParam) {
|
||||||
|
log.info("仙工AGV查询门状态,请求参数 - {}", requestParam);
|
||||||
|
JSONObject result = new JSONObject();
|
||||||
|
|
||||||
|
String[] doorNameLists = requestParam.getJSONArray("doorNameList").getString(0).split(",");
|
||||||
|
|
||||||
|
JSONArray data = new JSONArray();
|
||||||
|
for (String name : doorNameLists) {
|
||||||
|
JSONObject jsonDevice = new JSONObject();
|
||||||
|
jsonDevice.put("doorName", name);
|
||||||
|
jsonDevice.put("msg", "");
|
||||||
|
jsonDevice.put("timestamp", "");
|
||||||
|
|
||||||
|
// 查询设备
|
||||||
|
Device device = deviceAppService.findDeviceByCode(name);
|
||||||
|
if (ObjectUtil.isEmpty(device)) {
|
||||||
|
throw new BadRequestException("设备号 " + name + " 不存在!");
|
||||||
|
}
|
||||||
|
// 查询驱动判断状态
|
||||||
|
StandardAutodoorDeviceDriver driver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
|
||||||
|
// 判断门是否完全打开
|
||||||
|
if (driver.getOpen() == 1 && driver.getClose() == 0 && driver.getToOpen() == 0 && driver.getToClose() == 0) {
|
||||||
|
jsonDevice.put("state", "2");
|
||||||
|
} else {
|
||||||
|
jsonDevice.put("state", "3");
|
||||||
|
}
|
||||||
|
data.add(jsonDevice);
|
||||||
|
}
|
||||||
|
result.put("result", 0);
|
||||||
|
result.put("message", "操作成功!");
|
||||||
|
result.put("data", data);
|
||||||
|
|
||||||
|
log.info("仙工AGV查询门状态,返回参数 - {}", result);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 叉车运单动作块
|
* 叉车运单动作块
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ public enum DriverTypeEnum {
|
|||||||
RGV_DEVICE_DRIVER(5, "rgv_station", "RGV", "rgv"),
|
RGV_DEVICE_DRIVER(5, "rgv_station", "RGV", "rgv"),
|
||||||
ELEVATOR_DRIVER(6, "standard_elevator", "电梯", "elevator"),
|
ELEVATOR_DRIVER(6, "standard_elevator", "电梯", "elevator"),
|
||||||
CONVEYOR_CONTROL(7, "standard_conveyor_control", "标准版-输送线", "conveyor"),
|
CONVEYOR_CONTROL(7, "standard_conveyor_control", "标准版-输送线", "conveyor"),
|
||||||
CONVEYOR_COLOR(8, "lamp_three_color", "标准版-三色灯", "color");
|
CONVEYOR_COLOR(8, "lamp_three_color", "标准版-三色灯", "color"),
|
||||||
|
CONVEYOR_AUTODOOR(9, "standard_autodoor", "标准版-自动门", "autodoor");
|
||||||
//驱动索引
|
//驱动索引
|
||||||
private int index;
|
private int index;
|
||||||
//驱动编码
|
//驱动编码
|
||||||
|
|||||||
@@ -1,72 +1,58 @@
|
|||||||
package org.nl.acs.device_driver.basedriver.standard_autodoor;
|
package org.nl.acs.device_driver.basedriver.standard_autodoor;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.nl.acs.device.device_driver.standard_inspect.ItemDTO;
|
import org.nl.acs.device.device_driver.standard_inspect.ItemDTO;
|
||||||
|
import org.nl.acs.device_driver.DeviceDriverBaseReader;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Slf4j
|
public enum ItemProtocol implements DeviceDriverBaseReader.KeyProvider {
|
||||||
public class ItemProtocol {
|
OPEN("open", "打开到位", "DB600.B0"),
|
||||||
public static String item_heartbeat = "heartbeat";
|
CLOSE("close", "关闭到位", "DB600.B1"),
|
||||||
public static String item_mode = "mode";
|
TO_OPEN("toOpen", "下发打开", "DB601.W1"),
|
||||||
public static String item_action = "action";
|
TO_CLOSE("toClose", "下发关闭", "DB601.W2");
|
||||||
public static String item_error = "error";
|
|
||||||
public static String item_to_command = "to_command";
|
|
||||||
|
|
||||||
|
private final String key;
|
||||||
|
private final String description;
|
||||||
|
private final String address;
|
||||||
|
|
||||||
private StandardAutodoorDeviceDriver driver;
|
ItemProtocol(String key, String description, String address) {
|
||||||
|
this.key = key;
|
||||||
public ItemProtocol(StandardAutodoorDeviceDriver driver) {
|
this.description = description;
|
||||||
this.driver = driver;
|
this.address = address;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getHeartbeat() {
|
@Override
|
||||||
return this.getOpcIntegerValue(item_heartbeat);
|
public String getKey() {
|
||||||
|
return this.key;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getMode() {
|
public String getDescription() {
|
||||||
return this.getOpcIntegerValue(item_mode);
|
return description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getAction() {
|
public String getAddress() {
|
||||||
return this.getOpcIntegerValue(item_action);
|
return address;
|
||||||
}
|
|
||||||
|
|
||||||
public int getError() {
|
|
||||||
return this.getOpcIntegerValue(item_error);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getToCommand() {
|
|
||||||
return this.getOpcIntegerValue(item_to_command);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public int getOpcIntegerValue(String protocol) {
|
|
||||||
Integer value = this.driver.getIntegeregerValue(protocol);
|
|
||||||
if (value == null) {
|
|
||||||
log.error("读取错误!");
|
|
||||||
} else {
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ItemDTO> getReadableItemDtos() {
|
public static List<ItemDTO> getReadableItemDtos() {
|
||||||
ArrayList list = new ArrayList();
|
List<ItemDTO> list = new ArrayList<>();
|
||||||
list.add(new ItemDTO(item_heartbeat, "心跳", "DB51.B0"));
|
for (ItemProtocol prop : values()) {
|
||||||
list.add(new ItemDTO(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true)));
|
if (!prop.getKey().startsWith("to")) {
|
||||||
list.add(new ItemDTO(item_action, "动作信号", "DB51.B2"));
|
list.add(new ItemDTO(prop.getKey(), prop.getDescription(), prop.getAddress()));
|
||||||
list.add(new ItemDTO(item_error, "报警信号", "DB51.B4"));
|
}
|
||||||
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ItemDTO> getWriteableItemDtos() {
|
public static List<ItemDTO> getWriteableItemDtos() {
|
||||||
ArrayList list = new ArrayList();
|
List<ItemDTO> list = new ArrayList<>();
|
||||||
list.add(new ItemDTO(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true)));
|
for (ItemProtocol prop : values()) {
|
||||||
|
if (prop.getKey().startsWith("to")) {
|
||||||
|
list.add(new ItemDTO(prop.getKey(), prop.getDescription(), prop.getAddress()));
|
||||||
|
}
|
||||||
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,13 +7,9 @@ import org.nl.acs.opc.Device;
|
|||||||
import org.nl.acs.opc.DeviceType;
|
import org.nl.acs.opc.DeviceType;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
|
||||||
* 自动门驱动定义
|
|
||||||
*/
|
|
||||||
@Service
|
@Service
|
||||||
public class StandardAutodoorDefinition implements OpcDeviceDriverDefinition {
|
public class StandardAutodoorDefinition implements OpcDeviceDriverDefinition {
|
||||||
@Override
|
@Override
|
||||||
@@ -34,7 +30,6 @@ public class StandardAutodoorDefinition implements OpcDeviceDriverDefinition {
|
|||||||
@Override
|
@Override
|
||||||
public DeviceDriver getDriverInstance(Device device) {
|
public DeviceDriver getDriverInstance(Device device) {
|
||||||
return (new StandardAutodoorDeviceDriver()).setDevice(device).setDriverDefinition(this);
|
return (new StandardAutodoorDeviceDriver()).setDevice(device).setDriverDefinition(this);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -51,21 +46,11 @@ public class StandardAutodoorDefinition implements OpcDeviceDriverDefinition {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ItemDTO> getReadableItemDTOs() {
|
public List<ItemDTO> getReadableItemDTOs() {
|
||||||
return getReadableItemDtos2();
|
return ItemProtocol.getReadableItemDtos();
|
||||||
}
|
|
||||||
|
|
||||||
public static List<ItemDTO> getReadableItemDtos2() {
|
|
||||||
List<ItemDTO> list = new ArrayList();
|
|
||||||
list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB600.B0"));
|
|
||||||
list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB600.B1", true));
|
|
||||||
list.add(new ItemDTO(ItemProtocol.item_action, "动作信号", "DB600.B2"));
|
|
||||||
list.add(new ItemDTO(ItemProtocol.item_error, "报警信号", "DB600.B4"));
|
|
||||||
return list;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ItemDTO> getWriteableItemDTOs() {
|
public List<ItemDTO> getWriteableItemDTOs() {
|
||||||
return ItemProtocol.getWriteableItemDtos();
|
return ItemProtocol.getWriteableItemDtos();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,164 +2,122 @@ package org.nl.acs.device_driver.basedriver.standard_autodoor;
|
|||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
|
|
||||||
import org.nl.acs.device.service.DeviceService;
|
|
||||||
import org.nl.acs.device_driver.DeviceDriver;
|
import org.nl.acs.device_driver.DeviceDriver;
|
||||||
|
import org.nl.acs.device_driver.DeviceDriverBaseReader;
|
||||||
|
import org.nl.acs.device_driver.RouteableDeviceDriver;
|
||||||
|
import org.nl.acs.device_driver.StandardRequestMethod;
|
||||||
import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
|
import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
|
||||||
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
|
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
|
||||||
import org.nl.acs.instruction.service.InstructionService;
|
import org.nl.acs.monitor.DeviceStageMonitor;
|
||||||
import org.nl.acs.opc.Device;
|
import org.nl.acs.opc.Device;
|
||||||
import org.nl.acs.route.service.RouteLineService;
|
import org.nl.modules.lucene.service.LuceneExecuteLogService;
|
||||||
import org.nl.acs.task.service.TaskService;
|
import org.nl.modules.lucene.service.dto.LuceneLogDto;
|
||||||
import org.nl.modules.wql.util.SpringContextHolder;
|
import org.nl.modules.wql.util.SpringContextHolder;
|
||||||
import org.openscada.opc.lib.da.Server;
|
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 自动门驱动
|
|
||||||
*/
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver {
|
public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements
|
||||||
protected ItemProtocol itemProtocol = new ItemProtocol(this);
|
DeviceDriver,
|
||||||
|
ExecutableDeviceDriver,
|
||||||
|
RouteableDeviceDriver,
|
||||||
|
DeviceStageMonitor,
|
||||||
|
StandardRequestMethod,
|
||||||
|
DeviceDriverBaseReader {
|
||||||
|
|
||||||
InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
|
private final LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class);
|
||||||
|
|
||||||
DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl");
|
/**
|
||||||
|
* 读取
|
||||||
|
*/
|
||||||
|
private int open;
|
||||||
|
private int close;
|
||||||
|
/**
|
||||||
|
* 下发命令
|
||||||
|
*/
|
||||||
|
private int toOpen = 0;
|
||||||
|
private int toClose = 0;
|
||||||
|
/**
|
||||||
|
* 当前设备编号
|
||||||
|
*/
|
||||||
|
private String currentDeviceCode;
|
||||||
|
|
||||||
RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl");
|
/**
|
||||||
|
* 消息
|
||||||
|
*/
|
||||||
|
private String message;
|
||||||
|
|
||||||
TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl");
|
/**
|
||||||
String container;
|
* 请求标记
|
||||||
String container_type_desc;
|
*/
|
||||||
String last_container_type_desc;
|
boolean requireSuccess = false;
|
||||||
String last_container;
|
|
||||||
//放货准备锁
|
|
||||||
String putReadyLock = null;
|
|
||||||
//有货标记
|
|
||||||
protected boolean has_goods_tag = false;
|
|
||||||
String devicecode;
|
|
||||||
int mode = 0;
|
|
||||||
int action = 0;
|
|
||||||
int error = 0;
|
|
||||||
Boolean iserror = false;
|
|
||||||
|
|
||||||
int move = 0;
|
/**
|
||||||
int task = 0;
|
* 请求时间
|
||||||
int last_action = 0;
|
*/
|
||||||
int last_mode = 0;
|
private long requireTime = System.currentTimeMillis();
|
||||||
int last_error = 0;
|
|
||||||
int last_move = 0;
|
|
||||||
int last_task = 0;
|
|
||||||
|
|
||||||
boolean hasVehicle = false;
|
/**
|
||||||
boolean isReady = false;
|
* 请求间隔时间
|
||||||
protected int instruction_num = 0;
|
*/
|
||||||
protected int instruction_num_truth = 0;
|
private long requireTimeOut = 3000L;
|
||||||
protected boolean hasGoods = false;
|
|
||||||
boolean isFold = false;
|
|
||||||
private String assemble_check_tag;
|
|
||||||
private Boolean sampleMode0;
|
|
||||||
private Boolean sampleMode3;
|
|
||||||
private Integer sampleError;
|
|
||||||
private Boolean sampleOnline;
|
|
||||||
protected String displayMessage = null;
|
|
||||||
public int display_message_time_out = 30000;
|
|
||||||
public Date display_message_time;
|
|
||||||
protected String current_stage_instruction_message;
|
|
||||||
protected String last_stage_instruction_message;
|
|
||||||
Integer heartbeat_tag;
|
|
||||||
private Date instruction_require_time = new Date();
|
|
||||||
private Date instruction_finished_time = new Date();
|
|
||||||
|
|
||||||
private int instruction_require_time_out;
|
/**
|
||||||
boolean requireSucess = false;
|
* 设备异常标记
|
||||||
|
*/
|
||||||
private int instruction_finished_time_out;
|
private boolean isError = false;
|
||||||
|
|
||||||
int branchProtocol = 0;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Device getDevice() {
|
public Device getDevice() {
|
||||||
return this.device;
|
return this.device;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <E extends Enum<E> & KeyProvider, T> T getOpcValue(E item, Class<T> fieldClassType) {
|
||||||
|
return (T) this.getValue(item.getKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setLog(String key, Object newValue, Object oldValue) {
|
||||||
|
logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "自动线程读取信号:" + key + ",由" + oldValue + "->" + newValue));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute() {
|
public void execute() {
|
||||||
String message = null;
|
this.currentDeviceCode = this.getDevice().getDevice_code();
|
||||||
|
this.loadAssignData(currentDeviceCode, ItemProtocol.class);
|
||||||
String device_code = this.getDevice().getDevice_code();
|
|
||||||
mode = this.itemProtocol.getMode();
|
|
||||||
action = this.itemProtocol.getAction();
|
|
||||||
error = this.itemProtocol.getError();
|
|
||||||
if (mode != last_mode) {
|
|
||||||
}
|
|
||||||
if (action != last_action) {
|
|
||||||
}
|
|
||||||
if (error != last_error) {
|
|
||||||
//this.execute_log.setContainer("");
|
|
||||||
}
|
|
||||||
last_action = action;
|
|
||||||
last_mode = mode;
|
|
||||||
last_error = error;
|
|
||||||
//message = StringFormatUtl.format("设备报警:{}", new Object[]{});
|
|
||||||
|
|
||||||
// String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized String getStatus() {
|
@Override
|
||||||
|
public void executeLogic() {
|
||||||
|
if (!this.online) {
|
||||||
|
this.message = "设备离线";
|
||||||
|
} else {
|
||||||
|
this.isError = false;
|
||||||
|
this.message = "";
|
||||||
|
//编写业务逻辑方法
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public JSONObject getDeviceStatusName() throws Exception {
|
||||||
JSONObject jo = new JSONObject();
|
JSONObject jo = new JSONObject();
|
||||||
|
jo.put("device_code", this.currentDeviceCode);
|
||||||
if (action == 1) {
|
jo.put("device_name", this.getDevice().getDevice_name());
|
||||||
jo.put("name", this.getDevice().getDevice_code());
|
jo.put("driver_type", "standard_autodoor");
|
||||||
jo.put("status", "OPEN");
|
jo.put("is_click", false);
|
||||||
|
jo.put("message", this.message);
|
||||||
} else if (action == 2) {
|
jo.put("isOnline", this.online);
|
||||||
jo.put("name", this.getDevice().getDevice_code());
|
jo.put("isError", this.isError);
|
||||||
jo.put("status", "CLOSE");
|
return jo;
|
||||||
|
|
||||||
} else {
|
|
||||||
jo.put("name", this.getDevice().getDevice_code());
|
|
||||||
jo.put("status", "ERROR");
|
|
||||||
}
|
|
||||||
return jo.toString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void writeing(int command) {
|
public void setDeviceStatus(JSONObject data) {
|
||||||
String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
|
|
||||||
+ "." + ItemProtocol.item_to_command;
|
|
||||||
|
|
||||||
String opcservcerid = this.getDevice().getOpc_server_id();
|
|
||||||
Server server = ReadUtil.getServer(opcservcerid);
|
|
||||||
Map<String, Object> itemMap = new HashMap<String, Object>();
|
|
||||||
itemMap.put(to_command, command);
|
|
||||||
ReadUtil.write(itemMap, server);
|
|
||||||
ReadUtil.write(itemMap, server);
|
|
||||||
server.disconnect();
|
|
||||||
log.info("下发PLC信号:{},{}", to_command, command);
|
|
||||||
System.out.println("设备:" + devicecode + ",下发PLC信号:" + to_command + ",value:" + command);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized void OpenOrClose(String type) {
|
|
||||||
|
|
||||||
//开门
|
|
||||||
if ("1".equals(type)) {
|
|
||||||
writeing(1);
|
|
||||||
} else {
|
|
||||||
writeing(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ public class StageServiceImpl implements StageService {
|
|||||||
jo.put("message", standardCoveyorControlDeviceDriver.getMessage());
|
jo.put("message", standardCoveyorControlDeviceDriver.getMessage());
|
||||||
} else if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) {
|
} else if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) {
|
||||||
standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
|
standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
|
||||||
if (standardAutodoorDeviceDriver.getMode() == 0) {
|
/* if (standardAutodoorDeviceDriver.getMode() == 0) {
|
||||||
mode = "未联机";
|
mode = "未联机";
|
||||||
} else if (standardAutodoorDeviceDriver.getMode() == 1) {
|
} else if (standardAutodoorDeviceDriver.getMode() == 1) {
|
||||||
mode = "单机";
|
mode = "单机";
|
||||||
@@ -241,13 +241,13 @@ public class StageServiceImpl implements StageService {
|
|||||||
action = "开到位";
|
action = "开到位";
|
||||||
} else if (standardAutodoorDeviceDriver.getAction() == 2) {
|
} else if (standardAutodoorDeviceDriver.getAction() == 2) {
|
||||||
action = "关到位";
|
action = "关到位";
|
||||||
}
|
}*/
|
||||||
obj.put("device_name", standardAutodoorDeviceDriver.getDevice().getDevice_name());
|
obj.put("device_name", standardAutodoorDeviceDriver.getDevice().getDevice_name());
|
||||||
jo.put("mode", mode);
|
jo.put("mode", mode);
|
||||||
jo.put("action", action);
|
jo.put("action", action);
|
||||||
jo.put("isOnline", true);
|
jo.put("isOnline", true);
|
||||||
jo.put("error", standardAutodoorDeviceDriver.getError());
|
// jo.put("error", standardAutodoorDeviceDriver.getError());
|
||||||
jo.put("isError", standardAutodoorDeviceDriver.getIserror());
|
// jo.put("isError", standardAutodoorDeviceDriver.getIserror());
|
||||||
}
|
}
|
||||||
//检测站点
|
//检测站点
|
||||||
else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
|
else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ import standard_scanner from '@/views/acs/device/driver/standard_scanner'
|
|||||||
import standard_conveyor_control_with_scanner from '@/views/acs/device/driver/standard_conveyor_control_with_scanner'
|
import standard_conveyor_control_with_scanner from '@/views/acs/device/driver/standard_conveyor_control_with_scanner'
|
||||||
import standard_conveyor_control from '@/views/acs/device/driver/standard_conveyor_control'
|
import standard_conveyor_control from '@/views/acs/device/driver/standard_conveyor_control'
|
||||||
import lamp_three_color from '@/views/acs/device/driver/lamp_three_color'
|
import lamp_three_color from '@/views/acs/device/driver/lamp_three_color'
|
||||||
|
import standard_autodoor from '@/views/acs/device/driver/standard_autodoor'
|
||||||
import standard_conveyor_monitor from '@/views/acs/device/driver/standard_conveyor_monitor'
|
import standard_conveyor_monitor from '@/views/acs/device/driver/standard_conveyor_monitor'
|
||||||
import lnsh_mixing_mill from '@/views/acs/device/driver/lnsh/lnsh_mixing_mill'
|
import lnsh_mixing_mill from '@/views/acs/device/driver/lnsh/lnsh_mixing_mill'
|
||||||
import lnsh_press from '@/views/acs/device/driver/lnsh/lnsh_press'
|
import lnsh_press from '@/views/acs/device/driver/lnsh/lnsh_press'
|
||||||
@@ -123,6 +124,7 @@ export default {
|
|||||||
standard_conveyor_monitor,
|
standard_conveyor_monitor,
|
||||||
lnsh_mixing_mill,
|
lnsh_mixing_mill,
|
||||||
lnsh_press,
|
lnsh_press,
|
||||||
|
standard_autodoor,
|
||||||
lnsh_palletizing_manipulator,
|
lnsh_palletizing_manipulator,
|
||||||
lnsh_fold_disc_site,
|
lnsh_fold_disc_site,
|
||||||
lnsh_kiln_lane,
|
lnsh_kiln_lane,
|
||||||
|
|||||||
@@ -0,0 +1,389 @@
|
|||||||
|
<template>
|
||||||
|
<!--自动门-->
|
||||||
|
<div>
|
||||||
|
<el-card class="box-card" shadow="never">
|
||||||
|
<div slot="header" class="clearfix">
|
||||||
|
<span class="role-span">扩展字段:</span>
|
||||||
|
</div>
|
||||||
|
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
|
||||||
|
<el-row>
|
||||||
|
<!-- <el-col :span="8">
|
||||||
|
<el-form-item label="颜色" label-width="150px">
|
||||||
|
<el-select
|
||||||
|
v-model="form.color"
|
||||||
|
placeholder="无"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in colorList"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>-->
|
||||||
|
</el-row>
|
||||||
|
</el-form>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
|
<el-card class="box-card" shadow="never">
|
||||||
|
<div slot="header" class="clearfix">
|
||||||
|
<span class="role-span">设备协议:</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
OpcServer:
|
||||||
|
<el-select
|
||||||
|
v-model="opc_id"
|
||||||
|
placeholder="无"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
@change="changeOpc"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dataOpcservers"
|
||||||
|
:key="item.opc_id"
|
||||||
|
:label="item.opc_name"
|
||||||
|
:value="item.opc_id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
PLC:
|
||||||
|
<el-select
|
||||||
|
v-model="plc_id"
|
||||||
|
placeholder="无"
|
||||||
|
clearable
|
||||||
|
@change="changePlc"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dataOpcPlcs"
|
||||||
|
:key="item.plc_id"
|
||||||
|
:label="item.plc_name"
|
||||||
|
:value="item.plc_id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
|
<el-card class="box-card" shadow="never">
|
||||||
|
<div slot="header" class="clearfix">
|
||||||
|
<span class="role-span">PLC读取字段:</span>
|
||||||
|
</div>
|
||||||
|
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
|
||||||
|
<el-table
|
||||||
|
v-loading="false"
|
||||||
|
:data="data1"
|
||||||
|
:max-height="550"
|
||||||
|
size="small"
|
||||||
|
style="width: 100%;margin-bottom: 15px"
|
||||||
|
>
|
||||||
|
|
||||||
|
<el-table-column prop="name" label="用途" />
|
||||||
|
<el-table-column prop="code" label="别名要求" />
|
||||||
|
<el-table-column prop="db" label="DB块">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input
|
||||||
|
v-model="data1[scope.$index].db"
|
||||||
|
size="mini"
|
||||||
|
class="edit-input"
|
||||||
|
@input="finishReadEdit(data1[scope.$index])"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="dbr_value">
|
||||||
|
<template slot="header">
|
||||||
|
<el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
|
||||||
|
</template>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</el-form>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
|
<el-card class="box-card" shadow="never">
|
||||||
|
<div slot="header" class="clearfix">
|
||||||
|
<span class="role-span">PLC写入字段:</span>
|
||||||
|
</div>
|
||||||
|
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
|
||||||
|
<el-table
|
||||||
|
v-loading="false"
|
||||||
|
:data="data2"
|
||||||
|
:max-height="550"
|
||||||
|
size="small"
|
||||||
|
style="width: 100%;margin-bottom: 15px"
|
||||||
|
>
|
||||||
|
|
||||||
|
<el-table-column prop="name" label="用途" />
|
||||||
|
<el-table-column prop="code" label="别名要求" />
|
||||||
|
<el-table-column prop="db" label="DB块">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input
|
||||||
|
v-model="data2[scope.$index].db"
|
||||||
|
size="mini"
|
||||||
|
class="edit-input"
|
||||||
|
@input="finishWriteEdit(data2[scope.$index])"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="dbr_value2">
|
||||||
|
<template slot="header">
|
||||||
|
<el-link type="primary" :underline="false" @click.native="test_read2()">测试读</el-link>
|
||||||
|
</template>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="dbw_value">
|
||||||
|
<template slot="header">
|
||||||
|
<el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
|
||||||
|
</template>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</el-form>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
|
<el-card class="box-card" shadow="never">
|
||||||
|
<div slot="header" class="clearfix">
|
||||||
|
<span class="role-span" />
|
||||||
|
<el-button
|
||||||
|
:loading="false"
|
||||||
|
icon="el-icon-check"
|
||||||
|
size="mini"
|
||||||
|
style="float: right; padding: 6px 9px"
|
||||||
|
type="primary"
|
||||||
|
@click="doSubmit"
|
||||||
|
>保存
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {
|
||||||
|
queryDriverConfig,
|
||||||
|
updateConfig,
|
||||||
|
testRead,
|
||||||
|
testwrite
|
||||||
|
} from '@/api/acs/device/driverConfig'
|
||||||
|
import { selectOpcList } from '@/api/acs/device/opc'
|
||||||
|
import { selectPlcList } from '@/api/acs/device/opcPlc'
|
||||||
|
import { selectListByOpcID } from '@/api/acs/device/opcPlc'
|
||||||
|
|
||||||
|
import crud from '@/mixins/crud'
|
||||||
|
import deviceCrud from '@/api/acs/device/device'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'LampThreeColor',
|
||||||
|
dicts: ['is_yes_not'],
|
||||||
|
mixins: [crud],
|
||||||
|
props: {
|
||||||
|
parentForm: {
|
||||||
|
type: Object,
|
||||||
|
require: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
device_code: '',
|
||||||
|
device_id: '',
|
||||||
|
plc_id: '',
|
||||||
|
plc_code: '',
|
||||||
|
opc_id: '',
|
||||||
|
opc_code: '',
|
||||||
|
configLoading: false,
|
||||||
|
dataOpcservers: [],
|
||||||
|
dataOpcPlcs: [],
|
||||||
|
deviceList: [],
|
||||||
|
data1: [],
|
||||||
|
data2: [],
|
||||||
|
form: {
|
||||||
|
inspect_in_stocck: true,
|
||||||
|
ignore_pickup_check: true,
|
||||||
|
ignore_release_check: true,
|
||||||
|
apply_task: true,
|
||||||
|
manual_create_task: true,
|
||||||
|
is_pickup: true,
|
||||||
|
is_release: true,
|
||||||
|
link_device_code: []
|
||||||
|
},
|
||||||
|
rules: {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
// 从父表单获取设备编码
|
||||||
|
this.device_id = this.$props.parentForm.device_id
|
||||||
|
this.device_code = this.$props.parentForm.device_code
|
||||||
|
queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
|
||||||
|
// 给表单赋值,并且属性不能为空
|
||||||
|
if (data.form) {
|
||||||
|
const arr = Object.keys(data.form)
|
||||||
|
// 不为空
|
||||||
|
if (arr.length > 0) {
|
||||||
|
this.form = data.form
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 给表单赋值,并且属性不能为空
|
||||||
|
if (data.parentForm) {
|
||||||
|
const arr = Object.keys(data.parentForm)
|
||||||
|
// 不为空
|
||||||
|
if (arr.length > 0) {
|
||||||
|
this.opc_code = data.parentForm.opc_code
|
||||||
|
this.plc_code = data.parentForm.plc_code
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.data1 = data.rs
|
||||||
|
this.data2 = data.ws
|
||||||
|
this.sliceItem()
|
||||||
|
})
|
||||||
|
selectPlcList().then(data => {updateConfig
|
||||||
|
this.dataOpcPlcs = data
|
||||||
|
this.plc_id = this.$props.parentForm.opc_plc_id
|
||||||
|
})
|
||||||
|
selectOpcList().then(data => {
|
||||||
|
this.dataOpcservers = data
|
||||||
|
this.opc_id = this.$props.parentForm.opc_server_id
|
||||||
|
})
|
||||||
|
deviceCrud.selectDeviceList().then(data => {
|
||||||
|
this.deviceList = data
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
changeOpc(val) {
|
||||||
|
this.dataOpcservers.forEach(item => {
|
||||||
|
if (item.opc_id === val) {
|
||||||
|
this.opc_code = item.opc_code
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
selectListByOpcID(val).then(data => {
|
||||||
|
this.dataOpcPlcs = data
|
||||||
|
this.plc_id = ''
|
||||||
|
this.plc_code = ''
|
||||||
|
if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
|
||||||
|
this.plc_id = this.dataOpcPlcs[0].plc_id
|
||||||
|
this.plc_code = this.dataOpcPlcs[0].plc_code
|
||||||
|
}
|
||||||
|
this.sliceItem()
|
||||||
|
})
|
||||||
|
},
|
||||||
|
finishReadEdit(data) {
|
||||||
|
// 编辑的是code列,并且值包含mode
|
||||||
|
if (data.code.indexOf('mode') !== -1) {
|
||||||
|
const dbValue = data.db
|
||||||
|
// .之前的字符串
|
||||||
|
const beforeStr = dbValue.match(/(\S*)\./)[1]
|
||||||
|
// .之后的字符串
|
||||||
|
const afterStr = dbValue.match(/\.(\S*)/)[1]
|
||||||
|
// 取最后数字
|
||||||
|
const endNumber = afterStr.substring(1)
|
||||||
|
// 最后为非数字
|
||||||
|
if (isNaN(parseInt(endNumber))) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for (const val in this.data1) {
|
||||||
|
if (this.data1[val].code.indexOf('action') !== -1) {
|
||||||
|
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
|
||||||
|
}
|
||||||
|
if (this.data1[val].code.indexOf('error') !== -1) {
|
||||||
|
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 3)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
changePlc(val) {
|
||||||
|
this.dataOpcPlcs.forEach(item => {
|
||||||
|
if (item.plc_id === val) {
|
||||||
|
this.plc_code = item.plc_code
|
||||||
|
this.sliceItem()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
test_read2() {
|
||||||
|
testRead(this.data2, this.opc_id).then(data => {
|
||||||
|
this.data2 = data
|
||||||
|
console.log(this.data2)
|
||||||
|
this.notify('操作成功!', 'success')
|
||||||
|
}).catch(err => {
|
||||||
|
console.log(err.response.data.message)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
test_read1() {
|
||||||
|
testRead(this.data1, this.opc_id).then(data => {
|
||||||
|
this.data1 = data
|
||||||
|
this.notify('操作成功!', 'success')
|
||||||
|
}).catch(err => {
|
||||||
|
console.log(err.response.data.message)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
test_write1() {
|
||||||
|
testwrite(this.data2, this.opc_id).then(data => {
|
||||||
|
this.notify('操作成功!', 'success')
|
||||||
|
}).catch(err => {
|
||||||
|
console.log(err.response.data.message)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
doSubmit() {
|
||||||
|
this.$refs['form'].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.configLoading = true
|
||||||
|
// 根据驱动类型判断是否为路由设备
|
||||||
|
const parentForm = this.parentForm
|
||||||
|
parentForm.is_route = true
|
||||||
|
parentForm.plc_id = this.plc_id
|
||||||
|
parentForm.opc_id = this.opc_id
|
||||||
|
updateConfig(parentForm, this.form, {}, this.data1, this.data2).then(res => {
|
||||||
|
this.notify('保存成功', 'success')
|
||||||
|
this.configLoading = false
|
||||||
|
}).catch(err => {
|
||||||
|
this.configLoading = false
|
||||||
|
console.log(err.response.data.message)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
sliceItem() { // 拼接DB的Item值
|
||||||
|
this.data1.forEach(item => {
|
||||||
|
const str = item.code
|
||||||
|
// 是否包含.
|
||||||
|
if (str.search('.') !== -1) {
|
||||||
|
// 截取最后一位
|
||||||
|
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
|
||||||
|
} else {
|
||||||
|
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.data2.forEach(item => {
|
||||||
|
const str = item.code
|
||||||
|
// 是否包含.
|
||||||
|
if (str.search('.') !== -1) {
|
||||||
|
// 截取最后一位
|
||||||
|
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
|
||||||
|
} else {
|
||||||
|
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
||||||
|
|
||||||
Reference in New Issue
Block a user