diff --git a/acs/nladmin-system/README.md b/acs/nladmin-system/README.md index bb93435..4d2ccd6 100644 --- a/acs/nladmin-system/README.md +++ b/acs/nladmin-system/README.md @@ -98,7 +98,7 @@ acs │ │ ├── AcsDeviceErpmappingService.java │ │ ├── DeviceAssignedService.java │ │ ├── DeviceDbitemService.java -│ │ ├── DeviceDriverDefinationAppService.java +│ │ ├── DeviceDriverDefinitionAppService.java │ │ ├── DeviceExtraService.java │ │ ├── DeviceService.java │ │ ├── dto @@ -137,49 +137,49 @@ acs │ ├── basedriver │ │ ├── agv │ │ │ ├── magic_agv -│ │ │ │ ├── MagicAgvDefination.java +│ │ │ │ ├── MagicAgvDefinition.java │ │ │ │ └── MagicAgvDeviceDriver.java │ │ │ ├── ndcone -│ │ │ │ ├── AgvNdcOneDefination.java +│ │ │ │ ├── AgvNdcOneDefinition.java │ │ │ │ └── AgvNdcOneDeviceDriver.java │ │ │ └── utils │ │ │ ├── IAgv.java │ │ │ ├── OneAgvPhase.java │ │ │ └── TwoAgvPhase.java │ │ ├── cargo_lift_conveyor -│ │ │ ├── CargoLiftConveyorDefination.java +│ │ │ ├── CargoLiftConveyorDefinition.java │ │ │ ├── CargoLiftConveyorDeviceDriver.java │ │ │ └── ItemProtocol.java │ │ ├── empty_vehicle_stacking_position -│ │ │ ├── EmptyVehicleStackingPositionDefination.java +│ │ │ ├── EmptyVehicleStackingPositionDefinition.java │ │ │ ├── EmptyVehicleStackingPositionDeviceDriver.java │ │ │ └── ItemProtocol.java │ │ ├── standard_conveyor_control │ │ │ ├── ItemProtocol.java -│ │ │ ├── StandardConveyorControlDefination.java +│ │ │ ├── StandardConveyorControlDefinition.java │ │ │ └── StandardCoveyorControlDeviceDriver.java │ │ ├── standard_conveyor_control_with_plcscanner │ │ │ ├── ItemProtocol.java -│ │ │ ├── StandardConveyorControlWithPlcScannerDefination.java +│ │ │ ├── StandardConveyorControlWithPlcScannerDefinition.java │ │ │ ├── StandardConveyorWithPlcScannerConfig.java │ │ │ └── StandardCoveyorControlWithPlcScannerDeviceDriver.java │ │ ├── standard_inspect_site │ │ │ ├── ItemProtocol.java -│ │ │ ├── StandardInspectSiteDefination.java +│ │ │ ├── StandardInspectSiteDefinition.java │ │ │ └── StandardInspectSiteDeviceDriver.java │ │ ├── standard_ordinary_site -│ │ │ ├── StandardOrdinarySiteDefination.java +│ │ │ ├── StandardOrdinarySiteDefinition.java │ │ │ └── StandardOrdinarySiteDeviceDriver.java │ │ ├── standard_scanner -│ │ │ ├── StandardScannerDefination.java +│ │ │ ├── StandardScannerDefinition.java │ │ │ └── StandardScannerDeviceDriver.java │ │ └── standard_storage -│ │ ├── StandardStorageDefination.java +│ │ ├── StandardStorageDefinition.java │ │ └── StandardStorageDeviceDriver.java -│ ├── defination -│ │ └── OpcDeviceDriverDefination.java +│ ├── definition +│ │ └── OpcDeviceDriverDefinition.java │ ├── DeviceDriver.java -│ ├── DeviceDriverDefination.java +│ ├── DeviceDriverDefinition.java │ ├── driver │ │ ├── AbstractDeviceDriver.java │ │ ├── AbstractOpcDeviceDriver.java @@ -187,93 +187,93 @@ acs │ │ └── OpcDeviceDriver.java │ ├── lamp_three_color │ │ ├── ItemProtocol.java -│ │ ├── LampThreecolorDefination.java +│ │ ├── LampThreecolorDefinition.java │ │ └── LampThreecolorDeviceDriver.java │ ├── LinewayDeviceDriver.java │ ├── lnsh │ │ ├── converor_barcode -│ │ │ ├── ConveyorBarcodeDefination.java +│ │ │ ├── ConveyorBarcodeDefinition.java │ │ │ ├── ConveyorBarcodeDeviceDriver.java │ │ │ └── ItemProtocol.java │ │ ├── conveyor_press_station -│ │ │ ├── ConveyorPressStationDefination.java +│ │ │ ├── ConveyorPressStationDefinition.java │ │ │ ├── ConveyorPressStationDeviceDriver.java │ │ │ └── ItemProtocol.java │ │ ├── lnsh_crusher │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshCrusherDefination.java +│ │ │ ├── LnshCrusherDefinition.java │ │ │ └── LnshCrusherDeviceDriver.java │ │ ├── lnsh_fold_disc_site │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshFoldDiscSiteDefination.java +│ │ │ ├── LnshFoldDiscSiteDefinition.java │ │ │ └── LnshFoldDiscSiteDeviceDriver.java │ │ ├── lnsh_kiln_lane │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshKilnLaneDefination.java +│ │ │ ├── LnshKilnLaneDefinition.java │ │ │ └── LnshKilnLaneDeviceDriver.java │ │ ├── lnsh_kiln_truss │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshKilnTrussDefination.java +│ │ │ ├── LnshKilnTrussDefinition.java │ │ │ └── LnshKilnTrussDeviceDriver.java │ │ ├── lnsh_labeling_machine │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshLabelingMachineDefination.java +│ │ │ ├── LnshLabelingMachineDefinition.java │ │ │ └── LnshLabelingMachineDeviceDriver.java │ │ ├── lnsh_Laminating_machine │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshLaminatingMachineDefination.java +│ │ │ ├── LnshLaminatingMachineDefinition.java │ │ │ └── LnshLaminatingMachineDeviceDriver.java │ │ ├── lnsh_mixing_mill │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshMixingMillDefination.java +│ │ │ ├── LnshMixingMillDefinition.java │ │ │ └── LnshMixingMillDeviceDriver.java │ │ ├── lnsh_out_kiln_truss │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshOutKilnTrussDefination.java +│ │ │ ├── LnshOutKilnTrussDefinition.java │ │ │ └── LnshOutKilnTrussDeviceDriver.java │ │ ├── lnsh_package_line │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshPackageLineDefination.java +│ │ │ ├── LnshPackageLineDefinition.java │ │ │ └── LnshPackageLineDeviceDriver.java │ │ ├── lnsh_package_pallet_manipulator │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshPackagePalletManipulatorDefination.java +│ │ │ ├── LnshPackagePalletManipulatorDefinition.java │ │ │ └── LnshPackagePalletManipulatorDeviceDriver.java │ │ ├── lnsh_package_site │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshPackageSiteDefination.java +│ │ │ ├── LnshPackageSiteDefinition.java │ │ │ └── LnshPackageSiteDeviceDriver.java │ │ ├── lnsh_palletizing_manipulator │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshPalletizingManipulatorDefination.java +│ │ │ ├── LnshPalletizingManipulatorDefinition.java │ │ │ └── LnshPalletizingManipulatorDeviceDriver.java │ │ ├── lnsh_palletizing_manipulator_site │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshPalletizingManipulatorSiteDefination.java +│ │ │ ├── LnshPalletizingManipulatorSiteDefinition.java │ │ │ └── LnshPalletizingManipulatorSiteDeviceDriver.java │ │ ├── lnsh_pallet_storage │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshPalletStorageDefination.java +│ │ │ ├── LnshPalletStorageDefinition.java │ │ │ └── LnshPalletStorageDeviceDriver.java │ │ ├── lnsh_press │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshPressDefination.java +│ │ │ ├── LnshPressDefinition.java │ │ │ └── LnshPressDeviceDriver.java │ │ ├── lnsh_rgv │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshRGVDefination.java +│ │ │ ├── LnshRGVDefinition.java │ │ │ └── LnshRGVDeviceDriver.java │ │ ├── lnsh_split_manipulator │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshSplitManipulatorDefination.java +│ │ │ ├── LnshSplitManipulatorDefinition.java │ │ │ └── LnshSplitManipulatorDeviceDriver.java │ │ ├── lnsh_station │ │ │ ├── ItemProtocol.java -│ │ │ ├── LnshStationDefination.java +│ │ │ ├── LnshStationDefinition.java │ │ │ └── LnshStationDeviceDriver.java │ │ └── package_site │ │ ├── ItemProtocol.java -│ │ ├── PackageSiteDefination.java +│ │ ├── PackageSiteDefinition.java │ │ └── PackageSiteDeviceDriver.java │ ├── RequestMethodEnum.java │ ├── RouteableDeviceDriver.java @@ -281,11 +281,11 @@ acs │ ├── StandardRequestMethod.java │ ├── standard_autodoor │ │ ├── ItemProtocol.java -│ │ ├── StandardAutodoorDefination.java +│ │ ├── StandardAutodoorDefinition.java │ │ └── StandardAutodoorDeviceDriver.java │ ├── standard_emptypallet_site │ │ ├── ItemProtocol.java -│ │ ├── StandardEmptyPalletSiteDefination.java +│ │ ├── StandardEmptyPalletSiteDefinition.java │ │ └── StandardEmptyPalletSiteDeviceDriver.java │ └── StorageDeviceDriver.java ├── ext @@ -416,7 +416,7 @@ acs │ ├── Device.java │ ├── DeviceAppService.java │ ├── DeviceAppServiceImpl.java -│ ├── DeviceDriverDefinationAppServiceImpl.java +│ ├── DeviceDriverDefinitionAppServiceImpl.java │ ├── DeviceExecuteAutoRun.java │ ├── DeviceExtraManageDto.java │ ├── DeviceManageDto.java diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java index fb4c1b7..6456bee 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java @@ -1,4 +1,33 @@ package org.nl.acs.agv.rest; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.agv.server.XianGongAgvService; +import org.nl.modules.logging.annotation.Log; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author zhangjiangwei + */ +@RestController +@RequiredArgsConstructor +@Api(tags = "仙工AGV") +@Slf4j public class XianGongAgvController { + + private final XianGongAgvService agvService; + + @PostMapping("/waitPointRequest") + @Log("仙工AGV请求取放货") + @ApiOperation("仙工AGV请求取放货") + public ResponseEntity xgAGVWaitPointRequest(@RequestBody JSONObject requestParam) { + return new ResponseEntity<>(agvService.xgAGVWaitPointRequest(requestParam), HttpStatus.OK); + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java new file mode 100644 index 0000000..0a67d0a --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java @@ -0,0 +1,313 @@ +package org.nl.acs.agv.server; + +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.common.StandardOrdinarySiteDevice; +import org.nl.acs.device_driver.RequestMethodEnum; +import org.nl.acs.device_driver.nl4.station.NL4StationDeviceDriver; +import org.nl.acs.log.service.DeviceExecuteLogService; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.task.service.dto.TaskDto; +import org.nl.modules.common.exception.BadRequestException; +import org.springframework.stereotype.Service; + +/** + * @author zhangjiangwei + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class AgvWaitUtil { + + private final DeviceAppService deviceAppService; + + private final DeviceExecuteLogService deviceExecuteLogService; + + //取货前等待 + public JSONObject waitInGet(String deviceCode) { + log.info("仙工AGV请求取货，设备号 - {}", deviceCode); + boolean flag = false; + + Device device = this.deviceAppService.findDeviceByCode(deviceCode); + if (ObjectUtil.isEmpty(device)) { + throw new BadRequestException("请求失败，未找到设备！"); + } + + if (device.getDeviceDriver() instanceof NL4StationDeviceDriver) { + // 诺力4期对接位驱动 + NL4StationDeviceDriver driver = (NL4StationDeviceDriver) device.getDeviceDriver(); + driver.writing("to_command", 1); + if (driver.getMode() != 0 + && (driver.getAction() == 1 || driver.getAction() == 3)) { + String message = "允许AGV取货。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备"; + if (driver.getMode() == 0) { + message += "未联机，"; + } else { + message += "不允许取货，"; + } + message += "不允许AGV取货。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } else if (device.getDeviceDriver() instanceof StandardOrdinarySiteDevice) { + // 普通站点驱动 + if ("true".equals(device.getExtraValue().get("station_manager"))) { + if (1 == device.getHas_goods()) { + String message = "允许AGV取货。"; + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备无货,"; + message += "不允许AGV取货。"; + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } else { + String message = "允许AGV取货。"; + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } + } else { + flag = true; + } + + if (flag) { + JSONObject result = new JSONObject(); + result.put("status", 200); + result.put("message", "允许取货！"); + log.info("允许仙工AGV取货，设备号 - {}", deviceCode); + return result; + } else { + throw new BadRequestException("请求失败!"); + } + } + + //取货完成等待 + public JSONObject waitOutGet(String deviceCode) { + log.info("仙工AGV取货完成后请求离开，设备号 - {}", deviceCode); + boolean flag = false; + + Device device = this.deviceAppService.findDeviceByCode(deviceCode); + if (ObjectUtil.isEmpty(device)) { + throw new BadRequestException("请求失败，未找到设备！"); + } + + if (device.getDeviceDriver() instanceof NL4StationDeviceDriver) { + // 诺力4期对接位驱动 + NL4StationDeviceDriver driver = (NL4StationDeviceDriver) device.getDeviceDriver(); + driver.writing("to_command", 2); + if (driver.getMode() != 0) { + String message = "允许AGV取货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备未联机"; + message += "不允许AGV取货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } else if (device.getDeviceDriver() instanceof StandardOrdinarySiteDevice) { + // 普通站点驱动 + String message = "允许AGV取货后离开。"; + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + flag = true; + } + + if (flag) { + JSONObject result = new JSONObject(); + result.put("status", 200); + result.put("message", "允许取货后离开！"); + log.info("允许仙工AGV取货后离开，设备号 - {}", deviceCode); + return result; + } else { + throw new BadRequestException("请求失败!"); + } + } + + //放货前等待 + public JSONObject waitInPut(String deviceCode) { + log.info("仙工AGV请求放货，设备号 - {}", deviceCode); + boolean flag = false; + + Device device = this.deviceAppService.findDeviceByCode(deviceCode); + if (ObjectUtil.isEmpty(device)) { + throw new BadRequestException("请求失败，未找到设备！"); + } + + if (device.getDeviceDriver() instanceof NL4StationDeviceDriver) { + // 诺力4期对接位驱动 + NL4StationDeviceDriver driver = (NL4StationDeviceDriver) device.getDeviceDriver(); + driver.writing("to_command", 3); + if (driver.getMode() != 0 + && (driver.getAction() == 2 || driver.getAction() == 3)) { + String message = "允许AGV放货。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备"; + if (driver.getMode() == 0) { + message += "未联机，"; + } else { + message += "不允许放货，"; + } + message += "不允许AGV放货。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } else if (device.getDeviceDriver() instanceof StandardOrdinarySiteDevice) { + // 普通站点驱动 + if ("true".equals(device.getExtraValue().get("station_manager"))) { + if (0 == device.getHas_goods()) { + String message = "允许AGV放货。"; + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备有货,"; + message += "不允许AGV放货。"; + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } else { + String message = "允许AGV放货。"; + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } + } else { + flag = true; + } + + if (flag) { + JSONObject result = new JSONObject(); + result.put("status", 200); + result.put("message", "允许放货！"); + log.info("允许仙工AGV放货，设备号 - {}", deviceCode); + return result; + } else { + throw new BadRequestException("请求失败!"); + } + } + + + //放货完成等待 + public JSONObject waitOutPut(String deviceCode, TaskDto task) { + log.info("仙工AGV放货完成后请求离开，设备号 - {}", deviceCode); + boolean flag = false; + + Device device = this.deviceAppService.findDeviceByCode(deviceCode); + if (ObjectUtil.isEmpty(device)) { + throw new BadRequestException("请求失败，未找到设备！"); + } + + if (device.getDeviceDriver() instanceof NL4StationDeviceDriver) { + // 诺力4期对接位驱动 + NL4StationDeviceDriver driver = (NL4StationDeviceDriver) device.getDeviceDriver(); + if (RequestMethodEnum.GANTRY_MATERIAL_FINISHED.getCode().equals(task.getDirection())) { + // 门架上料完成任务 + if (deviceCode.equals(task.getNext_device_code2())) { + // 如果是放满点，需要把取满点的信息写入再请求离开。 + Device device2 = this.deviceAppService.findDeviceByCode(task.getStart_device_code2()); + driver.writing("to_material", device2.getMaterial_type()); + driver.writing("to_qty", device2.getBatch()); + driver.writing("to_command", 4); + if (driver.getMode() != 0) { + String message = "允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备未联机，"; + message += "不允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } else { + driver.writing("to_command", 4); + if (driver.getMode() != 0) { + String message = "允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备未联机，"; + message += "不允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } + } else if (RequestMethodEnum.CHANNEL_STEEL_CALL_MATERIAL.getCode().equals(task.getDirection())) { + // 槽钢呼叫满料任务 + if (deviceCode.equals(task.getNext_device_code())) { + // 如果是放满点，需要把取满点的信息写入再请求离开。 + Device device2 = this.deviceAppService.findDeviceByCode(task.getStart_device_code()); + driver.writing("to_material", device2.getMaterial_type()); + driver.writing("to_qty", device2.getBatch()); + driver.writing("to_command", 4); + if (driver.getMode() != 0) { + String message = "允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备未联机，"; + message += "不允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } else { + driver.writing("to_command", 4); + if (driver.getMode() != 0) { + String message = "允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备未联机，"; + message += "不允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } + } else { + driver.writing("to_command", 4); + if (driver.getMode() != 0) { + String message = "允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + String message = "设备未联机，"; + message += "不允许AGV放货后离开。"; + driver.setMessage(message); + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + } + } + } else if (device.getDeviceDriver() instanceof StandardOrdinarySiteDevice) { + // 普通站点驱动 + String message = "允许AGV放货后离开。"; + this.deviceExecuteLogService.deviceExecuteLog(deviceCode, "", "", message); + flag = true; + } else { + flag = true; + } + + if (flag) { + JSONObject result = new JSONObject(); + result.put("status", 200); + result.put("message", "允许放货后离开！"); + log.info("允许仙工AGV放货后离开，设备号 - {}", deviceCode); + return result; + } else { + throw new BadRequestException("请求失败!"); + } + } +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java index fb91d9c..a391330 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java @@ -79,4 +79,5 @@ public interface XianGongAgvService { public JSONObject createOrederData(Instruction inst, String type); + JSONObject xgAGVWaitPointRequest(JSONObject requestParam); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index a3a4fef..50302e6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -11,7 +11,7 @@ import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.config.AcsConfig; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.device_driver.basedriver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index b4832e6..5f8ac52 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -1,5 +1,6 @@ package org.nl.acs.agv.server.impl; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; @@ -10,17 +11,22 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; import org.nl.acs.agv.AgvUtil; +import org.nl.acs.agv.server.AgvWaitUtil; import org.nl.acs.agv.server.XianGongAgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.log.LokiLog; import org.nl.acs.log.LokiLogType; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceType; +import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.service.dto.TaskDto; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.service.ParamService; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.Arrays; @@ -35,7 +41,13 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { private final DeviceAppService deviceAppService; private final ParamService paramService; private final AcsToWmsService acsToWmsService; - Map AGVDeviceStatus = new HashMap(); + private final InstructionService instructionService; + private final AgvWaitUtil agvWaitUtil; + private final TaskService taskService; + Map AGVDeviceStatus = new HashMap<>(); + + @Value("${server.port}") + public int port; @LokiLog(type = LokiLogType.AGV) @Override @@ -210,32 +222,17 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { @LokiLog(type = LokiLogType.AGV) @Override public HttpResponse sendOrderSequencesToXZ(Instruction inst) throws Exception { - JSONObject jo = new JSONObject(); - jo.put("intendedVehicle", ""); - jo.put("category", ""); - jo.put("failureFatal", false); - jo.put("complete", false); - JSONArray transports = new JSONArray(); - JSONObject orderjo = new JSONObject(); - orderjo.put("name", inst.getInstruction_code()); - orderjo.put("order", createOrederData(inst, "1")); - transports.add(orderjo); - jo.put("transports", transports); - - JSONArray ja1 = new JSONArray(); - JSONObject jo1 = new JSONObject(); - jo1.put("key", ""); - jo1.put("value", ""); - ja1.add(jo1); - jo.put("properties", ja1); - + com.alibaba.fastjson.JSONObject jo = new com.alibaba.fastjson.JSONObject(); + jo.put("id", inst.getInstruction_code()); + jo.put("complete", true); + jo.put("blocks", createBlocksData(inst)); + jo.put("priority", inst.getPriority()); log.info("任务号：{},指令号{},下发agv订单序列参数:{}", inst.getTask_code(), inst.getInstruction_code(), jo.toString()); - if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) { - String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); - String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); - - agvurl = agvurl + ":" + agvport + "/api/route/orderSequences/" + inst.getTask_code(); + if (StrUtil.equals(paramService.findByCode(org.nl.acs.config.AcsConfig.FORKAGV).getValue(), "1")) { + String agvurl = paramService.findByCode(org.nl.acs.config.AcsConfig.AGVURL).getValue(); + String agvport = paramService.findByCode(org.nl.acs.config.AcsConfig.AGVPORT).getValue(); + agvurl = agvurl + ":" + agvport + "/setOrder"; HttpResponse result = HttpRequest.post(agvurl) .body(String.valueOf(jo))//表单内容 @@ -243,7 +240,6 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .execute(); log.info(agvurl); log.info("任务号：{},指令号{},状态{},下发agv订单序列反馈:{}", inst.getTask_code(), inst.getInstruction_code(), result.getStatus(), result.body()); - return result; } else { return null; @@ -462,4 +458,258 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { return AGVDeviceStatus; } + public JSONArray createBlocksData(Instruction inst) { + String ip = paramService.findByCode("local_ip").getValue(); + String addr = ip + port; + + JSONArray blocks = new JSONArray(); + + // 起点1 + Device device1 = deviceAppService.findDeviceByCode(inst.getStart_device_code()); + if ("true".equals(device1.getExtraValue().get("ignore_pickup_check"))) { + //取货前等待 + JSONObject block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getStart_point_code() + "INGET"); + block.put("operation", "script"); + block.put("id", inst.getStart_point_code() + "INGET"); + block.put("script_name", "userpy/interact.py"); + JSONObject scriptArgs = new JSONObject(); + scriptArgs.put("addr", addr); + JSONObject data = new JSONObject(); + JSONObject reach = new JSONObject(); + reach.put("task_code", inst.getInstruction_code()); + reach.put("address", inst.getStart_point_code() + "INGET"); + data.put("reach", reach); + scriptArgs.put("data", data); + scriptArgs.put("protocol", "HTTP"); + block.put("script_args", scriptArgs); + blocks.add(block); + } + + JSONObject block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getStart_point_code()); + block.put("operation", "JackLoad"); + blocks.add(block); + + if ("true".equals(device1.getExtraValue().get("ignore_pickup_check"))) { + //取货完成等待 + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getStart_point_code() + "OUTGET"); + block.put("operation", "script"); + block.put("id", inst.getStart_point_code() + "OUTGET"); + block.put("script_name", "userpy/interact.py"); + JSONObject scriptArgs = new JSONObject(); + scriptArgs.put("addr", addr); + JSONObject data = new JSONObject(); + JSONObject reach = new JSONObject(); + reach.put("task_code", inst.getInstruction_code()); + reach.put("address", inst.getStart_point_code() + "OUTGET"); + data.put("reach", reach); + scriptArgs.put("data", data); + scriptArgs.put("protocol", "HTTP"); + block.put("script_args", scriptArgs); + blocks.add(block); + } + + // 终点1 + Device device2 = deviceAppService.findDeviceByCode(inst.getNext_device_code()); + if ("true".equals(device2.getExtraValue().get("ignore_release_check"))) { + //放货前等待 + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getNext_point_code() + "INPUT"); + block.put("operation", "script"); + block.put("id", inst.getNext_point_code() + "INPUT"); + block.put("script_name", "userpy/interact.py"); + JSONObject scriptArgs = new JSONObject(); + scriptArgs.put("addr", addr); + JSONObject data = new JSONObject(); + JSONObject reach = new JSONObject(); + reach.put("task_code", inst.getInstruction_code()); + reach.put("address", inst.getNext_point_code() + "INPUT"); + data.put("reach", reach); + scriptArgs.put("data", data); + scriptArgs.put("protocol", "HTTP"); + block.put("script_args", scriptArgs); + blocks.add(block); + } + + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getNext_point_code()); + block.put("operation", "JackUnload"); + blocks.add(block); + + if ("true".equals(device2.getExtraValue().get("ignore_release_check"))) { + //放货完成等待 + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getNext_point_code() + "OUTPUT"); + block.put("operation", "script"); + block.put("id", inst.getNext_point_code() + "OUTPUT"); + block.put("script_name", "userpy/interact.py"); + JSONObject scriptArgs = new JSONObject(); + scriptArgs.put("addr", addr); + JSONObject data = new JSONObject(); + JSONObject reach = new JSONObject(); + reach.put("task_code", inst.getInstruction_code()); + reach.put("address", inst.getNext_point_code() + "OUTPUT"); + data.put("reach", reach); + scriptArgs.put("data", data); + scriptArgs.put("protocol", "HTTP"); + block.put("script_args", scriptArgs); + blocks.add(block); + } + + // 起点2 + Device device3 = deviceAppService.findDeviceByCode(inst.getStart_device_code2()); + if ("true".equals(device3.getExtraValue().get("ignore_pickup_check"))) { + //取货前等待 + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getStart_point_code2() + "INGET"); + block.put("operation", "script"); + block.put("id", inst.getStart_point_code2() + "INGET"); + block.put("script_name", "userpy/interact.py"); + JSONObject scriptArgs = new JSONObject(); + scriptArgs.put("addr", addr); + JSONObject data = new JSONObject(); + JSONObject reach = new JSONObject(); + reach.put("task_code", inst.getInstruction_code()); + reach.put("address", inst.getStart_point_code2() + "INGET"); + data.put("reach", reach); + scriptArgs.put("data", data); + scriptArgs.put("protocol", "HTTP"); + block.put("script_args", scriptArgs); + blocks.add(block); + } + + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getStart_point_code2()); + block.put("operation", "JackLoad"); + blocks.add(block); + + if ("true".equals(device3.getExtraValue().get("ignore_pickup_check"))) { + //取货完成等待 + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getStart_point_code2() + "OUTGET"); + block.put("operation", "script"); + block.put("id", inst.getStart_point_code2() + "OUTGET"); + block.put("script_name", "userpy/interact.py"); + JSONObject scriptArgs = new JSONObject(); + scriptArgs.put("addr", addr); + JSONObject data = new JSONObject(); + JSONObject reach = new JSONObject(); + reach.put("task_code", inst.getInstruction_code()); + reach.put("address", inst.getStart_point_code2() + "OUTGET"); + data.put("reach", reach); + scriptArgs.put("data", data); + scriptArgs.put("protocol", "HTTP"); + block.put("script_args", scriptArgs); + blocks.add(block); + } + + // 终点2 + Device device4 = deviceAppService.findDeviceByCode(inst.getNext_device_code2()); + if ("true".equals(device4.getExtraValue().get("ignore_release_check"))) { + //放货前等待 + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getNext_point_code2() + "INPUT"); + block.put("operation", "script"); + block.put("id", inst.getNext_point_code2() + "INPUT"); + block.put("script_name", "userpy/interact.py"); + JSONObject scriptArgs = new JSONObject(); + scriptArgs.put("addr", addr); + JSONObject data = new JSONObject(); + JSONObject reach = new JSONObject(); + reach.put("task_code", inst.getInstruction_code()); + reach.put("address", inst.getNext_point_code2() + "INPUT"); + data.put("reach", reach); + scriptArgs.put("data", data); + scriptArgs.put("protocol", "HTTP"); + block.put("script_args", scriptArgs); + blocks.add(block); + } + + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getNext_point_code2()); + block.put("operation", "JackUnload"); + blocks.add(block); + + if ("true".equals(device4.getExtraValue().get("ignore_release_check"))) { + //放货完成等待 + block = new JSONObject(); + block.put("blockId", IdUtil.simpleUUID()); + block.put("location", inst.getNext_point_code2() + "OUTPUT"); + block.put("operation", "script"); + block.put("id", inst.getNext_point_code2() + "OUTPUT"); + block.put("script_name", "userpy/interact.py"); + JSONObject scriptArgs = new JSONObject(); + scriptArgs.put("addr", addr); + JSONObject data = new JSONObject(); + JSONObject reach = new JSONObject(); + reach.put("task_code", inst.getInstruction_code()); + reach.put("address", inst.getNext_point_code2() + "OUTPUT"); + data.put("reach", reach); + scriptArgs.put("data", data); + scriptArgs.put("protocol", "HTTP"); + block.put("script_args", scriptArgs); + blocks.add(block); + } + + return blocks; + } + + @Override + public JSONObject xgAGVWaitPointRequest(JSONObject requestParam) { + log.info("仙工AGV请求取放货，请求参数 - {}", requestParam); + String instCode = requestParam.getString("task_code"); + Instruction inst = instructionService.findByCodeFromCache(instCode); + if (ObjectUtil.isEmpty(inst)) { + throw new BadRequestException("请求失败，未找到指令！"); + } + TaskDto task = taskService.findByCodeFromCache(inst.getTask_code()); + if (ObjectUtil.isEmpty(task)) { + throw new BadRequestException("请求失败，未找到指令对应任务！"); + } + String address = requestParam.getString("address"); + if (StrUtil.isBlank(address)) { + throw new BadRequestException("请求失败，地址为空！"); + } + + + if (address.contains("IN")) { + String deviceCodeNow = address.substring(0, address.length() - 5); + if (ObjectUtil.isEmpty(deviceAppService.findDeviceByCode(deviceCodeNow))) { + throw new BadRequestException("设备号 " + deviceCodeNow + " 不存在！"); + } + + if (address.contains("GET")) { + return agvWaitUtil.waitInGet(deviceCodeNow); + } else if (address.contains("PUT")) { + return agvWaitUtil.waitInPut(deviceCodeNow); + } + } + if (address.contains("OUT")) { + String deviceCodeNow = address.substring(0, address.length() - 6); + if (ObjectUtil.isEmpty(deviceAppService.findDeviceByCode(deviceCodeNow))) { + throw new BadRequestException("设备号 " + deviceCodeNow + " 不存在！"); + } + + if (address.contains("GET")) { + return agvWaitUtil.waitOutGet(deviceCodeNow); + } else if (address.contains("PUT")) { + return agvWaitUtil.waitOutPut(deviceCodeNow, task); + } + } + + throw new BadRequestException("请求失败，IN OUT 站点错误!"); + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index 92f0bbb..25b6b96 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -11,83 +11,7 @@ import com.alibaba.fastjson.JSONObject; public enum DriverTypeEnum { ORDINARY_SITE(1, "standard_ordinary_site", "普通站点", "station"), - INSPECT_SITE(3, "standard_inspect_site", "检测站点", "station"), - - AUTODOOR(9, "standard_autodoor", "标准版-自动门", "autodoor"), - - STACK_EMPUYPALLET_SITE(10, "standard_emptypallet_site", "标准版-空盘叠盘站点", "station"), - - LAMP_THREE_COLOR(11, "lamp_three_color", "标准版-三色灯", "alarmLamp"), - - SPECIAL_ORDINARY_SITE(12, "special_ordinary_site", "特殊版-普通站点-关联锁定", "station"), - - STORAGE(13, "standard_storage", "标准版-货架", "storage"), - - SCANNER(14, "standard_scanner", "标准版-扫码器", "scanner"), - - INSPECT_CONVEYOR_CONTROL_WITH_SCANNER(15, "standard_conveyor_control_with_scanner", "标准版-输送机-控制点-关联扫码", "station"), - - INSPECT_CONVEYOR_CONTROL(16, "standard_conveyor_control", "标准版-输送机-控制点", "conveyor"), - - INSPECT_CONVEYOR_MONITOR(17, "standard_conveyor_monitor", "标准版-输送机-监控点", "conveyor"), - - MANIPULATOR_INSPECT_SITE_NDC(18, "manipulator_inspect_site_NDC", "区域管制设备交互站点-NDC", "station"), - - INSPECT_CONVEYOR_CONTROL_WITH_PLCSCANNER(27, "standard_conveyor_control_with_plcscanner", "标准版-输送机-控制点-PLC扫码", "conveyor"), - - ELECTRIC_FENCE(32, "electric_fence", "标准版-电子围栏", "safetydoor"), - - OUMULONGPLC(33, "oumulong_plc", "标准版-自动门-欧姆龙plc", "autodoor"), - - TRAFFIC_LIGHT(34, "traffic_light", "标准版-交通灯-欧姆龙plc", "alarmLamp"), - - STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv"), - - LNSH_MIXING_MILL(37, "lnsh_mixing_mill", "标准版-混碾机", "station"), - - LNSH_PRESS(38, "lnsh_press", "标准版-压力机", "station"), - - LNSH_PALLETIZING_MANIPULATOR(39, "lnsh_palletizing_manipulator", "标准版-压制码垛机械手", "station"), - - LNSH_KILN_TRUSS(40, "lnsh_kiln_truss", "标准版-进窑桁架", "station"), - - LNSH_OUT_KILN_TRUSS(41, "lnsh_out_kiln_truss", "标准版-出窑桁架", "station"), - - LNSH_KILN_LANE(42, "lnsh_kiln_lane", "标准版-窑车道", "station"), - - LNSH_FOLD_DISC_SITE(43, "lnsh_fold_disc_site", "标准版-叠盘机", "station"), - - LNSH_PALLET_STORAGE(44, "lnsh_pallet_storage", "标准版-托盘存储线", "station"), - - LNSH_PACKAGE_PALLET_MANIPULATOR(45, "lnsh_package_pallet_manipulator", "标准版-分拣机械手", "station"), - - LNSH_LABELING_MACHINE(46, "lnsh_labeling_machine", "标准版-贴标机", "station"), - - LNSH_SPLIT_MANIPULATOR(47, "lnsh_split_manipulator", "标准版-拆垛机械手", "station"), - - LNSH_RGV(48, "lnsh_rgv", "标准版-RGV", "rgv"), - - LNSH_PACKAGE_LINE(49, "lnsh_package_line", "标准版-包装机", "station"), - - LNSH_STATION(50, "lnsh_station", "标准版-工位(交互模板)", "station"), - - LNSH_LAMINATING_MACHINE(51, "lnsh_Laminating_machine", "标准版-覆膜机", "station"), - - LNSH_PACKAGE_SITE(52, "lnsh_package_site", "标准版-包装线工位", "station"), - - LNSH_CRUSHER(53, "lnsh_crusher", "标准版-破碎机", "station"), - - LNSH_PALLETIZING_MANIPULATOR_SITE(54, "lnsh_palletizing_manipulator_site", "标准版-机械手对接位", "station"), - - AGV_NDC_ONE(55, "agv_ndc_one", "NDC1楼AGV", "agv"), - - AGV_NDC_TWO(56, "agv_ndc_two", "NDC2楼AGV", "agv"), - - CONVEYOR_SSX_BARCODE(54, "conveyor_ssx_barcode", "标准版-下发条码输送线", "station"), - - CONVEYOR_PRESS_STATION(54, "conveyor_press_station", "标准版-压制对接位", "station"), - - PACKAGE_SITE(55, "package_site", "包装线工位", "station"); + NL4_STATION(2, "nl4_station", "诺力四期-对接位", "station"); //驱动索引 private int index; //驱动编码 diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDTO.java similarity index 76% rename from acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDTO.java index b9d5cd8..3830413 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDTO.java @@ -3,20 +3,20 @@ package org.nl.acs.device.device_driver.standard_inspect; import lombok.Data; @Data -public class ItemDto { +public class ItemDTO { private String code; private String name; private String db; private Boolean need_tips; - public ItemDto(String code, String name, String db) { + public ItemDTO(String code, String name, String db) { this.need_tips = Boolean.FALSE; this.code = code; this.name = name; this.db = db; } - public ItemDto(String code, String name, String db, Boolean need_tips) { + public ItemDTO(String code, String name, String db, Boolean need_tips) { this.need_tips = Boolean.FALSE; this.code = code; this.name = name; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java index 2a53e45..0728811 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java @@ -42,22 +42,22 @@ public class ItemProtocol { } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB112.B2", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB112.B3")); - list.add(new ItemDto(item_action, "动作信号", "DB112.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB112.B5")); - list.add(new ItemDto(item_task, "任务号", "DB112.D6")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB112.B2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB112.B3")); + list.add(new ItemDTO(item_action, "动作信号", "DB112.B4")); + list.add(new ItemDTO(item_error, "报警信号", "DB112.B5")); + list.add(new ItemDTO(item_task, "任务号", "DB112.D6")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB200.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB200.W4")); - list.add(new ItemDto(item_to_task, "任务号", "DB200.D6")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB200.W2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB200.W4")); + list.add(new ItemDTO(item_to_task, "任务号", "DB200.D6")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ReadUtil.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ReadUtil.java index 244e493..cd59d66 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ReadUtil.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ReadUtil.java @@ -184,7 +184,7 @@ public class ReadUtil { } public static JSONArray getReadableItemDtos() { - List list = ItemProtocol.getReadableItemDtos(); + List list = ItemProtocol.getReadableItemDtos(); JSONArray array = JSONArray.parseArray(JSON.toJSONString(list)); return array; @@ -192,7 +192,7 @@ public class ReadUtil { } public static JSONArray getWriteableItemDtos() { - List list = ItemProtocol.getWriteableItemDtos(); + List list = ItemProtocol.getWriteableItemDtos(); JSONArray array = JSONArray.parseArray(JSON.toJSONString(list)); return array; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinitionAppService.java similarity index 52% rename from acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinitionAppService.java index c1668e0..0f3dcba 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinitionAppService.java @@ -1,19 +1,19 @@ package org.nl.acs.device.service; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.opc.DeviceType; import java.util.List; -public interface DeviceDriverDefinationAppService { +public interface DeviceDriverDefinitionAppService { List getDeviceDriverCodes(); - DeviceDriverDefination getDeviceDriverDefination(String driverCode); + DeviceDriverDefinition getDeviceDriverDefinition(String driverCode); - List getDeviceDriverDefinations(); + List getDeviceDriverDefinitions(); - List getDeviceDriverDefinations(DeviceType var1); + List getDeviceDriverDefinitions(DeviceType var1); boolean isRoute(Class var1); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 310aa30..765f4f0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -16,16 +16,16 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.map.ListOrderedMap; import org.nl.acs.auto.initial.ApplicationAutoInitial; -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.device_driver.standard_inspect.ReadUtil; import org.nl.acs.device.service.*; import org.nl.acs.device.service.dto.*; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.device_driver.ScannerDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_scanner.StandardScannerDeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; @@ -34,7 +34,6 @@ import org.nl.modules.common.utils.FileUtil; import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.ParamService; -import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -66,7 +65,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial private final OpcService opcService; private final RedisUtils redisUtils; private final OpcPlcService opcPlcService; - private final DeviceDriverDefinationAppService deviceDriverDefinationAppService; + private final DeviceDriverDefinitionAppService deviceDriverDefinitionAppService; private final DeviceAppService deviceAppService; private final ParamService paramService; List storageCells = new ArrayList<>(); @@ -258,8 +257,8 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial // allDevice.remove(deviceByCode); log.info("设备删除成功!"); - if (deviceByCode != null && ObjectUtil.isNotEmpty(deviceByCode.getDeviceDriverDefination())) { - if (StrUtil.equals("storage", deviceByCode.getDeviceDriverDefination().getFitDeviceTypes().get(0).name())) { + if (deviceByCode != null && ObjectUtil.isNotEmpty(deviceByCode.getDeviceDriverDefinition())) { + if (StrUtil.equals("storage", deviceByCode.getDeviceDriverDefinition().getFitDeviceTypes().get(0).name())) { storageTab.delete("substring_index( storage_code,'-',1)= '" + device_code + "'"); } else { @@ -776,13 +775,6 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial wo.insert(inserjson); - } else { - devrundto.setContainer(null); - devrundto.setTaskno("0"); - devrundto.setHasgoods("0"); - devrundto.setRemark(null); - JSONObject inserjson = (JSONObject) JSONObject.toJSON(dto); - wo.update(json); } } else { @@ -955,10 +947,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial String material_type = form.getString("material_type"); String quantity = form.getString("quantity"); String remark = form.getString("remark"); - String vehicle_code = form.getString("vehicle_code"); String islock = form.getString("islock"); - String requireSucess = form.getString("requireSucess"); - String fullrequireSucess = form.getString("fullrequireSucess"); if (device_code.indexOf(".") != -1) { device_code = device_code.substring(0, device_code.indexOf(".")); } @@ -1209,13 +1198,13 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial JSONObject result = new JSONObject(); //根据设备驱动定义获取OPC读写数据 - DeviceDriverDefination deviceDriverDefination = deviceDriverDefinationAppService.getDeviceDriverDefination(driver_code); - OpcDeviceDriverDefination opcDeviceDriverDefination = null; - if (deviceDriverDefination instanceof OpcDeviceDriverDefination) { - opcDeviceDriverDefination = (OpcDeviceDriverDefination) deviceDriverDefination; + DeviceDriverDefinition deviceDriverDefinition = deviceDriverDefinitionAppService.getDeviceDriverDefinition(driver_code); + OpcDeviceDriverDefinition opcDeviceDriverDefinition = null; + if (deviceDriverDefinition instanceof OpcDeviceDriverDefinition) { + opcDeviceDriverDefinition = (OpcDeviceDriverDefinition) deviceDriverDefinition; //处理DB读和写属性 - result.put("rs", opcDeviceDriverDefination.getReadableItemDtos()); - result.put("ws", opcDeviceDriverDefination.getWriteableItemDtos()); + result.put("rs", opcDeviceDriverDefinition.getReadableItemDTOs()); + result.put("ws", opcDeviceDriverDefinition.getWriteableItemDTOs()); } @@ -1273,11 +1262,11 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial JSONArray rs = WQLObject.getWQLObject("acs_device_extra").query("filed_type='02' and device_id = '" + device_id + "'", "order_seq").getResultJSONArray(0); JSONArray r_arry = new JSONArray(); //先获取模板 - if(ObjectUtil.isNotEmpty(opcDeviceDriverDefination)){ - List readableItemDtos = opcDeviceDriverDefination.getReadableItemDtos(); + if(ObjectUtil.isNotEmpty(opcDeviceDriverDefinition)){ + List readableItemDtos = opcDeviceDriverDefinition.getReadableItemDTOs(); List readableItemJsons = new ArrayList<>(); for (int i = 0; i < readableItemDtos.size(); i++) { - ItemDto itemDto = readableItemDtos.get(i); + ItemDTO itemDto = readableItemDtos.get(i); JSONObject readableItemJson = new JSONObject(); readableItemJson.put("code",itemDto.getCode()); readableItemJson.put("name",itemDto.getName()); @@ -1309,7 +1298,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial rarry.add(jsonObject); } for (int i = 0; i < readableItemDtos.size(); i++) { - ItemDto itemDto = readableItemDtos.get(i); + ItemDTO itemDto = readableItemDtos.get(i); JSONObject readableItemJson = new JSONObject(); readableItemJson.put("code",itemDto.getCode()); readableItemJson.put("name",itemDto.getName()); @@ -1320,10 +1309,10 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial } JSONArray ws = WQLObject.getWQLObject("acs_device_extra").query("filed_type='03' and device_id = '" + device_id + "'", "order_seq").getResultJSONArray(0); JSONArray w_arry = new JSONArray(); - List writeableItemDtos = opcDeviceDriverDefination.getWriteableItemDtos(); + List writeableItemDtos = opcDeviceDriverDefinition.getWriteableItemDTOs(); List writeableItemJsons = new ArrayList<>(); for (int i = 0; i < writeableItemDtos.size(); i++) { - ItemDto itemDto = writeableItemDtos.get(i); + ItemDTO itemDto = writeableItemDtos.get(i); JSONObject writeableItemJson = new JSONObject(); writeableItemJson.put("code",itemDto.getCode()); writeableItemJson.put("name",itemDto.getName()); @@ -1355,7 +1344,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial warry.add(jsonObject); } for (int i = 0; i < writeableItemDtos.size(); i++) { - ItemDto itemDto = writeableItemDtos.get(i); + ItemDTO itemDto = writeableItemDtos.get(i); JSONObject writeableItemJson = new JSONObject(); writeableItemJson.put("code",itemDto.getCode()); writeableItemJson.put("name",itemDto.getName()); @@ -1663,12 +1652,12 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial //处理设备扩展属性 JSONObject result = new JSONObject(); //根据设备驱动定义获取OPC读写数据 - DeviceDriverDefination deviceDriverDefination = deviceDriverDefinationAppService.getDeviceDriverDefination(driver_code); - if (deviceDriverDefination instanceof OpcDeviceDriverDefination) { - OpcDeviceDriverDefination opcDeviceDriverDefination = (OpcDeviceDriverDefination) deviceDriverDefination; + DeviceDriverDefinition deviceDriverDefinition = deviceDriverDefinitionAppService.getDeviceDriverDefinition(driver_code); + if (deviceDriverDefinition instanceof OpcDeviceDriverDefinition) { + OpcDeviceDriverDefinition opcDeviceDriverDefinition = (OpcDeviceDriverDefinition) deviceDriverDefinition; //处理DB读和写属性 - result.put("rs", opcDeviceDriverDefination.getReadableItemDtos()); - result.put("ws", opcDeviceDriverDefination.getWriteableItemDtos()); + result.put("rs", opcDeviceDriverDefinition.getReadableItemDTOs()); + result.put("ws", opcDeviceDriverDefinition.getWriteableItemDTOs()); } return result; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriver.java index 4ac300f..ad3418b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriver.java @@ -14,12 +14,12 @@ public interface DeviceDriver { Device getDevice(); - DeviceDriverDefination getDriverDefination(); + DeviceDriverDefinition getDriverDefinition(); - DeviceDriver setDriverDefination(DeviceDriverDefination var1); + DeviceDriver setDriverDefinition(DeviceDriverDefinition var1); - default String getDriverDefinationCode() { - return this.getDriverDefination().getDriverCode(); + default String getDriverDefinitionCode() { + return this.getDriverDefinition().getDriverCode(); } //将扩展表中的字符串数组数据转换成集合 diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriverDefinition.java similarity index 90% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriverDefinition.java index 0f50865..06438e3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/DeviceDriverDefinition.java @@ -8,7 +8,7 @@ import java.util.List; /** * 设备驱动定义 */ -public interface DeviceDriverDefination { +public interface DeviceDriverDefinition { String getDriverCode(); String getDriverName(); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java index dbea2ab..bc49fc2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java @@ -10,43 +10,17 @@ import com.alibaba.fastjson.JSONObject; * https://blog.csdn.net/moneyshi/article/details/82978073 */ public enum RequestMethodEnum { - order_verify(1, "order_verify", "人工排产确认","0"), - order_finish(2, "order_finish", "工单完成","0"), + real_time_set_point(1, "real_time_set_point", "反馈信号状态","1"), - apply_put_full_vehicle(3, "apply_put_full_vehicle", "申请补满料盅托盘(叫料)","0"), + feedback_task_status(2, "feedback_task_status", "反馈任务状态","1"), - apply_put_empty_vehicle(4, "apply_put_empty_vehicle", "申请补空料盅托盘(叫空盘)","0"), + GANTRY_MATERIAL_FINISHED(3, "gantryMaterialFinished", "门架上料完成","0"), - apply_take_empty_vehicle(5, "apply_take_empty_vehicle", "申请取走空料盅托盘(取空盘)","0"), + CHANNEL_STEEL_MATERIAL_FINISHED(4, "channelSteelMaterialFinished", "槽钢上料完成", "0"), - apply_take_full_vehicle(6, "apply_take_full_vehicle", "申请取走满料盅托盘（入库）","0"), - - apply_force_take_full_vehicle(7, "apply_force_take_full_vehicle", "申请强制取走满料盅托盘(强制入库)","0"), - - apply_force_take_full_vehicle_in_storage(8, "apply_force_take_full_vehicle_in_storage", "申请强制满托入缓存","0"), - - barcode_success_apply(9, "barcode_success_apply", "扫码成功申请","0"), - - get_vehicle_info(10, "get_vehicle_info", "获取组盘信息","0"), - - force_no_package(11, "force_no_package", "强制去包装位-不包装","0"), - - apply_labelling(12, "apply_labelling", "申请贴标","0"), - - apply_one_grab(13, "apply_one_grab", "单次放置完成","0"), - - real_time_set_point(14, "real_time_set_point", "反馈信号状态","1"), - - feedback_task_status(15, "feedback_task_status", "反馈任务状态","1"), - - feedback_device_status(16, "feedback_device_status", "反馈设备状态","1"), - - apply_feedback_weight(17, "apply_feedback_weight", "反馈压机残留重量","0"), - - apply_get_put_station(18, "apply_get_put_station", "反馈当前抓取放置位","0"), - - press_request_material(19, "pressRequestMaterial", "压机叫料","0"); + CHANNEL_STEEL_CALL_MATERIAL(5, "channelSteelCallMaterial", "槽钢呼叫满料", "0"), + PRODUCTION_COMPLETED(6, "productionCompleted", "下料完成", "0"); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefinition.java similarity index 87% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefinition.java index 50f1fce..7a827f6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDefinition.java @@ -1,7 +1,7 @@ package org.nl.acs.device_driver.basedriver.agv.magic_agv; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import java.util.List; * 普通站点定义 */ @Service -public class MagicAgvDefination implements DeviceDriverDefination { +public class MagicAgvDefinition implements DeviceDriverDefinition { @Override public String getDriverCode() { return "magic_agv"; @@ -31,7 +31,7 @@ public class MagicAgvDefination implements DeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new MagicAgvDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new MagicAgvDeviceDriver()).setDevice(device).setDriverDefinition(this); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDeviceDriver.java index ae0cd7e..812e50e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/magic_agv/MagicAgvDeviceDriver.java @@ -2,7 +2,7 @@ package org.nl.acs.device_driver.basedriver.agv.magic_agv; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.device_driver.driver.AbstractDeviceDriver; import org.nl.acs.opc.Device; import org.springframework.stereotype.Service; @@ -19,12 +19,12 @@ public class MagicAgvDeviceDriver extends AbstractDeviceDriver implements Device } @Override - public DeviceDriverDefination getDriverDefination() { + public DeviceDriverDefinition getDriverDefinition() { return null; } @Override - public DeviceDriver setDriverDefination(DeviceDriverDefination var1) { + public DeviceDriver setDriverDefinition(DeviceDriverDefinition var1) { return null; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefinition.java similarity index 87% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefinition.java index 7a7ec93..2d6e996 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDefinition.java @@ -1,7 +1,7 @@ package org.nl.acs.device_driver.basedriver.agv.ndcone; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import java.util.List; * NDC单工位AGV */ @Service -public class AgvNdcOneDefination implements DeviceDriverDefination { +public class AgvNdcOneDefinition implements DeviceDriverDefinition { @Override public String getDriverCode() { return "agv_ndc_one"; @@ -31,7 +31,7 @@ public class AgvNdcOneDefination implements DeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new AgvNdcOneDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new AgvNdcOneDeviceDriver()).setDevice(device).setDriverDefinition(this); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index b9dddb5..4294fec 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -2,20 +2,15 @@ package org.nl.acs.device_driver.basedriver.agv.ndcone; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.mvel2.util.ErrorUtil; -import org.nl.acs.agv.server.AgvService; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.config.AcsConfig; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.basedriver.agv.utils.OneAgvPhase; -import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.device_driver.driver.AbstractDeviceDriver; @@ -25,11 +20,9 @@ import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachi import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalletizingManipulatorSiteDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.WmsToAcsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; -import org.nl.acs.ext.wms.service.impl.WmsToAcsServiceImpl; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.instruction.service.impl.InstructionServiceImpl; @@ -48,11 +41,7 @@ import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.start.auto.run.NDCSocketConnectionAutoRun; -import javax.validation.constraints.NotBlank; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * NDC单工位AGV diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDefinition.java similarity index 78% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDefinition.java index eb17957..9b8ff96 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.basedriver.cargo_lift_conveyor; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import java.util.List; * 货梯对接线 */ @Service -public class CargoLiftConveyorDefination implements OpcDeviceDriverDefination { +public class CargoLiftConveyorDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "cargo_lift_conveyor"; @@ -32,7 +32,7 @@ public class CargoLiftConveyorDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new CargoLiftConveyorDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new CargoLiftConveyorDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -48,12 +48,12 @@ public class CargoLiftConveyorDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/ItemProtocol.java index c27bee2..fd860db 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.basedriver.cargo_lift_conveyor; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -72,25 +72,25 @@ public class ItemProtocol { } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "VW0")); - list.add(new ItemDto(item_mode, "工作模式", "VW2")); - list.add(new ItemDto(item_move, "光电信号", "VW4")); - list.add(new ItemDto(item_action, "取放信号", "VW6")); - list.add(new ItemDto(item_error, "故障", "VW8")); - list.add(new ItemDto(item_task, "任务号", "VD10")); + list.add(new ItemDTO(item_heartbeat, "心跳", "VW0")); + list.add(new ItemDTO(item_mode, "工作模式", "VW2")); + list.add(new ItemDTO(item_move, "光电信号", "VW4")); + list.add(new ItemDTO(item_action, "取放信号", "VW6")); + list.add(new ItemDTO(item_error, "故障", "VW8")); + list.add(new ItemDTO(item_task, "任务号", "VD10")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "VW102")); - list.add(new ItemDto(item_to_target, "下发目标站", "VW104")); - list.add(new ItemDto(item_to_task, "任务号", "VD108")); - list.add(new ItemDto(item_to_door, "门", "VD112")); - list.add(new ItemDto(item_to_floor, "楼层", "VD114")); + list.add(new ItemDTO(item_to_command, "下发指令", "VW102")); + list.add(new ItemDTO(item_to_target, "下发目标站", "VW104")); + list.add(new ItemDTO(item_to_task, "任务号", "VD108")); + list.add(new ItemDTO(item_to_door, "门", "VD112")); + list.add(new ItemDTO(item_to_floor, "楼层", "VD114")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDefinition.java similarity index 77% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDefinition.java index a5e78fc..f382de7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import java.util.List; * 空托盘叠盘位 */ @Service -public class EmptyVehicleStackingPositionDefination implements OpcDeviceDriverDefination { +public class EmptyVehicleStackingPositionDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "empty_vehicle_stacking_position"; @@ -32,7 +32,7 @@ public class EmptyVehicleStackingPositionDefination implements OpcDeviceDriverDe @Override public DeviceDriver getDriverInstance(Device device) { - return (new EmptyVehicleStackingPositionDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new EmptyVehicleStackingPositionDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -48,12 +48,12 @@ public class EmptyVehicleStackingPositionDefination implements OpcDeviceDriverDe } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/ItemProtocol.java index a26c51d..b8bf626 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -76,24 +76,24 @@ public class ItemProtocol { } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "VW0")); - list.add(new ItemDto(item_mode, "工作模式", "VW2")); - list.add(new ItemDto(item_move, "光电信号", "VW4")); - list.add(new ItemDto(item_number, "数量", "VW6")); - list.add(new ItemDto(item_container_type, "托盘类型", "VW8")); - list.add(new ItemDto(item_error, "故障", "VW10")); - list.add(new ItemDto(item_task, "任务号", "VD12")); + list.add(new ItemDTO(item_heartbeat, "心跳", "VW0")); + list.add(new ItemDTO(item_mode, "工作模式", "VW2")); + list.add(new ItemDTO(item_move, "光电信号", "VW4")); + list.add(new ItemDTO(item_number, "数量", "VW6")); + list.add(new ItemDTO(item_container_type, "托盘类型", "VW8")); + list.add(new ItemDTO(item_error, "故障", "VW10")); + list.add(new ItemDTO(item_task, "任务号", "VD12")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "VW52")); - list.add(new ItemDto(item_to_target , "下发目标站", "VW54")); - list.add(new ItemDto(item_to_task, "任务号", "VD58")); + list.add(new ItemDTO(item_to_command, "下发指令", "VW52")); + list.add(new ItemDTO(item_to_target , "下发目标站", "VW54")); + list.add(new ItemDTO(item_to_task, "任务号", "VD58")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java similarity index 72% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java index d2bf6f2..f99b017 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java @@ -1,7 +1,7 @@ -package org.nl.acs.device_driver.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 java.util.ArrayList; import java.util.List; @@ -53,18 +53,18 @@ public class ItemProtocol { } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B4")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB51.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_action, "动作信号", "DB51.B2")); + list.add(new ItemDTO(item_error, "报警信号", "DB51.B4")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefinition.java similarity index 62% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefinition.java index b320a9d..df0bc5d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefinition.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.standard_autodoor; +package org.nl.acs.device_driver.basedriver.standard_autodoor; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * 自动门驱动定义 */ @Service -public class StandardAutodoorDefination implements OpcDeviceDriverDefination { +public class StandardAutodoorDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "standard_autodoor"; @@ -33,7 +33,7 @@ public class StandardAutodoorDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardAutodoorDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new StandardAutodoorDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -50,21 +50,21 @@ public class StandardAutodoorDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { - List 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")); + public static List getReadableItemDtos2() { + List 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 - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java similarity index 97% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDeviceDriver.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java index b770a87..3f4af5a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.standard_autodoor; +package org.nl.acs.device_driver.basedriver.standard_autodoor; import com.alibaba.fastjson.JSONObject; import lombok.Getter; @@ -16,7 +16,6 @@ import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; import java.util.HashMap; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/ItemProtocol.java index 1fc7f8a..490a6ed 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.basedriver.standard_conveyor_control; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -96,26 +96,26 @@ public class ItemProtocol { } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB600.B3")); - list.add(new ItemDto(item_ioaction, "进出类型", "DB600.B4")); - list.add(new ItemDto(item_height, "高度类型", "DB600.B5")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_direction, "电机方向", "DB600.B7")); - list.add(new ItemDto(item_operation_type, "作业类型", "DB600.B8")); - list.add(new ItemDto(item_task, "任务号", "DB600.D22")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB600.B2")); + list.add(new ItemDTO(item_action, "取放信号", "DB600.B3")); + list.add(new ItemDTO(item_ioaction, "进出类型", "DB600.B4")); + list.add(new ItemDTO(item_height, "高度类型", "DB600.B5")); + list.add(new ItemDTO(item_error, "报警信号", "DB600.B6")); + list.add(new ItemDTO(item_direction, "电机方向", "DB600.B7")); + list.add(new ItemDTO(item_operation_type, "作业类型", "DB600.B8")); + list.add(new ItemDTO(item_task, "任务号", "DB600.D22")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB601.W4")); - list.add(new ItemDto(item_to_task, "任务号", "DB601.D8")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB601.W4")); + list.add(new ItemDTO(item_to_task, "任务号", "DB601.D8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefinition.java similarity index 77% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefinition.java index f8a8cdd..a15474e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardConveyorControlDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.basedriver.standard_conveyor_control; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -16,7 +15,7 @@ import java.util.List; * 说明：该站点为普通带光电检测站点 */ @Service -public class StandardConveyorControlDefination implements OpcDeviceDriverDefination { +public class StandardConveyorControlDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "standard_conveyor_control"; @@ -34,7 +33,7 @@ public class StandardConveyorControlDefination implements OpcDeviceDriverDefinat @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardCoveyorControlDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new StandardCoveyorControlDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,13 +50,13 @@ public class StandardConveyorControlDefination implements OpcDeviceDriverDefinat } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/ItemProtocol.java index 1a7bfad..cbfd9fc 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcsc import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -135,28 +135,28 @@ public class ItemProtocol { return "0"; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB600.B3")); - list.add(new ItemDto(item_ioaction, "进出类型", "DB600.B4")); - list.add(new ItemDto(item_height, "高度类型", "DB600.B5")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_direction, "电机方向", "DB600.B7")); - list.add(new ItemDto(item_operation_type, "作业类型", "DB600.B8")); - list.add(new ItemDto(item_task, "任务号", "DB600.D22")); - list.add(new ItemDto(item_barcode, "托盘号", "DB600.S26")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB600.B2")); + list.add(new ItemDTO(item_action, "取放信号", "DB600.B3")); + list.add(new ItemDTO(item_ioaction, "进出类型", "DB600.B4")); + list.add(new ItemDTO(item_height, "高度类型", "DB600.B5")); + list.add(new ItemDTO(item_error, "报警信号", "DB600.B6")); + list.add(new ItemDTO(item_direction, "电机方向", "DB600.B7")); + list.add(new ItemDTO(item_operation_type, "作业类型", "DB600.B8")); + list.add(new ItemDTO(item_task, "任务号", "DB600.D22")); + list.add(new ItemDTO(item_barcode, "托盘号", "DB600.S26")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB601.W4")); - list.add(new ItemDto(item_to_task, "任务号", "DB601.D8")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB601.W4")); + list.add(new ItemDTO(item_to_task, "任务号", "DB601.D8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefinition.java similarity index 76% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefinition.java index faf9dda..7f0b9b0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_plcscanner; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; * 输送机-控制点-PLC扫码器驱动定义 */ @Service -public class StandardConveyorControlWithPlcScannerDefination implements OpcDeviceDriverDefination { +public class StandardConveyorControlWithPlcScannerDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "standard_conveyor_control_with_plcscanner"; @@ -33,7 +32,7 @@ public class StandardConveyorControlWithPlcScannerDefination implements OpcDevic @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardCoveyorControlWithPlcScannerDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new StandardCoveyorControlWithPlcScannerDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -50,13 +49,13 @@ public class StandardConveyorControlWithPlcScannerDefination implements OpcDevic } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/ItemProtocol.java similarity index 74% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/ItemProtocol.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/ItemProtocol.java index c5e6978..18a4632 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/ItemProtocol.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.standard_emptypallet_site; +package org.nl.acs.device_driver.basedriver.standard_emptypallet_site; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -84,22 +84,22 @@ public class ItemProtocol { } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_number, "数量", "DB600.B3")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B5")); - list.add(new ItemDto(item_task, "任务号", "DB600.D6")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB600.B2")); + list.add(new ItemDTO(item_number, "数量", "DB600.B3")); + list.add(new ItemDTO(item_error, "报警信号", "DB600.B5")); + list.add(new ItemDTO(item_task, "任务号", "DB600.D6")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB601.W4")); - list.add(new ItemDto(item_to_task, "任务号", "DB601.D8")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB601.W4")); + list.add(new ItemDTO(item_to_task, "任务号", "DB601.D8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/StandardEmptyPalletSiteDefinition.java similarity index 60% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/StandardEmptyPalletSiteDefinition.java index e710285..0766812 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/StandardEmptyPalletSiteDefinition.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.standard_emptypallet_site; +package org.nl.acs.device_driver.basedriver.standard_emptypallet_site; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; * 说明：该站点为普通带光电检测站点 */ @Service -public class StandardEmptyPalletSiteDefination implements OpcDeviceDriverDefination { +public class StandardEmptyPalletSiteDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "standard_emptypallet_site"; @@ -34,7 +34,7 @@ public class StandardEmptyPalletSiteDefination implements OpcDeviceDriverDefinat @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardEmptyPalletSiteDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new StandardEmptyPalletSiteDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,23 +51,23 @@ public class StandardEmptyPalletSiteDefination implements OpcDeviceDriverDefinat } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { - List 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_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_number, "数量", "DB600.B3")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B5")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB600.D6")); + public static List getReadableItemDtos2() { + List 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_move, "光电开关信号", "DB600.B2")); + list.add(new ItemDTO(ItemProtocol.item_number, "数量", "DB600.B3")); + list.add(new ItemDTO(ItemProtocol.item_error, "报警信号", "DB600.B5")); + list.add(new ItemDTO(ItemProtocol.item_task, "任务号", "DB600.D6")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java similarity index 99% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java index 8f6041d..1d777ed 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.standard_emptypallet_site; +package org.nl.acs.device_driver.basedriver.standard_emptypallet_site; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -32,7 +32,6 @@ import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; import java.util.*; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/ItemProtocol.java index 88f825b..72533b6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.basedriver.standard_inspect_site; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -86,21 +86,21 @@ public class ItemProtocol { } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_task, "任务号", "DB600.D8")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB600.B2")); + list.add(new ItemDTO(item_error, "报警信号", "DB600.B6")); + list.add(new ItemDTO(item_task, "任务号", "DB600.D8")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB.D4")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB.W2")); + list.add(new ItemDTO(item_to_task, "任务号", "DB.D4")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefinition.java similarity index 65% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefinition.java index 7c97c36..4d692b2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.basedriver.standard_inspect_site; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; * 说明：该站点为普通带光电检测站点 */ @Service -public class StandardInspectSiteDefination implements OpcDeviceDriverDefination { +public class StandardInspectSiteDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "standard_inspect_site"; @@ -34,7 +34,7 @@ public class StandardInspectSiteDefination implements OpcDeviceDriverDefination @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new StandardInspectSiteDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,22 +51,22 @@ public class StandardInspectSiteDefination implements OpcDeviceDriverDefination } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB.B1", true)); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB.B3")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB.D4")); + public static List getReadableItemDtos2() { + List list = new ArrayList(); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB.B1", true)); + list.add(new ItemDTO(ItemProtocol.item_move, "光电开关信号", "DB.B2")); + list.add(new ItemDTO(ItemProtocol.item_error, "报警信号", "DB.B3")); + list.add(new ItemDTO(ItemProtocol.item_task, "任务号", "DB.D4")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefinition.java similarity index 86% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefinition.java index fbe27f4..0603528 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefinition.java @@ -1,7 +1,7 @@ package org.nl.acs.device_driver.basedriver.standard_ordinary_site; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import java.util.List; * 普通站点定义 */ @Service -public class StandardOrdinarySiteDefination implements DeviceDriverDefination { +public class StandardOrdinarySiteDefinition implements DeviceDriverDefinition { @Override public String getDriverCode() { return "standard_ordinary_site"; @@ -31,7 +31,7 @@ public class StandardOrdinarySiteDefination implements DeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardOrdinarySiteDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new StandardOrdinarySiteDeviceDriver()).setDevice(device).setDriverDefinition(this); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefinition.java similarity index 86% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefinition.java index 0a29625..3ab7906 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_scanner/StandardScannerDefinition.java @@ -1,7 +1,7 @@ package org.nl.acs.device_driver.basedriver.standard_scanner; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import java.util.List; * 扫码器 */ @Service -public class StandardScannerDefination implements DeviceDriverDefination { +public class StandardScannerDefinition implements DeviceDriverDefinition { @Override public String getDriverCode() { return "standard_scanner"; @@ -31,7 +31,7 @@ public class StandardScannerDefination implements DeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardScannerDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new StandardScannerDeviceDriver()).setDevice(device).setDriverDefinition(this); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefinition.java similarity index 86% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefinition.java index 78bd720..735a693 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_storage/StandardStorageDefinition.java @@ -1,7 +1,7 @@ package org.nl.acs.device_driver.basedriver.standard_storage; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import java.util.List; * 货架 */ @Service -public class StandardStorageDefination implements DeviceDriverDefination { +public class StandardStorageDefinition implements DeviceDriverDefinition { @Override public String getDriverCode() { return "standard_storage"; @@ -31,7 +31,7 @@ public class StandardStorageDefination implements DeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardStorageDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new StandardStorageDeviceDriver()).setDevice(device).setDriverDefinition(this); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java deleted file mode 100644 index 8c57a60..0000000 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.acs.device_driver.defination; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriverDefination; - -import java.util.List; - -public interface OpcDeviceDriverDefination extends DeviceDriverDefination { - List getReadableItemDtos(); - - List getWriteableItemDtos(); -} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/definition/OpcDeviceDriverDefinition.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/definition/OpcDeviceDriverDefinition.java new file mode 100644 index 0000000..688494e --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/definition/OpcDeviceDriverDefinition.java @@ -0,0 +1,12 @@ +package org.nl.acs.device_driver.definition; + +import org.nl.acs.device.device_driver.standard_inspect.ItemDTO; +import org.nl.acs.device_driver.DeviceDriverDefinition; + +import java.util.List; + +public interface OpcDeviceDriverDefinition extends DeviceDriverDefinition { + List getReadableItemDTOs(); + + List getWriteableItemDTOs(); +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java index f206bcf..58c375a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.driver; import lombok.Getter; import lombok.Setter; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.opc.Device; @Getter @@ -11,7 +11,7 @@ import org.nl.acs.opc.Device; public class AbstractDeviceDriver implements DeviceDriver { public Device device; - private DeviceDriverDefination driverDefination; + private DeviceDriverDefinition driverDefinition; private boolean stop = false; @@ -28,13 +28,13 @@ public class AbstractDeviceDriver implements DeviceDriver { @Override - public DeviceDriverDefination getDriverDefination() { - return this.driverDefination; + public DeviceDriverDefinition getDriverDefinition() { + return this.driverDefinition; } @Override - public DeviceDriver setDriverDefination(DeviceDriverDefination var1) { - this.driverDefination = driverDefination; + public DeviceDriver setDriverDefinition(DeviceDriverDefinition var1) { + this.driverDefinition = driverDefinition; return this; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java index 51cba48..2d4c651 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java @@ -11,6 +11,7 @@ import org.openscada.opc.lib.da.Item; import org.openscada.opc.lib.da.ItemState; import org.springframework.beans.factory.annotation.Autowired; +import java.lang.reflect.Method; import java.util.*; public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements OpcDeviceDriver { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/ItemProtocol.java index e1de560..a6deb63 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/ItemProtocol.java @@ -1,7 +1,7 @@ package org.nl.acs.device_driver.lamp_three_color; 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 java.util.ArrayList; import java.util.List; @@ -53,18 +53,18 @@ public class ItemProtocol { } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B4")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB51.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_action, "动作信号", "DB51.B2")); + list.add(new ItemDTO(item_error, "报警信号", "DB51.B4")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDefinition.java similarity index 65% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDefinition.java index f5d6861..727b898 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lamp_three_color; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * 自动门驱动定义 */ @Service -public class LampThreecolorDefination implements OpcDeviceDriverDefination { +public class LampThreecolorDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lamp_three_color"; @@ -33,7 +33,7 @@ public class LampThreecolorDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LampThreecolorDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LampThreecolorDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -50,21 +50,21 @@ public class LampThreecolorDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { - List 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")); + public static List getReadableItemDtos2() { + List 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 - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDefinition.java similarity index 78% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDefinition.java index 27962d6..d3aaf9d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.converor_barcode; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * */ @Service -public class ConveyorBarcodeDefination implements OpcDeviceDriverDefination { +public class ConveyorBarcodeDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "conveyor_ssx_barcode"; @@ -33,7 +33,7 @@ public class ConveyorBarcodeDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new ConveyorBarcodeDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new ConveyorBarcodeDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -50,12 +50,12 @@ public class ConveyorBarcodeDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ItemProtocol.java index dc9636a..2233aa5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ItemProtocol.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -117,23 +117,23 @@ public class ItemProtocol { return "0"; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B3")); - list.add(new ItemDto(item_task, "任务号", "DB51.D4")); - list.add(new ItemDto(item_barcode, "条码", "DB51.W8")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB51.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB51.B2")); + list.add(new ItemDTO(item_error, "报警信号", "DB51.B3")); + list.add(new ItemDTO(item_task, "任务号", "DB51.D4")); + list.add(new ItemDTO(item_barcode, "条码", "DB51.W8")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB50.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB50.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB50.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB50.W8")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB50.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB50.W2")); + list.add(new ItemDTO(item_to_task, "任务号", "DB50.D4")); + list.add(new ItemDTO(item_to_barcode, "条码", "DB50.W8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDefinition.java similarity index 78% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDefinition.java index 38c1bfd..593ae62 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.conveyor_press_station; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * */ @Service -public class ConveyorPressStationDefination implements OpcDeviceDriverDefination { +public class ConveyorPressStationDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "conveyor_press_station"; @@ -33,7 +33,7 @@ public class ConveyorPressStationDefination implements OpcDeviceDriverDefination @Override public DeviceDriver getDriverInstance(Device device) { - return (new ConveyorPressStationDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new ConveyorPressStationDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -50,12 +50,12 @@ public class ConveyorPressStationDefination implements OpcDeviceDriverDefination } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java index a97ec75..631cca3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ItemProtocol.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -125,28 +125,28 @@ public class ItemProtocol { return "0"; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB51.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB51.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB51.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B5")); - list.add(new ItemDto(item_task, "任务号", "DB51.D6")); - list.add(new ItemDto(item_weight, "重量", "DB51.D10")); - list.add(new ItemDto(item_material, "物料", "DB51.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB51.W66")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB51.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB51.B2")); + list.add(new ItemDTO(item_action, "取放信号", "DB51.B3")); + list.add(new ItemDTO(item_ioaction, "进出信号", "DB51.B4")); + list.add(new ItemDTO(item_error, "报警信号", "DB51.B5")); + list.add(new ItemDTO(item_task, "任务号", "DB51.D6")); + list.add(new ItemDTO(item_weight, "重量", "DB51.D10")); + list.add(new ItemDTO(item_material, "物料", "DB51.STRING14.50")); + list.add(new ItemDTO(item_barcode, "条码", "DB51.W66")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB50.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB50.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB50.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB50.W8")); - list.add(new ItemDto(item_to_mix_num, "碾次", "DB50.STRING10.50")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB50.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB50.W2")); + list.add(new ItemDTO(item_to_task, "任务号", "DB50.D4")); + list.add(new ItemDTO(item_to_barcode, "条码", "DB50.W8")); + list.add(new ItemDTO(item_to_mix_num, "碾次", "DB50.STRING10.50")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java index a7eb617..27bc4ea 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -100,23 +100,23 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB112.B2")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB112.B3")); - list.add(new ItemDto(item_error, "报警信号", "DB112.B4")); - list.add(new ItemDto(item_task, "任务号", "DB112.D6")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB112.B2")); + list.add(new ItemDTO(item_container_type, "托盘类型", "DB112.B3")); + list.add(new ItemDTO(item_error, "报警信号", "DB112.B4")); + list.add(new ItemDTO(item_task, "任务号", "DB112.D6")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB113.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB113.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB113.D4")); - list.add(new ItemDto(item_to_barcode, "条码", "DB113.W8")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB113.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB113.W2")); + list.add(new ItemDTO(item_to_task, "任务号", "DB113.D4")); + list.add(new ItemDTO(item_to_barcode, "条码", "DB113.W8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefinition.java similarity index 62% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefinition.java index c4e9427..b9f2045 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; * */ @Service -public class LnshLaminatingMachineDefination implements OpcDeviceDriverDefination { +public class LnshLaminatingMachineDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_Laminating_machine"; @@ -34,7 +34,7 @@ public class LnshLaminatingMachineDefination implements OpcDeviceDriverDefinatio @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshLaminatingMachineDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshLaminatingMachineDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,23 +51,23 @@ public class LnshLaminatingMachineDefination implements OpcDeviceDriverDefinatio } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB.B1", true)); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB.B2")); - list.add(new ItemDto(ItemProtocol.item_container_type, "托盘类型", "DB.B3")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB.B4")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB.D6")); + public static List getReadableItemDtos2() { + List list = new ArrayList(); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB.B1", true)); + list.add(new ItemDTO(ItemProtocol.item_move, "光电开关信号", "DB.B2")); + list.add(new ItemDTO(ItemProtocol.item_container_type, "托盘类型", "DB.B3")); + list.add(new ItemDTO(ItemProtocol.item_error, "报警信号", "DB.B4")); + list.add(new ItemDTO(ItemProtocol.item_task, "任务号", "DB.D6")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/ItemProtocol.java index 560221d..454f97e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_crusher; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -118,27 +118,27 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_error, "故障", "DB1.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.D4")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D8")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D12")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D16")); - list.add(new ItemDto(item_close_time, "关机时间", "DB1.D20")); - list.add(new ItemDto(item_material, "当前生产物料", "DB1.S24")); - list.add(new ItemDto(item_waitBroken_weight, "待破碎重量", "DB1.D280")); - list.add(new ItemDto(item_alreadyBroken_weight, "已破碎重量", "DB1.D284")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB1.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB1.B2")); + list.add(new ItemDTO(item_error, "故障", "DB1.B3")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB1.D4")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB1.D8")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB1.D12")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB1.D16")); + list.add(new ItemDTO(item_close_time, "关机时间", "DB1.D20")); + list.add(new ItemDTO(item_material, "当前生产物料", "DB1.S24")); + list.add(new ItemDTO(item_waitBroken_weight, "待破碎重量", "DB1.D280")); + list.add(new ItemDTO(item_alreadyBroken_weight, "已破碎重量", "DB1.D284")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "DB2.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_error, "下发故障", "DB2.W2")); + list.add(new ItemDTO(item_to_command, "下发指令", "DB2.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_error, "下发故障", "DB2.W2")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDefinition.java similarity index 58% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDefinition.java index 08854a0..330277b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_crusher; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * 晟华破碎机 */ @Service -public class LnshCrusherDefination implements OpcDeviceDriverDefination { +public class LnshCrusherDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_crusher"; @@ -33,7 +33,7 @@ public class LnshCrusherDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshCrusherDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshCrusherDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -49,29 +49,29 @@ public class LnshCrusherDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { + public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "故障", "DB1.B3")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.D4")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D8")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D12")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D16")); - list.add(new ItemDto(ItemProtocol.item_close_time, "关机时间", "DB1.D20")); - list.add(new ItemDto(ItemProtocol.item_material, "当前生产物料", "DB1.S24")); - list.add(new ItemDto(ItemProtocol.item_waitBroken_weight, "待破碎重量", "DB1.D280")); - list.add(new ItemDto(ItemProtocol.item_alreadyBroken_weight, "已破碎重量", "DB1.D284")); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(ItemProtocol.item_status, "设备状态", "DB1.B2")); + list.add(new ItemDTO(ItemProtocol.item_error, "故障", "DB1.B3")); + list.add(new ItemDTO(ItemProtocol.item_open_time, "开机时间", "DB1.D4")); + list.add(new ItemDTO(ItemProtocol.item_standby_time, "待机时间", "DB1.D8")); + list.add(new ItemDTO(ItemProtocol.item_production_time, "生产时间", "DB1.D12")); + list.add(new ItemDTO(ItemProtocol.item_error_time, "故障时间", "DB1.D16")); + list.add(new ItemDTO(ItemProtocol.item_close_time, "关机时间", "DB1.D20")); + list.add(new ItemDTO(ItemProtocol.item_material, "当前生产物料", "DB1.S24")); + list.add(new ItemDTO(ItemProtocol.item_waitBroken_weight, "待破碎重量", "DB1.D280")); + list.add(new ItemDTO(ItemProtocol.item_alreadyBroken_weight, "已破碎重量", "DB1.D284")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java index c0d28ee..63b74c7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -150,25 +150,25 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB120.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB120.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB120.B2")); - list.add(new ItemDto(item_open_time, "开机时间", "DB120.STRING4.50")); - list.add(new ItemDto(item_close_time, "关机时间", "DB120.D56")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB120.D60")); - list.add(new ItemDto(item_production_time, "生产时间", "DB120.D64")); - list.add(new ItemDto(item_error_time, "故障时间", "DB120.D68")); - list.add(new ItemDto(item_container_qty, "托盘数", "DB120.D72")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB120.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB120.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB120.B2")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB120.STRING4.50")); + list.add(new ItemDTO(item_close_time, "关机时间", "DB120.D56")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB120.D60")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB120.D64")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB120.D68")); + list.add(new ItemDTO(item_container_qty, "托盘数", "DB120.D72")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "DB121.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB121.W2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB121.D4")); + list.add(new ItemDTO(item_to_command, "下发指令", "DB121.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "下发目标站", "DB121.W2")); + list.add(new ItemDTO(item_to_task, "下发任务号", "DB121.D4")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefinition.java similarity index 76% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefinition.java index fed43de..69294b6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; * 晟华叠盘机 */ @Service -public class LnshFoldDiscSiteDefination implements OpcDeviceDriverDefination { +public class LnshFoldDiscSiteDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_fold_disc_site"; @@ -33,7 +32,7 @@ public class LnshFoldDiscSiteDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshFoldDiscSiteDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshFoldDiscSiteDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -49,12 +48,12 @@ public class LnshFoldDiscSiteDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/ItemProtocol.java index 2e19f59..d441002 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_kiln_lane; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -108,25 +108,25 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB3.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB3.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB3.B2")); - list.add(new ItemDto(item_open_time, "开机时间", "DB3.STRING4.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB3.D56")); - list.add(new ItemDto(item_production_time, "生产时间", "DB3.D60")); - list.add(new ItemDto(item_error_time, "故障时间", "DB3.D64")); - list.add(new ItemDto(item_car_sum, "窑车总数", "DB3.D68")); - list.add(new ItemDto(item_nullCar_qty, "空窑车数", "DB3.D72")); - list.add(new ItemDto(item_burning_car_qty, "在烧窑车数", "DB3.D76")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB3.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB3.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB3.B2")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB3.STRING4.50")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB3.D56")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB3.D60")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB3.D64")); + list.add(new ItemDTO(item_car_sum, "窑车总数", "DB3.D68")); + list.add(new ItemDTO(item_nullCar_qty, "空窑车数", "DB3.D72")); + list.add(new ItemDTO(item_burning_car_qty, "在烧窑车数", "DB3.D76")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "DB4.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB4.STRING2.50")); + list.add(new ItemDTO(item_to_command, "下发指令", "DB4.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_material_code, "下发物料编号", "DB4.STRING2.50")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKiLnLaneDefinition.java similarity index 60% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKiLnLaneDefinition.java index 08bc1df..c6654bc 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKilnLaneDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_lane/LnshKiLnLaneDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_kiln_lane; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * 晟华窑车道 */ @Service -public class LnshKilnLaneDefination implements OpcDeviceDriverDefination { +public class LnshKiLnLaneDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_kiln_lane"; @@ -33,7 +33,7 @@ public class LnshKilnLaneDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshKilnLaneDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshKilnLaneDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -49,27 +49,27 @@ public class LnshKilnLaneDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { + public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB3.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB3.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB3.B2")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB3.STRING4.50")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB3.D56")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB3.D60")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB3.D64")); - list.add(new ItemDto(ItemProtocol.item_car_sum, "窑车总数", "DB3.D68")); - list.add(new ItemDto(ItemProtocol.item_nullCar_qty, "空窑车数", "DB3.D72")); - list.add(new ItemDto(ItemProtocol.item_burning_car_qty, "在烧窑车数", "DB3.D76")); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB3.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB3.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(ItemProtocol.item_status, "设备状态", "DB3.B2")); + list.add(new ItemDTO(ItemProtocol.item_open_time, "开机时间", "DB3.STRING4.50")); + list.add(new ItemDTO(ItemProtocol.item_standby_time, "待机时间", "DB3.D56")); + list.add(new ItemDTO(ItemProtocol.item_production_time, "生产时间", "DB3.D60")); + list.add(new ItemDTO(ItemProtocol.item_error_time, "故障时间", "DB3.D64")); + list.add(new ItemDTO(ItemProtocol.item_car_sum, "窑车总数", "DB3.D68")); + list.add(new ItemDTO(ItemProtocol.item_nullCar_qty, "空窑车数", "DB3.D72")); + list.add(new ItemDTO(ItemProtocol.item_burning_car_qty, "在烧窑车数", "DB3.D76")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/ItemProtocol.java index 1a42043..9e1b129 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_kiln_truss; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -98,23 +98,23 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.STRING4.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D56")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D60")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D64")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB1.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB1.B2")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB1.STRING4.50")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB1.D56")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB1.D60")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB1.D64")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "DB2.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D4")); + list.add(new ItemDTO(item_to_command, "下发指令", "DB2.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "下发目标站", "DB2.W2")); + list.add(new ItemDTO(item_to_task, "下发任务号", "DB2.D4")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKiLnTrussDefinition.java similarity index 77% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKiLnTrussDefinition.java index 9edd2cf..4e3bb4d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKilnTrussDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_kiln_truss/LnshKiLnTrussDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_kiln_truss; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; * 晟华入出窑桁架 */ @Service -public class LnshKilnTrussDefination implements OpcDeviceDriverDefination { +public class LnshKiLnTrussDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_kiln_truss"; @@ -33,7 +32,7 @@ public class LnshKilnTrussDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshKilnTrussDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshKilnTrussDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -49,12 +48,12 @@ public class LnshKilnTrussDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/ItemProtocol.java index 0c82a8d..fe1d4e2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_labeling_machine; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -103,24 +103,24 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB600.B2")); - list.add(new ItemDto(item_open_time, "开机时间", "DB600.D4")); - list.add(new ItemDto(item_close_time, "关机时间", "DB600.D8")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB600.D12")); - list.add(new ItemDto(item_production_time, "生产时间", "DB600.D16")); - list.add(new ItemDto(item_error_time, "故障时间", "DB600.D20")); - list.add(new ItemDto(item_labeling_qty, "贴标数量", "DB600.D24")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB600.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB600.B2")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB600.D4")); + list.add(new ItemDTO(item_close_time, "关机时间", "DB600.D8")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB600.D12")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB600.D16")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB600.D20")); + list.add(new ItemDTO(item_labeling_qty, "贴标数量", "DB600.D24")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "DB601.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB601.D2")); + list.add(new ItemDTO(item_to_command, "下发指令", "DB601.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_material_code, "下发物料编号", "DB601.D2")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDefinition.java similarity index 61% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDefinition.java index f72f359..f75b3f1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_labeling_machine/LnshLabelingMachineDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_labeling_machine; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * 晟华贴标机 */ @Service -public class LnshLabelingMachineDefination implements OpcDeviceDriverDefination { +public class LnshLabelingMachineDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_labeling_machine"; @@ -33,7 +33,7 @@ public class LnshLabelingMachineDefination implements OpcDeviceDriverDefination @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshLabelingMachineDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshLabelingMachineDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -49,26 +49,26 @@ public class LnshLabelingMachineDefination implements OpcDeviceDriverDefination } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { + public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB600.B3")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB600.D6")); - list.add(new ItemDto(ItemProtocol.item_close_time, "关机时间", "DB600.D10")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB600.D14")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB600.D18")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB600.D22")); - list.add(new ItemDto(ItemProtocol.item_labeling_qty, "贴标数量", "DB600.D26")); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); + list.add(new ItemDTO(ItemProtocol.item_status, "设备状态", "DB600.B3")); + list.add(new ItemDTO(ItemProtocol.item_open_time, "开机时间", "DB600.D6")); + list.add(new ItemDTO(ItemProtocol.item_close_time, "关机时间", "DB600.D10")); + list.add(new ItemDTO(ItemProtocol.item_standby_time, "待机时间", "DB600.D14")); + list.add(new ItemDTO(ItemProtocol.item_production_time, "生产时间", "DB600.D18")); + list.add(new ItemDTO(ItemProtocol.item_error_time, "故障时间", "DB600.D22")); + list.add(new ItemDTO(ItemProtocol.item_labeling_qty, "贴标数量", "DB600.D26")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java index 5a56ad2..76b30de 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_mixing_mill; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -133,30 +133,30 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB61.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB61.B1", Boolean.TRUE)); - list.add(new ItemDto(item_status, "设备状态", "DB61.B2")); - list.add(new ItemDto(item_error, "故障代码", "DB61.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB61.STRING4.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB61.D56")); - list.add(new ItemDto(item_production_time, "生产时间", "DB61.D60")); - list.add(new ItemDto(item_error_time, "故障时间", "DB61.D64")); - list.add(new ItemDto(item_weight, "当前生产重量", "DB61.D68")); - list.add(new ItemDto(item_order_No, "工单号", "DB61.STRING72.50")); - list.add(new ItemDto(item_mix_num, "碾次", "DB61.D124")); - list.add(new ItemDto(item_material, "当前生产物料", "DB61.STRING128.50")); + public static List getReadableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB61.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB61.B1", Boolean.TRUE)); + list.add(new ItemDTO(item_status, "设备状态", "DB61.B2")); + list.add(new ItemDTO(item_error, "故障代码", "DB61.B3")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB61.STRING4.50")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB61.D56")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB61.D60")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB61.D64")); + list.add(new ItemDTO(item_weight, "当前生产重量", "DB61.D68")); + list.add(new ItemDTO(item_order_No, "工单号", "DB61.STRING72.50")); + list.add(new ItemDTO(item_mix_num, "碾次", "DB61.D124")); + list.add(new ItemDTO(item_material, "当前生产物料", "DB61.STRING128.50")); return list; } - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "反馈", "DB51.W0", Boolean.TRUE)); - list.add(new ItemDto(item_to_error, "error", "DB51.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB51.STRING4.50")); - list.add(new ItemDto(item_to_weight, "生产重量", "DB51.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB51.STRING60.50")); + public static List getWriteableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(item_to_command, "反馈", "DB51.W0", Boolean.TRUE)); + list.add(new ItemDTO(item_to_error, "error", "DB51.W2")); + list.add(new ItemDTO(item_to_order_No, "工单号", "DB51.STRING4.50")); + list.add(new ItemDTO(item_to_weight, "生产重量", "DB51.D56")); + list.add(new ItemDTO(item_to_material_code, "下发物料编号", "DB51.STRING60.50")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefinition.java similarity index 76% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefinition.java index 436f1b4..b2d32b5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_mixing_mill; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -16,7 +15,7 @@ import java.util.List; * */ @Service -public class LnshMixingMillDefination implements OpcDeviceDriverDefination { +public class LnshMixingMillDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_mixing_mill"; @@ -34,7 +33,7 @@ public class LnshMixingMillDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshMixingMillDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshMixingMillDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,12 +50,12 @@ public class LnshMixingMillDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java index 0d7eef3..0797a99 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -112,26 +112,26 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(item_outKiln_move, "出窑光电", "DB1.B3")); - list.add(new ItemDto(item_outKiln_barcode, "出窑条码", "DB1.W4")); - list.add(new ItemDto(item_outKiln_device, "出窑设备", "DB1.D6")); - list.add(new ItemDto(item_open_time, "开机时间", "DB1.STRING10.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB1.D62")); - list.add(new ItemDto(item_production_time, "生产时间", "DB1.D66")); - list.add(new ItemDto(item_error_time, "故障时间", "DB1.D70")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB1.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB1.B2")); + list.add(new ItemDTO(item_outKiln_move, "出窑光电", "DB1.B3")); + list.add(new ItemDTO(item_outKiln_barcode, "出窑条码", "DB1.W4")); + list.add(new ItemDTO(item_outKiln_device, "出窑设备", "DB1.D6")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB1.STRING10.50")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB1.D62")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB1.D66")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB1.D70")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "DB1.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB1.W2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB1.D4")); + list.add(new ItemDTO(item_to_command, "下发指令", "DB1.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "下发目标站", "DB1.W2")); + list.add(new ItemDTO(item_to_task, "下发任务号", "DB1.D4")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKiLnTrussDefinition.java similarity index 60% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKiLnTrussDefinition.java index 668d493..c85679e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKiLnTrussDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * 晟华出窑桁架 */ @Service -public class LnshOutKilnTrussDefination implements OpcDeviceDriverDefination { +public class LnshOutKiLnTrussDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_out_kiln_truss"; @@ -33,7 +33,7 @@ public class LnshOutKilnTrussDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshOutKilnTrussDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshOutKilnTrussDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -49,27 +49,27 @@ public class LnshOutKilnTrussDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { + public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2")); - list.add(new ItemDto(ItemProtocol.item_outKiln_move, "出窑光电", "DB1.B3")); - list.add(new ItemDto(ItemProtocol.item_outKiln_barcode, "出窑条码", "DB1.W4")); - list.add(new ItemDto(ItemProtocol.item_outKiln_device, "出窑设备", "DB1.D6")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.STRING10.50")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D62")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D66")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D70")); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB1.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(ItemProtocol.item_status, "设备状态", "DB1.B2")); + list.add(new ItemDTO(ItemProtocol.item_outKiln_move, "出窑光电", "DB1.B3")); + list.add(new ItemDTO(ItemProtocol.item_outKiln_barcode, "出窑条码", "DB1.W4")); + list.add(new ItemDTO(ItemProtocol.item_outKiln_device, "出窑设备", "DB1.D6")); + list.add(new ItemDTO(ItemProtocol.item_open_time, "开机时间", "DB1.STRING10.50")); + list.add(new ItemDTO(ItemProtocol.item_standby_time, "待机时间", "DB1.D62")); + list.add(new ItemDTO(ItemProtocol.item_production_time, "生产时间", "DB1.D66")); + list.add(new ItemDTO(ItemProtocol.item_error_time, "故障时间", "DB1.D70")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/ItemProtocol.java index 250756c..b07b4c7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_line; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -159,34 +159,34 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "VB6000")); - list.add(new ItemDto(item_mode, "工作模式", "VB6001", Boolean.TRUE)); - list.add(new ItemDto(item_status, "设备状态", "VB6002")); - list.add(new ItemDto(item_open_time, "开机时间", "VB6010.20")); - list.add(new ItemDto(item_standby_time, "待机时间", "VD6030")); - list.add(new ItemDto(item_production_time, "生产时间", "VD6035")); - list.add(new ItemDto(item_error_time, "故障时间", "VD6040")); - list.add(new ItemDto(item_vehicle_code, "载具编码", "VW6005")); - list.add(new ItemDto(item_vehicle_type, "载具类型", "VB6003")); - list.add(new ItemDto(item_error, "故障类型", "VB6004")); + public static List getReadableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(item_heartbeat, "心跳", "VB6000")); + list.add(new ItemDTO(item_mode, "工作模式", "VB6001", Boolean.TRUE)); + list.add(new ItemDTO(item_status, "设备状态", "VB6002")); + list.add(new ItemDTO(item_open_time, "开机时间", "VB6010.20")); + list.add(new ItemDTO(item_standby_time, "待机时间", "VD6030")); + list.add(new ItemDTO(item_production_time, "生产时间", "VD6035")); + list.add(new ItemDTO(item_error_time, "故障时间", "VD6040")); + list.add(new ItemDTO(item_vehicle_code, "载具编码", "VW6005")); + list.add(new ItemDTO(item_vehicle_type, "载具类型", "VB6003")); + list.add(new ItemDTO(item_error, "故障类型", "VB6004")); return list; } - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发指令", "VW6100", Boolean.TRUE)); - list.add(new ItemDto(item_to_order_code, "下发订单编号", "VB6200.10")); - list.add(new ItemDto(item_to_customer, "下发客户名称", "VB6210.10")); - list.add(new ItemDto(item_to_product_name, "下发产品名称", "VB6220.20")); - list.add(new ItemDto(item_to_product_grade, "下发产品牌号", "VB6240.20")); - list.add(new ItemDto(item_to_single_weight, "下发单重", "VB6260.10")); - list.add(new ItemDto(item_to_qty, "下发数量", "VB6270.10")); - list.add(new ItemDto(item_to_weight, "下发净重", "VB6280.10")); - list.add(new ItemDto(item_to_date, "下发生产日期", "VB6290.10")); - list.add(new ItemDto(item_to_material_code, "下发产品编码", "VB6300.20")); - list.add(new ItemDto(item_to_brick_type, "下发砖型", "VB6320.10")); + public static List getWriteableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(item_to_command, "下发指令", "VW6100", Boolean.TRUE)); + list.add(new ItemDTO(item_to_order_code, "下发订单编号", "VB6200.10")); + list.add(new ItemDTO(item_to_customer, "下发客户名称", "VB6210.10")); + list.add(new ItemDTO(item_to_product_name, "下发产品名称", "VB6220.20")); + list.add(new ItemDTO(item_to_product_grade, "下发产品牌号", "VB6240.20")); + list.add(new ItemDTO(item_to_single_weight, "下发单重", "VB6260.10")); + list.add(new ItemDTO(item_to_qty, "下发数量", "VB6270.10")); + list.add(new ItemDTO(item_to_weight, "下发净重", "VB6280.10")); + list.add(new ItemDTO(item_to_date, "下发生产日期", "VB6290.10")); + list.add(new ItemDTO(item_to_material_code, "下发产品编码", "VB6300.20")); + list.add(new ItemDTO(item_to_brick_type, "下发砖型", "VB6320.10")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefinition.java similarity index 76% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefinition.java index f9731aa..972a9d2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_line; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; * 晟华包装机 */ @Service -public class LnshPackageLineDefination implements OpcDeviceDriverDefination { +public class LnshPackageLineDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_package_line"; @@ -33,7 +32,7 @@ public class LnshPackageLineDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshPackageLineDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshPackageLineDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -49,13 +48,13 @@ public class LnshPackageLineDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java index fb6e4a9..0c8d36d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -219,22 +219,22 @@ public class ItemProtocol { return "0"; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB80.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB80.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB80.B2")); - list.add(new ItemDto(item_error, "故障代码", "DB80.B3")); - list.add(new ItemDto(item_putStation, "当前码盘工位", "DB80.D4")); - list.add(new ItemDto(item_material, "当前物料", "DB80.STRING8.50")); - list.add(new ItemDto(item_qty, "拆/码垛数量", "DB80.D60")); - list.add(new ItemDto(item_open_time, "开机时间", "DB80.STRING64.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB80.D116")); - list.add(new ItemDto(item_production_time, "生产时间", "DB80.D120")); - list.add(new ItemDto(item_error_time, "故障时间", "DB80.D124")); - list.add(new ItemDto(item_order_No, "工单号", "DB80.STRING128.50")); - list.add(new ItemDto(item_grab_station, "当前抓取工位", "DB80.B130")); - list.add(new ItemDto(item_place_station, "当前放置工位", "DB80.B132")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB80.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB80.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB80.B2")); + list.add(new ItemDTO(item_error, "故障代码", "DB80.B3")); + list.add(new ItemDTO(item_putStation, "当前码盘工位", "DB80.D4")); + list.add(new ItemDTO(item_material, "当前物料", "DB80.STRING8.50")); + list.add(new ItemDTO(item_qty, "拆/码垛数量", "DB80.D60")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB80.STRING64.50")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB80.D116")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB80.D120")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB80.D124")); + list.add(new ItemDTO(item_order_No, "工单号", "DB80.STRING128.50")); + list.add(new ItemDTO(item_grab_station, "当前抓取工位", "DB80.B130")); + list.add(new ItemDTO(item_place_station, "当前放置工位", "DB80.B132")); // list.add(new ItemDto(item_product_code, "产品编号", "DB1.W184")); // list.add(new ItemDto(item_AlongSide, "A长边", "DB1.W186")); // list.add(new ItemDto(item_BshortSide, "B短边", "DB1.W188")); @@ -243,21 +243,21 @@ public class ItemProtocol { return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB81.B0")); - list.add(new ItemDto(item_to_error, "故障代码", "DB81.B1")); - list.add(new ItemDto(item_to_on_vehicle_qty, "托盘上数量", "DB81.W2")); - list.add(new ItemDto(item_to_tray_qty, "允许码垛数量", "DB81.W4")); - list.add(new ItemDto(item_to_vehicle_type, "托盘类型", "DB81.W6")); - list.add(new ItemDto(item_to_material, "下发物料编号", "DB81.STRING10.50")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB81.STRING62.50")); + list.add(new ItemDTO(item_to_feedback, "机器人动作反馈", "DB81.B0")); + list.add(new ItemDTO(item_to_error, "故障代码", "DB81.B1")); + list.add(new ItemDTO(item_to_on_vehicle_qty, "托盘上数量", "DB81.W2")); + list.add(new ItemDTO(item_to_tray_qty, "允许码垛数量", "DB81.W4")); + list.add(new ItemDTO(item_to_vehicle_type, "托盘类型", "DB81.W6")); + list.add(new ItemDTO(item_to_material, "下发物料编号", "DB81.STRING10.50")); + list.add(new ItemDTO(item_to_order_No, "工单号", "DB81.STRING62.50")); // list.add(new ItemDto(item_to_order_qty, "工单数量", "DB2.D106")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB81.B63")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB81.W64")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB81.W66")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB81.W68")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB81.W70")); + list.add(new ItemDTO(item_to_product_code, "产品编号", "DB81.B63")); + list.add(new ItemDTO(item_to_AlongSide, "A长边", "DB81.W64")); + list.add(new ItemDTO(item_to_BshortSide, "B短边", "DB81.W66")); + list.add(new ItemDTO(item_to_Htrapezoidal, "H梯形高", "DB81.W68")); + list.add(new ItemDTO(item_to_Wthickness, "W厚度", "DB81.W70")); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefinition.java similarity index 76% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefinition.java index 8f08ec6..ec1e0f8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_pallet_manipulator; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -16,7 +15,7 @@ import java.util.List; * */ @Service -public class LnshPackagePalletManipulatorDefination implements OpcDeviceDriverDefination { +public class LnshPackagePalletManipulatorDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_package_pallet_manipulator"; @@ -34,7 +33,7 @@ public class LnshPackagePalletManipulatorDefination implements OpcDeviceDriverDe @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshPackagePalletManipulatorDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshPackagePalletManipulatorDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,12 +50,12 @@ public class LnshPackagePalletManipulatorDefination implements OpcDeviceDriverDe } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index fffa987..e94c9cb 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -246,8 +246,8 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD if(grab_station>0) { GrabPlaceStationRequest request = new GrabPlaceStationRequest(); request.setDevice_code(this.getDevice_code()); - request.setRequest_medthod_code(RequestMethodEnum.apply_get_put_station.getCode()); - request.setRequest_medthod_name(RequestMethodEnum.apply_get_put_station.getName()); +// request.setRequest_medthod_code(RequestMethodEnum.apply_get_put_station.getCode()); +// request.setRequest_medthod_name(RequestMethodEnum.apply_get_put_station.getName()); List getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); List putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); request.setGet_station(getDeviceCodeList.get((grab_station)-1)); @@ -292,8 +292,8 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD if(place_station>0) { GrabPlaceStationRequest request = new GrabPlaceStationRequest(); request.setDevice_code(this.getDevice_code()); - request.setRequest_medthod_code(RequestMethodEnum.apply_get_put_station.getCode()); - request.setRequest_medthod_name(RequestMethodEnum.apply_get_put_station.getName()); +// request.setRequest_medthod_code(RequestMethodEnum.apply_get_put_station.getCode()); +// request.setRequest_medthod_name(RequestMethodEnum.apply_get_put_station.getName()); List getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); List putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); request.setGet_station(getDeviceCodeList.get((grab_station)-1)); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java index 1e861e0..4784996 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_site; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -125,27 +125,27 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB51.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB51.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB51.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B5")); - list.add(new ItemDto(item_task, "任务号", "DB51.D6")); - list.add(new ItemDto(item_is_weight, "重量", "DB51.D10")); - list.add(new ItemDto(item_material, "物料", "DB51.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB51.W66")); + public static List getReadableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB51.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB51.B2")); + list.add(new ItemDTO(item_action, "取放信号", "DB51.B3")); + list.add(new ItemDTO(item_ioaction, "进出信号", "DB51.B4")); + list.add(new ItemDTO(item_error, "报警信号", "DB51.B5")); + list.add(new ItemDTO(item_task, "任务号", "DB51.D6")); + list.add(new ItemDTO(item_is_weight, "重量", "DB51.D10")); + list.add(new ItemDTO(item_material, "物料", "DB51.STRING14.50")); + list.add(new ItemDTO(item_barcode, "条码", "DB51.W66")); return list; } - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发指令", "DB51.B0", Boolean.TRUE)); - list.add(new ItemDto(item_to_target, "下发目标站", "DB51.B2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB51.B4")); - list.add(new ItemDto(item_to_is_package, "下发是否包装", "DB51.B8")); + public static List getWriteableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(item_to_command, "下发指令", "DB51.B0", Boolean.TRUE)); + list.add(new ItemDTO(item_to_target, "下发目标站", "DB51.B2")); + list.add(new ItemDTO(item_to_task, "下发任务号", "DB51.B4")); + list.add(new ItemDTO(item_to_is_package, "下发是否包装", "DB51.B8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefinition.java similarity index 57% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefinition.java index edac139..20251ea 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_package_site; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; * */ @Service -public class LnshPackageSiteDefination implements OpcDeviceDriverDefination { +public class LnshPackageSiteDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_package_site"; @@ -34,7 +34,7 @@ public class LnshPackageSiteDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshPackageSiteDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshPackageSiteDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,27 +51,27 @@ public class LnshPackageSiteDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB51.B1", Boolean.TRUE)); - list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "DB51.B2")); - list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "DB51.B3")); - list.add(new ItemDto(ItemProtocol.item_ioaction, "进出信号", "DB51.B4")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB51.B5")); - list.add(new ItemDto(ItemProtocol.item_task, "任务号", "DB51.B6")); - list.add(new ItemDto(ItemProtocol.item_is_weight, "重量", "DB51.B10")); - list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB51.STRING14.50")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB51.B66")); + public static List getReadableItemDtos2() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB51.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB51.B1", Boolean.TRUE)); + list.add(new ItemDTO(ItemProtocol.item_move, "光电开关信号", "DB51.B2")); + list.add(new ItemDTO(ItemProtocol.item_action, "取放信号", "DB51.B3")); + list.add(new ItemDTO(ItemProtocol.item_ioaction, "进出信号", "DB51.B4")); + list.add(new ItemDTO(ItemProtocol.item_error, "报警信号", "DB51.B5")); + list.add(new ItemDTO(ItemProtocol.item_task, "任务号", "DB51.B6")); + list.add(new ItemDTO(ItemProtocol.item_is_weight, "重量", "DB51.B10")); + list.add(new ItemDTO(ItemProtocol.item_material, "物料", "DB51.STRING14.50")); + list.add(new ItemDTO(ItemProtocol.item_barcode, "条码", "DB51.B66")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/ItemProtocol.java index 031a4dc..727cacd 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_pallet_storage; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -113,26 +113,26 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB600.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB600.D6")); - list.add(new ItemDto(item_close_time, "关机时间", "DB600.D10")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB600.D14")); - list.add(new ItemDto(item_production_time, "生产时间", "DB600.D18")); - list.add(new ItemDto(item_error_time, "故障时间", "DB600.D22")); - list.add(new ItemDto(item_tray_crib_qty, "托盘垛数", "DB600.D26")); - list.add(new ItemDto(item_total_container, "托盘总数量", "DB600.D30")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB600.B3")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB600.D6")); + list.add(new ItemDTO(item_close_time, "关机时间", "DB600.D10")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB600.D14")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB600.D18")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB600.D22")); + list.add(new ItemDTO(item_tray_crib_qty, "托盘垛数", "DB600.D26")); + list.add(new ItemDTO(item_total_container, "托盘总数量", "DB600.D30")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发指令", "DB601.W2", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "下发目标站", "DB601.W4")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB601.D8")); + list.add(new ItemDTO(item_to_command, "下发指令", "DB601.W2", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "下发目标站", "DB601.W4")); + list.add(new ItemDTO(item_to_task, "下发任务号", "DB601.D8")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefinition.java similarity index 60% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefinition.java index 74cc6aa..c6785e8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_pallet_storage/LnshPalletStorageDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_pallet_storage; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * 晟华托盘存储线 */ @Service -public class LnshPalletStorageDefination implements OpcDeviceDriverDefination { +public class LnshPalletStorageDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_pallet_storage"; @@ -33,7 +33,7 @@ public class LnshPalletStorageDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshPalletStorageDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshPalletStorageDeviceDriver()).setDevice(device).setDriverDefinition(this); } @Override @@ -49,27 +49,27 @@ public class LnshPalletStorageDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { + public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB600.B3")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB600.D6")); - list.add(new ItemDto(ItemProtocol.item_close_time, "关机时间", "DB600.D10")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB600.D14")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB600.D18")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB600.D22")); - list.add(new ItemDto(ItemProtocol.item_tray_crib_qty, "托盘垛数", "DB600.D26")); - list.add(new ItemDto(ItemProtocol.item_total_container, "托盘总数量", "DB600.D30")); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); + list.add(new ItemDTO(ItemProtocol.item_status, "设备状态", "DB600.B3")); + list.add(new ItemDTO(ItemProtocol.item_open_time, "开机时间", "DB600.D6")); + list.add(new ItemDTO(ItemProtocol.item_close_time, "关机时间", "DB600.D10")); + list.add(new ItemDTO(ItemProtocol.item_standby_time, "待机时间", "DB600.D14")); + list.add(new ItemDTO(ItemProtocol.item_production_time, "生产时间", "DB600.D18")); + list.add(new ItemDTO(ItemProtocol.item_error_time, "故障时间", "DB600.D22")); + list.add(new ItemDTO(ItemProtocol.item_tray_crib_qty, "托盘垛数", "DB600.D26")); + list.add(new ItemDTO(ItemProtocol.item_total_container, "托盘总数量", "DB600.D30")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java index a14c5af..563741a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/ItemProtocol.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -210,44 +210,44 @@ public class ItemProtocol { return 0f; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB112.B2")); - list.add(new ItemDto(item_status, "设备动作", "DB112.B3")); - list.add(new ItemDto(item_error, "故障代码", "DB112.B4")); - list.add(new ItemDto(item_open_time, "开机时间", "DB112.STRING6.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB112.D58")); - list.add(new ItemDto(item_production_time, "生产时间", "DB112.D62")); - list.add(new ItemDto(item_error_time, "故障时间", "DB112.D66")); - list.add(new ItemDto(item_get_station, "当前抓取工位", "DB112.B70")); - list.add(new ItemDto(item_put_station, "当前放置工位", "DB112.B71")); - list.add(new ItemDto(item_is_qualified, "是否合格", "DB112.B72")); - list.add(new ItemDto(item_laser_marking_code, "激光标刻码", "DB112.STRING74.50")); - list.add(new ItemDto(item_grinding_number, "碾次", "DB112.STRING126.50")); - list.add(new ItemDto(item_height1, "高度1", "DB112.REAL178")); - list.add(new ItemDto(item_height2, "高度2", "DB112.REAL182")); - list.add(new ItemDto(item_height3, "高度3", "DB112.REAL186")); - list.add(new ItemDto(item_height4, "高度4", "DB112.REAL190")); - list.add(new ItemDto(item_width1, "宽度1", "DB112.REAL194")); - list.add(new ItemDto(item_width2, "宽度2", "DB112.REAL198")); - list.add(new ItemDto(item_len, "长度", "DB112.REAL202")); - list.add(new ItemDto(item_volume, "体积", "DB112.REAL206")); - list.add(new ItemDto(item_flatness, "平面度", "DB112.REAL210")); - list.add(new ItemDto(item_unqualified_qty, "缺陷个数", "DB112.REAL214")); - list.add(new ItemDto(item_weight, "重量", "DB112.REAL218")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB112.B2")); + list.add(new ItemDTO(item_status, "设备动作", "DB112.B3")); + list.add(new ItemDTO(item_error, "故障代码", "DB112.B4")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB112.STRING6.50")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB112.D58")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB112.D62")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB112.D66")); + list.add(new ItemDTO(item_get_station, "当前抓取工位", "DB112.B70")); + list.add(new ItemDTO(item_put_station, "当前放置工位", "DB112.B71")); + list.add(new ItemDTO(item_is_qualified, "是否合格", "DB112.B72")); + list.add(new ItemDTO(item_laser_marking_code, "激光标刻码", "DB112.STRING74.50")); + list.add(new ItemDTO(item_grinding_number, "碾次", "DB112.STRING126.50")); + list.add(new ItemDTO(item_height1, "高度1", "DB112.REAL178")); + list.add(new ItemDTO(item_height2, "高度2", "DB112.REAL182")); + list.add(new ItemDTO(item_height3, "高度3", "DB112.REAL186")); + list.add(new ItemDTO(item_height4, "高度4", "DB112.REAL190")); + list.add(new ItemDTO(item_width1, "宽度1", "DB112.REAL194")); + list.add(new ItemDTO(item_width2, "宽度2", "DB112.REAL198")); + list.add(new ItemDTO(item_len, "长度", "DB112.REAL202")); + list.add(new ItemDTO(item_volume, "体积", "DB112.REAL206")); + list.add(new ItemDTO(item_flatness, "平面度", "DB112.REAL210")); + list.add(new ItemDTO(item_unqualified_qty, "缺陷个数", "DB112.REAL214")); + list.add(new ItemDTO(item_weight, "重量", "DB112.REAL218")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB113.W0", Boolean.TRUE)); - list.add(new ItemDto(item_to_error, "error", "DB113.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB113.STRING4.50")); - list.add(new ItemDto(item_to_weight, "生产重量", "DB113.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB113.STRING60.50")); + list.add(new ItemDTO(item_to_command, "反馈", "DB113.W0", Boolean.TRUE)); + list.add(new ItemDTO(item_to_error, "error", "DB113.W2")); + list.add(new ItemDTO(item_to_order_No, "工单号", "DB113.STRING4.50")); + list.add(new ItemDTO(item_to_weight, "生产重量", "DB113.D56")); + list.add(new ItemDTO(item_to_material_code, "下发物料编号", "DB113.STRING60.50")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefinition.java similarity index 76% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefinition.java index cd74017..a99b562 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -16,7 +15,7 @@ import java.util.List; * */ @Service -public class LnshPalletizingManipulatorDefination implements OpcDeviceDriverDefination { +public class LnshPalletizingManipulatorDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_palletizing_manipulator"; @@ -34,7 +33,7 @@ public class LnshPalletizingManipulatorDefination implements OpcDeviceDriverDefi @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshPalletizingManipulatorDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshPalletizingManipulatorDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,12 +50,12 @@ public class LnshPalletizingManipulatorDefination implements OpcDeviceDriverDefi } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java index cbb053c..5cf681f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/ItemProtocol.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -667,136 +667,136 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB112.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB112.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB112.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB112.B5")); - list.add(new ItemDto(item_task, "任务号", "DB112.D6")); - list.add(new ItemDto(item_weight, "重量", "DB112.D10")); - list.add(new ItemDto(item_material, "物料", "DB112.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB112.W66")); - list.add(new ItemDto(item_encoder_qty, "码盘位当前码盘数量", "DB112.W68")); - list.add(new ItemDto(item_unqualified_qty, "不合格数量", "DB112.W70")); - list.add(new ItemDto(item_product_code, "产品编号", "DB112.B72")); - list.add(new ItemDto(item_AlongSide, "A长边", "DB112.W74")); - list.add(new ItemDto(item_BshortSide, "B短边", "DB112.W76")); - list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB112.W78")); - list.add(new ItemDto(item_Wthickness, "W厚度", "DB112.W80")); - list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB112.W82")); - list.add(new ItemDto(item_tray_high, "垛盘高度", "DB112.W84")); - list.add(new ItemDto(item_crib_category, "垛型类别", "DB112.W86")); - list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB112.W88")); - list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB112.W90")); - list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB112.W92")); - list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB112.W94")); - list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB112.W96")); - list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB112.W98")); - list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB112.W100")); - list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB112.W102")); - list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB112.W104")); - list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB112.W106")); - list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB112.W108")); - list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB112.W110")); - list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB112.W112")); - list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB112.W114")); - list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB112.W116")); - list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB112.W118")); - list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB112.W120")); - list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB112.W122")); - list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB112.W124")); - list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB112.W126")); - list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB112.W128")); - list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB112.W130")); - list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB112.W132")); - list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB112.W134")); - list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB112.W136")); - list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB112.W138")); - list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB112.W140")); - list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB112.W142")); - list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB112.W144")); - list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB112.W146")); - list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB112.W148")); - list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB112.W150")); - list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB112.W152")); - list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB112.W154")); - list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB112.W156")); - list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB112.W158")); - list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB112.W160")); - list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB112.W162")); - list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB112.W164")); - list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB112.W166")); - list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB112.W168")); - list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB112.W170")); - list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB112.W172")); - list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB112.W174")); - list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB112.W176")); - list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB112.W178")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB112.B2")); + list.add(new ItemDTO(item_action, "取放信号", "DB112.B3")); + list.add(new ItemDTO(item_ioaction, "进出信号", "DB112.B4")); + list.add(new ItemDTO(item_error, "报警信号", "DB112.B5")); + list.add(new ItemDTO(item_task, "任务号", "DB112.D6")); + list.add(new ItemDTO(item_weight, "重量", "DB112.D10")); + list.add(new ItemDTO(item_material, "物料", "DB112.STRING14.50")); + list.add(new ItemDTO(item_barcode, "条码", "DB112.W66")); + list.add(new ItemDTO(item_encoder_qty, "码盘位当前码盘数量", "DB112.W68")); + list.add(new ItemDTO(item_unqualified_qty, "不合格数量", "DB112.W70")); + list.add(new ItemDTO(item_product_code, "产品编号", "DB112.B72")); + list.add(new ItemDTO(item_AlongSide, "A长边", "DB112.W74")); + list.add(new ItemDTO(item_BshortSide, "B短边", "DB112.W76")); + list.add(new ItemDTO(item_Htrapezoidal, "H梯形高", "DB112.W78")); + list.add(new ItemDTO(item_Wthickness, "W厚度", "DB112.W80")); + list.add(new ItemDTO(item_tray_qty, "当前垛盘数", "DB112.W82")); + list.add(new ItemDTO(item_tray_high, "垛盘高度", "DB112.W84")); + list.add(new ItemDTO(item_crib_category, "垛型类别", "DB112.W86")); + list.add(new ItemDTO(item_palletX1_line, "码垛X1行", "DB112.W88")); + list.add(new ItemDTO(item_palletY1_row, "码垛Y1列", "DB112.W90")); + list.add(new ItemDTO(item_palletA1_angle, "码垛A1角度", "DB112.W92")); + list.add(new ItemDTO(item_palletX2_line, "码垛X2行", "DB112.W94")); + list.add(new ItemDTO(item_palletY2_row, "码垛Y2列", "DB112.W96")); + list.add(new ItemDTO(item_palletA2_angle, "码垛A2角度", "DB112.W98")); + list.add(new ItemDTO(item_palletX3_line, "码垛X3行", "DB112.W100")); + list.add(new ItemDTO(item_palletY3_row, "码垛Y3列", "DB112.W102")); + list.add(new ItemDTO(item_palletA3_angle, "码垛A3角度", "DB112.W104")); + list.add(new ItemDTO(item_pressCribX1_line, "压垛X1行", "DB112.W106")); + list.add(new ItemDTO(item_pressCribY1_row, "压垛Y1列", "DB112.W108")); + list.add(new ItemDTO(item_pressCribA1_angle, "压垛A1角度", "DB112.W110")); + list.add(new ItemDTO(item_pressCribX2_line, "压垛X2行", "DB112.W112")); + list.add(new ItemDTO(item_pressCribY2_row, "压垛Y2列", "DB112.W114")); + list.add(new ItemDTO(item_pressCribA2_angle, "压垛A2角度", "DB112.W116")); + list.add(new ItemDTO(item_pressCribX3_line, "压垛X3行", "DB112.W118")); + list.add(new ItemDTO(item_pressCribY3_row, "压垛Y3列", "DB112.W120")); + list.add(new ItemDTO(item_pressCribA3_angle, "压垛A3角度", "DB112.W122")); + list.add(new ItemDTO(item_Zoffset, "Z轴偏移", "DB112.W124")); + list.add(new ItemDTO(item_pallet_layerQty, "码垛层数", "DB112.W126")); + list.add(new ItemDTO(item_pressCrib_layerQty, "压垛层数", "DB112.W128")); + list.add(new ItemDTO(item_codeLayerX1_interval, "码层X1间隔", "DB112.W130")); + list.add(new ItemDTO(item_codeLayerY1_interval, "码层Y1间隔", "DB112.W132")); + list.add(new ItemDTO(item_codeLayerX2_interval, "码层X2间隔", "DB112.W134")); + list.add(new ItemDTO(item_codeLayerY2_interval, "码层Y2间隔", "DB112.W136")); + list.add(new ItemDTO(item_codeLayerX3_interval, "码层X3间隔", "DB112.W138")); + list.add(new ItemDTO(item_codeLayerY3_interval, "码层Y3间隔", "DB112.W140")); + list.add(new ItemDTO(item_codeLayerX1_offset, "码层X1偏移", "DB112.W142")); + list.add(new ItemDTO(item_codeLayerY1_offset, "码层Y1偏移", "DB112.W144")); + list.add(new ItemDTO(item_codeLayerX2_offset, "码层X2偏移", "DB112.W146")); + list.add(new ItemDTO(item_codeLayerY2_offset, "码层Y2偏移", "DB112.W148")); + list.add(new ItemDTO(item_codeLayerX3_offset, "码层X3偏移", "DB112.W150")); + list.add(new ItemDTO(item_codeLayerY3_offset, "码层Y3偏移", "DB112.W152")); + list.add(new ItemDTO(item_pressLayerX1_interval, "压层X1间隔", "DB112.W154")); + list.add(new ItemDTO(item_pressLayerY1_interval, "压层Y1间隔", "DB112.W156")); + list.add(new ItemDTO(item_pressLayerX2_interval, "压层X2间隔", "DB112.W158")); + list.add(new ItemDTO(item_pressLayerY2_interval, "压层Y2间隔", "DB112.W160")); + list.add(new ItemDTO(item_pressLayerX3_interval, "压层X3间隔", "DB112.W162")); + list.add(new ItemDTO(item_pressLayerY3_interval, "压层Y3间隔", "DB112.W164")); + list.add(new ItemDTO(item_pressLayerX1_offset, "压层X1偏移", "DB112.W166")); + list.add(new ItemDTO(item_pressLayerY1_offset, "压层Y1偏移", "DB112.W168")); + list.add(new ItemDTO(item_pressLayerX2_offset, "压层X2偏移", "DB112.W170")); + list.add(new ItemDTO(item_pressLayerY2_offset, "压层Y2偏移", "DB112.W172")); + list.add(new ItemDTO(item_pressLayerX3_offset, "压层X3偏移", "DB112.W174")); + list.add(new ItemDTO(item_pressLayerY3_offset, "压层Y3偏移", "DB112.W176")); + list.add(new ItemDTO(item_tool_coordinate, "工具坐标", "DB112.W178")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB113.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB113.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB113.D4")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB113.B8")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB113.W10")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB113.W12")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB113.W14")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB113.W16")); - list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB113.W18")); - list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB113.W20")); - list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB113.W22")); - list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB113.W24")); - list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB113.W26")); - list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB113.W28")); - list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB113.W30")); - list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB113.W32")); - list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB113.W34")); - list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB113.W36")); - list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB113.W38")); - list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB113.W40")); - list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB113.W42")); - list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB113.W44")); - list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB113.W46")); - list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB113.W48")); - list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB113.W50")); - list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB113.W52")); - list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB113.W54")); - list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB113.W56")); - list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB113.W58")); - list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB113.W60")); - list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB113.W62")); - list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB113.W64")); - list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB113.W66")); - list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB113.W68")); - list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB113.W70")); - list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB113.W72")); - list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB113.W74")); - list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB113.W76")); - list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB113.W78")); - list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB113.W80")); - list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB113.W82")); - list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB113.W84")); - list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB113.W86")); - list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB113.W88")); - list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB113.W90")); - list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB113.W92")); - list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB113.W94")); - list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB113.W96")); - list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB113.W98")); - list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB113.W100")); - list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB113.W102")); - list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB113.W104")); - list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB113.W106")); - list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB113.W108")); - list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB113.W110")); - list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB113.W112")); - list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB113.W114")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB113.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB113.W2")); + list.add(new ItemDTO(item_to_task, "任务号", "DB113.D4")); + list.add(new ItemDTO(item_to_product_code, "产品编号", "DB113.B8")); + list.add(new ItemDTO(item_to_AlongSide, "A长边", "DB113.W10")); + list.add(new ItemDTO(item_to_BshortSide, "B短边", "DB113.W12")); + list.add(new ItemDTO(item_to_Htrapezoidal, "H梯形高", "DB113.W14")); + list.add(new ItemDTO(item_to_Wthickness, "W厚度", "DB113.W16")); + list.add(new ItemDTO(item_to_tray_qty, "当前垛盘数", "DB113.W18")); + list.add(new ItemDTO(item_to_tray_high, "垛盘高度", "DB113.W20")); + list.add(new ItemDTO(item_to_crib_category, "垛型类别", "DB113.W22")); + list.add(new ItemDTO(item_to_palletX1_line, "码垛X1行", "DB113.W24")); + list.add(new ItemDTO(item_to_palletY1_row, "码垛Y1列", "DB113.W26")); + list.add(new ItemDTO(item_to_palletA1_angle, "码垛A1角度", "DB113.W28")); + list.add(new ItemDTO(item_to_palletX2_line, "码垛X2行", "DB113.W30")); + list.add(new ItemDTO(item_to_palletY2_row, "码垛Y2列", "DB113.W32")); + list.add(new ItemDTO(item_to_palletA2_angle, "码垛A2角度", "DB113.W34")); + list.add(new ItemDTO(item_to_palletX3_line, "码垛X3行", "DB113.W36")); + list.add(new ItemDTO(item_to_palletY3_row, "码垛Y3列", "DB113.W38")); + list.add(new ItemDTO(item_to_palletA3_angle, "码垛A3角度", "DB113.W40")); + list.add(new ItemDTO(item_to_pressCribX1_line, "压垛X1行", "DB113.W42")); + list.add(new ItemDTO(item_to_pressCribY1_row, "压垛Y1列", "DB113.W44")); + list.add(new ItemDTO(item_to_pressCribA1_angle, "压垛A1角度", "DB113.W46")); + list.add(new ItemDTO(item_to_pressCribX2_line, "压垛X2行", "DB113.W48")); + list.add(new ItemDTO(item_to_pressCribY2_row, "压垛Y2列", "DB113.W50")); + list.add(new ItemDTO(item_to_pressCribA2_angle, "压垛A2角度", "DB113.W52")); + list.add(new ItemDTO(item_to_pressCribX3_line, "压垛X3行", "DB113.W54")); + list.add(new ItemDTO(item_to_pressCribY3_row, "压垛Y3列", "DB113.W56")); + list.add(new ItemDTO(item_to_pressCribA3_angle, "压垛A3角度", "DB113.W58")); + list.add(new ItemDTO(item_to_Zoffset, "Z轴偏移", "DB113.W60")); + list.add(new ItemDTO(item_to_pallet_layerQty, "码垛层数", "DB113.W62")); + list.add(new ItemDTO(item_to_pressCrib_layerQty, "压垛层数", "DB113.W64")); + list.add(new ItemDTO(item_to_codeLayerX1_interval, "码层X1间隔", "DB113.W66")); + list.add(new ItemDTO(item_to_codeLayerY1_interval, "码层Y1间隔", "DB113.W68")); + list.add(new ItemDTO(item_to_codeLayerX2_interval, "码层X2间隔", "DB113.W70")); + list.add(new ItemDTO(item_to_codeLayerY2_interval, "码层Y2间隔", "DB113.W72")); + list.add(new ItemDTO(item_to_codeLayerX3_interval, "码层X3间隔", "DB113.W74")); + list.add(new ItemDTO(item_to_codeLayerY3_interval, "码层Y3间隔", "DB113.W76")); + list.add(new ItemDTO(item_to_codeLayerX1_offset, "码层X1偏移", "DB113.W78")); + list.add(new ItemDTO(item_to_codeLayerY1_offset, "码层Y1偏移", "DB113.W80")); + list.add(new ItemDTO(item_to_codeLayerX2_offset, "码层X2偏移", "DB113.W82")); + list.add(new ItemDTO(item_to_codeLayerY2_offset, "码层Y2偏移", "DB113.W84")); + list.add(new ItemDTO(item_to_codeLayerX3_offset, "码层X3偏移", "DB113.W86")); + list.add(new ItemDTO(item_to_codeLayerY3_offset, "码层Y3偏移", "DB113.W88")); + list.add(new ItemDTO(item_to_pressLayerX1_interval, "压层X1间隔", "DB113.W90")); + list.add(new ItemDTO(item_to_pressLayerY1_interval, "压层Y1间隔", "DB113.W92")); + list.add(new ItemDTO(item_to_pressLayerX2_interval, "压层X2间隔", "DB113.W94")); + list.add(new ItemDTO(item_to_pressLayerY2_interval, "压层Y2间隔", "DB113.W96")); + list.add(new ItemDTO(item_to_pressLayerX3_interval, "压层X3间隔", "DB113.W98")); + list.add(new ItemDTO(item_to_pressLayerY3_interval, "压层Y3间隔", "DB113.W100")); + list.add(new ItemDTO(item_to_pressLayerX1_offset, "压层X1偏移", "DB113.W102")); + list.add(new ItemDTO(item_to_pressLayerY1_offset, "压层Y1偏移", "DB113.W104")); + list.add(new ItemDTO(item_to_pressLayerX2_offset, "压层X2偏移", "DB113.W106")); + list.add(new ItemDTO(item_to_pressLayerY2_offset, "压层Y2偏移", "DB113.W108")); + list.add(new ItemDTO(item_to_pressLayerX3_offset, "压层X3偏移", "DB113.W110")); + list.add(new ItemDTO(item_to_pressLayerY3_offset, "压层Y3偏移", "DB113.W112")); + list.add(new ItemDTO(item_to_tool_coordinate, "工具坐标", "DB113.W114")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefinition.java similarity index 76% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefinition.java index 98bfe2f..6812423 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -16,7 +15,7 @@ import java.util.List; * */ @Service -public class LnshPalletizingManipulatorSiteDefination implements OpcDeviceDriverDefination { +public class LnshPalletizingManipulatorSiteDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_palletizing_manipulator_site"; @@ -34,7 +33,7 @@ public class LnshPalletizingManipulatorSiteDefination implements OpcDeviceDriver @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshPalletizingManipulatorSiteDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshPalletizingManipulatorSiteDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,12 +50,12 @@ public class LnshPalletizingManipulatorSiteDefination implements OpcDeviceDriver } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java index 738bc92..c605313 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/ItemProtocol.java @@ -3,7 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_press; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -205,48 +205,48 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB112.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB112.B2")); - list.add(new ItemDto(item_error, "故障", "DB112.B3")); - list.add(new ItemDto(item_open_time, "开机时间", "DB112.STRING4.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB112.D56")); - list.add(new ItemDto(item_production_time, "生产时间", "DB112.D60")); - list.add(new ItemDto(item_error_time, "故障时间", "DB112.D64")); - list.add(new ItemDto(item_material, "当前生产物料", "DB112.STRING68.50")); - list.add(new ItemDto(item_qty, "当前已生产数量", "DB112.D120")); - list.add(new ItemDto(item_weight, "当前已生产重量", "DB112.D124")); - list.add(new ItemDto(item_qualified, "当前已生产合格数", "DB112.D128")); - list.add(new ItemDto(item_unqualified, "当前已生产不合格数", "DB112.D132")); - list.add(new ItemDto(item_order_No, "工单号", "DB112.STRING136.50")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB112.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB112.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB112.B2")); + list.add(new ItemDTO(item_error, "故障", "DB112.B3")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB112.STRING4.50")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB112.D56")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB112.D60")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB112.D64")); + list.add(new ItemDTO(item_material, "当前生产物料", "DB112.STRING68.50")); + list.add(new ItemDTO(item_qty, "当前已生产数量", "DB112.D120")); + list.add(new ItemDTO(item_weight, "当前已生产重量", "DB112.D124")); + list.add(new ItemDTO(item_qualified, "当前已生产合格数", "DB112.D128")); + list.add(new ItemDTO(item_unqualified, "当前已生产不合格数", "DB112.D132")); + list.add(new ItemDTO(item_order_No, "工单号", "DB112.STRING136.50")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "反馈", "DB113.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_error, "error", "DB113.W2")); - list.add(new ItemDto(item_to_order_No, "工单号", "DB113.STRING4.50")); - list.add(new ItemDto(item_to_qty, "生产重量", "DB113.D56")); - list.add(new ItemDto(item_to_material_code, "下发物料编号", "DB113.STRING60.50")); - list.add(new ItemDto(item_to_brick_code, "砖型代号", "DB113.STRING112.50")); - list.add(new ItemDto(item_to_formula, "配方代号", "DB113.STRING164.50")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB113.W216")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB113.W218")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB113.W220")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB113.W222")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB113.W224")); - list.add(new ItemDto(item_to_size_error, "尺寸允许误差", "DB113.REAL228")); - list.add(new ItemDto(item_to_single_weight, "单重允许误差", "DB113.REAL232")); - list.add(new ItemDto(item_to_drawing_address, "图纸地址", "DB113.REAL236")); - list.add(new ItemDto(item_to_standard_weight, "标准重量", "DB113.REAL240")); - list.add(new ItemDto(item_to_detection_error, "检测误差值", "DB113.REAL244")); - list.add(new ItemDto(item_to_standard_size_height1, "标准尺寸高度1", "DB113.REAL248")); - list.add(new ItemDto(item_to_standard_size_height2, "标准尺寸高度2", "DB113.REAL252")); - list.add(new ItemDto(item_to_standard_size_height3, "标准尺寸高度3", "DB113.REAL256")); - list.add(new ItemDto(item_to_standard_size_height4, "标准尺寸高度4", "DB113.REAL260")); + list.add(new ItemDTO(item_to_command, "反馈", "DB113.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_error, "error", "DB113.W2")); + list.add(new ItemDTO(item_to_order_No, "工单号", "DB113.STRING4.50")); + list.add(new ItemDTO(item_to_qty, "生产重量", "DB113.D56")); + list.add(new ItemDTO(item_to_material_code, "下发物料编号", "DB113.STRING60.50")); + list.add(new ItemDTO(item_to_brick_code, "砖型代号", "DB113.STRING112.50")); + list.add(new ItemDTO(item_to_formula, "配方代号", "DB113.STRING164.50")); + list.add(new ItemDTO(item_to_product_code, "产品编号", "DB113.W216")); + list.add(new ItemDTO(item_to_AlongSide, "A长边", "DB113.W218")); + list.add(new ItemDTO(item_to_BshortSide, "B短边", "DB113.W220")); + list.add(new ItemDTO(item_to_Htrapezoidal, "H梯形高", "DB113.W222")); + list.add(new ItemDTO(item_to_Wthickness, "W厚度", "DB113.W224")); + list.add(new ItemDTO(item_to_size_error, "尺寸允许误差", "DB113.REAL228")); + list.add(new ItemDTO(item_to_single_weight, "单重允许误差", "DB113.REAL232")); + list.add(new ItemDTO(item_to_drawing_address, "图纸地址", "DB113.REAL236")); + list.add(new ItemDTO(item_to_standard_weight, "标准重量", "DB113.REAL240")); + list.add(new ItemDTO(item_to_detection_error, "检测误差值", "DB113.REAL244")); + list.add(new ItemDTO(item_to_standard_size_height1, "标准尺寸高度1", "DB113.REAL248")); + list.add(new ItemDTO(item_to_standard_size_height2, "标准尺寸高度2", "DB113.REAL252")); + list.add(new ItemDTO(item_to_standard_size_height3, "标准尺寸高度3", "DB113.REAL256")); + list.add(new ItemDTO(item_to_standard_size_height4, "标准尺寸高度4", "DB113.REAL260")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefinition.java similarity index 77% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefinition.java index cc4dc40..dd60133 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_press; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -16,7 +15,7 @@ import java.util.List; * */ @Service -public class LnshPressDefination implements OpcDeviceDriverDefination { +public class LnshPressDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_press"; @@ -34,7 +33,7 @@ public class LnshPressDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshPressDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshPressDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,13 +50,13 @@ public class LnshPressDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java index 689289b..2141e93 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/ItemProtocol.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -166,36 +166,36 @@ public class ItemProtocol { return "0"; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB50.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB50.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_status, "设备状态", "DB50.B2")); - list.add(new ItemDto(item_move1, "前工位光电信号", "DB50.B3")); - list.add(new ItemDto(item_move2, "后工位光电信号", "DB50.B4")); - list.add(new ItemDto(item_action1, "前工位动作信号", "DB50.B5")); - list.add(new ItemDto(item_action2, "后工位动作信号", "DB50.B6")); - list.add(new ItemDto(item_walk_y, "行走列", "DB50.B7")); - list.add(new ItemDto(item_error, "车体报警", "DB50.B8")); - list.add(new ItemDto(item_task1, "前工位任务号", "DB50.D10")); - list.add(new ItemDto(item_task2, "后工位任务号", "DB50.D14")); - list.add(new ItemDto(item_open_time, "开机时间", "DB50.STRING18.50")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB50.D70")); - list.add(new ItemDto(item_production_time, "生产时间", "DB50.D74")); - list.add(new ItemDto(item_error_time, "故障时间", "DB50.D78")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB50.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB50.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_status, "设备状态", "DB50.B2")); + list.add(new ItemDTO(item_move1, "前工位光电信号", "DB50.B3")); + list.add(new ItemDTO(item_move2, "后工位光电信号", "DB50.B4")); + list.add(new ItemDTO(item_action1, "前工位动作信号", "DB50.B5")); + list.add(new ItemDTO(item_action2, "后工位动作信号", "DB50.B6")); + list.add(new ItemDTO(item_walk_y, "行走列", "DB50.B7")); + list.add(new ItemDTO(item_error, "车体报警", "DB50.B8")); + list.add(new ItemDTO(item_task1, "前工位任务号", "DB50.D10")); + list.add(new ItemDTO(item_task2, "后工位任务号", "DB50.D14")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB50.STRING18.50")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB50.D70")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB50.D74")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB50.D78")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command1, "前工位下发指令", "DB51.W0")); - list.add(new ItemDto(item_to_onset1, "下发起始站", "DB51.W2")); - list.add(new ItemDto(item_to_target1, "下发目标站", "DB51.W4")); - list.add(new ItemDto(item_to_task1, "下发任务号", "DB51.D6")); - list.add(new ItemDto(item_to_command2, "后工位下发指令", "DB51.W10")); - list.add(new ItemDto(item_to_onset2, "下发起始站", "DB51.W12")); - list.add(new ItemDto(item_to_target2, "下发目标站", "DB51.W14")); - list.add(new ItemDto(item_to_task2, "下发任务号2", "DB51.D16")); + list.add(new ItemDTO(item_to_command1, "前工位下发指令", "DB51.W0")); + list.add(new ItemDTO(item_to_onset1, "下发起始站", "DB51.W2")); + list.add(new ItemDTO(item_to_target1, "下发目标站", "DB51.W4")); + list.add(new ItemDTO(item_to_task1, "下发任务号", "DB51.D6")); + list.add(new ItemDTO(item_to_command2, "后工位下发指令", "DB51.W10")); + list.add(new ItemDTO(item_to_onset2, "下发起始站", "DB51.W12")); + list.add(new ItemDTO(item_to_target2, "下发目标站", "DB51.W14")); + list.add(new ItemDTO(item_to_task2, "下发任务号2", "DB51.D16")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefinition.java similarity index 55% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefinition.java index 4174040..04d3f59 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.lnsh_rgv; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; * */ @Service -public class LnshRGVDefination implements OpcDeviceDriverDefination { +public class LnshRGVDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_rgv"; @@ -34,7 +34,7 @@ public class LnshRGVDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshRGVDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshRGVDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,32 +51,32 @@ public class LnshRGVDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return getReadableItemDtos2(); } - public static List getReadableItemDtos2() { + public static List getReadableItemDtos2() { ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB50.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB50.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB50.B2")); - list.add(new ItemDto(ItemProtocol.item_move1, "前工位光电信号", "DB50.B3")); - list.add(new ItemDto(ItemProtocol.item_move2, "后工位光电信号", "DB50.B4")); - list.add(new ItemDto(ItemProtocol.item_action1, "前工位动作信号", "DB50.B5")); - list.add(new ItemDto(ItemProtocol.item_action2, "后工位动作信号", "DB50.B6")); - list.add(new ItemDto(ItemProtocol.item_walk_y, "行走列", "DB50.B7")); - list.add(new ItemDto(ItemProtocol.item_error, "车体报警", "DB50.B8")); - list.add(new ItemDto(ItemProtocol.item_task1, "前工位任务号", "DB50.D10")); - list.add(new ItemDto(ItemProtocol.item_task2, "后工位任务号", "DB50.D14")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB50.STRING18.50")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB50.D70")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB50.D74")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB50.D78")); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB50.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB50.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(ItemProtocol.item_status, "设备状态", "DB50.B2")); + list.add(new ItemDTO(ItemProtocol.item_move1, "前工位光电信号", "DB50.B3")); + list.add(new ItemDTO(ItemProtocol.item_move2, "后工位光电信号", "DB50.B4")); + list.add(new ItemDTO(ItemProtocol.item_action1, "前工位动作信号", "DB50.B5")); + list.add(new ItemDTO(ItemProtocol.item_action2, "后工位动作信号", "DB50.B6")); + list.add(new ItemDTO(ItemProtocol.item_walk_y, "行走列", "DB50.B7")); + list.add(new ItemDTO(ItemProtocol.item_error, "车体报警", "DB50.B8")); + list.add(new ItemDTO(ItemProtocol.item_task1, "前工位任务号", "DB50.D10")); + list.add(new ItemDTO(ItemProtocol.item_task2, "后工位任务号", "DB50.D14")); + list.add(new ItemDTO(ItemProtocol.item_open_time, "开机时间", "DB50.STRING18.50")); + list.add(new ItemDTO(ItemProtocol.item_standby_time, "待机时间", "DB50.D70")); + list.add(new ItemDTO(ItemProtocol.item_production_time, "生产时间", "DB50.D74")); + list.add(new ItemDTO(ItemProtocol.item_error_time, "故障时间", "DB50.D78")); return list; } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java index f39f238..e28c016 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java @@ -1,11 +1,10 @@ package org.nl.acs.device_driver.lnsh.lnsh_split_manipulator; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -703,144 +702,144 @@ public class ItemProtocol { return "0"; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB7.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB7.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_error, "故障", "DB7.B3")); - list.add(new ItemDto(item_getStation, "当前抓取工位", "DB7.D4")); - list.add(new ItemDto(item_barcode, "条码", "DB7.S8")); - list.add(new ItemDto(item_open_time, "开机时间", "DB7.D264")); - list.add(new ItemDto(item_standby_time, "待机时间", "DB7.D520")); - list.add(new ItemDto(item_production_time, "生产时间", "DB7.D524")); - list.add(new ItemDto(item_error_time, "故障时间", "DB7.D528")); - list.add(new ItemDto(item_material, "物料", "DB7.D532")); - list.add(new ItemDto(item_total_split, "累计拆垛数量", "DB7.D536")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB7.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB7.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_error, "故障", "DB7.B3")); + list.add(new ItemDTO(item_getStation, "当前抓取工位", "DB7.D4")); + list.add(new ItemDTO(item_barcode, "条码", "DB7.S8")); + list.add(new ItemDTO(item_open_time, "开机时间", "DB7.D264")); + list.add(new ItemDTO(item_standby_time, "待机时间", "DB7.D520")); + list.add(new ItemDTO(item_production_time, "生产时间", "DB7.D524")); + list.add(new ItemDTO(item_error_time, "故障时间", "DB7.D528")); + list.add(new ItemDTO(item_material, "物料", "DB7.D532")); + list.add(new ItemDTO(item_total_split, "累计拆垛数量", "DB7.D536")); - list.add(new ItemDto(item_product_code, "产品编号", "DB7.D544")); - list.add(new ItemDto(item_AlongSide, "A长边", "DB7.D548")); - list.add(new ItemDto(item_BshortSide, "B短边", "DB7.D552")); - list.add(new ItemDto(item_Htrapezoidal, "H梯形高", "DB7.D556")); - list.add(new ItemDto(item_Wthickness, "W厚度", "DB7.D560")); - list.add(new ItemDto(item_tray_qty, "当前垛盘数", "DB7.D564")); - list.add(new ItemDto(item_tray_high, "垛盘高度", "DB7.D568")); - list.add(new ItemDto(item_crib_category, "垛型类别", "DB7.D572")); - list.add(new ItemDto(item_palletX1_line, "码垛X1行", "DB7.REAL576")); - list.add(new ItemDto(item_palletY1_row, "码垛Y1列", "DB7.REAL580")); - list.add(new ItemDto(item_palletA1_angle, "码垛A1角度", "DB7.REAL584")); - list.add(new ItemDto(item_palletX2_line, "码垛X2行", "DB7.REAL588")); - list.add(new ItemDto(item_palletY2_row, "码垛Y2列", "DB7.REAL592")); - list.add(new ItemDto(item_palletA2_angle, "码垛A2角度", "DB7.REAL596")); - list.add(new ItemDto(item_palletX3_line, "码垛X3行", "DB7.REAL600")); - list.add(new ItemDto(item_palletY3_row, "码垛Y3列", "DB7.REAL604")); - list.add(new ItemDto(item_palletA3_angle, "码垛A3角度", "DB7.REAL608")); - list.add(new ItemDto(item_pressCribX1_line, "压垛X1行", "DB7.REAL612")); - list.add(new ItemDto(item_pressCribY1_row, "压垛Y1列", "DB7.REAL616")); - list.add(new ItemDto(item_pressCribA1_angle, "压垛A1角度", "DB7.REAL620")); - list.add(new ItemDto(item_pressCribX2_line, "压垛X2行", "DB7.REAL624")); - list.add(new ItemDto(item_pressCribY2_row, "压垛Y2列", "DB7.REAL628")); - list.add(new ItemDto(item_pressCribA2_angle, "压垛A2角度", "DB7.REAL632")); - list.add(new ItemDto(item_pressCribX3_line, "压垛X3行", "DB7.REAL636")); - list.add(new ItemDto(item_pressCribY3_row, "压垛Y3列", "DB7.REAL640")); - list.add(new ItemDto(item_pressCribA3_angle, "压垛A3角度", "DB7.REAL644")); - list.add(new ItemDto(item_Zoffset, "Z轴偏移", "DB7.REAL648")); - list.add(new ItemDto(item_pallet_layerQty, "码垛层数", "DB7.D652")); - list.add(new ItemDto(item_pressCrib_layerQty, "压垛层数", "DB7.D656")); - list.add(new ItemDto(item_codeLayerX1_interval, "码层X1间隔", "DB7.REAL660")); - list.add(new ItemDto(item_codeLayerY1_interval, "码层Y1间隔", "DB7.REAL664")); - list.add(new ItemDto(item_codeLayerX2_interval, "码层X2间隔", "DB7.REAL668")); - list.add(new ItemDto(item_codeLayerY2_interval, "码层Y2间隔", "DB7.REAL672")); - list.add(new ItemDto(item_codeLayerX3_interval, "码层X3间隔", "DB7.REAL676")); - list.add(new ItemDto(item_codeLayerY3_interval, "码层Y3间隔", "DB7.REAL680")); - list.add(new ItemDto(item_codeLayerX1_offset, "码层X1偏移", "DB7.REAL684")); - list.add(new ItemDto(item_codeLayerY1_offset, "码层Y1偏移", "DB7.REAL688")); - list.add(new ItemDto(item_codeLayerX2_offset, "码层X2偏移", "DB7.REAL692")); - list.add(new ItemDto(item_codeLayerY2_offset, "码层Y2偏移", "DB7.REAL696")); - list.add(new ItemDto(item_codeLayerX3_offset, "码层X3偏移", "DB7.REAL700")); - list.add(new ItemDto(item_codeLayerY3_offset, "码层Y3偏移", "DB7.REAL704")); - list.add(new ItemDto(item_pressLayerX1_interval, "压层X1间隔", "DB7.REAL708")); - list.add(new ItemDto(item_pressLayerY1_interval, "压层Y1间隔", "DB7.REAL712")); - list.add(new ItemDto(item_pressLayerX2_interval, "压层X2间隔", "DB7.REAL716")); - list.add(new ItemDto(item_pressLayerY2_interval, "压层Y2间隔", "DB7.REAL720")); - list.add(new ItemDto(item_pressLayerX3_interval, "压层X3间隔", "DB7.REAL724")); - list.add(new ItemDto(item_pressLayerY3_interval, "压层Y3间隔", "DB7.REAL728")); - list.add(new ItemDto(item_pressLayerX1_offset, "压层X1偏移", "DB7.REAL732")); - list.add(new ItemDto(item_pressLayerY1_offset, "压层Y1偏移", "DB7.REAL736")); - list.add(new ItemDto(item_pressLayerX2_offset, "压层X2偏移", "DB7.REAL740")); - list.add(new ItemDto(item_pressLayerY2_offset, "压层Y2偏移", "DB7.REAL744")); - list.add(new ItemDto(item_pressLayerX3_offset, "压层X3偏移", "DB7.REAL748")); - list.add(new ItemDto(item_pressLayerY3_offset, "压层Y3偏移", "DB7.REAL752")); - list.add(new ItemDto(item_one_cribTotal, "1#垛总数", "DB7.D756")); - list.add(new ItemDto(item_two_cribTotal, "2#垛总数", "DB7.D760")); - list.add(new ItemDto(item_one_qty, "1#垛当前数", "DB7.D764")); - list.add(new ItemDto(item_two_qty, "2#垛当前数", "DB7.D768")); - list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB7.D772")); + list.add(new ItemDTO(item_product_code, "产品编号", "DB7.D544")); + list.add(new ItemDTO(item_AlongSide, "A长边", "DB7.D548")); + list.add(new ItemDTO(item_BshortSide, "B短边", "DB7.D552")); + list.add(new ItemDTO(item_Htrapezoidal, "H梯形高", "DB7.D556")); + list.add(new ItemDTO(item_Wthickness, "W厚度", "DB7.D560")); + list.add(new ItemDTO(item_tray_qty, "当前垛盘数", "DB7.D564")); + list.add(new ItemDTO(item_tray_high, "垛盘高度", "DB7.D568")); + list.add(new ItemDTO(item_crib_category, "垛型类别", "DB7.D572")); + list.add(new ItemDTO(item_palletX1_line, "码垛X1行", "DB7.REAL576")); + list.add(new ItemDTO(item_palletY1_row, "码垛Y1列", "DB7.REAL580")); + list.add(new ItemDTO(item_palletA1_angle, "码垛A1角度", "DB7.REAL584")); + list.add(new ItemDTO(item_palletX2_line, "码垛X2行", "DB7.REAL588")); + list.add(new ItemDTO(item_palletY2_row, "码垛Y2列", "DB7.REAL592")); + list.add(new ItemDTO(item_palletA2_angle, "码垛A2角度", "DB7.REAL596")); + list.add(new ItemDTO(item_palletX3_line, "码垛X3行", "DB7.REAL600")); + list.add(new ItemDTO(item_palletY3_row, "码垛Y3列", "DB7.REAL604")); + list.add(new ItemDTO(item_palletA3_angle, "码垛A3角度", "DB7.REAL608")); + list.add(new ItemDTO(item_pressCribX1_line, "压垛X1行", "DB7.REAL612")); + list.add(new ItemDTO(item_pressCribY1_row, "压垛Y1列", "DB7.REAL616")); + list.add(new ItemDTO(item_pressCribA1_angle, "压垛A1角度", "DB7.REAL620")); + list.add(new ItemDTO(item_pressCribX2_line, "压垛X2行", "DB7.REAL624")); + list.add(new ItemDTO(item_pressCribY2_row, "压垛Y2列", "DB7.REAL628")); + list.add(new ItemDTO(item_pressCribA2_angle, "压垛A2角度", "DB7.REAL632")); + list.add(new ItemDTO(item_pressCribX3_line, "压垛X3行", "DB7.REAL636")); + list.add(new ItemDTO(item_pressCribY3_row, "压垛Y3列", "DB7.REAL640")); + list.add(new ItemDTO(item_pressCribA3_angle, "压垛A3角度", "DB7.REAL644")); + list.add(new ItemDTO(item_Zoffset, "Z轴偏移", "DB7.REAL648")); + list.add(new ItemDTO(item_pallet_layerQty, "码垛层数", "DB7.D652")); + list.add(new ItemDTO(item_pressCrib_layerQty, "压垛层数", "DB7.D656")); + list.add(new ItemDTO(item_codeLayerX1_interval, "码层X1间隔", "DB7.REAL660")); + list.add(new ItemDTO(item_codeLayerY1_interval, "码层Y1间隔", "DB7.REAL664")); + list.add(new ItemDTO(item_codeLayerX2_interval, "码层X2间隔", "DB7.REAL668")); + list.add(new ItemDTO(item_codeLayerY2_interval, "码层Y2间隔", "DB7.REAL672")); + list.add(new ItemDTO(item_codeLayerX3_interval, "码层X3间隔", "DB7.REAL676")); + list.add(new ItemDTO(item_codeLayerY3_interval, "码层Y3间隔", "DB7.REAL680")); + list.add(new ItemDTO(item_codeLayerX1_offset, "码层X1偏移", "DB7.REAL684")); + list.add(new ItemDTO(item_codeLayerY1_offset, "码层Y1偏移", "DB7.REAL688")); + list.add(new ItemDTO(item_codeLayerX2_offset, "码层X2偏移", "DB7.REAL692")); + list.add(new ItemDTO(item_codeLayerY2_offset, "码层Y2偏移", "DB7.REAL696")); + list.add(new ItemDTO(item_codeLayerX3_offset, "码层X3偏移", "DB7.REAL700")); + list.add(new ItemDTO(item_codeLayerY3_offset, "码层Y3偏移", "DB7.REAL704")); + list.add(new ItemDTO(item_pressLayerX1_interval, "压层X1间隔", "DB7.REAL708")); + list.add(new ItemDTO(item_pressLayerY1_interval, "压层Y1间隔", "DB7.REAL712")); + list.add(new ItemDTO(item_pressLayerX2_interval, "压层X2间隔", "DB7.REAL716")); + list.add(new ItemDTO(item_pressLayerY2_interval, "压层Y2间隔", "DB7.REAL720")); + list.add(new ItemDTO(item_pressLayerX3_interval, "压层X3间隔", "DB7.REAL724")); + list.add(new ItemDTO(item_pressLayerY3_interval, "压层Y3间隔", "DB7.REAL728")); + list.add(new ItemDTO(item_pressLayerX1_offset, "压层X1偏移", "DB7.REAL732")); + list.add(new ItemDTO(item_pressLayerY1_offset, "压层Y1偏移", "DB7.REAL736")); + list.add(new ItemDTO(item_pressLayerX2_offset, "压层X2偏移", "DB7.REAL740")); + list.add(new ItemDTO(item_pressLayerY2_offset, "压层Y2偏移", "DB7.REAL744")); + list.add(new ItemDTO(item_pressLayerX3_offset, "压层X3偏移", "DB7.REAL748")); + list.add(new ItemDTO(item_pressLayerY3_offset, "压层Y3偏移", "DB7.REAL752")); + list.add(new ItemDTO(item_one_cribTotal, "1#垛总数", "DB7.D756")); + list.add(new ItemDTO(item_two_cribTotal, "2#垛总数", "DB7.D760")); + list.add(new ItemDTO(item_one_qty, "1#垛当前数", "DB7.D764")); + list.add(new ItemDTO(item_two_qty, "2#垛当前数", "DB7.D768")); + list.add(new ItemDTO(item_tool_coordinate, "工具坐标", "DB7.D772")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB8.W0")); - list.add(new ItemDto(item_to_error, "故障代码", "DB8.W1")); - list.add(new ItemDto(item_to_material, "物料", "DB8.S2")); - list.add(new ItemDto(item_to_product_code, "产品编号", "DB8.D258")); - list.add(new ItemDto(item_to_AlongSide, "A长边", "DB8.D262")); - list.add(new ItemDto(item_to_BshortSide, "B短边", "DB8.D266")); - list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB8.D270")); - list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB8.D274")); - list.add(new ItemDto(item_to_tray_qty, "当前垛盘数", "DB8.D278")); - list.add(new ItemDto(item_to_tray_high, "垛盘高度", "DB8.D282")); - list.add(new ItemDto(item_to_crib_category, "垛型类别", "DB8.D286")); - list.add(new ItemDto(item_to_palletX1_line, "码垛X1行", "DB8.REAL290")); - list.add(new ItemDto(item_to_palletY1_row, "码垛Y1列", "DB8.REAL294")); - list.add(new ItemDto(item_to_palletA1_angle, "码垛A1角度", "DB8.REAL298")); - list.add(new ItemDto(item_to_palletX2_line, "码垛X2行", "DB8.REAL302")); - list.add(new ItemDto(item_to_palletY2_row, "码垛Y2列", "DB8.REAL306")); - list.add(new ItemDto(item_to_palletA2_angle, "码垛A2角度", "DB8.REAL310")); - list.add(new ItemDto(item_to_palletX3_line, "码垛X3行", "DB8.REAL314")); - list.add(new ItemDto(item_to_palletY3_row, "码垛Y3列", "DB8.REAL318")); - list.add(new ItemDto(item_to_palletA3_angle, "码垛A3角度", "DB8.REAL322")); - list.add(new ItemDto(item_to_pressCribX1_line, "压垛X1行", "DB8.REAL326")); - list.add(new ItemDto(item_to_pressCribY1_row, "压垛Y1列", "DB8.REAL330")); - list.add(new ItemDto(item_to_pressCribA1_angle, "压垛A1角度", "DB8.REAL334")); - list.add(new ItemDto(item_to_pressCribX2_line, "压垛X2行", "DB8.REAL338")); - list.add(new ItemDto(item_to_pressCribY2_row, "压垛Y2列", "DB8.REAL342")); - list.add(new ItemDto(item_to_pressCribA2_angle, "压垛A2角度", "DB8.REAL346")); - list.add(new ItemDto(item_to_pressCribX3_line, "压垛X3行", "DB8.REAL350")); - list.add(new ItemDto(item_to_pressCribY3_row, "压垛Y3列", "DB8.REAL354")); - list.add(new ItemDto(item_to_pressCribA3_angle, "压垛A3角度", "DB8.REAL358")); - list.add(new ItemDto(item_to_Zoffset, "Z轴偏移", "DB8.REAL362")); - list.add(new ItemDto(item_to_pallet_layerQty, "码垛层数", "DB8.D366")); - list.add(new ItemDto(item_to_pressCrib_layerQty, "压垛层数", "DB8.D370")); - list.add(new ItemDto(item_to_codeLayerX1_interval, "码层X1间隔", "DB8.REAL374")); - list.add(new ItemDto(item_to_codeLayerY1_interval, "码层Y1间隔", "DB8.REAL378")); - list.add(new ItemDto(item_to_codeLayerX2_interval, "码层X2间隔", "DB8.REAL382")); - list.add(new ItemDto(item_to_codeLayerY2_interval, "码层Y2间隔", "DB8.REAL386")); - list.add(new ItemDto(item_to_codeLayerX3_interval, "码层X3间隔", "DB8.REAL390")); - list.add(new ItemDto(item_to_codeLayerY3_interval, "码层Y3间隔", "DB8.REAL394")); - list.add(new ItemDto(item_to_codeLayerX1_offset, "码层X1偏移", "DB8.REAL398")); - list.add(new ItemDto(item_to_codeLayerY1_offset, "码层Y1偏移", "DB8.REAL402")); - list.add(new ItemDto(item_to_codeLayerX2_offset, "码层X2偏移", "DB8.REAL406")); - list.add(new ItemDto(item_to_codeLayerY2_offset, "码层Y2偏移", "DB8.REAL410")); - list.add(new ItemDto(item_to_codeLayerX3_offset, "码层X3偏移", "DB8.REAL414")); - list.add(new ItemDto(item_to_codeLayerY3_offset, "码层Y3偏移", "DB8.REAL418")); - list.add(new ItemDto(item_to_pressLayerX1_interval, "压层X1间隔", "DB8.REAL422")); - list.add(new ItemDto(item_to_pressLayerY1_interval, "压层Y1间隔", "DB8.REAL426")); - list.add(new ItemDto(item_to_pressLayerX2_interval, "压层X2间隔", "DB8.REAL430")); - list.add(new ItemDto(item_to_pressLayerY2_interval, "压层Y2间隔", "DB8.REAL434")); - list.add(new ItemDto(item_to_pressLayerX3_interval, "压层X3间隔", "DB8.REAL438")); - list.add(new ItemDto(item_to_pressLayerY3_interval, "压层Y3间隔", "DB8.REAL442")); - list.add(new ItemDto(item_to_pressLayerX1_offset, "压层X1偏移", "DB8.REAL446")); - list.add(new ItemDto(item_to_pressLayerY1_offset, "压层Y1偏移", "DB8.REAL450")); - list.add(new ItemDto(item_to_pressLayerX2_offset, "压层X2偏移", "DB8.REAL454")); - list.add(new ItemDto(item_to_pressLayerY2_offset, "压层Y2偏移", "DB8.REAL458")); - list.add(new ItemDto(item_to_pressLayerX3_offset, "压层X3偏移", "DB8.REAL462")); - list.add(new ItemDto(item_to_pressLayerY3_offset, "压层Y3偏移", "DB8.REAL466")); - list.add(new ItemDto(item_to_one_cribTotal, "1#垛总数", "DB8.D470")); - list.add(new ItemDto(item_to_two_cribTotal, "2#垛总数", "DB8.D474")); - list.add(new ItemDto(item_to_one_qty, "1#垛当前数", "DB8.D478")); - list.add(new ItemDto(item_to_two_qty, "2#垛当前数", "DB8.D482")); - list.add(new ItemDto(item_to_tool_coordinate, "工具坐标", "DB8.D486")); + list.add(new ItemDTO(item_to_feedback, "机器人动作反馈", "DB8.W0")); + list.add(new ItemDTO(item_to_error, "故障代码", "DB8.W1")); + list.add(new ItemDTO(item_to_material, "物料", "DB8.S2")); + list.add(new ItemDTO(item_to_product_code, "产品编号", "DB8.D258")); + list.add(new ItemDTO(item_to_AlongSide, "A长边", "DB8.D262")); + list.add(new ItemDTO(item_to_BshortSide, "B短边", "DB8.D266")); + list.add(new ItemDTO(item_to_Htrapezoidal, "H梯形高", "DB8.D270")); + list.add(new ItemDTO(item_to_Wthickness, "W厚度", "DB8.D274")); + list.add(new ItemDTO(item_to_tray_qty, "当前垛盘数", "DB8.D278")); + list.add(new ItemDTO(item_to_tray_high, "垛盘高度", "DB8.D282")); + list.add(new ItemDTO(item_to_crib_category, "垛型类别", "DB8.D286")); + list.add(new ItemDTO(item_to_palletX1_line, "码垛X1行", "DB8.REAL290")); + list.add(new ItemDTO(item_to_palletY1_row, "码垛Y1列", "DB8.REAL294")); + list.add(new ItemDTO(item_to_palletA1_angle, "码垛A1角度", "DB8.REAL298")); + list.add(new ItemDTO(item_to_palletX2_line, "码垛X2行", "DB8.REAL302")); + list.add(new ItemDTO(item_to_palletY2_row, "码垛Y2列", "DB8.REAL306")); + list.add(new ItemDTO(item_to_palletA2_angle, "码垛A2角度", "DB8.REAL310")); + list.add(new ItemDTO(item_to_palletX3_line, "码垛X3行", "DB8.REAL314")); + list.add(new ItemDTO(item_to_palletY3_row, "码垛Y3列", "DB8.REAL318")); + list.add(new ItemDTO(item_to_palletA3_angle, "码垛A3角度", "DB8.REAL322")); + list.add(new ItemDTO(item_to_pressCribX1_line, "压垛X1行", "DB8.REAL326")); + list.add(new ItemDTO(item_to_pressCribY1_row, "压垛Y1列", "DB8.REAL330")); + list.add(new ItemDTO(item_to_pressCribA1_angle, "压垛A1角度", "DB8.REAL334")); + list.add(new ItemDTO(item_to_pressCribX2_line, "压垛X2行", "DB8.REAL338")); + list.add(new ItemDTO(item_to_pressCribY2_row, "压垛Y2列", "DB8.REAL342")); + list.add(new ItemDTO(item_to_pressCribA2_angle, "压垛A2角度", "DB8.REAL346")); + list.add(new ItemDTO(item_to_pressCribX3_line, "压垛X3行", "DB8.REAL350")); + list.add(new ItemDTO(item_to_pressCribY3_row, "压垛Y3列", "DB8.REAL354")); + list.add(new ItemDTO(item_to_pressCribA3_angle, "压垛A3角度", "DB8.REAL358")); + list.add(new ItemDTO(item_to_Zoffset, "Z轴偏移", "DB8.REAL362")); + list.add(new ItemDTO(item_to_pallet_layerQty, "码垛层数", "DB8.D366")); + list.add(new ItemDTO(item_to_pressCrib_layerQty, "压垛层数", "DB8.D370")); + list.add(new ItemDTO(item_to_codeLayerX1_interval, "码层X1间隔", "DB8.REAL374")); + list.add(new ItemDTO(item_to_codeLayerY1_interval, "码层Y1间隔", "DB8.REAL378")); + list.add(new ItemDTO(item_to_codeLayerX2_interval, "码层X2间隔", "DB8.REAL382")); + list.add(new ItemDTO(item_to_codeLayerY2_interval, "码层Y2间隔", "DB8.REAL386")); + list.add(new ItemDTO(item_to_codeLayerX3_interval, "码层X3间隔", "DB8.REAL390")); + list.add(new ItemDTO(item_to_codeLayerY3_interval, "码层Y3间隔", "DB8.REAL394")); + list.add(new ItemDTO(item_to_codeLayerX1_offset, "码层X1偏移", "DB8.REAL398")); + list.add(new ItemDTO(item_to_codeLayerY1_offset, "码层Y1偏移", "DB8.REAL402")); + list.add(new ItemDTO(item_to_codeLayerX2_offset, "码层X2偏移", "DB8.REAL406")); + list.add(new ItemDTO(item_to_codeLayerY2_offset, "码层Y2偏移", "DB8.REAL410")); + list.add(new ItemDTO(item_to_codeLayerX3_offset, "码层X3偏移", "DB8.REAL414")); + list.add(new ItemDTO(item_to_codeLayerY3_offset, "码层Y3偏移", "DB8.REAL418")); + list.add(new ItemDTO(item_to_pressLayerX1_interval, "压层X1间隔", "DB8.REAL422")); + list.add(new ItemDTO(item_to_pressLayerY1_interval, "压层Y1间隔", "DB8.REAL426")); + list.add(new ItemDTO(item_to_pressLayerX2_interval, "压层X2间隔", "DB8.REAL430")); + list.add(new ItemDTO(item_to_pressLayerY2_interval, "压层Y2间隔", "DB8.REAL434")); + list.add(new ItemDTO(item_to_pressLayerX3_interval, "压层X3间隔", "DB8.REAL438")); + list.add(new ItemDTO(item_to_pressLayerY3_interval, "压层Y3间隔", "DB8.REAL442")); + list.add(new ItemDTO(item_to_pressLayerX1_offset, "压层X1偏移", "DB8.REAL446")); + list.add(new ItemDTO(item_to_pressLayerY1_offset, "压层Y1偏移", "DB8.REAL450")); + list.add(new ItemDTO(item_to_pressLayerX2_offset, "压层X2偏移", "DB8.REAL454")); + list.add(new ItemDTO(item_to_pressLayerY2_offset, "压层Y2偏移", "DB8.REAL458")); + list.add(new ItemDTO(item_to_pressLayerX3_offset, "压层X3偏移", "DB8.REAL462")); + list.add(new ItemDTO(item_to_pressLayerY3_offset, "压层Y3偏移", "DB8.REAL466")); + list.add(new ItemDTO(item_to_one_cribTotal, "1#垛总数", "DB8.D470")); + list.add(new ItemDTO(item_to_two_cribTotal, "2#垛总数", "DB8.D474")); + list.add(new ItemDTO(item_to_one_qty, "1#垛当前数", "DB8.D478")); + list.add(new ItemDTO(item_to_two_qty, "2#垛当前数", "DB8.D482")); + list.add(new ItemDTO(item_to_tool_coordinate, "工具坐标", "DB8.D486")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java deleted file mode 100644 index 4a173b1..0000000 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java +++ /dev/null @@ -1,138 +0,0 @@ -package org.nl.acs.device_driver.lnsh.lnsh_split_manipulator; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -/** - * 晟华拆垛机械手 - * - */ -@Service -public class LnshSplitManipulatorDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "lnsh_split_manipulator"; - } - - @Override - public String getDriverName() { - return "晟华-拆垛机械手"; - } - - @Override - public String getDriverDescription() { - return "晟华-拆垛机械手"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new LnshSplitManipulatorDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return LnshSplitManipulatorDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.station); - return types; - } - - @Override - public List getReadableItemDtos() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB7.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB7.B1", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_error, "故障", "DB7.B3")); - list.add(new ItemDto(ItemProtocol.item_getStation, "当前抓取工位", "DB7.D4")); - list.add(new ItemDto(ItemProtocol.item_barcode, "条码", "DB7.S8")); - list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB7.D264")); - list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB7.D520")); - list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB7.D524")); - list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB7.D528")); - list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB7.S532")); - list.add(new ItemDto(ItemProtocol.item_total_split, "累计拆垛数量", "DB7.D536")); - - list.add(new ItemDto(ItemProtocol.item_product_code, "产品编号", "DB7.D544")); - list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB7.D548")); - list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB7.D552")); - list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB7.D556")); - list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB7.D560")); - list.add(new ItemDto(ItemProtocol.item_tray_qty, "当前垛盘数", "DB7.D564")); - list.add(new ItemDto(ItemProtocol.item_tray_high, "垛盘高度", "DB7.D568")); - list.add(new ItemDto(ItemProtocol.item_crib_category, "垛型类别", "DB7.D572")); - list.add(new ItemDto(ItemProtocol.item_palletX1_line, "码垛X1行", "DB7.REAL576")); - list.add(new ItemDto(ItemProtocol.item_palletY1_row, "码垛Y1列", "DB7.REAL580")); - list.add(new ItemDto(ItemProtocol.item_palletA1_angle, "码垛A1角度", "DB7.REAL584")); - list.add(new ItemDto(ItemProtocol.item_palletX2_line, "码垛X2行", "DB7.REAL588")); - list.add(new ItemDto(ItemProtocol.item_palletY2_row, "码垛Y2列", "DB7.REAL592")); - list.add(new ItemDto(ItemProtocol.item_palletA2_angle, "码垛A2角度", "DB7.REAL596")); - list.add(new ItemDto(ItemProtocol.item_palletX3_line, "码垛X3行", "DB7.REAL600")); - list.add(new ItemDto(ItemProtocol.item_palletY3_row, "码垛Y3列", "DB7.REAL604")); - list.add(new ItemDto(ItemProtocol.item_palletA3_angle, "码垛A3角度", "DB7.REAL608")); - list.add(new ItemDto(ItemProtocol.item_pressCribX1_line, "压垛X1行", "DB7.REAL612")); - list.add(new ItemDto(ItemProtocol.item_pressCribY1_row, "压垛Y1列", "DB7.REAL616")); - list.add(new ItemDto(ItemProtocol.item_pressCribA1_angle, "压垛A1角度", "DB7.REAL620")); - list.add(new ItemDto(ItemProtocol.item_pressCribX2_line, "压垛X2行", "DB7.REAL624")); - list.add(new ItemDto(ItemProtocol.item_pressCribY2_row, "压垛Y2列", "DB7.REAL628")); - list.add(new ItemDto(ItemProtocol.item_pressCribA2_angle, "压垛A2角度", "DB7.REAL632")); - list.add(new ItemDto(ItemProtocol.item_pressCribX3_line, "压垛X3行", "DB7.REAL636")); - list.add(new ItemDto(ItemProtocol.item_pressCribY3_row, "压垛Y3列", "DB7.REAL640")); - list.add(new ItemDto(ItemProtocol.item_pressCribA3_angle, "压垛A3角度", "DB7.REAL644")); - list.add(new ItemDto(ItemProtocol.item_Zoffset, "Z轴偏移", "DB7.REAL648")); - list.add(new ItemDto(ItemProtocol.item_pallet_layerQty, "码垛层数", "DB7.D652")); - list.add(new ItemDto(ItemProtocol.item_pressCrib_layerQty, "压垛层数", "DB7.D656")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX1_interval, "码层X1间隔", "DB7.REAL660")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY1_interval, "码层Y1间隔", "DB7.REAL664")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX2_interval, "码层X2间隔", "DB7.REAL668")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY2_interval, "码层Y2间隔", "DB7.REAL672")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX3_interval, "码层X3间隔", "DB7.REAL676")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY3_interval, "码层Y3间隔", "DB7.REAL680")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX1_offset, "码层X1偏移", "DB7.REAL684")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY1_offset, "码层Y1偏移", "DB7.REAL688")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX2_offset, "码层X2偏移", "DB7.REAL692")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY2_offset, "码层Y2偏移", "DB7.REAL696")); - list.add(new ItemDto(ItemProtocol.item_codeLayerX3_offset, "码层X3偏移", "DB7.REAL700")); - list.add(new ItemDto(ItemProtocol.item_codeLayerY3_offset, "码层Y3偏移", "DB7.REAL704")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX1_interval, "压层X1间隔", "DB7.REAL708")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY1_interval, "压层Y1间隔", "DB7.REAL712")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX2_interval, "压层X2间隔", "DB7.REAL716")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY2_interval, "压层Y2间隔", "DB7.REAL720")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX3_interval, "压层X3间隔", "DB7.REAL724")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY3_interval, "压层Y3间隔", "DB7.REAL728")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX1_offset, "压层X1偏移", "DB7.REAL732")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY1_offset, "压层Y1偏移", "DB7.REAL736")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX2_offset, "压层X2偏移", "DB7.REAL740")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY2_offset, "压层Y2偏移", "DB7.REAL744")); - list.add(new ItemDto(ItemProtocol.item_pressLayerX3_offset, "压层X3偏移", "DB7.REAL748")); - list.add(new ItemDto(ItemProtocol.item_pressLayerY3_offset, "压层Y3偏移", "DB7.REAL752")); - list.add(new ItemDto(ItemProtocol.item_one_cribTotal, "1#垛总数", "DB7.D756")); - list.add(new ItemDto(ItemProtocol.item_two_cribTotal, "2#垛总数", "DB7.D760")); - list.add(new ItemDto(ItemProtocol.item_one_qty, "1#垛当前数", "DB7.D764")); - list.add(new ItemDto(ItemProtocol.item_two_qty, "2#垛当前数", "DB7.D768")); - list.add(new ItemDto(ItemProtocol.item_tool_coordinate, "工具坐标", "DB7.D772")); - return list; - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefinition.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefinition.java new file mode 100644 index 0000000..d920aeb --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefinition.java @@ -0,0 +1,138 @@ +package org.nl.acs.device_driver.lnsh.lnsh_split_manipulator; + +import org.nl.acs.device.device_driver.standard_inspect.ItemDTO; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceType; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +/** + * 晟华拆垛机械手 + * + */ +@Service +public class LnshSplitManipulatorDefinition implements OpcDeviceDriverDefinition { + @Override + public String getDriverCode() { + return "lnsh_split_manipulator"; + } + + @Override + public String getDriverName() { + return "晟华-拆垛机械手"; + } + + @Override + public String getDriverDescription() { + return "晟华-拆垛机械手"; + } + + @Override + public DeviceDriver getDriverInstance(Device device) { + return (new LnshSplitManipulatorDeviceDriver()).setDevice(device).setDriverDefinition(this); + + } + + @Override + public Class getDeviceDriverType() { + return LnshSplitManipulatorDeviceDriver.class; + } + + @Override + public List getFitDeviceTypes() { + List types = new LinkedList(); + types.add(DeviceType.station); + return types; + } + + @Override + public List getReadableItemDTOs() { + return getReadableItemDtos2(); + } + + public static List getReadableItemDtos2() { + ArrayList list = new ArrayList(); + list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB7.B0")); + list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB7.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(ItemProtocol.item_error, "故障", "DB7.B3")); + list.add(new ItemDTO(ItemProtocol.item_getStation, "当前抓取工位", "DB7.D4")); + list.add(new ItemDTO(ItemProtocol.item_barcode, "条码", "DB7.S8")); + list.add(new ItemDTO(ItemProtocol.item_open_time, "开机时间", "DB7.D264")); + list.add(new ItemDTO(ItemProtocol.item_standby_time, "待机时间", "DB7.D520")); + list.add(new ItemDTO(ItemProtocol.item_production_time, "生产时间", "DB7.D524")); + list.add(new ItemDTO(ItemProtocol.item_error_time, "故障时间", "DB7.D528")); + list.add(new ItemDTO(ItemProtocol.item_material, "物料", "DB7.S532")); + list.add(new ItemDTO(ItemProtocol.item_total_split, "累计拆垛数量", "DB7.D536")); + + list.add(new ItemDTO(ItemProtocol.item_product_code, "产品编号", "DB7.D544")); + list.add(new ItemDTO(ItemProtocol.item_AlongSide, "A长边", "DB7.D548")); + list.add(new ItemDTO(ItemProtocol.item_BshortSide, "B短边", "DB7.D552")); + list.add(new ItemDTO(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB7.D556")); + list.add(new ItemDTO(ItemProtocol.item_Wthickness, "W厚度", "DB7.D560")); + list.add(new ItemDTO(ItemProtocol.item_tray_qty, "当前垛盘数", "DB7.D564")); + list.add(new ItemDTO(ItemProtocol.item_tray_high, "垛盘高度", "DB7.D568")); + list.add(new ItemDTO(ItemProtocol.item_crib_category, "垛型类别", "DB7.D572")); + list.add(new ItemDTO(ItemProtocol.item_palletX1_line, "码垛X1行", "DB7.REAL576")); + list.add(new ItemDTO(ItemProtocol.item_palletY1_row, "码垛Y1列", "DB7.REAL580")); + list.add(new ItemDTO(ItemProtocol.item_palletA1_angle, "码垛A1角度", "DB7.REAL584")); + list.add(new ItemDTO(ItemProtocol.item_palletX2_line, "码垛X2行", "DB7.REAL588")); + list.add(new ItemDTO(ItemProtocol.item_palletY2_row, "码垛Y2列", "DB7.REAL592")); + list.add(new ItemDTO(ItemProtocol.item_palletA2_angle, "码垛A2角度", "DB7.REAL596")); + list.add(new ItemDTO(ItemProtocol.item_palletX3_line, "码垛X3行", "DB7.REAL600")); + list.add(new ItemDTO(ItemProtocol.item_palletY3_row, "码垛Y3列", "DB7.REAL604")); + list.add(new ItemDTO(ItemProtocol.item_palletA3_angle, "码垛A3角度", "DB7.REAL608")); + list.add(new ItemDTO(ItemProtocol.item_pressCribX1_line, "压垛X1行", "DB7.REAL612")); + list.add(new ItemDTO(ItemProtocol.item_pressCribY1_row, "压垛Y1列", "DB7.REAL616")); + list.add(new ItemDTO(ItemProtocol.item_pressCribA1_angle, "压垛A1角度", "DB7.REAL620")); + list.add(new ItemDTO(ItemProtocol.item_pressCribX2_line, "压垛X2行", "DB7.REAL624")); + list.add(new ItemDTO(ItemProtocol.item_pressCribY2_row, "压垛Y2列", "DB7.REAL628")); + list.add(new ItemDTO(ItemProtocol.item_pressCribA2_angle, "压垛A2角度", "DB7.REAL632")); + list.add(new ItemDTO(ItemProtocol.item_pressCribX3_line, "压垛X3行", "DB7.REAL636")); + list.add(new ItemDTO(ItemProtocol.item_pressCribY3_row, "压垛Y3列", "DB7.REAL640")); + list.add(new ItemDTO(ItemProtocol.item_pressCribA3_angle, "压垛A3角度", "DB7.REAL644")); + list.add(new ItemDTO(ItemProtocol.item_Zoffset, "Z轴偏移", "DB7.REAL648")); + list.add(new ItemDTO(ItemProtocol.item_pallet_layerQty, "码垛层数", "DB7.D652")); + list.add(new ItemDTO(ItemProtocol.item_pressCrib_layerQty, "压垛层数", "DB7.D656")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerX1_interval, "码层X1间隔", "DB7.REAL660")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerY1_interval, "码层Y1间隔", "DB7.REAL664")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerX2_interval, "码层X2间隔", "DB7.REAL668")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerY2_interval, "码层Y2间隔", "DB7.REAL672")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerX3_interval, "码层X3间隔", "DB7.REAL676")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerY3_interval, "码层Y3间隔", "DB7.REAL680")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerX1_offset, "码层X1偏移", "DB7.REAL684")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerY1_offset, "码层Y1偏移", "DB7.REAL688")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerX2_offset, "码层X2偏移", "DB7.REAL692")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerY2_offset, "码层Y2偏移", "DB7.REAL696")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerX3_offset, "码层X3偏移", "DB7.REAL700")); + list.add(new ItemDTO(ItemProtocol.item_codeLayerY3_offset, "码层Y3偏移", "DB7.REAL704")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerX1_interval, "压层X1间隔", "DB7.REAL708")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerY1_interval, "压层Y1间隔", "DB7.REAL712")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerX2_interval, "压层X2间隔", "DB7.REAL716")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerY2_interval, "压层Y2间隔", "DB7.REAL720")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerX3_interval, "压层X3间隔", "DB7.REAL724")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerY3_interval, "压层Y3间隔", "DB7.REAL728")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerX1_offset, "压层X1偏移", "DB7.REAL732")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerY1_offset, "压层Y1偏移", "DB7.REAL736")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerX2_offset, "压层X2偏移", "DB7.REAL740")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerY2_offset, "压层Y2偏移", "DB7.REAL744")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerX3_offset, "压层X3偏移", "DB7.REAL748")); + list.add(new ItemDTO(ItemProtocol.item_pressLayerY3_offset, "压层Y3偏移", "DB7.REAL752")); + list.add(new ItemDTO(ItemProtocol.item_one_cribTotal, "1#垛总数", "DB7.D756")); + list.add(new ItemDTO(ItemProtocol.item_two_cribTotal, "2#垛总数", "DB7.D760")); + list.add(new ItemDTO(ItemProtocol.item_one_qty, "1#垛当前数", "DB7.D764")); + list.add(new ItemDTO(ItemProtocol.item_two_qty, "2#垛当前数", "DB7.D768")); + list.add(new ItemDTO(ItemProtocol.item_tool_coordinate, "工具坐标", "DB7.D772")); + return list; + } + + @Override + public List getWriteableItemDTOs() { + return ItemProtocol.getWriteableItemDtos(); + } + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java index 21b743b..12a4b3d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/ItemProtocol.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import lombok.Getter; import lombok.Setter; 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 java.util.ArrayList; import java.util.List; @@ -116,26 +116,26 @@ public class ItemProtocol { return "0"; } - public static List getReadableItemDtos() { + public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB81.B10")); - list.add(new ItemDto(item_mode, "工作模式", "DB81.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB81.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB81.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB81.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB81.B5")); - list.add(new ItemDto(item_task, "任务号", "DB81.D6")); - list.add(new ItemDto(item_weight, "重量", "DB81.D10")); - list.add(new ItemDto(item_material, "物料", "DB81.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB81.W66")); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB81.B10")); + list.add(new ItemDTO(item_mode, "工作模式", "DB81.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB81.B2")); + list.add(new ItemDTO(item_action, "取放信号", "DB81.B3")); + list.add(new ItemDTO(item_ioaction, "进出信号", "DB81.B4")); + list.add(new ItemDTO(item_error, "报警信号", "DB81.B5")); + list.add(new ItemDTO(item_task, "任务号", "DB81.D6")); + list.add(new ItemDTO(item_weight, "重量", "DB81.D10")); + list.add(new ItemDTO(item_material, "物料", "DB81.STRING14.50")); + list.add(new ItemDTO(item_barcode, "条码", "DB81.W66")); return list; } - public static List getWriteableItemDtos() { + public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB71.W0", Boolean.valueOf(true))); - list.add(new ItemDto(item_to_target, "目标站", "DB71.W2")); - list.add(new ItemDto(item_to_task, "任务号", "DB71.D4")); + list.add(new ItemDTO(item_to_command, "作业命令", "DB71.W0", Boolean.valueOf(true))); + list.add(new ItemDTO(item_to_target, "目标站", "DB71.W2")); + list.add(new ItemDTO(item_to_task, "任务号", "DB71.D4")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefinition.java similarity index 77% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefinition.java index 0fce903..b2a3eff 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDefinition.java @@ -1,13 +1,12 @@ package org.nl.acs.device_driver.lnsh.lnsh_station; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -16,7 +15,7 @@ import java.util.List; * */ @Service -public class LnshStationDefination implements OpcDeviceDriverDefination { +public class LnshStationDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "lnsh_station"; @@ -34,7 +33,7 @@ public class LnshStationDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new LnshStationDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new LnshStationDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -51,12 +50,12 @@ public class LnshStationDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/ItemProtocol.java index 8596a97..8fd6743 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/ItemProtocol.java @@ -3,8 +3,7 @@ package org.nl.acs.device_driver.lnsh.package_site; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.lnsh.lnsh_package_site.LnshPackageSiteDeviceDriver; +import org.nl.acs.device.device_driver.standard_inspect.ItemDTO; import java.util.ArrayList; import java.util.List; @@ -133,28 +132,28 @@ public class ItemProtocol { return ""; } - public static List getReadableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_move, "光电开关信号", "DB51.B2")); - list.add(new ItemDto(item_action, "取放信号", "DB51.B3")); - list.add(new ItemDto(item_ioaction, "进出信号", "DB51.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B5")); - list.add(new ItemDto(item_task, "任务号", "DB51.D6")); - list.add(new ItemDto(item_is_weight, "重量", "DB51.D10")); - list.add(new ItemDto(item_material, "物料", "DB51.STRING14.50")); - list.add(new ItemDto(item_barcode, "条码", "DB51.W66")); + public static List getReadableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(item_heartbeat, "心跳", "DB51.B0")); + list.add(new ItemDTO(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); + list.add(new ItemDTO(item_move, "光电开关信号", "DB51.B2")); + list.add(new ItemDTO(item_action, "取放信号", "DB51.B3")); + list.add(new ItemDTO(item_ioaction, "进出信号", "DB51.B4")); + list.add(new ItemDTO(item_error, "报警信号", "DB51.B5")); + list.add(new ItemDTO(item_task, "任务号", "DB51.D6")); + list.add(new ItemDTO(item_is_weight, "重量", "DB51.D10")); + list.add(new ItemDTO(item_material, "物料", "DB51.STRING14.50")); + list.add(new ItemDTO(item_barcode, "条码", "DB51.W66")); return list; } - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发指令", "DB51.B0", Boolean.TRUE)); - list.add(new ItemDto(item_to_target, "下发目标站", "DB51.B2")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB51.B4")); - list.add(new ItemDto(item_to_is_package, "下发是否包装", "DB51.B8")); - list.add(new ItemDto(item_is_message, "下发信息反馈", "DB62.STRING10.50")); + public static List getWriteableItemDtos() { + ArrayList list = new ArrayList<>(); + list.add(new ItemDTO(item_to_command, "下发指令", "DB51.B0", Boolean.TRUE)); + list.add(new ItemDTO(item_to_target, "下发目标站", "DB51.B2")); + list.add(new ItemDTO(item_to_task, "下发任务号", "DB51.B4")); + list.add(new ItemDTO(item_to_is_package, "下发是否包装", "DB51.B8")); + list.add(new ItemDTO(item_is_message, "下发信息反馈", "DB62.STRING10.50")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDefination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDefinition.java similarity index 78% rename from acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDefination.java rename to acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDefinition.java index b5d32df..60c5a35 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDefination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDefinition.java @@ -1,8 +1,8 @@ package org.nl.acs.device_driver.lnsh.package_site; -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.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceType; import org.springframework.stereotype.Service; @@ -15,7 +15,7 @@ import java.util.List; * */ @Service -public class PackageSiteDefination implements OpcDeviceDriverDefination { +public class PackageSiteDefinition implements OpcDeviceDriverDefinition { @Override public String getDriverCode() { return "package_site"; @@ -33,7 +33,7 @@ public class PackageSiteDefination implements OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new PackageSiteDeviceDriver()).setDevice(device).setDriverDefination(this); + return (new PackageSiteDeviceDriver()).setDevice(device).setDriverDefinition(this); } @@ -50,12 +50,12 @@ public class PackageSiteDefination implements OpcDeviceDriverDefination { } @Override - public List getReadableItemDtos() { + public List getReadableItemDTOs() { return ItemProtocol.getReadableItemDtos(); } @Override - public List getWriteableItemDtos() { + public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/ItemProtocol.java new file mode 100644 index 0000000..2439eae --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/ItemProtocol.java @@ -0,0 +1,87 @@ +package org.nl.acs.device_driver.nl4.station; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author zhangjiangwei + */ +@Getter +@Setter +public class ItemProtocol { + + // 心跳 + public static final String ITEM_HEARTBEAT = "heartbeat"; + // 工作模式 + public static final String ITEM_MODE = "mode"; + // 光电信号 + public static final String ITEM_MOVE = "move"; + // 取放信号 + public static final String ITEM_ACTION = "action"; + // error + public static final String ITEM_ERROR = "error"; + // 任务号 + public static final String ITEM_TASK = "task"; + + // 下发命令 + public static final String ITEM_TO_COMMAND = "to_command"; + // 下发物料编号 + public static final String ITEM_TO_MATERIAL = "to_material"; + // 下发数量 + public static final String ITEM_TO_QTY = "to_qty"; + + boolean isOnline; + + private final NL4StationDeviceDriver driver; + + public ItemProtocol(NL4StationDeviceDriver driver) { + this.driver = driver; + } + + public int getOpcIntegerValue(String protocol) { + Integer value = this.driver.getIntegeregerValue(protocol); + if (value == null) { + this.isOnline = false; + return 0; + } else { + this.isOnline = true; + return value; + } + } + + public int getHeartbeat() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_HEARTBEAT); + } + + public int getMode() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_MODE); + } + + public int getMove() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_MOVE); + } + + public int getAction() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_ACTION); + } + + public int getError() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_ERROR); + } + + public int getTask() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_TASK); + } + + public int getToCommand() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_TO_COMMAND); + } + + public int getToMaterial() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_TO_MATERIAL); + } + + public int getToQty() { + return this.getOpcIntegerValue(ItemProtocol.ITEM_TO_QTY); + } +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/NL4StationDefinition.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/NL4StationDefinition.java new file mode 100644 index 0000000..43cf3fd --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/NL4StationDefinition.java @@ -0,0 +1,72 @@ +package org.nl.acs.device_driver.nl4.station; + +import org.nl.acs.device.device_driver.standard_inspect.ItemDTO; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.definition.OpcDeviceDriverDefinition; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceType; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +/** + * @author zhangjiangwei + */ +@Service +public class NL4StationDefinition implements OpcDeviceDriverDefinition { + + @Override + public String getDriverCode() { + return "nl4_station"; + } + + @Override + public String getDriverName() { + return "诺力四期-对接位"; + } + + @Override + public String getDriverDescription() { + return "诺力四期-对接位"; + } + + @Override + public DeviceDriver getDriverInstance(Device device) { + return new NL4StationDeviceDriver().setDevice(device).setDriverDefinition(this); + } + + @Override + public Class getDeviceDriverType() { + return NL4StationDeviceDriver.class; + } + + @Override + public List getFitDeviceTypes() { + List types = new LinkedList<>(); + types.add(DeviceType.station); + return types; + } + + @Override + public List getReadableItemDTOs() { + ArrayList itemDTOs = new ArrayList<>(); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_HEARTBEAT, "心跳", "")); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_MODE, "工作模式", "")); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_MOVE, "光电信号", "")); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_ACTION, "动作信号", "")); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_ERROR, "error", "")); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_TASK, "任务号", "")); + return itemDTOs; + } + + @Override + public List getWriteableItemDTOs() { + ArrayList itemDTOs = new ArrayList<>(); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_TO_COMMAND, "下发命令", "")); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_TO_MATERIAL, "下发物料编号", "")); + itemDTOs.add(new ItemDTO(ItemProtocol.ITEM_TO_QTY, "下发数量", "")); + return itemDTOs; + } +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/NL4StationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/NL4StationDeviceDriver.java new file mode 100644 index 0000000..f5614e3 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/nl4/station/NL4StationDeviceDriver.java @@ -0,0 +1,561 @@ +package org.nl.acs.device_driver.nl4.station; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; +import org.nl.acs.device.service.DeviceService; +import org.nl.acs.device_driver.*; +import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.log.service.DeviceExecuteLogService; +import org.nl.acs.monitor.DeviceStageMonitor; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.service.dto.TaskDto; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.SpringContextHolder; + +import java.lang.reflect.InvocationTargetException; +import java.util.HashMap; +import java.util.Map; + +/** + * @author zhangjiangwei + */ +@Slf4j +@Getter +@Setter +@RequiredArgsConstructor +public class NL4StationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, StandardRequestMethod, HeartbeatableDeviceDriver { + + // 心跳 + private int heartbeat = 0; + private int lastHeartbeat = this.heartbeat; + // 工作模式 + private int mode = 0; + private int lastMode = this.mode; + // 光电信号 + private int move = 0; + private int lastMove = this.move; + // 动作信号 + private int action = 0; + private int lastAction = this.action; + // error + private int error = 0; + private int lastError = this.error; + // 任务号 + private int task = 0; + private int lastTask = this.task; + + // 下发命令 + private int toCommand = 0; + private int lastToCommand = this.toCommand; + // 下发物料 + private int toMaterial = 0; + private int lastToMaterial = this.toMaterial; + // 下发数量 + private int toQty = 0; + private int lastToQty = this.toQty; + + private String deviceCode = null; + private boolean isOnline = false; + private boolean isError = false; + private String message = ""; + + private final ItemProtocol itemProtocol = new ItemProtocol(this); + + private boolean requireSuccess = false; + private long requireTime = System.currentTimeMillis(); + private long requireTimeOut = 3000L; + + private final DeviceExecuteLogService deviceExecuteLogService = SpringContextHolder.getBean(DeviceExecuteLogService.class); + private final DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); + private final TaskService taskService = SpringContextHolder.getBean(TaskService.class); + private final DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); + + @Override + public void execute() throws Exception { + this.message = ""; + + try { + this.deviceCode = this.device.getDevice_code(); + + this.mode = this.itemProtocol.getMode(); + this.move = this.itemProtocol.getMove(); + this.action = this.itemProtocol.getAction(); + this.error = this.itemProtocol.getError(); + this.task = this.itemProtocol.getTask(); + + this.toCommand = this.itemProtocol.getToCommand(); + this.toMaterial = this.itemProtocol.getToMaterial(); + this.toQty = this.itemProtocol.getToQty(); + + if (this.mode != this.lastMode) { + this.requireSuccess = false; + this.deviceExecuteLogService.deviceItemValue(this.deviceCode, ItemProtocol.ITEM_MODE, String.valueOf(mode)); + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", ItemProtocol.ITEM_MODE + " " + this.lastMode + " -> " + this.mode); + } + if (this.move != this.lastMove) { + this.deviceExecuteLogService.deviceItemValue(this.deviceCode, ItemProtocol.ITEM_MOVE, String.valueOf(this.move)); + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", ItemProtocol.ITEM_MOVE + " " + this.lastMove + " -> " + this.move); + } + if (this.action != this.lastAction) { + this.deviceExecuteLogService.deviceItemValue(this.deviceCode, ItemProtocol.ITEM_ACTION, String.valueOf(this.action)); + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", ItemProtocol.ITEM_ACTION + " " + this.lastAction + " -> " + this.action); + } + if (this.error != this.lastError) { + this.deviceExecuteLogService.deviceItemValue(this.deviceCode, ItemProtocol.ITEM_ERROR, String.valueOf(this.error)); + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", ItemProtocol.ITEM_ERROR + " " + this.lastError + " -> " + this.error); + } + if (this.task != this.lastTask) { + this.deviceExecuteLogService.deviceItemValue(this.deviceCode, ItemProtocol.ITEM_TASK, String.valueOf(this.task)); + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", ItemProtocol.ITEM_TASK + " " + this.lastTask + " -> " + this.task); + } + + if (this.toCommand != this.lastToCommand) { + this.deviceExecuteLogService.deviceItemValue(this.deviceCode, ItemProtocol.ITEM_TO_COMMAND, String.valueOf(this.toCommand)); + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", ItemProtocol.ITEM_TO_COMMAND + " " + this.lastToCommand + " -> " + this.toCommand); + } + if (this.toMaterial != this.lastToMaterial) { + this.deviceExecuteLogService.deviceItemValue(this.deviceCode, ItemProtocol.ITEM_TO_MATERIAL, String.valueOf(this.toMaterial)); + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", ItemProtocol.ITEM_TO_MATERIAL + " " + this.lastToMaterial + " -> " + this.toMaterial); + } + if (this.toQty != this.lastToQty) { + this.deviceExecuteLogService.deviceItemValue(this.deviceCode, ItemProtocol.ITEM_TO_QTY, String.valueOf(this.toQty)); + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", ItemProtocol.ITEM_TO_QTY + " " + this.lastToQty + " -> " + this.toQty); + } + } catch (Exception e) { + log.error("{} device driver execute error!", deviceCode); + log.error(e.getMessage(), e); + return; + } + + if (mode == 0) { + // 脱机 + this.isOnline = false; + this.isError = true; + this.message = "脱机。"; + } else if (error != 0) { + //有报警 + this.isOnline = false; + this.isError = true; + this.message = "有报警。"; + //无报警 + } else { + this.isOnline = true; + this.isError = false; + this.message = ""; + + if (this.mode > 2 && !this.requireSuccess) { + Object methodName = this.device.getExtraValue().get(String.valueOf(mode)); + if (ObjectUtil.isNotEmpty(methodName)) { + try { + this.executionMethodByMode(methodName.toString()); + this.requireSuccess = true; + } catch (Exception e) { + log.error("{} device driver execute error!", deviceCode); + log.error(e.getMessage(), e); + + String message = "执行工作模式对应方法 " + methodName + " 错误！错误信息：" + e.getMessage(); + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + this.isError = true; + } + } else { + String message = "未知工作模式，驱动未配置对应方法。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + } + } + } + } + + @Override + public JSONObject getDeviceStatusName() throws Exception { + return null; + } + + @Override + public void setDeviceStatus(JSONObject data) { + + } + + public void writing(String param, Object value) { + + String to_param = this.getDevice().getOpc_server_code() + "." + + this.getDevice().getOpc_plc_code() + "." + + this.getDevice().getDevice_code() + "." + + param; + + Map itemMap = new HashMap<>(); + itemMap.put(to_param, value); + this.control(itemMap); + + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", param + " 写入 " + value); + } + + private synchronized void executionMethodByMode(String methodName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + long currentTimeMillis = System.currentTimeMillis(); + if (currentTimeMillis - this.requireTime < this.requireTimeOut) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); + } else { + this.requireTime = currentTimeMillis; + this.getClass().getMethod(methodName).invoke(this); + } + } + + @NotNull + public TaskDto creatTask(Device device1, Device device2, Device device3, Device device4, RequestMethodEnum method) { + JSONObject rpUpdate = new JSONObject(); + rpUpdate.put("islock", "1"); + rpUpdate.put("update_by", "auto"); + rpUpdate.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("acs_device_runpoint").update(rpUpdate, "device_code IN ('" + device1.getDevice_code() + "', '" + device2.getDevice_code() + "', '" + device3.getDevice_code() + "', '" + device4.getDevice_code() + "')"); + + device1.setIslock("1"); + device2.setIslock("1"); + device3.setIslock("1"); + device4.setIslock("1"); + + JSONObject task = new JSONObject(); + task.put("start_point_code", device1.getDevice_code()); + task.put("start_parent_code", device1.getDevice_code()); + task.put("start_device_code", device1.getDevice_code()); + task.put("next_point_code", device2.getDevice_code()); + task.put("next_parent_code", device2.getDevice_code()); + task.put("next_device_code", device2.getDevice_code()); + task.put("start_point_code2", device3.getDevice_code()); + task.put("start_device_code2", device3.getDevice_code()); + task.put("next_point_code2", device4.getDevice_code()); + task.put("next_device_code2", device4.getDevice_code()); + task.put("priority", 1); + task.put("task_type", 1); + task.put("direction", method.getCode()); + return task.toJavaObject(TaskDto.class); + } + + /** + * 门架上料完成 + */ + @SuppressWarnings("unused") + public synchronized void gantryMaterialFinished() throws Exception { + Device currentDevice = this.deviceAppService.findDeviceByCode(this.deviceCode); + if ("0".equals(currentDevice.getIslock())) { + // 门架上料完成放空设备 + Object gantryDeviceCode1 = this.getDevice().getExtraValue().get("gantry_device_code1"); + if (ObjectUtil.isEmpty(gantryDeviceCode1)) { + String message = "门架上料完成放空设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray emptyDeviceCodes = JSONArray.parseArray(gantryDeviceCode1.toString()); + // 门架上料完成取满设备 + Object gantryDeviceCode2 = this.getDevice().getExtraValue().get("gantry_device_code2"); + if (ObjectUtil.isEmpty(gantryDeviceCode2)) { + String message = "门架上料完成取满设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray materialDeviceCodes = JSONArray.parseArray(gantryDeviceCode2.toString()); + + // 查找合适的放空设备 + Device emptyDevice = null; + for (int i = 0; i < emptyDeviceCodes.size(); i++) { + String deviceCode = emptyDeviceCodes.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 0 == device.getHas_goods()) { + emptyDevice = device; + break; + } + } + if (ObjectUtil.isEmpty(emptyDevice)) { + String message = "未找到合适的门架上料完成放空设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert emptyDevice != null; + + // 查找合适的取满设备 + Device materialDevice = null; + for (int i = 0; i < materialDeviceCodes.size(); i++) { + String deviceCode = materialDeviceCodes.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 1 == device.getHas_goods()) { + materialDevice = device; + break; + } + } + if (ObjectUtil.isEmpty(materialDevice)) { + String message = "未找到合适的门架上料完成取满设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert materialDevice != null; + + this.taskService.create(this.creatTask(currentDevice, emptyDevice, materialDevice, currentDevice, RequestMethodEnum.GANTRY_MATERIAL_FINISHED)); + } + } + + /** + * 槽钢上料完成 + */ + @SuppressWarnings("unused") + public synchronized void channelSteelMaterialFinished() throws Exception { + Device currentDevice = this.deviceAppService.findDeviceByCode(this.deviceCode); + if ("0".equals(currentDevice.getIslock())) { + // 槽钢上料完成取满设备 + Object channelSteelDeviceCode1 = this.getDevice().getExtraValue().get("channel_steel_device_code1"); + if (ObjectUtil.isEmpty(channelSteelDeviceCode1)) { + String message = "槽钢上料完成取满设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray deviceCodes1 = JSONArray.parseArray(channelSteelDeviceCode1.toString()); + // 槽钢上料完成放满设备 + Object channelSteelDeviceCode2 = this.getDevice().getExtraValue().get("channel_steel_device_code2"); + if (ObjectUtil.isEmpty(channelSteelDeviceCode2)) { + String message = "槽钢上料完成放满设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray deviceCodes2 = JSONArray.parseArray(channelSteelDeviceCode2.toString()); + // 槽钢上料完成放空设备 + Object channelSteelDeviceCode4 = this.getDevice().getExtraValue().get("channel_steel_device_code4"); + if (ObjectUtil.isEmpty(channelSteelDeviceCode4)) { + String message = "槽钢上料完成放空设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray deviceCodes4 = JSONArray.parseArray(channelSteelDeviceCode4.toString()); + + // 查找合适的取满设备 + Device device1 = null; + for (int i = 0; i < deviceCodes1.size(); i++) { + String deviceCode = deviceCodes1.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 1 == device.getHas_goods()) { + device1 = device; + break; + } + } + if (ObjectUtil.isEmpty(device1)) { + String message = "未找到合适的槽钢上料完成取满设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert device1 != null; + + // 查找合适的放满设备 + Device device2 = null; + for (int i = 0; i < deviceCodes2.size(); i++) { + String deviceCode = deviceCodes2.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 0 == device.getHas_goods()) { + device2 = device; + break; + } + } + if (ObjectUtil.isEmpty(device2)) { + String message = "未找到合适的槽钢上料完成放满设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert device2 != null; + + // 查找合适的放空设备 + Device device4 = null; + for (int i = 0; i < deviceCodes4.size(); i++) { + String deviceCode = deviceCodes4.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 0 == device.getHas_goods()) { + device4 = device; + break; + } + } + if (ObjectUtil.isEmpty(device4)) { + String message = "未找到合适的槽钢上料完成放空设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert device4 != null; + + this.taskService.create(this.creatTask(device1, device2, currentDevice, device4, RequestMethodEnum.CHANNEL_STEEL_MATERIAL_FINISHED)); + } + } + + /** + * 槽钢呼叫满料 + */ + @SuppressWarnings("unused") + public synchronized void channelSteelCallMaterial() throws Exception { + Device currentDevice = this.deviceAppService.findDeviceByCode(this.deviceCode); + if ("0".equals(currentDevice.getIslock())) { + // 槽钢呼叫满料取满设备 + Object channelSteelCallMaterialDeviceCode1 = this.getDevice().getExtraValue().get("channel_steel_call_material_device_code1"); + if (ObjectUtil.isEmpty(channelSteelCallMaterialDeviceCode1)) { + String message = "槽钢呼叫满料取满设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray deviceCodes1 = JSONArray.parseArray(channelSteelCallMaterialDeviceCode1.toString()); + // 槽钢呼叫满料取空设备 + Object channelSteelCallMaterialDeviceCode3 = this.getDevice().getExtraValue().get("channel_steel_call_material_device_code3"); + if (ObjectUtil.isEmpty(channelSteelCallMaterialDeviceCode3)) { + String message = "槽钢呼叫满料取空设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray deviceCodes3 = JSONArray.parseArray(channelSteelCallMaterialDeviceCode3.toString()); + // 槽钢呼叫满料放空设备 + Object channelSteelCallMaterialDeviceCode4 = this.getDevice().getExtraValue().get("channel_steel_call_material_device_code4"); + if (ObjectUtil.isEmpty(channelSteelCallMaterialDeviceCode4)) { + String message = "槽钢呼叫满料放空设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray deviceCodes4 = JSONArray.parseArray(channelSteelCallMaterialDeviceCode4.toString()); + + // 查找合适的取满设备 + Device device1 = null; + for (int i = 0; i < deviceCodes1.size(); i++) { + String deviceCode = deviceCodes1.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 1 == device.getHas_goods()) { + device1 = device; + break; + } + } + if (ObjectUtil.isEmpty(device1)) { + String message = "未找到合适的槽钢呼叫满料取满设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert device1 != null; + + // 查找合适的取空设备 + Device device3 = null; + for (int i = 0; i < deviceCodes3.size(); i++) { + String deviceCode = deviceCodes3.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 1 == device.getHas_goods()) { + device3 = device; + break; + } + } + if (ObjectUtil.isEmpty(device3)) { + String message = "未找到合适的槽钢呼叫满料取空设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert device3 != null; + + // 查找合适的放空设备 + Device device4 = null; + for (int i = 0; i < deviceCodes4.size(); i++) { + String deviceCode = deviceCodes4.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 0 == device.getHas_goods()) { + device4 = device; + break; + } + } + if (ObjectUtil.isEmpty(device4)) { + String message = "未找到合适的槽钢呼叫满料放空设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert device4 != null; + + this.taskService.create(this.creatTask(device1, currentDevice, device3, device4, RequestMethodEnum.CHANNEL_STEEL_CALL_MATERIAL)); + } + } + + /** + * 下料完成 + */ + @SuppressWarnings("unused") + public synchronized void productionCompleted() throws Exception { + Device currentDevice = this.deviceAppService.findDeviceByCode(this.deviceCode); + if ("0".equals(currentDevice.getIslock())) { + // 下料完成放满设备 + Object productionCompletedDeviceCode2 = this.getDevice().getExtraValue().get("production_completed_device_code2"); + if (ObjectUtil.isEmpty(productionCompletedDeviceCode2)) { + String message = "下料完成放满设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray deviceCodes2 = JSONArray.parseArray(productionCompletedDeviceCode2.toString()); + // 下料完成取空设备 + Object productionCompletedDeviceCode3 = this.getDevice().getExtraValue().get("production_completed_device_code3"); + if (ObjectUtil.isEmpty(productionCompletedDeviceCode3)) { + String message = "下料完成取空设备未配置。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + JSONArray deviceCodes3 = JSONArray.parseArray(productionCompletedDeviceCode3.toString()); + + // 查找合适的放满设备 + Device device2 = null; + for (int i = 0; i < deviceCodes2.size(); i++) { + String deviceCode = deviceCodes2.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 0 == device.getHas_goods()) { + device2 = device; + break; + } + } + if (ObjectUtil.isEmpty(device2)) { + String message = "未找到合适的下料完成放满设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert device2 != null; + + // 查找合适的取空设备 + Device device3 = null; + for (int i = 0; i < deviceCodes3.size(); i++) { + String deviceCode = deviceCodes3.getString(i); + Device device = deviceAppService.findDeviceByCode(deviceCode); + if ("0".equals(device.getIslock()) && 1 == device.getHas_goods()) { + device3 = device; + break; + } + } + if (ObjectUtil.isEmpty(device3)) { + String message = "未找到合适的下料完成取空设备。"; + this.message = message; + this.deviceExecuteLogService.deviceExecuteLog(this.deviceCode, "", "", message); + return; + } + assert device3 != null; + + this.taskService.create(this.creatTask(currentDevice, device2, device3, currentDevice, RequestMethodEnum.PRODUCTION_COMPLETED)); + } + } +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 7f009be..b4f653a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.AgvUtil; import org.nl.acs.config.AcsConfig; import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol; import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; @@ -29,8 +28,7 @@ import org.nl.acs.device_driver.lnsh.lnsh_press.LnshPressDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_rgv.LnshRGVDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; -import org.nl.acs.ext.wms.data.AcsToWmsData.grab_place_station.GrabPlaceStationResponse; +import org.nl.acs.device_driver.basedriver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.ext.wms.data.WmstoAcsData.createOrder.CreateOrderRequest; import org.nl.acs.ext.wms.data.WmstoAcsData.createOrder.CreateOrderResponse; import org.nl.acs.ext.wms.data.WmstoAcsData.createOrder.OrderDto; @@ -45,7 +43,6 @@ import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.order.service.ProduceshiftorderService; -import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service_impl/HeartbeatUnifiedServiceimpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service_impl/HeartbeatUnifiedServiceimpl.java index 7d9e503..3060331 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service_impl/HeartbeatUnifiedServiceimpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service_impl/HeartbeatUnifiedServiceimpl.java @@ -9,10 +9,8 @@ import org.nl.acs.heartbeat.HeartbeatConfig; import org.nl.acs.heartbeat.HeartbeatEvent; import org.nl.acs.heartbeat.dto.HeartbeatManageDto; import org.nl.acs.heartbeat.enums.HeartbeatType; -import org.nl.acs.heartbeat.event.HeartbeatOfflineEvent; import org.nl.acs.heartbeat.service.HeartbeatManageService; import org.nl.acs.heartbeat.service.HeartbeatUnifiedService; -import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; @@ -168,7 +166,7 @@ public class HeartbeatUnifiedServiceimpl implements HeartbeatUnifiedService, App } public HeartbeatManageDto findByResourceCode(String resource_code) { - Iterator iterator = this.heartbeats.iterator(); + Iterator iterator = this.heartbeats.iterator(); HeartbeatManageDto dto; do { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index a28a6b9..f0972ef 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -2,7 +2,6 @@ package org.nl.acs.instruction.service.impl; -import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -40,7 +39,6 @@ import org.nl.modules.system.service.ParamService; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.exception.WDKException; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -721,8 +719,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu String start_device_code = dto.getNext_device_code(); String start_point_code = null; String next_point_code = null; - String start_device = deviceAppService.findDeviceByCode(start_device_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name(); - String next_device = deviceAppService.findDeviceByCode(next_device_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name(); + String start_device = deviceAppService.findDeviceByCode(start_device_code).getDeviceDriverDefinition().getFitDeviceTypes().get(0).name(); + String next_device = deviceAppService.findDeviceByCode(next_device_code).getDeviceDriverDefinition().getFitDeviceTypes().get(0).name(); if (StrUtil.equals("storage", start_device)) { start_point_code = start_device_code + "-" + acsTask.getFrom_y() + "-" + acsTask.getFrom_z(); } else { @@ -971,7 +969,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu inst.setFrom_y(start_point[1]); inst.setFrom_z(start_point[2]); } else { - String start_device = deviceAppService.findDeviceByCode(start_device_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name(); + String start_device = deviceAppService.findDeviceByCode(start_device_code).getDeviceDriverDefinition().getFitDeviceTypes().get(0).name(); if (StrUtil.equals("storage", start_device)) { String[] start_point = start_point_code.split("-"); inst.setFrom_x(start_point[0]); @@ -991,7 +989,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu inst.setTo_z(next_point[2]); } else { - String next_device = deviceAppService.findDeviceByCode(next_device_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name(); + String next_device = deviceAppService.findDeviceByCode(next_device_code).getDeviceDriverDefinition().getFitDeviceTypes().get(0).name(); if (StrUtil.equals("storage", next_device)) { String[] next_point = start_point_code.split("-"); inst.setTo_x(next_point[0]); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/Device.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/Device.java index 0230442..88db36a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/Device.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/Device.java @@ -2,7 +2,7 @@ package org.nl.acs.opc; import lombok.Data; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; @Data public class Device extends DeviceManageDto { @@ -11,7 +11,7 @@ public class Device extends DeviceManageDto { private int status_code = 0; private String status_message = ""; private DeviceDriver deviceDriver; - private DeviceDriverDefination deviceDriverDefination; + private DeviceDriverDefinition deviceDriverDefinition; @Override public String toString() { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java index 6834e76..52b82b8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java @@ -5,9 +5,9 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; import org.nl.acs.auto.initial.ApplicationAutoInitial; -import org.nl.acs.device.service.DeviceDriverDefinationAppService; +import org.nl.acs.device.service.DeviceDriverDefinitionAppService; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device_driver.DeviceDriverDefinition; import org.nl.acs.device_driver.LinewayDeviceDriver; import org.nl.acs.device_driver.driver.OpcDeviceDriver; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +23,7 @@ public class DeviceAppServiceImpl implements DeviceAppService, ApplicationAutoIn @Autowired private DeviceManageService deviceManageService; @Autowired - private DeviceDriverDefinationAppService deviceDriverDefinationAppService; + private DeviceDriverDefinitionAppService deviceDriverDefinitionAppService; @Override public List findAllDevice() { @@ -300,7 +300,7 @@ public class DeviceAppServiceImpl implements DeviceAppService, ApplicationAutoIn while (var3.hasNext()) { Device device = (Device) var3.next(); if (ObjectUtil.equal(device.getDevice_code(), deviceCode)) { - return device.getDeviceDriverDefination().getFitDeviceTypes().get(0).name(); + return device.getDeviceDriverDefinition().getFitDeviceTypes().get(0).name(); } } return null; @@ -332,10 +332,10 @@ public class DeviceAppServiceImpl implements DeviceAppService, ApplicationAutoIn this.code_indexs.add(device.getDevice_code()); if (!StrUtil.isEmpty(device.getDriver_code())) { - DeviceDriverDefination defination = this.deviceDriverDefinationAppService.getDeviceDriverDefination(deviceManage.getDriver_code()); - if (defination != null) { - device.setDeviceDriverDefination(defination); - DeviceDriver driver = defination.getDriverInstance(device); + DeviceDriverDefinition definition = this.deviceDriverDefinitionAppService.getDeviceDriverDefinition(deviceManage.getDriver_code()); + if (definition != null) { + device.setDeviceDriverDefinition(definition); + DeviceDriver driver = definition.getDriverInstance(device); device.setDeviceDriver(driver); } @@ -379,10 +379,10 @@ public class DeviceAppServiceImpl implements DeviceAppService, ApplicationAutoIn this.code_indexs.add(device.getDevice_code()); if (!StrUtil.isEmpty(device.getDriver_code())) { - DeviceDriverDefination defination = this.deviceDriverDefinationAppService.getDeviceDriverDefination(deviceManage.getDriver_code()); - if (defination != null) { - device.setDeviceDriverDefination(defination); - DeviceDriver driver = defination.getDriverInstance(device); + DeviceDriverDefinition definition = this.deviceDriverDefinitionAppService.getDeviceDriverDefinition(deviceManage.getDriver_code()); + if (definition != null) { + device.setDeviceDriverDefinition(definition); + DeviceDriver driver = definition.getDriverInstance(device); device.setDeviceDriver(driver); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java deleted file mode 100644 index 5ac2623..0000000 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.nl.acs.opc; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.service.DeviceDriverDefinationAppService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.modules.common.exception.BadRequestException; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Service; - -import java.util.*; - -@Service -@Slf4j -public class DeviceDriverDefinationAppServiceImpl implements DeviceDriverDefinationAppService, InitializingBean, ApplicationContextAware { - @Autowired - private Map deviceDriverDefinations = new HashMap(); - @Autowired( - required = false - ) - List deviceDriverDefinationsx; - - public DeviceDriverDefinationAppServiceImpl() { - this.deviceDriverDefinations = Collections.synchronizedMap(this.deviceDriverDefinations); - } - - @Override - public List getDeviceDriverCodes() { - return null; - } - - @Override - public DeviceDriverDefination getDeviceDriverDefination(String driverCode) { - return (DeviceDriverDefination) this.deviceDriverDefinations.get(driverCode); - } - - @Override - public List getDeviceDriverDefinations() { - return new LinkedList(this.deviceDriverDefinations.values()); - } - - @Override - public List getDeviceDriverDefinations(DeviceType deviceType) { - Collection definations = this.deviceDriverDefinations.values(); - List deviceTypeDefinations = new LinkedList(); - Iterator var4 = definations.iterator(); - - while (var4.hasNext()) { - DeviceDriverDefination defination = (DeviceDriverDefination) var4.next(); - if (defination.getFitDeviceTypes() == null || defination.getDriverCode() == null || defination.getDeviceDriverType() == null) { - throw new BadRequestException("当前驱动defination定义异常：" + defination.getClass()); - } - - if (defination.getFitDeviceTypes().contains(deviceType)) { - deviceTypeDefinations.add(defination); - } - } - - return deviceTypeDefinations; - } - - @Override - public boolean isRoute(Class var1) { - return false; - } - - @Override - public boolean isOpc(Class var1) { - return false; - } - - @Override - public void afterPropertiesSet() throws Exception { - this.initial(); - } - - public void initial() { - if (this.deviceDriverDefinationsx != null) { - Iterator var1 = this.deviceDriverDefinationsx.iterator(); - - DeviceDriverDefination deviceDriverDefination; - while (var1.hasNext()) { - deviceDriverDefination = (DeviceDriverDefination) var1.next(); - if (deviceDriverDefination.getDriverCode() != null && deviceDriverDefination.getFitDeviceTypes() != null && deviceDriverDefination.getFitDeviceTypes() != null) { - this.addDeviceDriverDefination(deviceDriverDefination.getDriverCode(), deviceDriverDefination); - } - - //log.warn("{}驱动定义异常", deviceDriverDefination.getClass()); - } - - } - } - - private void addDeviceDriverDefination(String driverCode, DeviceDriverDefination deviceDriverDefination) { - this.deviceDriverDefinations.put(driverCode, deviceDriverDefination); - } - - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - - } -} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceDriverDefinitionAppServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceDriverDefinitionAppServiceImpl.java new file mode 100644 index 0000000..6487d8c --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceDriverDefinitionAppServiceImpl.java @@ -0,0 +1,106 @@ +package org.nl.acs.opc; + +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.service.DeviceDriverDefinitionAppService; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.DeviceDriverDefinition; +import org.nl.modules.common.exception.BadRequestException; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +@Slf4j +public class DeviceDriverDefinitionAppServiceImpl implements DeviceDriverDefinitionAppService, InitializingBean, ApplicationContextAware { + @Autowired + private Map deviceDriverDefinitions = new HashMap(); + @Autowired( + required = false + ) + List deviceDriverDefinitionsxes; + + public DeviceDriverDefinitionAppServiceImpl() { + this.deviceDriverDefinitions = Collections.synchronizedMap(this.deviceDriverDefinitions); + } + + @Override + public List getDeviceDriverCodes() { + return null; + } + + @Override + public DeviceDriverDefinition getDeviceDriverDefinition(String driverCode) { + return (DeviceDriverDefinition) this.deviceDriverDefinitions.get(driverCode); + } + + @Override + public List getDeviceDriverDefinitions() { + return new LinkedList(this.deviceDriverDefinitions.values()); + } + + @Override + public List getDeviceDriverDefinitions(DeviceType deviceType) { + Collection definitions = this.deviceDriverDefinitions.values(); + List deviceTypeDefinitions = new LinkedList(); + Iterator var4 = definitions.iterator(); + + while (var4.hasNext()) { + DeviceDriverDefinition definition = (DeviceDriverDefinition) var4.next(); + if (definition.getFitDeviceTypes() == null || definition.getDriverCode() == null || definition.getDeviceDriverType() == null) { + throw new BadRequestException("当前驱动definition定义异常：" + definition.getClass()); + } + + if (definition.getFitDeviceTypes().contains(deviceType)) { + deviceTypeDefinitions.add(definition); + } + } + + return deviceTypeDefinitions; + } + + @Override + public boolean isRoute(Class var1) { + return false; + } + + @Override + public boolean isOpc(Class var1) { + return false; + } + + @Override + public void afterPropertiesSet() throws Exception { + this.initial(); + } + + public void initial() { + if (this.deviceDriverDefinitionsxes != null) { + Iterator var1 = this.deviceDriverDefinitionsxes.iterator(); + + DeviceDriverDefinition deviceDriverDefinition; + while (var1.hasNext()) { + deviceDriverDefinition = (DeviceDriverDefinition) var1.next(); + if (deviceDriverDefinition.getDriverCode() != null && deviceDriverDefinition.getFitDeviceTypes() != null && deviceDriverDefinition.getFitDeviceTypes() != null) { + this.addDeviceDriverDefinition(deviceDriverDefinition.getDriverCode(), deviceDriverDefinition); + } + + //log.warn("{}驱动定义异常", deviceDriverDefinition.getClass()); + } + + } + } + + private void addDeviceDriverDefinition(String driverCode, DeviceDriverDefinition deviceDriverDefinition) { + this.deviceDriverDefinitions.put(driverCode, deviceDriverDefinition); + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + + } +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java index d299cba..5a33aa8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java @@ -29,8 +29,6 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC private int all_null; private Map itemSearchCache; - LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); - public DeviceOpcProtocolRunable() { this.error_num = 0; @@ -56,10 +54,12 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC this.OpcServer = opcServer; } + private OpcItemDto getItem(String item) { OpcItemDto x = (OpcItemDto) this.itemSearchCache.get(item); if (x == null) { Iterator var3 = this.protocols.iterator(); + while (var3.hasNext()) { OpcItemDto dto = (OpcItemDto) var3.next(); if (StrUtil.equals(item, dto.getItem_code())) { @@ -69,9 +69,11 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC } } } + return x; } + @Override public void run() { if (OpcConfig.opc_item_read_using_callback) { @@ -81,6 +83,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC } } + private void runOld() { OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService .class); while (true) { @@ -96,10 +99,10 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC log.trace("清理server..."); } - 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(); +// 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 itemsString = new ArrayList(); Iterator var3 = this.protocols.iterator(); @@ -120,7 +123,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC try { Item item = group.addItem(string); itemsMap.put(string, item); -// log.trace("添加成功 {}", string); + log.trace("添加成功 {}", string); } catch (Exception var26) { err_message.append(string + ":" + var26.getMessage()); if (!is_error) { @@ -132,14 +135,13 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC String tag; if (is_error) { tag = err_message.toString(); -// log.warn("{}:{}", OpcConfig.resource_code, tag); + log.warn("{}:{}", OpcConfig.resource_code, tag); } if (!OpcStartTag.is_run) { OpcStartTag.is_run = true; } - //线程名 tag = ""; if (log.isWarnEnabled()) { tag = Thread.currentThread().getName(); @@ -147,25 +149,26 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC tag = tag + this.getOpcGroupID(); } } + UnifiedDataAccessor accessor_value = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key); boolean time_out = false; - label97: while (DeviceOpcSynchronizeAutoRun.isRun) { long begin = System.currentTimeMillis(); if (log.isTraceEnabled()) { -// log.trace("{} 开始记时{}", tag, DateUtil.now()); + log.trace("{} 开始记时{}", tag, DateUtil.now()); } Map itemStatus = group.read(true, (Item[]) itemsMap.values().toArray(new Item[0])); long end = System.currentTimeMillis(); long duration = end - begin; if (log.isTraceEnabled()) { -// log.trace("{} 读取耗时：{}", tag, duration); + log.trace("{} 读取耗时：{}", tag, duration); } + if (duration > 1000L) { if (!time_out) { -// log.warn("{} 读取超时 : {}", tag, duration); + log.warn("{} 读取超时 : {}", tag, duration); } time_out = true; @@ -188,7 +191,8 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC String itemId = item.getId(); Object his = accessor_value.getValue(itemId); if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD) && his != null) { -// log.warn("opc 值不健康 item: {}, 状态: {}", itemId, itemState.getQuality()); + log.warn("opc 值不健康 item: {}, 状态: {}", itemId, itemState.getQuality()); + valueAllNotNull = false; } if (!UnifiedDataAppService.isEquals(value, his)) { @@ -196,8 +200,9 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC if (true) { this.logItemChanged(itemId, accessor_value, value, itemDto); } - - accessor_value.setValue(itemId, value); + if(!ObjectUtil.isEmpty(value)){ + accessor_value.setValue(itemId, value); + } } } @@ -218,31 +223,33 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC random *= 1000; if (this.all_null < 3) { if (log.isWarnEnabled()) { - log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null, 5000 + random); + log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,5000 + random); } - ThreadUtl.sleep((long) ((new Random()).nextInt(3) + 1) * 1000); + + ThreadUtl.sleep((long) ((new Random()).nextInt(3) +1) * 1000); break start; } else if (this.all_null < 6) { if (log.isWarnEnabled()) { log.warn(tag + "重新创建server"); - log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null, 30000 + random); + log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,30000 + random); } - ThreadUtl.sleep((long) ((new Random()).nextInt(3) + 1) * 1000); +// ThreadUtl.sleep((long) (30000 + random)); + ThreadUtl.sleep((long) ((new Random()).nextInt(3) +1) * 1000); break start; } else if (this.all_null < 12) { if (log.isWarnEnabled()) { -// log.warn("{} 所有内容都为空, all_null:{} ,暂定{}ms", tag, all_null, '\uea60' + random); + log.warn("{} 所有内容都为空, all_null:{} ,暂定{}ms", tag, all_null, '\uea60' + random); } - ThreadUtl.sleep((long) ((new Random()).nextInt(3) + 1) * 1000); - break start; + ThreadUtl.sleep((long) ('\uea60' + random)); } else { if (log.isWarnEnabled()) { -// log.warn("{} 所有内容都为空, all_null:{} ,暂定{}ms", tag, all_null, 120000 + random); + log.warn("{} 所有内容都为空, all_null:{} ,暂定{}ms", tag, all_null, 120000 + random); } -// ThreadUtl.sleep((long) ((new Random()).nextInt(3) + 1) * 1000); -// break start; + + ThreadUtl.sleep((long) (120000 + random)); } + ++this.all_null; } else { this.all_null = 0; @@ -258,9 +265,9 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC try { this.server.disconnect(); } catch (Exception var25) { - } } + this.server = null; if (!DeviceOpcSynchronizeAutoRun.isRun) { log.warn("opc线程停止2。。。"); @@ -347,12 +354,13 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC } } + public void connectionStateChanged(boolean connected) { if (!connected) { this.server = null; } -// log.warn("opc server {} {}", this.getOpcGroupID(), connected ? "connected" : "disconnected"); + log.warn("opc server {} {}", this.getOpcGroupID(), connected ? "connected" : "disconnected"); } private String getOpcGroupID() { @@ -367,6 +375,8 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC long seconds = mss % 60000L / 1000L; return days + " days " + hours + " hours " + minutes + " minutes " + seconds + " seconds "; } + + public void changed(Item item, ItemState itemState) { String itemId = item.getId(); @@ -382,7 +392,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC // } else if (log.isInfoEnabled()) { // log.info("Item {} new value: {}, Timestamp: {}, Quality: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime(), itemState.getQuality()}); // } -// log.trace("Item {} new value: {}, Timestamp: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime()}); + log.trace("Item {} new value: {}, Timestamp: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime()}); OpcItemDto itemDto = this.getItem(itemId); // if (Boolean.TRUE.equals(itemDto.getNeed_log())) { @@ -398,8 +408,6 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC private void logItemChanged(String itemId, UnifiedDataAccessor accessor_value, Object value, OpcItemDto itemDto) { Object his = accessor_value.getValue(itemId); - itemDto.setHis_item_value(his); - itemDto.setItem_value(value); List relate_items = itemDto.getRelate_items(); if (relate_items != null && !relate_items.isEmpty()) { StringBuilder sb = new StringBuilder(); @@ -410,23 +418,11 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC Object obj = accessor_value.getValue(relate); sb.append("key:" + relate + "value:" + obj + ";"); } - if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time")) { - // 存在上次点位值为null情况 则不记录日志 - LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1), - String.valueOf(itemDto.getHis_item_value()), String.valueOf(itemDto.getItem_value())); - luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); - log.info("{}", JSON.toJSONString(luceneLogDto)); - } + log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value, sb}); +// this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{};信号快照：{}", new Object[]{itemId, his, value, sb}); } else { -// log.info("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); - // 存在上次点位值为null情况 则不记录日志 - if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time")) { - LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1), - String.valueOf(itemDto.getHis_item_value()), String.valueOf(itemDto.getItem_value())); - luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); - log.info("{}", JSON.toJSONString(luceneLogDto)); - - } + log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); +// this.businessLogger.setResource(itemDto.getDevice_code(), itemDto.getDevice_name()).log("信号{}变更从{}->{}", new Object[]{itemId, his, value}); } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 9c5a6f9..dd8ffb0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; 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; @@ -27,10 +26,8 @@ import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdina import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; -import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; -import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskResponse; +import org.nl.acs.device_driver.basedriver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; import org.nl.acs.ext.wms.data.AcsToWmsData.feedBackTaskStatus.FeedBackTaskStatusRequest; -import org.nl.acs.ext.wms.data.Resp; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -43,12 +40,10 @@ import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskFeedbackService; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.task.service.dto.TaskFeedbackDto; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.FileUtil; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.ParamService; -import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -313,10 +308,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { task_code = CodeUtil.getNewCode("TASK_NO"); task_code = "-" + task_code; } - String start_point_code = dto.getStart_point_code(); - String next_point_code = dto.getNext_point_code(); - String start_device_code = dto.getStart_device_code(); - String next_device_code = dto.getNext_device_code(); String route_plan_code = dto.getRoute_plan_code(); dto.setCreate_by(currentUsername); dto.setUpdate_by(currentUsername); @@ -331,19 +322,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } String plan_code = dto.getRoute_plan_code(); //判断起点终点设备类型 - String startDeviceType = deviceAppService.findDeviceTypeByCode(dto.getStart_device_code()); - String nextDeviceType = deviceAppService.findDeviceTypeByCode(dto.getNext_device_code()); - if (routelineserver.getShortPathLines(dto.getStart_device_code(), dto.getNext_device_code(), plan_code).size() == 0) { + if (routelineserver.getShortPathLines(dto.getStart_device_code(), dto.getNext_device_code(), plan_code).isEmpty() + && routelineserver.getShortPathLines(dto.getStart_device_code2(), dto.getNext_device_code2(), plan_code).isEmpty()) { throw new Exception(dto.getStart_point_code() + "->" + dto.getNext_point_code() + "路由不通!"); } - String createTaskCheck = acsConfigService.findByCode(AcsConfig.CREATETASKCHECK).getValue(); - DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - Device nextdevice = appService.findDeviceByCode(next_device_code); - Device startdevice = appService.findDeviceByCode(start_device_code); - dto.setMaterial(startdevice.getMaterial_type()); - StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; + WQLObject wo = WQLObject.getWQLObject("acs_task"); JSONObject json = (JSONObject) JSONObject.toJSON(dto); @@ -549,25 +532,187 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { request.setTask_status(entity.getTask_status()); request.setRequest_medthod_code(RequestMethodEnum.feedback_task_status.getCode()); request.setRequest_medthod_name(RequestMethodEnum.feedback_task_status.getName()); - boolean flag = false; - String resp = null; try { - resp = acstowmsService.applyTask(request); + acstowmsService.applyTask(request); } catch (Exception e) { - flag = true; - e.printStackTrace(); - } finally { - + log.error("feedback task finish to wms error!", e); } } - //如果属于先知AGV，关闭运单序列 - if (StrUtil.equals(acsConfigService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { - try { - XianGongAgvServiceImpl xianGongAgv = SpringContextHolder.getBean(XianGongAgvServiceImpl.class); - xianGongAgv.markComplete(entity.getTask_code()); - } catch (Exception e) { - e.printStackTrace(); - } + + // 诺力四期 完成任务后更新点位状态 + if (RequestMethodEnum.GANTRY_MATERIAL_FINISHED.getCode().equals(entity.getDirection())) { + // 门架上料完成任务 + WQLObject rpTable = WQLObject.getWQLObject("acs_device_runpoint"); + + Device device2 = deviceAppService.findDeviceByCode(entity.getNext_device_code()); + device2.setIslock("0"); + device2.setHas_goods(0); + device2.setMaterial_type("0"); + device2.setBatch("0"); + JSONObject update23 = new JSONObject(); + update23.put("islock", "0"); + update23.put("hasgoods", "0"); + update23.put("material_type", "0"); + update23.put("batch", "0"); + update23.put("update_by", "auto"); + update23.put("update_time", DateUtil.now()); + rpTable.update(update23, "device_code = '" + device2.getDevice_code() + "'"); + + Device device3 = deviceAppService.findDeviceByCode(entity.getStart_device_code2()); + Device device4 = deviceAppService.findDeviceByCode(entity.getNext_device_code2()); + device4.setIslock("0"); + device4.setHas_goods(1); + device4.setMaterial_type(device3.getMaterial_type()); + device4.setBatch(device3.getBatch()); + JSONObject update4 = new JSONObject(); + update4.put("islock", "0"); + update4.put("hasgoods", "1"); + update4.put("material_type", device3.getMaterial_type()); + update4.put("batch", device3.getBatch()); + update4.put("update_by", "auto"); + update4.put("update_time", DateUtil.now()); + rpTable.update(update4, "device_code = '" + device4.getDevice_code() + "'"); + + device3.setIslock("0"); + device3.setHas_goods(0); + device3.setMaterial_type("0"); + device3.setBatch("0"); + rpTable.update(update23, "device_code = '" + device3.getDevice_code() + "'"); + } else if (RequestMethodEnum.CHANNEL_STEEL_MATERIAL_FINISHED.getCode().equals(entity.getDirection())) { + // 槽钢上料完成任务 + WQLObject rpTable = WQLObject.getWQLObject("acs_device_runpoint"); + + Device device1 = deviceAppService.findDeviceByCode(entity.getStart_device_code()); + Device device2 = deviceAppService.findDeviceByCode(entity.getNext_device_code()); + device2.setIslock("0"); + device2.setHas_goods(1); + device2.setMaterial_type(device1.getMaterial_type()); + device2.setBatch(device1.getBatch()); + JSONObject update2 = new JSONObject(); + update2.put("islock", "0"); + update2.put("hasgoods", "1"); + update2.put("material_type", device1.getMaterial_type()); + update2.put("batch", device1.getBatch()); + update2.put("update_by", "auto"); + update2.put("update_time", DateUtil.now()); + rpTable.update(update2, "device_code = '" + device2.getDevice_code() + "'"); + + device1.setIslock("0"); + device1.setHas_goods(0); + device1.setMaterial_type("0"); + device1.setBatch("0"); + JSONObject update13 = new JSONObject(); + update13.put("islock", "0"); + update13.put("hasgoods", "0"); + update13.put("material_type", "0"); + update13.put("batch", "0"); + update13.put("update_by", "auto"); + update13.put("update_time", DateUtil.now()); + rpTable.update(update13, "device_code = '" + device1.getDevice_code() + "'"); + + Device device3 = deviceAppService.findDeviceByCode(entity.getStart_device_code2()); + device3.setIslock("0"); + device3.setHas_goods(0); + device3.setMaterial_type("0"); + device3.setBatch("0"); + rpTable.update(update13, "device_code = '" + device3.getDevice_code() + "'"); + + Device device4 = deviceAppService.findDeviceByCode(entity.getNext_device_code2()); + device4.setIslock("0"); + device4.setHas_goods(1); + device4.setMaterial_type("0"); + device4.setBatch("0"); + JSONObject update4 = new JSONObject(); + update4.put("islock", "0"); + update4.put("hasgoods", "1"); + update4.put("material_type", "0"); + update4.put("batch", "0"); + update4.put("update_by", "auto"); + update4.put("update_time", DateUtil.now()); + rpTable.update(update4, "device_code = '" + device4.getDevice_code() + "'"); + } else if (RequestMethodEnum.CHANNEL_STEEL_CALL_MATERIAL.getCode().equals(entity.getDirection())) { + // 槽钢呼叫满料任务 + WQLObject rpTable = WQLObject.getWQLObject("acs_device_runpoint"); + + Device device1 = deviceAppService.findDeviceByCode(entity.getStart_device_code()); + Device device2 = deviceAppService.findDeviceByCode(entity.getNext_device_code()); + device2.setIslock("0"); + device2.setHas_goods(1); + device2.setMaterial_type(device1.getMaterial_type()); + device2.setBatch(device1.getBatch()); + JSONObject update2 = new JSONObject(); + update2.put("islock", "0"); + update2.put("hasgoods", "1"); + update2.put("material_type", device1.getMaterial_type()); + update2.put("batch", device1.getBatch()); + update2.put("update_by", "auto"); + update2.put("update_time", DateUtil.now()); + rpTable.update(update2, "device_code = '" + device2.getDevice_code() + "'"); + + device1.setIslock("0"); + device1.setHas_goods(0); + device1.setMaterial_type("0"); + device1.setBatch("0"); + JSONObject update134 = new JSONObject(); + update134.put("islock", "0"); + update134.put("hasgoods", "0"); + update134.put("material_type", "0"); + update134.put("batch", "0"); + update134.put("update_by", "auto"); + update134.put("update_time", DateUtil.now()); + rpTable.update(update134, "device_code = '" + device1.getDevice_code() + "'"); + + Device device3 = deviceAppService.findDeviceByCode(entity.getStart_device_code2()); + device3.setIslock("0"); + device3.setHas_goods(0); + device3.setMaterial_type("0"); + device3.setBatch("0"); + rpTable.update(update134, "device_code = '" + device3.getDevice_code() + "'"); + + Device device4 = deviceAppService.findDeviceByCode(entity.getNext_device_code2()); + device4.setIslock("0"); + device4.setHas_goods(0); + device4.setMaterial_type("0"); + device4.setBatch("0"); + rpTable.update(update134, "device_code = '" + device4.getDevice_code() + "'"); + } else if (RequestMethodEnum.PRODUCTION_COMPLETED.getCode().equals(entity.getDirection())) { + // 下料完成任务 + WQLObject rpTable = WQLObject.getWQLObject("acs_device_runpoint"); + + Device device1 = deviceAppService.findDeviceByCode(entity.getStart_device_code()); + device1.setIslock("0"); + device1.setHas_goods(1); + device1.setMaterial_type("0"); + device1.setBatch("0"); + JSONObject update12 = new JSONObject(); + update12.put("islock", "0"); + update12.put("hasgoods", "1"); + update12.put("material_type", "0"); + update12.put("batch", "0"); + update12.put("update_by", "auto"); + update12.put("update_time", DateUtil.now()); + rpTable.update(update12, "device_code = '" + device1.getDevice_code() + "'"); + + Device device2 = deviceAppService.findDeviceByCode(entity.getNext_device_code()); + device2.setIslock("0"); + device2.setHas_goods(1); + device2.setMaterial_type("0"); + device2.setBatch("0"); + rpTable.update(update12, "device_code = '" + device2.getDevice_code() + "'"); + + Device device3 = deviceAppService.findDeviceByCode(entity.getStart_device_code2()); + device3.setIslock("0"); + device3.setHas_goods(0); + device3.setMaterial_type("0"); + device3.setBatch("0"); + JSONObject update3 = new JSONObject(); + update3.put("islock", "0"); + update3.put("hasgoods", "0"); + update3.put("material_type", "0"); + update3.put("batch", "0"); + update3.put("update_by", "auto"); + update3.put("update_time", DateUtil.now()); + rpTable.update(update3, "device_code = '" + device3.getDevice_code() + "'"); } } @@ -614,15 +759,22 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } - List shortPathsList = routeLineService.getShortPathLines(entity.getStart_device_code(), entity.getNext_device_code(), entity.getRoute_plan_code()); - String type = shortPathsList.get(0).getType(); - // != 0 为agv任务 - if (!StrUtil.equals(type, "0")) { - if (StrUtil.equals(acsConfigService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { - XianGongAgvServiceImpl xianGongAgv = SpringContextHolder.getBean(XianGongAgvServiceImpl.class); - xianGongAgv.markComplete(entity.getTask_code()); - } - } + + Device device1 = deviceAppService.findDeviceByCode(entity.getStart_device_code()); + Device device2 = deviceAppService.findDeviceByCode(entity.getNext_device_code()); + Device device3 = deviceAppService.findDeviceByCode(entity.getStart_device_code2()); + Device device4 = deviceAppService.findDeviceByCode(entity.getNext_device_code2()); + + JSONObject rpUpdate = new JSONObject(); + rpUpdate.put("islock", "0"); + rpUpdate.put("update_by", "auto"); + rpUpdate.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("acs_device_runpoint").update(rpUpdate, "device_code IN ('" + device1.getDevice_code() + "', '" + device2.getDevice_code() + "', '" + device3.getDevice_code() + "', '" + device4.getDevice_code() + "')"); + + device1.setIslock("0"); + device2.setIslock("0"); + device3.setIslock("0"); + device4.setIslock("0"); } @Override @@ -1025,7 +1177,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { task.setStart_device_code(task.getStart_device_code()); } else { - String start_device = deviceAppService.findDeviceByCode(start_point_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name(); + String start_device = deviceAppService.findDeviceByCode(start_point_code).getDeviceDriverDefinition().getFitDeviceTypes().get(0).name(); //如果point_device为货架，则不包含列层信息，需要重新拼接 if (StrUtil.equals("storage", start_device)) { if (StrUtil.isEmpty(task.getFrom_x())) { @@ -1077,7 +1229,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { task.setNext_device_code(task.getNext_device_code()); } else { - String next_device = deviceAppService.findDeviceByCode(next_point_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name(); + String next_device = deviceAppService.findDeviceByCode(next_point_code).getDeviceDriverDefinition().getFitDeviceTypes().get(0).name(); if (StrUtil.equals("storage", next_device)) { if (StrUtil.isEmpty(task.getTo_x())) { throw new BadRequestException("货位信息终点需要包含列信息"); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java index 51f5a04..7748423 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java @@ -3,7 +3,6 @@ package org.nl.modules.logicflow.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -20,8 +19,8 @@ import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalle import org.nl.acs.device_driver.lnsh.lnsh_rgv.LnshRGVDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; -import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; +import org.nl.acs.device_driver.basedriver.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.device_driver.basedriver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; @@ -195,7 +194,7 @@ public class StageServiceImpl implements StageService { if (!ObjectUtil.isNull(device)) { // if (ObjectUtil.isNotEmpty(device.getDeviceDriver())) { -// IDriverService driverService = applicationContext.getBean(device.getDeviceDriverDefination().getDriverCode(), IDriverService.class); +// IDriverService driverService = applicationContext.getBean(device.getDeviceDriverDefinition().getDriverCode(), IDriverService.class); // obj.put("device_name", device.getDevice_name()); // jo = driverService.getDeviceInfo(device); // } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java index 8677789..bfdb6b3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java @@ -11,7 +11,7 @@ import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdina import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver; import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; -import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; +import org.nl.acs.device_driver.basedriver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.opc.Device; @@ -53,6 +53,8 @@ public class AutoCreateInst { String priority = acsTask.getPriority(); String start_point_code = acsTask.getStart_point_code(); String start_device_code = acsTask.getStart_device_code(); + String start_point_code2 = acsTask.getStart_point_code2(); + String start_device_code2 = acsTask.getStart_device_code2(); String route_plan_code = acsTask.getRoute_plan_code(); String vehicleType = acsTask.getVehicle_type(); //是否复合任务 =0非复合任务 @@ -60,6 +62,8 @@ public class AutoCreateInst { String compound_task_data = null; String next_point_code = acsTask.getNext_point_code(); String next_device_code = acsTask.getNext_device_code(); + String next_point_code2 = acsTask.getNext_point_code2(); + String next_device_code2 = acsTask.getNext_device_code2(); if (StrUtil.isEmpty(start_device_code)) { log.info("任务 [" + taskcode + "] 起点设备为空，无法生成指令。"); acsTask.setRemark("任务 [" + taskcode + "] 起点设备为空，无法生成指令。"); @@ -72,6 +76,18 @@ public class AutoCreateInst { taskserver.updateByCodeFromCache(acsTask); continue; } + if (StrUtil.isEmpty(start_device_code2)) { + log.info("任务 [" + taskcode + "] 起点设备2为空，无法生成指令。"); + acsTask.setRemark("任务 [" + taskcode + "] 起点设备2为空，无法生成指令。"); + taskserver.updateByCodeFromCache(acsTask); + continue; + } + if (StrUtil.isEmpty(next_device_code2)) { + log.info("任务 [" + taskcode + "] 终点设备为2空，无法生成指令。"); + acsTask.setRemark("任务 [" + taskcode + "] 终点设备2为空，无法生成指令。"); + taskserver.updateByCodeFromCache(acsTask); + continue; + } List instructions = instructionService.queryAll("instruction_status < 2"); String maxInstnumber = acsConfigService.findByCode(AcsConfig.MAXINSTNUMBER).getValue(); if (ObjectUtils.isNotEmpty(maxInstnumber)) { @@ -120,7 +136,8 @@ public class AutoCreateInst { } //校验路由关系 List shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code); - if (ObjectUtils.isEmpty(shortPathsList)) { + List shortPathsList2 = routeLineService.getShortPathLines(start_device_code2, next_device_code2, route_plan_code); + if (ObjectUtils.isEmpty(shortPathsList) || ObjectUtils.isEmpty(shortPathsList2)) { log.info("任务 [" + taskcode + "] 路由不通无法生成指令。"); acsTask.setRemark("任务 [" + taskcode + "] 路由不通无法生成指令。"); taskserver.updateByCodeFromCache(acsTask); @@ -132,11 +149,8 @@ public class AutoCreateInst { } Device startdevice = appService.findDeviceByCode(start_device_code); Device nextdevice = appService.findDeviceByCode(next_device_code); - if (StrUtil.equals(appService.findDeviceTypeByCode(next_device_code), "storage")) { - next_point_code = next_device_code + "-" + acsTask.getTo_y() + "-" + acsTask.getTo_z(); - } else { - next_point_code = next_device_code; - } + Device startdevice2 = appService.findDeviceByCode(start_device_code2); + Device nextdevice2 = appService.findDeviceByCode(next_device_code2); if (ObjectUtils.isEmpty(startdevice)) { log.info("任务 [" + taskcode + "] 起点设备编码 [" + start_device_code + "] 对应设备未找到，无法生成指令。"); continue; @@ -145,166 +159,15 @@ public class AutoCreateInst { log.info("任务 [" + taskcode + "] 终点设备编码 [" + next_device_code + "] 对应设备未找到，无法生成指令。"); continue; } - //普通站点 - StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; - StandardEmptyPalletSiteDeviceDriver standardEmptsyPalletSiteDeviceDriver; - LampThreecolorDeviceDriver lampThreecolorDeviceDriver; - LnshFoldDiscSiteDeviceDriver lnshFoldDiscSiteDeviceDriver; - - String createTaskCheck = acsConfigService.findByCode(AcsConfig.CREATETASKCHECK).getValue(); - - if (StrUtil.equals(createTaskCheck, "1")) { - if (startdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) startdevice.getDeviceDriver(); - if (standardInspectSiteDeviceDriver.getMode() != 2) { - log.info("起点设备:" + startdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); - acsTask.setRemark("起点设备:" + startdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); - taskserver.updateByCodeFromCache(acsTask); - //this.execute_log.setResource(startdevice.getDevice_code(), startdevice.getDevice_code()); - //this.execute_log.log("起点设备:" + startdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); - continue; - } - } - if (startdevice.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) { - standardEmptsyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) startdevice.getDeviceDriver(); - if (standardEmptsyPalletSiteDeviceDriver.getMode() != 2) { - log.info("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); - acsTask.setRemark("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); - taskserver.updateByCodeFromCache(acsTask); - continue; - } - } - if (startdevice.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { - lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) startdevice.getDeviceDriver(); - if (lnshFoldDiscSiteDeviceDriver.getMode() != 2) { - log.info("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); - acsTask.setRemark("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); - taskserver.updateByCodeFromCache(acsTask); - continue; - } - } - - //校验 是否同任务是否存在相同终点、未完成的指令 - int sameqty = instructionService.querySameDestinationInst(next_point_code); - if (sameqty > 0) { - log.info("存在相同终点的指令,任务号：" + taskcode); - acsTask.setRemark("存在相同终点的指令,任务号：" + taskcode); - taskserver.updateByCodeFromCache(acsTask); - continue; - } + if (ObjectUtils.isEmpty(startdevice2)) { + log.info("任务 [" + taskcode + "] 起点设备2编码 [" + start_device_code + "] 对应设备未找到，无法生成指令。"); + continue; + } + if (ObjectUtils.isEmpty(nextdevice2)) { + log.info("任务 [" + taskcode + "] 终点设备2编码 [" + next_device_code + "] 对应设备未找到，无法生成指令。"); + continue; } - //空盘位生成指令需要另外逻辑 - if (nextdevice.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { - lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) nextdevice.getDeviceDriver(); - if (lnshFoldDiscSiteDeviceDriver.getMode() == 0) { - log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } else if (lnshFoldDiscSiteDeviceDriver.getError() != 0 - || lnshFoldDiscSiteDeviceDriver.getStatus() == 3) { - log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } - int max_emptypalletnum = Integer.parseInt(nextdevice.getExtraValue().get("max_emptypalletnum").toString()); - int nowNumber = lnshFoldDiscSiteDeviceDriver.getContainer_qty(); - if (nowNumber >= max_emptypalletnum) { - log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已满，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已满，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } - // 查看是否有相同终点的指令 - int count = instructionService.queryDeviceInstCount(next_device_code); - if (count > 0) { - log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已被占用，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已被占用，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - //this.execute_log.setResource(nextdevice.getDevice_code(), nextdevice.getDevice_code()); - //this.execute_log.log("存在相同终点的指令,任务号：" + taskcode); - continue; - } - next_point_code = next_device_code + "." + (nowNumber + 1); - } else if (nextdevice.getDeviceDriver() instanceof LnshStationDeviceDriver - && "true".equals(nextdevice.getExtraValue().get("inspect_in_stocck"))) { - LnshStationDeviceDriver deviceDriver = (LnshStationDeviceDriver) nextdevice.getDeviceDriver(); - if (deviceDriver.getMode() == 0) { - log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } else if (deviceDriver.getMove() != 0) { - log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 有货，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 有货，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } else if (deviceDriver.getError() != 0) { - log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } - } - - if (startdevice.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { - lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) startdevice.getDeviceDriver(); - if (lnshFoldDiscSiteDeviceDriver.getMode() == 0) { - log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } else if (lnshFoldDiscSiteDeviceDriver.getError() != 0 - || lnshFoldDiscSiteDeviceDriver.getStatus() == 3) { - log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } - - int container_qty = lnshFoldDiscSiteDeviceDriver.getContainer_qty(); - int max_emptypalletnum = Integer.parseInt(startdevice.getExtraValue().get("max_emptypalletnum").toString()); - if (container_qty < (max_emptypalletnum / 2)) { - log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 可用托盘数量少于最大托盘数量 [" + max_emptypalletnum + "] / 2，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 可用托盘数量少于最大托盘数量 [" + max_emptypalletnum + "] / 2，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } - - int count = instructionService.queryDeviceInstCount(start_device_code); - if (count > 0) { - log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - //this.execute_log.setResource(nextdevice.getDevice_code(), nextdevice.getDevice_code()); - //this.execute_log.log("存在相同终点的指令,任务号：" + taskcode); - continue; - } - - start_point_code = start_device_code + ".1"; - } else if (startdevice.getDeviceDriver() instanceof LnshStationDeviceDriver - && "true".equals(startdevice.getExtraValue().get("inspect_in_stocck"))) { - LnshStationDeviceDriver deviceDriver = (LnshStationDeviceDriver) startdevice.getDeviceDriver(); - if (deviceDriver.getMode() == 0) { - log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } else if (deviceDriver.getMove() == 0) { - log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 无货，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 无货，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } else if (deviceDriver.getError() != 0) { - log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。"); - acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。"); - taskserver.updateByCodeFromCache(acsTask); - continue; - } - } Instruction instdto = new Instruction(); instdto.setInstruction_type(acsTask.getTask_type()); @@ -323,6 +186,10 @@ public class AutoCreateInst { instdto.setNext_device_code(next_device_code); instdto.setStart_point_code(start_point_code); instdto.setNext_point_code(next_point_code); + instdto.setStart_device_code2(start_device_code2); + instdto.setStart_point_code2(start_point_code2); + instdto.setNext_device_code2(next_device_code2); + instdto.setNext_point_code2(next_point_code2); instdto.setCompound_inst_data(compound_task_data); instdto.setPriority(priority); instdto.setInstruction_status("0"); diff --git a/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index 6ce0bda..2be3ad3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -1,31 +1,19 @@ 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.JSONArray; -import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; import org.nl.acs.agv.server.NDCAgvService; -import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.auto.run.AbstractAutoRunnable; import org.nl.acs.auto.run.AutoRunService; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.basedriver.agv.ndcone.AgvNdcOneDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalletizingManipulatorSiteDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; -import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.instruction.service.impl.InstructionServiceImpl; import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl; import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.modules.system.service.ParamService; @@ -41,7 +29,6 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.util.Date; import java.util.List; -import java.util.Map; import static org.nl.acs.agv.server.impl.NDCAgvServiceImpl.Bytes2HexString; diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml index 7bd7aa6..baaafec 100644 --- a/acs/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml @@ -6,8 +6,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy -# url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl4_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} password: ${DB_PWD:123456} # 初始连接数 diff --git a/acs/nladmin-system/src/main/resources/config/application.yml b/acs/nladmin-system/src/main/resources/config/application.yml index 43cf9ea..fbf3987 100644 --- a/acs/nladmin-system/src/main/resources/config/application.yml +++ b/acs/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: diff --git a/acs/nladmin-ui/src/views/acs/device/config.vue b/acs/nladmin-ui/src/views/acs/device/config.vue index a13cb2b..419bf05 100644 --- a/acs/nladmin-ui/src/views/acs/device/config.vue +++ b/acs/nladmin-ui/src/views/acs/device/config.vue @@ -104,6 +104,7 @@ import conveyor_press_station from '@/views/acs/device/driver/lnsh/conveyor_pres import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one' import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two' import package_site from './driver/lnsh/package_site.vue' +import nl4_station from '@/views/acs/device/driver/nl4/nl4_station.vue' export default { name: 'DeviceConfig', @@ -111,8 +112,8 @@ export default { lamp_three_color, standard_storage, standard_scanner, standard_conveyor_control_with_scanner, standard_conveyor_control, standard_conveyor_monitor, lnsh_mixing_mill, lnsh_press, lnsh_palletizing_manipulator, lnsh_fold_disc_site, lnsh_kiln_lane, lnsh_kiln_truss, lnsh_package_line, lnsh_out_kiln_truss, lnsh_package_pallet_manipulator, lnsh_pallet_storage, lnsh_labeling_machine, lnsh_split_manipulator, lnsh_rgv, - lnsh_station, lnsh_Laminating_machine, lnsh_package_site, lnsh_crusher, lnsh_palletizing_manipulator_site,conveyor_ssx_barcode, conveyor_press_station, - agv_ndc_one, agv_ndc_two,package_site}, + lnsh_station, lnsh_Laminating_machine, lnsh_package_site, lnsh_crusher, lnsh_palletizing_manipulator_site, conveyor_ssx_barcode, conveyor_press_station, + agv_ndc_one, agv_ndc_two, package_site, nl4_station }, dicts: ['device_type'], mixins: [crud], data() { diff --git a/acs/nladmin-ui/src/views/acs/device/driver/nl4/nl4_station.vue b/acs/nladmin-ui/src/views/acs/device/driver/nl4/nl4_station.vue new file mode 100644 index 0000000..b17fe8a --- /dev/null +++ b/acs/nladmin-ui/src/views/acs/device/driver/nl4/nl4_station.vue @@ -0,0 +1,744 @@ + + + + + diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue index 89e8717..2c06f93 100644 --- a/acs/nladmin-ui/src/views/acs/instruction/index.vue +++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue @@ -173,15 +173,9 @@ - - - - - - 完成 - 取消 - 下发 - + 完成 + 取消 + 下发