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

opt: 历史任务记录显示起点2终点2,监控大屏2秒刷新

Browse Source
This commit is contained in:
yanps
2024-05-14 09:00:00 +08:00
parent 9bbe7c8b68
commit 4df8527bb4
7 changed files with 125 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -197,7 +197,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
//未联机
} else if (mode == 0) {
this.setIsonline(false);
this.setIserror(true);
message = "未联机";
//有报警
} else if (error != 0) {

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/ItemProtocol.java
View File

@@ -127,7 +127,7 @@ public class ItemProtocol {
Boolean isonline;
Boolean isError;
Boolean isError = false;
public int getOpcIntegerValue(String protocol) {
Integer value = this.driver.getIntegeregerValue(protocol);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/ItemProtocol.java
View File

@@ -113,7 +113,7 @@ public class ItemProtocol {
}
Boolean isonline;
Boolean isError;
Boolean isError = false;
public int getOpcIntegerValue(String protocol) {
Integer value = this.driver.getIntegeregerValue(protocol);

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -235,6 +235,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
String status = (String) whereJson.get("status");
String point_code = (String) whereJson.get("point_code");
String create_time = (String) whereJson.get("createTime");
String type = (String) whereJson.get("type");
String end_time = (String) whereJson.get("end_time");
IPage<InstructionMybatis> queryPage = PageUtil.toMybatisPage(page);
@@ -252,6 +253,9 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
if (!StrUtil.isEmpty(status)) {
wrapper.eq(InstructionMybatis::getInstruction_status, status);
}
if (!StrUtil.isEmpty(type)) {
wrapper.eq(InstructionMybatis::getInstruction_type, type);
}
if (!StrUtil.isEmpty(point_code)) {
wrapper.and(instructionMybatis -> instructionMybatis.like(InstructionMybatis::getStart_point_code, point_code).or().like(InstructionMybatis::getNext_point_code, point_code));
}