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

fix

Browse Source
This commit is contained in:
psh
2024-04-02 11:15:15 +08:00
parent a713b80a61
commit 2b3c3d7eb1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
View File

@@ -196,7 +196,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
Object his = accessor_value.getValue(itemId); Object his = accessor_value.getValue(itemId);
if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD) && his != null) { if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD) && his != null) {
log.warn("opc 值不健康 item: {}, 状态: {}", itemId, itemState.getQuality()); log.warn("opc 值不健康 item: {}, 状态: {}", itemId, itemState.getQuality());
valueAllNotNull = true; valueAllNotNull = false;
} }
if (!UnifiedDataAppService.isEquals(value, his)) { if (!UnifiedDataAppService.isEquals(value, his)) {

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java
View File

@@ -171,7 +171,10 @@ public class MJXLTask extends AbstractTask {
SchBasePoint schBasePoint=null; SchBasePoint schBasePoint=null;
int qty=0; int qty=0;
for (Map.Entry<SchBasePoint, Integer> next : pointMap.entrySet()) { for (Map.Entry<SchBasePoint, Integer> next : pointMap.entrySet()) {
if (next.getValue() >= qty) { if (next.getValue() >= qty && schBasePoint==null) {
qty = next.getValue();
schBasePoint = next.getKey();
}else if (next.getValue() >= qty && next.getKey().getPoint_code().compareTo(schBasePoint.getPoint_code()) < 0){
qty = next.getValue(); qty = next.getValue();
schBasePoint = next.getKey(); schBasePoint = next.getKey();
} }