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 0220ad90f..f6a6afb16 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 @@ -224,6 +224,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC random *= 1000; if (this.all_null < 3) { if (log.isWarnEnabled()) { + log.warn(tag + "1重新创建server"); log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3); } @@ -231,14 +232,14 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC break start; } else if (this.all_null < 6) { if (log.isWarnEnabled()) { - log.warn(tag + "重新创建server"); + log.warn(tag + "2重新创建server"); log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3); } ThreadUtl.sleep(3000); break start; } else if (this.all_null < 12) { if (log.isWarnEnabled()) { - log.warn(tag + "重新创建server"); + log.warn(tag + "3重新创建server"); log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3); } ThreadUtl.sleep(3000); diff --git a/acs/nladmin-system/src/main/resources/log/AcsToLk.xml b/acs/nladmin-system/src/main/resources/log/AcsToLk.xml index 76f95f2be..986b7f28c 100644 --- a/acs/nladmin-system/src/main/resources/log/AcsToLk.xml +++ b/acs/nladmin-system/src/main/resources/log/AcsToLk.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml index b7b3978eb..6388f813e 100644 --- a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml +++ b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml index 8abb83afb..ab61b9b7f 100644 --- a/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml +++ b/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml index 60427e421..bc8b49dde 100644 --- a/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml +++ b/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml index 7dda9dfd5..449ee9eb9 100644 --- a/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml +++ b/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/LkToAcs.xml b/acs/nladmin-system/src/main/resources/log/LkToAcs.xml index 9f827c3d3..d06be707c 100644 --- a/acs/nladmin-system/src/main/resources/log/LkToAcs.xml +++ b/acs/nladmin-system/src/main/resources/log/LkToAcs.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml index 016b46e9c..ede1c7a66 100644 --- a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml +++ b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml index ca3f78791..f80c20f81 100644 --- a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml +++ b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/OpcUtil.xml b/acs/nladmin-system/src/main/resources/log/OpcUtil.xml index 63531d7ba..b7234fa2f 100644 --- a/acs/nladmin-system/src/main/resources/log/OpcUtil.xml +++ b/acs/nladmin-system/src/main/resources/log/OpcUtil.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml index 4eec0b7a0..461ac1ac4 100644 --- a/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml +++ b/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml index 4ea34f9f4..650f7cc3b 100644 --- a/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml +++ b/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml index 03c1a31d6..46aade8b0 100644 --- a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml +++ b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml @@ -10,7 +10,7 @@ 15 - 200MB + 50MB 2GB diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index cf9b0947f..347dcd797 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -64,7 +64,7 @@ https://juejin.cn/post/6844903775631572999 15 - 200MB + 50MB 20GB @@ -117,7 +117,7 @@ https://juejin.cn/post/6844903775631572999 15 - 200MB + 50MB 20GB diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java index 0f64f17f5..e57361faf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java @@ -117,4 +117,8 @@ public interface AcsConfig { * 指令下发立库 */ String INSTSENDLK = "instSendLk"; + /** + * 日志级别 + */ + String LOGLEVEL = "log_level"; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index cf557d4ba..9e832859b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -261,6 +261,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .device_code("下发诺宝运单") .content("任务号:"+inst.getTask_code()+",指令号:"+inst.getInstruction_code()+",下发agv订单序列参数:"+jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); log.info("任务号：{},指令号{},下发agv订单序列参数:{}", inst.getTask_code(), inst.getInstruction_code(), jo); @@ -281,6 +282,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .device_code("诺宝运单响应") .content("任务号:"+inst.getTask_code()+",指令号:"+inst.getInstruction_code()+",下发诺宝订单序列反馈参数:"+jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1); log.info("任务号：{},指令号{},状态{},下发agv订单序列反馈:{}", inst.getTask_code(), inst.getInstruction_code(), result.getStatus(), result.body()); @@ -803,6 +805,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .device_code("下发叉车运单") .content("任务号:"+inst.getTask_code()+",指令号:"+inst.getInstruction_code()+",下发叉车订单序列参数:"+jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); log.info("任务号：{},指令号{},下发agv订单序列参数:{}", inst.getTask_code(), inst.getInstruction_code(), jo); @@ -823,6 +826,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { .device_code("叉车运单响应") .content("任务号:"+inst.getTask_code()+",指令号:"+inst.getInstruction_code()+",下发叉车订单序列反馈参数:"+jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1); log.info("任务号：{},指令号{},状态{},下发agv叉车订单序列反馈:{}", inst.getTask_code(), inst.getInstruction_code(), result.getStatus(), result.body()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java index ecfe7c248..6ba644bc8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java @@ -64,7 +64,7 @@ public class AcsPointAngleController { @GetMapping("/updateActive") @Log("是否启用") - public ResponseEntity updateOn(@RequestParam Long id, @RequestParam String is_active) { + public ResponseEntity updateOn(@RequestParam String id, @RequestParam String is_active) { acsPointAngleService.updateOn(id, is_active); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java index d252a5083..1da3bf060 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java @@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; /** @@ -23,37 +25,38 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("acs_point_angle") - +@NoArgsConstructor +@AllArgsConstructor public class AcsPointAngle implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - + @TableId(value = "id", type = IdType.AUTO) + private String id; + + private String start_device_code; - + private String next_device_code; - + private BigDecimal next_point_angle; - + private String is_active; - + private String create_by; - + private String create_time; - + private String update_by; - + private String update_time; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java index 8628210a9..039f0ff3c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java @@ -28,7 +28,7 @@ public interface IAcsPointAngleService extends IService { Map queryAll(Map whereJson, Pageable page); - void updateOn(Long id, String is_active); + void updateOn(String id, String is_active); /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java index 4616ad237..e1abff178 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java @@ -97,7 +97,7 @@ public class AcsPointAngleServiceImpl extends ServiceImpl" + this.stop) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -202,6 +203,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .device_code(device_code) .content("信号" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + ItemProtocol.address + this.last_address + "->" + this.address) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -210,6 +212,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .device_code(device_code) .content("信号" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + ItemProtocol.electricity + this.last_electricity + "->" + this.electricity) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -394,6 +397,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -403,6 +407,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + resplogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { @@ -435,6 +440,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -444,6 +450,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { @@ -472,6 +479,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -481,6 +489,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { inst.setInstruction_status(InstructionStatusEnum.BUSY.getIndex()); @@ -507,6 +516,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -516,6 +526,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { writing("to_line", 2); @@ -537,6 +548,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -546,6 +558,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { writing("to_di_low", 0); @@ -601,6 +614,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .requestparam("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(reqlogDto); HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() @@ -610,6 +624,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); + reqlogDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(resplogDto); if (resp.getStatus() == 200) { writing("to_di_low", 0); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index dbf493d14..e6ef10bbd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -380,6 +380,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -426,6 +427,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("申请AGV任务,返回参数:" + jo.getString("body")) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); requireSucess = true; } else { @@ -766,6 +768,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { @@ -797,6 +800,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java index f3973c62b..d3b67d2eb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java @@ -570,6 +570,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } message = "下发电气任务号成功"; @@ -681,6 +682,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -713,6 +715,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } requireSucess = true; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java index 910efddda..b93e25813 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java @@ -698,6 +698,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -733,6 +734,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java index 61c74d676..cbc742666 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java @@ -369,6 +369,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("二楼到一楼输送线申请行架任务,参数,接口返回:" + jo) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); this.requireSucess = true; } else { @@ -376,6 +377,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("二楼到一楼输送线申请行架任务,返回参数:" + jo.getString("body")) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } } @@ -527,6 +529,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(1000); @@ -570,6 +573,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); @@ -685,6 +689,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java index ed7fafc21..eaaf07258 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java @@ -339,6 +339,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("申请捆扎,参数,接口返回:" + jo) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); // Map datas = applyLabelingAndBindingResponse.getData(); packagePLCData(jo.getString("data"), mode); @@ -348,6 +349,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("申请捆扎失败,接口返回:" + jo.getString("body")) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } @@ -381,6 +383,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("申请贴标成功:" + jo) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); List list = new ArrayList(); Map map5 = new HashMap(); @@ -399,6 +402,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("申请贴标失败,接口返回:" + jo.getString("body")) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } @@ -706,6 +710,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { @@ -756,6 +761,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); @@ -872,6 +878,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(1000); @@ -915,6 +922,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java index f9bc73820..2b8be67a5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java @@ -1,11 +1,9 @@ package org.nl.acs.device_driver.one_conveyor.fold_disc_site; -import cn.hutool.core.collection.CollectionUtil; 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 cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Data; @@ -21,8 +19,6 @@ import org.nl.acs.device_driver.FeedLmsRealFailed; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.device_driver.led.led_screen.LedScreenDeviceDriver; -import org.nl.acs.device_driver.one_manipulator.box_package_manipulator.InteractionJsonDTO; import org.nl.acs.enums.StorageTypeEnum; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.history.ErrorUtil; @@ -39,10 +35,8 @@ import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.route.service.impl.RouteLineServiceImpl; import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.enums.TaskTypeEnum; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; import org.nl.config.language.LangProcess; @@ -215,6 +209,16 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements } + //托盘去扫码位 + if (mode == 4){ + List list1 = new ArrayList(); + Map map = new HashMap(); + map.put("code", "to_command"); + map.put("value", 0); + list1.add(map); + this.writing(list1); + } + if (mode == 0) { this.setIsonline(false); message = "universal_off-line"; @@ -233,25 +237,15 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements //申请空托盘入库 if (mode == 9 && move == 1 && !requireSucess){ - applyEmptyTask(StorageTypeEnum.DISKS_IN.getType()); - List list1 = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_command"); - map.put("value", 9); - list1.add(map); - this.writing(list1); + applyEmptyTask(StorageTypeEnum.DISKS_IN.getType(), mode); + } //申请空托盘出库 if (mode == 8 && move == 1 && !requireSucess){ - applyEmptyTask(StorageTypeEnum.DISKS_OUT.getType()); - List list1 = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_command"); - map.put("value", 8); - list1.add(map); - this.writing(list1); + applyEmptyTask(StorageTypeEnum.DISKS_OUT.getType(),mode); + } @@ -450,6 +444,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(1000); @@ -493,6 +488,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); @@ -525,6 +521,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { @@ -540,7 +537,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements } - private void applyEmptyTask(String type) { + private void applyEmptyTask(String type, int mode) { Date date = new Date(); if (date.getTime() - this.require_apply_strangulation_time.getTime() < (long) this.instruction_require_time_out) { @@ -550,13 +547,13 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements try { JSONObject param = new JSONObject(); param.put("device_code", device_code); - param.put("vehicle_code", barcode); param.put("container_type", container_type); param.put("type", type); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content("申请空托盘出入库,参数:" + param) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); String response = acsToWmsService.applyTwo(param); JSONObject jo = JSON.parseObject(response); @@ -565,13 +562,21 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .device_code(device_code) .content("申请空托盘出入库,参数,接口返回:" + jo) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); + List list1 = new ArrayList(); + Map map = new HashMap(); + map.put("code", "to_command"); + map.put("value", mode); + list1.add(map); + this.writing(list1); this.requireSucess = true; }else { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) .content("申请空托盘出入库,返回参数:" + jo.getString("body")) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } } catch (Exception e) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index aea161fe8..84c087f05 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -285,24 +285,21 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv List toInstructions; //木箱入库申请入库任务 if (mode == 6 && !requireSucess){ - applyIn(StorageTypeEnum.BOX_IN.getType()); - List list1 = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_command"); - map.put("value", 6); - list1.add(map); - this.writing(list1); + applyIn(StorageTypeEnum.BOX_IN.getType(),mode); + } //子卷入库申请入库任务 if (mode == 7 && !requireSucess){ - applyIn(StorageTypeEnum.STORAGE.getType()); - List list1 = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_command"); - map.put("value", 7); - list1.add(map); - this.writing(list1); + applyIn(StorageTypeEnum.STORAGE.getType(),mode); + + } + + + //申请空托盘入库 + if (mode == 9 && move == 1 && !requireSucess){ + applyEmptyTask(StorageTypeEnum.DISKS_IN.getType(), mode); + } //申请入库指令、异常位指令 @@ -385,7 +382,55 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv } } - private void applyIn(String type) { + private void applyEmptyTask(String type, int mode) { + Date date = new Date(); + if (date.getTime() - this.require_apply_strangulation_time.getTime() + < (long) this.instruction_require_time_out) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); + return; + } else { + try { + JSONObject param = new JSONObject(); + param.put("device_code", device_code); + param.put("container_type", container_type); + param.put("type", type); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(device_code) + .content("申请空托盘出入库,参数:" + param) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); + String response = acsToWmsService.applyTwo(param); + JSONObject jo = JSON.parseObject(response); + if (response == null || jo.getInteger("status") == 200) { + LuceneLogDto logDto2 = LuceneLogDto.builder() + .device_code(device_code) + .content("申请空托盘出入库,参数,接口返回:" + jo) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto2); + List list1 = new ArrayList(); + Map map = new HashMap(); + map.put("code", "to_command"); + map.put("value", mode); + list1.add(map); + this.writing(list1); + this.requireSucess = true; + }else { + LuceneLogDto logDto2 = LuceneLogDto.builder() + .device_code(device_code) + .content("申请空托盘出入库,返回参数:" + jo.getString("body")) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto2); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + private void applyIn(String type, int mode) { Date date = new Date(); if (date.getTime() - this.require_apply_strangulation_time.getTime() < (long) this.instruction_require_time_out) { @@ -400,7 +445,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv param.put("type", type); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) - .content("申请空托盘出入库,参数:" + param) + .content("木箱、子卷入库申请入库任务,参数:" + param) .build(); luceneExecuteLogService.deviceExecuteLog(logDto); String response = acsToWmsService.applyTwo(param); @@ -408,14 +453,20 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv if (response == null || jo.getInteger("status") == 200) { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) - .content("木箱入库申请入库任务,参数,接口返回:" + jo) + .content("木箱、子卷入库申请入库任务,参数,接口返回:" + jo) .build(); luceneExecuteLogService.deviceExecuteLog(logDto2); + List list1 = new ArrayList(); + Map map = new HashMap(); + map.put("code", "to_command"); + map.put("value", mode); + list1.add(map); + this.writing(list1); this.requireSucess = true; }else { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) - .content("木箱入库申请入库任务,返回参数:" + jo.getString("body")) + .content("木箱、子卷入库申请入库任务,返回参数:" + jo.getString("body")) .build(); luceneExecuteLogService.deviceExecuteLog(logDto2); } @@ -629,16 +680,16 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv */ public JSONObject clearMessage() { JSONObject json = new JSONObject(); - json.put("task_code", ""); - json.put("inst_code", ""); - json.put("start_device_code", ""); - json.put("next_device_code", ""); - json.put("material_type", ""); - json.put("quantity", ""); - json.put("vehicle_code", ""); - json.put("instruction_status", ""); - json.put("entry_time", ""); - json.put("ip", ""); + json.put("task_code", "0"); + json.put("inst_code", "0"); + json.put("start_device_code", "0"); + json.put("next_device_code", "0"); + json.put("material_type", "0"); + json.put("quantity", "0"); + json.put("vehicle_code", "0"); + json.put("instruction_status", "0"); + json.put("entry_time", "0"); + json.put("ip", "0"); return json; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java index 9ad3ed248..fc7b9ce1c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java @@ -621,6 +621,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(1000); @@ -664,6 +665,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content(device_code + inst.getInstruction_code() + "再次下发电气信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); try { Thread.sleep(500); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java index f0ac006b3..8a55936ac 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java @@ -434,6 +434,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } @@ -459,6 +460,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } this.setRequireSucess(true); @@ -559,6 +561,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java index 0e176481a..b1be9a5ea 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java @@ -166,6 +166,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("读取信号值时出现异常" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + Arrays.toString(e.getStackTrace())) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -241,7 +242,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } //任务完成 - if (action == 5 && move == 0) { + if (action == 4 && move == 0) { if (inst != null) { try { logServer.deviceExecuteLog(this.device_code, "", "", "放货完成"); @@ -386,6 +387,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } //创建指令后修改任务状态 @@ -409,6 +411,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } this.setRequireSucess(true); @@ -439,9 +442,9 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i map4.put("value", task); list.add(map4); if (ObjectUtil.isNotEmpty(interactionJsonDTO)) { - if (ObjectUtil.isNotEmpty(interactionJsonDTO.getWeight())) { + if (ObjectUtil.isNotEmpty(interactionJsonDTO.getWidth())) { map5.put("code", "to_width"); - map5.put("value", interactionJsonDTO.getWeight()); + map5.put("value", interactionJsonDTO.getWidth()); list.add(map5); } if (ObjectUtil.isNotEmpty(interactionJsonDTO.getLength())) { @@ -505,6 +508,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/InteractionJsonDTO.java index ff628b40b..2bd53e5cf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/InteractionJsonDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/InteractionJsonDTO.java @@ -12,7 +12,7 @@ public class InteractionJsonDTO { /** *木箱宽度 */ - private String weight; + private String width; /** *木箱高度 */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java index 7379801ed..7d60f656f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java @@ -405,6 +405,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } //创建指令后修改任务状态 @@ -428,6 +429,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } this.setRequireSucess(true); @@ -520,6 +522,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java index 05972fa56..76794eee8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java @@ -398,6 +398,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } //创建指令后修改任务状态 @@ -423,6 +424,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } this.setRequireSucess(true); @@ -545,6 +547,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/ItemProtocol.java index 43faa8f6b..8f29094fc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/ItemProtocol.java @@ -20,7 +20,7 @@ ItemProtocol { //光电信号 public static String item_move = "move1"; //动作信号 - public static String item_action = "action"; + public static String item_action = "action1"; //行走列 public static String item_walk_y = "walk_y"; //任务号 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java index 87bee3b5c..23b4fee90 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java @@ -275,6 +275,7 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr this.writing(map); logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务,返回参数:" + applyManipulatorActionResponse); message = "申请行架任务成功"; + requireSucess = true; } else { message = applyManipulatorActionResponse.getMessage(); map.put("to_command", 99); @@ -355,10 +356,10 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr jo.put("isOnline", this.getIsonline()); jo.put("error", this.getError()); jo.put("isError", this.getIserror()); - jo.put("message", LangProcess.msg(message)); + jo.put("message", message); jo.put("notCreateTaskMessage", notCreateTaskMessage); - jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); - jo.put("feedMessage", LangProcess.msg(feedMessage)); + jo.put("notCreateInstMessage",notCreateInstMessage); + jo.put("feedMessage", feedMessage); jo.put("driver_type", "siemens_conveyor"); jo.put("is_click", true); return jo; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 214dcc8bb..408dcf376 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -281,6 +281,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Boolean requireSucess = false; + /** * 当前指令 */ @@ -365,7 +366,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } - if (mode != 3 && requireSucess) { + if (mode != 3 || requireSucess) { message = "one_message7"; } else { if (error != 0) { @@ -377,7 +378,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme case 0: boolean b = applyTask(); if (b) { - if (updateCommand("0")) break; requireSucess = false; } break; @@ -651,6 +651,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme .device_code(device_code) .content("申请更新点位,参数,接口返回:" + jo) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); String poinCode = jo.getString("point_code"); if (StrUtil.isNotEmpty(poinCode)) { @@ -690,6 +691,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme .device_code(device_code) .content("申请更新点位,返回参数:" + jo.getString("body")) .build(); + logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); } } @@ -803,18 +805,25 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } else { //维修解警后重新向堆垛机下发指令 Instruction instructionErro = checkInst(); - if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())){ + if (ObjectUtil.isNotEmpty(instructionErro)&&InstructionStatusEnum.BUSY.getIndex().equals(instructionErro.getInstruction_status())&& StrUtil.isNotEmpty(instructionErro.getExecute_code())){ List list = new ArrayList(); pakagePLCData(list, String.valueOf(z),String.valueOf(x),String.valueOf(y),instructionErro.getExecute_code(),task); + requireSucess = true; return true; } this.instruction_require_time = date; + //暂停任务 + if (stopReceiveTask){ + this.notCreateInstMessage = "任务暂停"; + return false; + } //输入:指令类型多种\ 指令状态多种\ Instruction instruction1 = new Instruction(); instruction1.setInstruction_status("0"); List instructions = instructionService.findByDeviceCodes(instruction1, false); if (CollUtil.isEmpty(instructions) || instructions.size() < 1) { + this.notCreateInstMessage = "未找到任务"; return false; } List instructionList = new ArrayList<>(); @@ -864,7 +873,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme List list = new ArrayList(); pakageCommand(list,"1", inst.getInstruction_code()); - if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { + if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name()) && !prohibitInWarehouse) { if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("z"))) { HashMap map4 = new HashMap(); map4.put("code", "to_x"); @@ -884,7 +893,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme list.add(map6); } } - if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name())) { + if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name()) && !prohibitOutWarehouse) { pakagePlc(inst, list); } if (ObjectUtil.isNotEmpty(list)) { @@ -1108,9 +1117,12 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme //监控大屏下发作业命令清警-5、召回-7、急停-8 Integer toCommand = data.getInteger("toCommand"); if (toCommand != null) { - Map map = new HashMap<>(); - map.put("to_command", toCommand); - this.writing(map); + HashMap map1 = new HashMap(); + List list = new ArrayList<>(); + map1.put("code", "to_command"); + map1.put("value", toCommand); + list.add(map1); + this.writing(map1); } //ACS监控大屏设置禁止入库、禁止出库、停止接收任务 Boolean prohibitInWarehouse = data.getBoolean("prohibitInWarehouse"); @@ -1134,6 +1146,12 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme itemMap.put(to_param, json.getString("value")); } } + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(device_code) + .content("下发电气信号:" + itemMap) + .build(); + logDto.setLog_level(3); + luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { this.checkcontrol(itemMap); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java index 8e76f6a72..ab4623e6c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java @@ -264,6 +264,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("反馈请求成功,响应参数:" + JSON.toJSONString(body)) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); Map map = new LinkedHashMap<>(); map.put("to_command", "5"); @@ -275,6 +276,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("反馈重量以及收卷轴LMS失败...") .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -282,6 +284,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("当前指令号为空") .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -329,6 +332,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -515,6 +519,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content(startDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1")) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); throw new BadRequestException(LangProcess.msg("device_checkAdd", startDevice.getDevice_code())); } @@ -524,6 +529,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content(nextDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1")) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); throw new BadRequestException(LangProcess.msg("device_checkAdd", nextDevice.getDevice_code())); @@ -562,6 +568,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content(LangProcess.msg("universal_message9") + e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } @@ -614,6 +621,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blanking_button/BlankingButtonDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blanking_button/BlankingButtonDriver.java index 303ce4396..d69c17f02 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blanking_button/BlankingButtonDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blanking_button/BlankingButtonDriver.java @@ -302,6 +302,7 @@ public class BlankingButtonDriver extends AbstractOpcDeviceDriver implements Dev .device_code(deviceCode) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java index 1a560176f..8830c9a19 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java @@ -251,6 +251,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -278,6 +279,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -298,6 +300,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple .device_code(device_code) .content("下发电气信号:" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { @@ -348,6 +351,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java index 875b9e3aa..a3e601359 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java @@ -110,6 +110,7 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index a133afd82..34283cd88 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -243,10 +243,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } if (requireSucess) { - remark = "universal_remark5"; + remark = "未复位"; } this.setNotCreateTaskMessage(remark); - //} } } @@ -330,9 +329,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver; StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; OvenInspectSiteDeviceDriver ovenInspectSiteDeviceDriver; - /*if (startdevice.getDeviceDriver() instanceof OvenInspectSiteDeviceDriver && nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { + /*if (startdevice.getDeviceDriver() instanceof OvenInspectSiteDeviceDriver && nextdevice.getDeviceDriver() instanceof RangingStationsDeviceDriver) { ovenInspectSiteDeviceDriver = (OvenInspectSiteDeviceDriver) startdevice.getDeviceDriver(); - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); + standardInspectSiteDeviceDriver = (RangingStationsDeviceDriver) nextdevice.getDeviceDriver(); if (ovenInspectSiteDeviceDriver.getMove() != 1 || standardInspectSiteDeviceDriver.getMove() == 1) { notCreateInstMessage = "手动创建指令未下发电气信号原因->烘箱检测站点-普通检测站点:" + ovenInspectSiteDeviceDriver.getDevicecode() + "无货,无法下发指令或" + standardInspectSiteDeviceDriver.getDevicecode() + "有货,无法下发指令!" + "!指令号:" + instruction.getInstruction_code(); @@ -345,9 +344,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i return false; } } - if (nextdevice.getDeviceDriver() instanceof OvenInspectSiteDeviceDriver && startdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { + if (nextdevice.getDeviceDriver() instanceof OvenInspectSiteDeviceDriver && startdevice.getDeviceDriver() instanceof RangingStationsDeviceDriver) { ovenInspectSiteDeviceDriver = (OvenInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) startdevice.getDeviceDriver(); + standardInspectSiteDeviceDriver = (RangingStationsDeviceDriver) startdevice.getDeviceDriver(); if (ovenInspectSiteDeviceDriver.getMove() != 1 || standardInspectSiteDeviceDriver.getMove() == 1) { notCreateInstMessage = "手动创建指令未下发电气信号原因->烘箱检测站点-普通检测站点:" + ovenInspectSiteDeviceDriver.getDevicecode() + "无货,无法下发指令或" + standardInspectSiteDeviceDriver.getDevicecode() + "有货,无法下发指令!" + "!指令号:" + instruction.getInstruction_code(); @@ -416,6 +415,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(msg) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); List list = new ArrayList<>(); Map map = new HashMap(); @@ -472,9 +472,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver; StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; OvenInspectSiteDeviceDriver ovenInspectSiteDeviceDriver; - /*if (startdevice.getDeviceDriver() instanceof OvenInspectSiteDeviceDriver && nextdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { + /*if (startdevice.getDeviceDriver() instanceof OvenInspectSiteDeviceDriver && nextdevice.getDeviceDriver() instanceof RangingStationsDeviceDriver) { ovenInspectSiteDeviceDriver = (OvenInspectSiteDeviceDriver) startdevice.getDeviceDriver(); - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); + standardInspectSiteDeviceDriver = (RangingStationsDeviceDriver) nextdevice.getDeviceDriver(); if (ovenInspectSiteDeviceDriver.getMove() != 1 || standardInspectSiteDeviceDriver.getMove() == 1) { notCreateInstMessage = "手动创建指令未下发电气信号原因->烘箱检测站点-普通检测站点:" + ovenInspectSiteDeviceDriver.getDevicecode() + "无货,无法下发指令或" + standardInspectSiteDeviceDriver.getDevicecode() + "有货,无法下发指令!" + "!任务号:" + task.getTask_code(); @@ -487,9 +487,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i return false; } } - if (nextdevice.getDeviceDriver() instanceof OvenInspectSiteDeviceDriver && startdevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { + if (nextdevice.getDeviceDriver() instanceof OvenInspectSiteDeviceDriver && startdevice.getDeviceDriver() instanceof RangingStationsDeviceDriver) { ovenInspectSiteDeviceDriver = (OvenInspectSiteDeviceDriver) nextdevice.getDeviceDriver(); - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) startdevice.getDeviceDriver(); + standardInspectSiteDeviceDriver = (RangingStationsDeviceDriver) startdevice.getDeviceDriver(); if (ovenInspectSiteDeviceDriver.getMove() == 1 || standardInspectSiteDeviceDriver.getMove() != 1) { notCreateInstMessage = "手动创建指令未下发电气信号原因->烘箱检测站点-普通检测站点:" + ovenInspectSiteDeviceDriver.getDevicecode() + "无货,无法下发指令或" + standardInspectSiteDeviceDriver.getDevicecode() + "有货,无法下发指令!" + "!任务号:" + task.getTask_code(); @@ -576,6 +576,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } @@ -592,6 +593,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(notCreateInstMessage) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！"); } @@ -601,6 +603,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(notCreateInstMessage) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！"); } @@ -616,6 +619,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(msg) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); List list = new ArrayList<>(); Map map = new HashMap(); @@ -773,6 +777,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content(notCreateInstMessage) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } return isClose; @@ -802,6 +807,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -1030,6 +1036,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(lampDevice.getDeviceDriver().getDeviceCode()) .content("下发报警灯" + lamp + "报警信号") .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); lampThreecolorDeviceDriver.writing("to_command", "1"); } @@ -1128,7 +1135,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("isError", this.getIserror()); jo.put("message", message); jo.put("notCreateTaskMessage", notCreateTaskMessage); - jo.put("notCreateInstMessage", notCreateInstMessage); + jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("feedMessage", feedMessage); jo.put("requireActionSucess", requireActionSucess); jo.put("driver_type", "siemens_conveyor"); @@ -1171,6 +1178,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -1189,6 +1197,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .device_code(device_code) .content("下发电气信号:" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index eae811986..f36ba36a6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -524,6 +524,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); this.control(itemMap); } @@ -543,6 +544,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -637,6 +639,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index 8771de923..3dc846cc0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -593,6 +593,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -665,10 +666,10 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp jo.put("isOnline", this.getIsonline()); jo.put("error", this.getError()); jo.put("isError", this.getIserror()); - jo.put("message", LangProcess.msg(message)); + jo.put("message", message); jo.put("notCreateTaskMessage", notCreateTaskMessage); - jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); - jo.put("feedMessage", LangProcess.msg(feedMessage)); + jo.put("notCreateInstMessage", notCreateInstMessage); + jo.put("feedMessage", feedMessage); jo.put("driver_type", "siemens_conveyor"); jo.put("is_click", true); jo.put("x", xPosition); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java index d9a5f3e88..88bdcd7fa 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java @@ -231,6 +231,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("反馈LMS子卷重量失败:"+ applyPlugPullSitResponse.getMessage()) .build(); + logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); } } else { @@ -409,26 +410,6 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp String interactionJson = taskDto.getInteraction_json(); InteractionJsonDTO interactionJsonDTO = JSON.parseObject(interactionJson, InteractionJsonDTO.class); Map map = new LinkedHashMap<>(); - /*if(ObjectUtil.isNotEmpty(interactionJsonDTO)){ - toDevice(interactionJsonDTO.getToPull(),"to_pull",map); - toDevice(interactionJsonDTO.getIsBushing(),"is_bushing",map); - toDevice(interactionJsonDTO.getToSize(),"to_size",map); - toDevice(interactionJsonDTO.getToBarcode(),"to_barcode",map); - toDevice(interactionJsonDTO.getToMaterial1(),"to_material1",map); - toDevice(interactionJsonDTO.getToMaterial2(),"to_material2",map); - toDevice(interactionJsonDTO.getToSpec1(),"to_spec1",map); - toDevice(interactionJsonDTO.getToSpec2(),"to_spec2",map); - toDevice(interactionJsonDTO.getToQty1(),"to_qty1",map); - toDevice(interactionJsonDTO.getToSize1(),"to_size1",map); - toDevice(interactionJsonDTO.getToSize2(),"to_size2",map); - toDevice(interactionJsonDTO.getToMaterial3(),"to_material3",map); - toDevice(interactionJsonDTO.getToMaterial4(),"to_material4",map); - toDevice(interactionJsonDTO.getToSpec3(),"to_spec3",map); - toDevice(interactionJsonDTO.getToSpec4(),"to_spec4",map); - toDevice(interactionJsonDTO.getToQty2(),"to_qty2",map); - toDevice(interactionJsonDTO.getToSize3(),"to_size3",map); - toDevice(interactionJsonDTO.getToSize4(),"to_size4",map); - }*/ map.put("to_command", CommonFinalParam.ONE); map.put("to_onset", start_addr); map.put("to_task", instruction.getInstruction_code()); @@ -488,6 +469,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content(device_code+"创建指令时出现异常:" + e.getMessage()) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); return false; } //创建指令后修改任务状态 @@ -511,26 +493,6 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp String start_addr = startDevice.getExtraValue().get("address").toString(); String next_addr = nextDevice.getExtraValue().get("address").toString(); Map map = new LinkedHashMap<>(); - /*if(ObjectUtil.isNotEmpty(interactionJsonDTO)){ - toDevice(interactionJsonDTO.getToPull(),"to_pull",map); - toDevice(interactionJsonDTO.getIsBushing(),"is_bushing",map); - toDevice(interactionJsonDTO.getToSize(),"to_size",map); - toDevice(interactionJsonDTO.getToBarcode(),"to_barcode",map); - toDevice(interactionJsonDTO.getToMaterial1(),"to_material1",map); - toDevice(interactionJsonDTO.getToMaterial2(),"to_material2",map); - toDevice(interactionJsonDTO.getToSpec1(),"to_spec1",map); - toDevice(interactionJsonDTO.getToSpec2(),"to_spec2",map); - toDevice(interactionJsonDTO.getToQty1(),"to_qty1",map); - toDevice(interactionJsonDTO.getToSize1(),"to_size1",map); - toDevice(interactionJsonDTO.getToSize2(),"to_size2",map); - toDevice(interactionJsonDTO.getToMaterial3(),"to_material3",map); - toDevice(interactionJsonDTO.getToMaterial4(),"to_material4",map); - toDevice(interactionJsonDTO.getToSpec3(),"to_spec3",map); - toDevice(interactionJsonDTO.getToSpec4(),"to_spec4",map); - toDevice(interactionJsonDTO.getToQty2(),"to_qty2",map); - toDevice(interactionJsonDTO.getToSize3(),"to_size3",map); - toDevice(interactionJsonDTO.getToSize4(),"to_size4",map); - }*/ map.put("to_command", CommonFinalParam.ONE); map.put("to_onset", start_addr); map.put("to_task", instdto.getInstruction_code()); @@ -587,6 +549,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -663,7 +626,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); - jo.put("feedMessage", LangProcess.msg(feedMessage)); + jo.put("feedMessage",feedMessage); jo.put("driver_type", "siemens_conveyor"); jo.put("is_click", true); jo.put("x", x_position); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/ItemProtocol.java new file mode 100644 index 000000000..fd89df48f --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/ItemProtocol.java @@ -0,0 +1,79 @@ +package org.nl.acs.device_driver.two_conveyor.ranging_stations; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device_driver.standard_inspect.ItemDto; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Data +public class ItemProtocol { + + + public static String item_mode = "mode"; + public static String item_length = "length"; + public static String item_action = "action"; + public static String item_to_command = "to_command"; + + private RangingStationsDeviceDriver driver; + + public ItemProtocol(RangingStationsDeviceDriver driver) { + this.driver = driver; + } + + public int getMode() { + return this.getOpcIntegerValue(item_mode); + } + public int getLength() { + return this.getOpcIntegerValue(item_length); + } + + public int getAction() { + return this.getOpcIntegerValue(item_action); + } + + public int getToCommand() { + return this.getOpcIntegerValue(item_to_command); + } + + + /** + *是否有货 + */ + public int hasGoods(int move) { + return move; + } + + Boolean isonline; + + public int getOpcIntegerValue(String protocol) { + Integer value = this.driver.getIntegeregerValue(protocol); + if (value == null) { + // log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); + setIsonline(false); + } else { + setIsonline(true); + return value; + } + return 0; + + } + + public static List getReadableItemDtos() { + ArrayList list = new ArrayList(); + list.add(new ItemDto(item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); + list.add(new ItemDto(item_length, "测距", "DB600.D6")); + list.add(new ItemDto(item_action, "取放信号", "DB600.D8")); + return list; + } + + public static List getWriteableItemDtos() { + ArrayList list = new ArrayList(); + list.add(new ItemDto(item_to_command, "作业命令", "DB601.W2", Boolean.valueOf(true))); + return list; + } + +} + diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDefination.java new file mode 100644 index 000000000..71bdff8f9 --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDefination.java @@ -0,0 +1,61 @@ +package org.nl.acs.device_driver.two_conveyor.ranging_stations; + +import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.domain.Device; +import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.springframework.stereotype.Service; + +import java.util.LinkedList; +import java.util.List; + +/** + * AGV站点-测距 + */ +@Service +public class RangingStationsDefination implements OpcDeviceDriverDefination { + @Override + public String getDriverCode() { + return "ranging_stations"; + } + + @Override + public String getDriverName() { + return "AGV站点-测距"; + } + + @Override + public String getDriverDescription() { + return "AGV站点-测距"; + } + + @Override + public DeviceDriver getDriverInstance(Device device) { + return (new RangingStationsDeviceDriver()).setDevice(device).setDriverDefination(this); + + } + + @Override + public Class getDeviceDriverType() { + return RangingStationsDeviceDriver.class; + } + + @Override + public List getFitDeviceTypes() { + List types = new LinkedList(); + types.add(DeviceType.conveyor); + return types; + } + + @Override + public List getReadableItemDtos() { + return ItemProtocol.getReadableItemDtos(); + } + + @Override + public List getWriteableItemDtos() { + return ItemProtocol.getWriteableItemDtos(); + } + +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java new file mode 100644 index 000000000..b455f83e1 --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java @@ -0,0 +1,403 @@ +package org.nl.acs.device_driver.two_conveyor.ranging_stations; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.domain.Device; +import org.nl.acs.device.service.DeviceService; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.RouteableDeviceDriver; +import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.monitor.DeviceStageMonitor; +import org.nl.acs.opc.WcsConfig; +import org.nl.acs.route.service.RouteLineService; +import org.nl.acs.route.service.dto.RouteLineDto; +import org.nl.acs.task.domain.Task; +import org.nl.acs.task.enums.TaskStatusEnum; +import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.service.dto.TaskDto; +import org.nl.acs.task.service.mapper.TaskMapper; +import org.nl.acs.utils.ConvertUtil; +import org.nl.common.utils.CodeUtil; +import org.nl.config.SpringContextHolder; +import org.openscada.opc.lib.da.Server; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * AGV站点-测距 + */ +@Slf4j +@Data +@RequiredArgsConstructor +public class RangingStationsDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { + protected ItemProtocol itemProtocol = new ItemProtocol(this); + + InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); + + DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); + + RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); + + TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); + + TaskMapper taskMapper; + AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); + + String container; + String container_type_desc; + String last_container_type_desc; + String last_container; + /** + * 放货准备锁 + */ + String putReadyLock = null; + /** + * 有货标记 + */ + protected boolean has_goods_tag = false; + + private Date time = new Date(); + + int mode = 0; + int last_mode = 0; + Boolean isonline = true; + int hasGoods = 0; + String message = null; + Boolean iserror = false; + + int length = 0; + int last_length = 0; + int action = 0; + int last_action = 0; + + + boolean hasVehicle = false; + boolean isReady = false; + protected int instruction_num = 0; + protected int instruction_num_truth = 0; + boolean isFold = false; + private String assemble_check_tag; + + protected String current_stage_instruction_message; + protected String last_stage_instruction_message; + Integer heartbeat_tag; + private Date instruction_require_time = new Date(); + private Date instruction_finished_time = new Date(); + + private int instruction_require_time_out; + boolean requireSucess = false; + + private int instruction_finished_time_out; + + int branchProtocol = 0; + /** + * 备注 + */ + String remark; + /** + * 数量 + */ + String qty; + /** + * 物料 + */ + String material; + /** + * 批次 + */ + String batch; + /** + * 当前指令 + */ + Instruction inst = null; + /** + * 上次指令 + */ + Instruction last_inst = null; + + /** + * 触摸屏手动触发任务 + */ + private Boolean is_has_task = false; + + /** + * 满盅入库请求标记 + */ + boolean Sucess = false; + + /** + * 暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 + */ + int flag; + + String devicecode; + + @Override + public Device getDevice() { + return this.device; + } + + + @Override + public void execute() { + String message = null; + try { + devicecode = this.getDeviceCode(); + mode = this.itemProtocol.getMode(); + length = this.itemProtocol.getLength(); + action = this.itemProtocol.getAction(); + if (mode != last_mode) { + this.setRequireSucess(false); + if (mode == 2) { + this.writing(0); + } + } + + + } catch (Exception var17) { + return; + } + + if (!this.itemProtocol.getIsonline()) { + this.setIsonline(false); + this.setIserror(true); + message = "信号量同步异常"; + //未联机 + } else if (mode == 0) { + this.setIsonline(false); + this.setIserror(true); + message = "未联机"; + //有报警 + } else { + this.setIsonline(true); + this.setIserror(false); + message = ""; + Instruction instruction = null; + List toInstructions; + switch (mode) { + case 1: + log.debug("设备运转模式:等待工作"); + return; + case 2: + break; + /*case 4: + //叫料 + if (move == 0 && !requireSucess) { + apply(4); + } + break; + case 5: + //满料出库 + if (move == 1 && !requireSucess) { + apply(5); + } + break; + case 6: + //申请空盘 + if (move == 0 && !requireSucess) { + apply(6); + } + break; + case 7: + //空托盘出库 + if (move == 1 && !requireSucess) { + apply(7); + } + break;*/ + default: + break; + } + + switch (flag) { + //取货完成 + case 1: + writing(2); + return; + //放货完成 + case 2: + writing(3); + return; + default: + break; + } + + } + last_mode = mode; + + } + + + + protected void thingToNothing() { + log.debug("从有货到无货 清理数据"); + this.set_last_container(container, container_type_desc); + } + + public void set_last_container(String barcode, String type_desc) { + this.set_last_container(barcode); + this.set_last_container_type_desc(type_desc); + } + + public void set_last_container(String barcode) { + } + + public void set_last_container_type_desc(String type) { + } + + public boolean exe_business() { + return true; + } + + /*protected void executing(Instruction instruction) { + this.executing(1, instruction, ""); + }*/ + + /*public void executing(int command, Instruction instruction, String appendMessage) { + String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_command; + String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_target; + String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_task; + if (appendMessage == null) { + appendMessage = ""; + } + if (instruction != null) { + instruction_num = Integer.parseInt(instruction.getInstruction_code()); + } + Map itemMap = new HashMap(); + itemMap.put(to_command, 1); + itemMap.put(to_task, instruction_num); + this.control(itemMap); + + }*/ + + public void executing(Server server, Map itemMap) { + this.control(itemMap); + } + + public void writing(int command) { + String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_command; + + //String opcservcerid = this.getDevice().getOpc_server_id(); +//Server server = ReadUtil.getServer(opcservcerid); + Map itemMap = new HashMap(); + itemMap.put(to_command, command); + this.control(itemMap); + + } + + + public boolean instruction_require(String container_code) { + return instruction_require(container_code, WcsConfig.task_container_type_default_desc); + } + + /** + * 请求指令 + * + * @param container_code + * @param container_type + */ + public synchronized boolean instruction_require(String container_code, String container_type) { + Date date = new Date(); + if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); + return false; + } else { + this.instruction_require_time = date; + TaskDto dto = new TaskDto(); + String now = DateUtil.now(); + dto.setTask_id(IdUtil.simpleUUID()); + dto.setCreate_by(this.getDevice().getDevice_code()); + dto.setUpdate_by(this.getDevice().getDevice_code()); + dto.setStart_point_code(this.getDevice().getDevice_code()); + dto.setVehicle_code(container_code); + dto.setVehicle_type(container_type); + + String taskcode = CodeUtil.getNewCode("TASK_NO"); + dto.setTask_code("-" + taskcode); + dto.setTask_status(TaskStatusEnum.READY.getIndex()); + dto.setPriority("101"); + RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); + String next_device_codecode = jo.getNext_device_code(); + if (StrUtil.isEmpty(next_device_codecode)) { + throw new RuntimeException("该设备未找到对应路由"); + } + dto.setNext_point_code(next_device_codecode); + dto.setUpdate_time(now); + dto.setCreate_time(now); + +// WQLObject wo = WQLObject.getWQLObject("acs_task"); +// JSONObject json = (JSONObject) JSONObject.toJSON(dto); +// +// wo.insert(json); + + Task entity = ConvertUtil.convert(dto, Task.class); + taskMapper.insert(entity); + requireSucess = false; + return true; + } + } + + @Override + public JSONObject getDeviceStatusName() { + JSONObject jo = new JSONObject(); + String mode = ""; + String action = ""; + String move = ""; + if (this.getMode() == 0) { + mode = "未联机"; + } else if (this.getMode() == 1) { + mode = "单机"; + } else if (this.getMode() == 2) { + mode = "联机"; + } else if (this.getMode() == 3) { + mode = "运行中"; + } + + /*if (this.getMove() == 0) { + move = "无货"; + jo.put("hasGoods", false); + } else if (this.getMove() == 1) { + move = "有货"; + jo.put("hasGoods", true); + } else if (this.getMove() == 2) { + move = "有托盘有货"; + jo.put("hasGoods", true); + }*/ + jo.put("device_name", this.getDevice().getDevice_name()); + jo.put("mode", mode); + jo.put("move", move); + jo.put("action", action); + jo.put("isOnline", this.getIsonline()); + jo.put("isError", this.getIserror()); + return jo; + } + + @Override + public void setDeviceStatus(JSONObject data) { + + } + + /** + * lms申请任务 + * + * @param + */ + public synchronized boolean apply(Integer type) { + return false; + } +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 96b1626a1..18560b69c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -559,6 +559,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -603,6 +604,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -633,6 +635,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); this.control(itemMap); } @@ -827,6 +830,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java index a80366db9..e4bf53339 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java @@ -219,6 +219,7 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } @@ -306,6 +307,7 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java index 996c3d79e..eb7893aa0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java @@ -276,6 +276,7 @@ public class WasteFoilWeighingStationDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } @@ -303,6 +304,7 @@ public class WasteFoilWeighingStationDriver extends AbstractOpcDeviceDriver impl .device_code(device_code) .content("下发多个电气信号" + itemMap) .build(); + logDto.setLog_level(3); luceneExecuteLogService.deviceExecuteLog(logDto); } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index d820d2429..4cdb503b7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -102,7 +102,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"applyTaskToWms", String.valueOf(result2.getStatus()), JSON.toJSONString(jo), String.valueOf(result2.body()), "ACS向LMS申请生箔按钮任务"); luceneLogService.interfaceExecuteLog(luceneLogDto); return result2.body(); @@ -184,7 +184,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"applyTaskToWms", String.valueOf(result2.getStatus()), JSON.toJSONString(param), String.valueOf(result2.body()), "二期入库申请任务"); luceneLogService.interfaceExecuteLog(luceneLogDto); return result2.body(); @@ -224,7 +224,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"applyTaskToWms", String.valueOf(result2.getStatus()), JSON.toJSONString(param), String.valueOf(result2.body()), "二期发货申请任务"); luceneLogService.interfaceExecuteLog(luceneLogDto); return result2.body(); @@ -264,7 +264,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"applyTaskToWms", String.valueOf(result2.getStatus()), JSON.toJSONString(param), String.valueOf(result2.body()), "二期发货申请捆扎、贴标"); luceneLogService.interfaceExecuteLog(luceneLogDto); return result2.body(); @@ -304,7 +304,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"applyTaskToWms", String.valueOf(result2.getStatus()), JSON.toJSONString(param), String.valueOf(result2.body()), "二期发货申请捆扎、贴标"); luceneLogService.interfaceExecuteLog(luceneLogDto); return result2.body(); @@ -404,7 +404,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { map.put("message", e.getMessage()); return JSONObject.toJavaObject(map, ApplyGreenFoilButtonResponse.class); } - LuceneLogDto luceneLogDto = new LuceneLogDto("ApplyGreenFoilButtonRequest", String.valueOf(applyGreenFoilButtonResponse.getCode()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"ApplyGreenFoilButtonRequest", String.valueOf(applyGreenFoilButtonResponse.getCode()), JSON.toJSONString(param), String.valueOf(applyGreenFoilButtonResponse.getMessage()), "ACS向LMS申请生箔按钮任务"); luceneLogService.interfaceExecuteLog(luceneLogDto); } @@ -439,7 +439,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { map.put("message", e.getMessage()); return JSONObject.toJavaObject(map, BlankingButtonResponse.class); } - LuceneLogDto luceneLogDto = new LuceneLogDto("BlankingButtonRequest", String.valueOf(blankingButtonResponse.getCode()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"BlankingButtonRequest", String.valueOf(blankingButtonResponse.getCode()), JSON.toJSONString(param), String.valueOf(blankingButtonResponse.getMessage()), "ACS向LMS申请表处下料位按钮任务"); luceneLogService.interfaceExecuteLog(luceneLogDto); } @@ -469,15 +469,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject jsonObject = JSONObject.parseObject(result); log.info("ApplyPlugPullSitResponse----返回参数{}", result); applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class); + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"ApplyPlugPullSiteRequest", String.valueOf(applyPlugPullSitResponse.getCode()), + JSON.toJSONString(param), String.valueOf(result), "ACS向LMS申请套管"); + luceneLogService.interfaceExecuteLog(luceneLogDto); } catch (Exception e) { JSONObject map = new JSONObject(); map.put("status", 400); map.put("message", e.getMessage()); return JSONObject.toJavaObject(map, ApplyPlugPullSitResponse.class); } - LuceneLogDto luceneLogDto = new LuceneLogDto("ApplyPlugPullSiteRequest", String.valueOf(applyPlugPullSitResponse.getCode()), - JSON.toJSONString(param), String.valueOf(applyPlugPullSitResponse.getMessage()), "ACS向LMS申请套管"); - luceneLogService.interfaceExecuteLog(luceneLogDto); + } return applyPlugPullSitResponse; } finally { @@ -511,7 +512,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { map.put("message", e.getMessage()); return JSONObject.toJavaObject(map, ApplyfeedbackSubVolumeWeightResponse.class); } - LuceneLogDto luceneLogDto = new LuceneLogDto("applyfeedbackSubVolumeWeightRequest", String.valueOf(applyfeedbackSubVolumeWeightResponse.getCode()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"applyfeedbackSubVolumeWeightRequest", String.valueOf(applyfeedbackSubVolumeWeightResponse.getCode()), JSON.toJSONString(param), String.valueOf(applyfeedbackSubVolumeWeightResponse.getMessage()), "ACS向LMS申请套管"); luceneLogService.interfaceExecuteLog(luceneLogDto); } @@ -547,7 +548,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { map.put("message", e.getMessage()); return JSONObject.toJavaObject(map, ApplyManipulatorActionResponse.class); } - LuceneLogDto luceneLogDto = new LuceneLogDto("ApplyManipulatorActionRequest", String.valueOf(applyManipulatorActionResponse.getCode()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"ApplyManipulatorActionRequest", String.valueOf(applyManipulatorActionResponse.getCode()), JSON.toJSONString(param), String.valueOf(applyManipulatorActionResponse), "ACS向LMS申请反馈子卷重量"); luceneLogService.interfaceExecuteLog(luceneLogDto); } @@ -584,7 +585,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { map.put("message", e.getMessage()); return JSONObject.toJavaObject(map, GetWasteFoilWeightResponse.class); } - LuceneLogDto luceneLogDto = new LuceneLogDto("GetWasteFoilWeightRequest", String.valueOf(getWasteFoilWeightResponse.getCode()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"GetWasteFoilWeightRequest", String.valueOf(getWasteFoilWeightResponse.getCode()), JSON.toJSONString(param), String.valueOf(getWasteFoilWeightResponse), "ACS向LMS申请反馈"); luceneLogService.interfaceExecuteLog(luceneLogDto); } @@ -610,7 +611,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { .body(); log.info("gccQueryStationState - 响应参数{}", responseBody); JSONObject jsonObject = JSONObject.parseObject(responseBody); - LuceneLogDto luceneLogDto = new LuceneLogDto("gccQueryStationState", String.valueOf(jsonObject.get("code")), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"gccQueryStationState", String.valueOf(jsonObject.get("code")), JSON.toJSONString("StartStationCode=" + inst.getStart_point_code() + "&EndStationCode=" + inst.getNext_point_code()), String.valueOf(jsonObject), "ACS查询站点有无货状态"); luceneLogService.interfaceExecuteLog(luceneLogDto); @@ -677,7 +678,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"applyTaskToWms", String.valueOf(result2.getStatus()), JSON.toJSONString(param), String.valueOf(result2.body()), "申请更新点位"); luceneLogService.interfaceExecuteLog(luceneLogDto); return result2.body(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 32d80efdc..6b110858c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.acs.device.domain.Device; import org.nl.acs.device_driver.agv.ndctwo.AgvNdcTwoDeviceDriver; import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.device_driver.one_conveyor.fold_disc_site.FoldDiscSiteDeviceDriver; import org.nl.acs.device_driver.one_manipulator.box_package_manipulator.BoxPackageManipulatorDeviceDriver; import org.nl.acs.device_driver.conveyor.box_palletizing_manipulator.BoxPalletizingManipulatorDeviceDriver; import org.nl.acs.device_driver.paper_tube_device2.PaperTubeConveyor2DeviceDriver; @@ -55,6 +56,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -506,6 +509,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { LampThreecolorDeviceDriver lampThreecolorDeviceDriver; SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver; + FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver; if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); hongXiangStationDeviceDriver.writing(code, value); @@ -522,6 +526,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { inflatableShaftLibraryDeviceDriver = (InflatableShaftLibraryDeviceDriver) device.getDeviceDriver(); inflatableShaftLibraryDeviceDriver.writing(code, value); } + if (device.getDeviceDriver() instanceof FoldDiscSiteDeviceDriver) { + foldDiscSiteDeviceDriver = (FoldDiscSiteDeviceDriver) device.getDeviceDriver(); + List list = new ArrayList(); + Map map = new HashMap(); + map.put("code",code); + map.put("value",value); + list.add(map); + foldDiscSiteDeviceDriver.writing(list); + } if (device.getDeviceDriver() instanceof WasteFoilWeighingStationDriver) { wasteFoilWeighingStationDriver = (WasteFoilWeighingStationDriver) device.getDeviceDriver(); wasteFoilWeighingStationDriver.writing(code, value); @@ -534,7 +547,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { } response.setStatus(200); response.setMessage("success"); - LuceneLogDto luceneLogDto = new LuceneLogDto("putAction", String.valueOf(response.getCode()), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"putAction", String.valueOf(response.getCode()), jsonObject, String.valueOf(response), "LMS下发动作"); luceneExecuteLogService.interfaceExecuteLog(luceneLogDto); log.info("putAction--------------:输出参数：" + response); @@ -619,6 +632,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { //子卷称重位 SubvolumeWeighingStationDriver subvolumeWeighingStationDriver; + //拆叠盘位 + FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver; + PlugPullDeviceSiteDeviceDriver plugPullDeviceSiteDeviceDriver; if (datas.size() == 0) { throw new BadRequestException("缺少输入参数！"); @@ -760,6 +776,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("action", subvolumeWeighingStationDriver.getAction()); jo.put("weight", subvolumeWeighingStationDriver.getWeight()); jo.put("error", subvolumeWeighingStationDriver.getError()); + }else if (device.getDeviceDriver() instanceof FoldDiscSiteDeviceDriver) { + foldDiscSiteDeviceDriver = (FoldDiscSiteDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", parent_device_code); + jo.put("move", foldDiscSiteDeviceDriver.getMove()); + jo.put("mode", foldDiscSiteDeviceDriver.getMode()); + jo.put("qty", foldDiscSiteDeviceDriver.getQty()); + jo.put("container_type", foldDiscSiteDeviceDriver.getContainer_type()); + jo.put("error", foldDiscSiteDeviceDriver.getError()); } else { jo.put("device_code", parent_device_code); } @@ -769,7 +793,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { resultJson.put("status", HttpStatus.OK.value()); resultJson.put("message", "操作成功"); resultJson.put("data", backja); - LuceneLogDto luceneLogDto = new LuceneLogDto("queryDevice", String.valueOf(resultJson.get("status")), + LuceneLogDto luceneLogDto = new LuceneLogDto(4,"queryDevice", String.valueOf(resultJson.get("status")), jsonObject, String.valueOf(resultJson), "LMS查询设备状态"); luceneExecuteLogService.interfaceExecuteLog(luceneLogDto); return resultJson; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java index c01690d14..5de8c9107 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; +import org.nl.acs.AcsConfig; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.opc.service.dto.OpcServerManageDto; import org.nl.acs.udw.UnifiedDataAccessor; @@ -13,9 +14,11 @@ import org.nl.acs.udw.UnifiedDataAppService; import org.nl.common.enums.LogTypeEnum; import org.nl.config.SpringContextHolder; import org.nl.config.lucene.service.dto.LuceneLogDto; +import org.nl.system.service.param.ISysParamService; import org.openscada.opc.lib.da.*; import java.util.*; +import java.util.regex.Pattern; @Slf4j @@ -400,6 +403,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC } private void logItemChanged(String itemId, UnifiedDataAccessor accessor_value, Object value, OpcItemDto itemDto) { + ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); Object his = accessor_value.getValue(itemId); List relate_items = itemDto.getRelate_items(); if (relate_items != null && !relate_items.isEmpty()) { @@ -411,34 +415,35 @@ 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")) { + if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time") && !itemDto.getItem_code().endsWith("consumption")) { // 存在上次点位值为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(his), String.valueOf(value)); - luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); - log.info("{}", JSON.toJSONString(luceneLogDto)); + if(!(his instanceof Float) && !(value instanceof Float)){ + LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(),4, itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1), + String.valueOf(his), String.valueOf(value)); + luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); + String logLevel = paramService.findByCode(AcsConfig.LOGLEVEL).getValue(); + if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){ + log.info("{}", JSON.toJSONString(luceneLogDto)); + } + } } } else { -// if(his instanceof int[]){ -// if(!Arrays.equals((long[]) his, (long[]) value)){ -// log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); -// } -// } else if(his instanceof String){ -// if(!StrUtil.equals((CharSequence) his, (CharSequence) value)){ -// log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); -// } -// } else { -// log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); -// } - -// log.warn("设备：{}信号{}变更从{}->{};信号快照：{}", new Object[]{itemDto.getDevice_code(), itemId, his, value}); - 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(his), String.valueOf(value)); - luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); - log.info("{}", JSON.toJSONString(luceneLogDto)); + if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time") && !itemDto.getItem_code().endsWith("consumption")) { + if(!(his instanceof Float) && !(value instanceof Float)){ + LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(),4, itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1), + String.valueOf(his), String.valueOf(value)); + luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); + String logLevel = paramService.findByCode(AcsConfig.LOGLEVEL).getValue(); + if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){ + log.info("{}", JSON.toJSONString(luceneLogDto)); + } + } } } } + public static boolean isNumeric(String str) { + return Pattern.compile("^[0-9]+$").matcher(str).matches(); + } + } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 247c199da..482d13edc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -344,6 +344,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme String vehicle_code = (String) whereJson.get("vehicle_code"); String material_type = (String) whereJson.get("material_type"); String status = (String) whereJson.get("status"); + String taskType = (String) whereJson.get("task_type"); String point_code = (String) whereJson.get("point_code"); String create_time = (String) whereJson.get("createTime"); String end_time = (String) whereJson.get("end_time"); @@ -353,6 +354,9 @@ public class TaskServiceImpl extends CommonServiceImpl impleme if (!StrUtil.isEmpty(task_code)) { wrapper.eq(Task::getTask_code, task_code); } + if (!StrUtil.isEmpty(taskType)) { + wrapper.eq(Task::getTask_type, taskType); + } if (!StrUtil.isEmpty(vehicle_code)) { wrapper.like(Task::getVehicle_code, vehicle_code); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/dto/LuceneLogDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/dto/LuceneLogDto.java index 560ad4b0c..dc3a78979 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/dto/LuceneLogDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/dto/LuceneLogDto.java @@ -37,6 +37,10 @@ public class LuceneLogDto { /* 日志类型 */ private String log_type; + /** + * 日志级别 + */ + private Integer log_level; /* 方法 */ private String method; @@ -69,11 +73,12 @@ public class LuceneLogDto { private String update_time; - public LuceneLogDto(final String opc_server_code, final String opc_plc_code, + public LuceneLogDto(final String opc_server_code, final String opc_plc_code,final Integer log_level, final String device_code, final String to_home, final String last_home, final String home) { super(); this.device_code = device_code; + this.log_level = log_level; this.content = "信号 [" + opc_server_code + "." + opc_plc_code + "." @@ -83,10 +88,10 @@ public class LuceneLogDto { + home; } - public LuceneLogDto(final String method, final String status, + public LuceneLogDto(final Integer log_level,final String method, final String status, final String requestparam, final String responseparam, final String content) { super(); - this.content = content; + this.log_level = log_level; this.method = method; this.status_code = status; this.requestparam = requestparam; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneExecuteLogServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneExecuteLogServiceImpl.java index fdc9d036a..49b25f2ca 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneExecuteLogServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneExecuteLogServiceImpl.java @@ -1,15 +1,22 @@ package org.nl.config.lucene.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.acs.AcsConfig; +import org.nl.config.SpringContextHolder; import org.nl.config.lucene.enums.LogTypeEnum; import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.config.lucene.service.dto.LuceneLogDto; +import org.nl.system.service.param.ISysParamService; import org.slf4j.MDC; import org.springframework.stereotype.Service; +import java.util.regex.Pattern; + /** * @author jlm * @description 服务实现 @@ -20,6 +27,8 @@ import org.springframework.stereotype.Service; @Slf4j public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { + + @Override public void deviceItemValue(String device_code, String key, String value) { String now = DateUtil.now(); @@ -27,14 +36,28 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { @Override public void deviceExecuteLog(LuceneLogDto luceneLogDto) { + ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); - log.info("{}", JSON.toJSONString(luceneLogDto)); + String logLevel = paramService.findByCode(AcsConfig.LOGLEVEL).getValue(); + if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && + ObjectUtil.isNotEmpty(luceneLogDto.getLog_level()) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){ + log.info("{}", JSON.toJSONString(luceneLogDto)); + } + } + + public static boolean isNumeric(String str) { + return Pattern.compile("^[0-9]+$").matcher(str).matches(); } @Override public void interfaceExecuteLog(LuceneLogDto luceneLogDto) { + ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); - log.info("{}", JSON.toJSONString(luceneLogDto)); + String logLevel = paramService.findByCode(AcsConfig.LOGLEVEL).getValue(); + if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && + ObjectUtil.isNotEmpty(luceneLogDto.getLog_level()) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){ + log.info("{}", JSON.toJSONString(luceneLogDto)); + } } @Override diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index 5f4bc05ae..3debd9ce3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -196,6 +196,7 @@ public class AutoCreateInst { .device_code("定时创建指令失败") .content(e.getMessage()) .build(); + logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); continue; } diff --git a/acs2/nladmin-ui/src/assets/images/bg_monitor.jpg b/acs2/nladmin-ui/src/assets/images/bg_monitor.jpg new file mode 100644 index 000000000..766397260 Binary files /dev/null and b/acs2/nladmin-ui/src/assets/images/bg_monitor.jpg differ diff --git a/acs2/nladmin-ui/src/i18n/langs/history/en.js b/acs2/nladmin-ui/src/i18n/langs/history/en.js index 8234a71ab..d57bafa2f 100644 --- a/acs2/nladmin-ui/src/i18n/langs/history/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/history/en.js @@ -7,6 +7,7 @@ export default { 'Status': 'Status', 'Priority': 'Task Priority', 'Starting_point_two': 'Starting Point Two', + 'Transit_point': 'Transit Point', 'Endpoint_two': 'Endpoint Two', 'Material': 'Material', 'Quantity': 'Quantity', diff --git a/acs2/nladmin-ui/src/i18n/langs/history/in.js b/acs2/nladmin-ui/src/i18n/langs/history/in.js index b20a7beac..b0a5ab1d6 100644 --- a/acs2/nladmin-ui/src/i18n/langs/history/in.js +++ b/acs2/nladmin-ui/src/i18n/langs/history/in.js @@ -7,6 +7,7 @@ export default { 'Status': 'Status', 'Priority': 'Prioritas Tugas', 'Starting_point_two': 'Titik Awalan Dua', + 'Transit_point': 'Titik transit', 'Endpoint_two': 'Titik Akhir Dua', 'Material': 'Bahan', 'Quantity': 'Jumlah', diff --git a/acs2/nladmin-ui/src/i18n/langs/history/zh.js b/acs2/nladmin-ui/src/i18n/langs/history/zh.js index 2e24ecab9..e332c0678 100644 --- a/acs2/nladmin-ui/src/i18n/langs/history/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/history/zh.js @@ -7,6 +7,7 @@ export default { 'Status': '状态', 'Priority': '任务优先级', 'Starting_point_two': '起点2', + 'Transit_point': '中转点', 'Endpoint_two': '终点2', 'Material': '物料', 'Quantity': '数量', diff --git a/acs2/nladmin-ui/src/views/acs/device/config.vue b/acs2/nladmin-ui/src/views/acs/device/config.vue index 2eb9742a6..9119a1ef8 100644 --- a/acs2/nladmin-ui/src/views/acs/device/config.vue +++ b/acs2/nladmin-ui/src/views/acs/device/config.vue @@ -75,6 +75,7 @@ import { get, selectDriverCodeList } from '@/api/acs/device/driverConfig' import { getDicts } from '@/views/system/dict/dict' import standard_autodoor from '@/views/acs/device/driver/standard_autodoor' import standard_inspect_site from './driver/standard_inspect_site' +import ranging_stations from './driver/ranging_stations' import standard_ordinary_site from './driver/standard_ordinary_site' import standard_storage from '@/views/acs/device/driver/standard_storage' import standard_scanner from '@/views/acs/device/driver/standard_scanner' @@ -153,6 +154,7 @@ export default { belt_conveyor, double_station_stacker, lamp_three_color, + ranging_stations, box_palletizing_manipulator, hongxiang_conveyor, hongxiang_device, diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/ranging_stations.vue b/acs2/nladmin-ui/src/views/acs/device/driver/ranging_stations.vue new file mode 100644 index 000000000..c421eda4d --- /dev/null +++ b/acs2/nladmin-ui/src/views/acs/device/driver/ranging_stations.vue @@ -0,0 +1,489 @@ + + + + + diff --git a/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue index 8164ad41e..18c5fdcfd 100644 --- a/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue +++ b/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue @@ -135,6 +135,7 @@ {{ $t('task.select.Ready') }} {{ $t('task.select.In_progress') }} {{ $t('task.select.Completed') }} + {{ $t('task.select.Cancel') }} diff --git a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue index 61ee27bb4..8963547b5 100644 --- a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue +++ b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue @@ -60,6 +60,20 @@ + + + + + + + + @@ -320,7 +340,7 @@ const defaultForm = { export default { name: 'Task', components: { pagination, crudOperation, Search }, - dicts: ['task_status'], + dicts: ['task_status', 'task_type'], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ diff --git a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue index 97e1bb6d4..dd9a20f3f 100644 --- a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue +++ b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue @@ -60,6 +60,20 @@ + + + + + + + + @@ -121,6 +141,7 @@ + @@ -160,7 +181,7 @@ const defaultForm = { export default { name: 'Task', components: { pagination, crudOperation, Search }, - dicts: ['task_status'], + dicts: ['task_status', 'task_type'], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return [ diff --git a/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue b/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue index 985bdd70d..9408568a5 100644 --- a/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue +++ b/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue @@ -14,7 +14,7 @@ @@ -41,7 +41,7 @@ clearable size="small" :placeholder="$t('route.placeholder.enter_next_device_code')" - style="width: 250px;" + style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" /> @@ -176,18 +176,18 @@ :label="$t('device.device_table_title.device_encoding')" :min-width="flexWidth('device_code',crud.data,$t('device.device_table_title.device_encoding'))" /> - + - + - - - - + + + + - - + + -