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

任务指令锁更新

Browse Source
This commit is contained in:
ludj
2023-02-06 18:10:06 +08:00
parent ce24dedb7c
commit 0429abc1e6
2 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -250,7 +250,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
@Override @Override
public Instruction findByTaskcodeAndStatus(String code) { public Instruction findByTaskcodeAndStatus(String code) {
synchronized (InstructionServiceImpl.class) {
Iterator var3 = instructions.iterator(); Iterator var3 = instructions.iterator();
while (var3.hasNext()) { while (var3.hasNext()) {
Instruction instruction = (Instruction) var3.next(); Instruction instruction = (Instruction) var3.next();
@@ -260,7 +259,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
} }
return null; return null;
}
} }
@Override @Override
@@ -1098,7 +1096,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
@Override @Override
public Instruction findByLinkNumSend(String code) { public Instruction findByLinkNumSend(String code) {
synchronized (InstructionServiceImpl.class) {
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Instruction inst = it.next(); Instruction inst = it.next();
@@ -1106,14 +1103,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return inst; return inst;
} }
} }
}
return null; return null;
} }
@Override @Override
public List<Instruction> findByLinkNum(String code) { public List<Instruction> findByLinkNum(String code) {
synchronized (InstructionServiceImpl.class) {
List<Instruction> list = new ArrayList<>(); List<Instruction> list = new ArrayList<>();
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
@@ -1123,12 +1118,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
} }
return list; return list;
}
} }
@Override @Override
public Instruction findByLinkNumNoSend(String code) { public Instruction findByLinkNumNoSend(String code) {
synchronized (InstructionServiceImpl.class) {
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Instruction inst = it.next(); Instruction inst = it.next();
@@ -1138,12 +1131,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
return null; return null;
}
} }
@Override @Override
public Instruction findByCodeFromCache(String code) { public Instruction findByCodeFromCache(String code) {
synchronized (InstructionServiceImpl.class) {
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Instruction inst = it.next(); Instruction inst = it.next();
@@ -1152,12 +1143,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
} }
return null; return null;
}
} }
@Override @Override
public Instruction findByBarcodeFromCache(String barcode) { public Instruction findByBarcodeFromCache(String barcode) {
synchronized (InstructionServiceImpl.class) {
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Instruction inst = it.next(); Instruction inst = it.next();
@@ -1166,12 +1155,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
} }
return null; return null;
}
} }
@Override @Override
public Instruction findByIdFromCache(String id) { public Instruction findByIdFromCache(String id) {
synchronized (InstructionServiceImpl.class) {
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Instruction inst = it.next(); Instruction inst = it.next();
@@ -1180,7 +1167,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
} }
return null; return null;
}
} }
@Override @Override
@@ -1256,7 +1242,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
@Override @Override
public Instruction findByDeviceCodeFromCache(String devicecode) { public Instruction findByDeviceCodeFromCache(String devicecode) {
synchronized (InstructionServiceImpl.class) {
List<Instruction> instructionList = instructions; List<Instruction> instructionList = instructions;
ListUtil.sort( ListUtil.sort(
instructionList, instructionList,
@@ -1274,7 +1259,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return inst; return inst;
} }
} }
}
return null; return null;
} }
@@ -1286,7 +1270,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
@Override @Override
public Integer querySameDestinationInst(String devicecode) { public Integer querySameDestinationInst(String devicecode) {
synchronized (InstructionServiceImpl.class) {
int num = 0; int num = 0;
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
@@ -1302,12 +1285,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
return num; return num;
}
} }
@Override @Override
public Integer querySameInstType(String inst_type) { public Integer querySameInstType(String inst_type) {
synchronized (InstructionServiceImpl.class) {
int num = 0; int num = 0;
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
@@ -1318,11 +1299,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
return num; return num;
} }
}
@Override @Override
public Integer querySameOriginInst(String devicecode) { public Integer querySameOriginInst(String devicecode) {
synchronized (InstructionServiceImpl.class) {
int num = 0; int num = 0;
Iterator<Instruction> it = instructions.iterator(); Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) { while (it.hasNext()) {
@@ -1337,12 +1316,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
} }
return num; return num;
}
} }
@Override @Override
public boolean removeByCodeFromCache(String code) { public boolean removeByCodeFromCache(String code) {
synchronized (InstructionServiceImpl.class) {
CopyOnWriteArrayList<Instruction> instructions = (CopyOnWriteArrayList<Instruction>) this.instructions; CopyOnWriteArrayList<Instruction> instructions = (CopyOnWriteArrayList<Instruction>) this.instructions;
instructions.removeIf((instruction) -> { instructions.removeIf((instruction) -> {
instruction.getInstruction_code().equals(code); instruction.getInstruction_code().equals(code);
@@ -1356,7 +1333,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
// } // }
// } // }
return true; return true;
}
} }
@Override @Override

36
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -298,7 +298,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override @Override
public List<TaskDto> queryTaskByDeviceCode(String device_code) { public List<TaskDto> queryTaskByDeviceCode(String device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>(); List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -309,12 +308,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return list; return list;
}
} }
@Override @Override
public List<TaskDto> queryTaskByStartDeviceCode(String start_device_code) { public List<TaskDto> queryTaskByStartDeviceCode(String start_device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>(); List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -329,12 +326,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return list; return list;
}
} }
@Override @Override
public List<TaskDto> queryTaskByBackDeviceCode(String back_start_device_code) { public List<TaskDto> queryTaskByBackDeviceCode(String back_start_device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>(); List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -348,12 +343,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return list; return list;
}
} }
@Override @Override
public List<TaskDto> queryTaskByDeviceCodeAndStatus(String device_code) { public List<TaskDto> queryTaskByDeviceCodeAndStatus(String device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>(); List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -367,11 +360,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return list; return list;
}
} }
public List<TaskDto> queryTaskByStartAndIntStatus(String head_start_device_code) { public List<TaskDto> queryTaskByStartAndIntStatus(String head_start_device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>(); List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -389,11 +380,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return list; return list;
}
} }
public List<TaskDto> queryTaskByNextAndIntStatus(String back_start_device_code) { public List<TaskDto> queryTaskByNextAndIntStatus(String back_start_device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>(); List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -410,7 +399,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return list; return list;
}
} }
@Override @Override
@@ -677,7 +665,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
wo.update(json); wo.update(json);
synchronized (TaskServiceImpl.class) {
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
TaskDto task = iterator.next(); TaskDto task = iterator.next();
@@ -688,7 +675,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
if (StrUtil.equals(dto.getTask_status(), "0") || StrUtil.equals(dto.getTask_status(), "1")) { if (StrUtil.equals(dto.getTask_status(), "0") || StrUtil.equals(dto.getTask_status(), "1")) {
tasks.add(dto); tasks.add(dto);
} }
}
// 判断是否为WMS下发的任务，如果是反馈任务状态给WMS // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS
String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue();
if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
@@ -1277,7 +1263,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override @Override
public boolean removeByCodeFromCache(String code) { public boolean removeByCodeFromCache(String code) {
synchronized (TaskServiceImpl.class) {
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
TaskDto task = iterator.next(); TaskDto task = iterator.next();
@@ -1287,7 +1272,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return false; return false;
}
} }
@Override @Override
@@ -1296,7 +1280,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
public TaskDto findByContainer(String container_code) { public TaskDto findByContainer(String container_code) {
synchronized (TaskServiceImpl.class) {
Iterator var3 = tasks.iterator(); Iterator var3 = tasks.iterator();
while (var3.hasNext()) { while (var3.hasNext()) {
@@ -1307,11 +1290,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
return null; return null;
}
} }
public TaskDto findByCodeFromCache(String task_code) { public TaskDto findByCodeFromCache(String task_code) {
synchronized (TaskServiceImpl.class) {
Iterator var3 = tasks.iterator(); Iterator var3 = tasks.iterator();
while (var3.hasNext()) { while (var3.hasNext()) {
@@ -1321,12 +1302,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return null; return null;
}
} }
@Override @Override
public TaskDto findByNextCode(String device_code) { public TaskDto findByNextCode(String device_code) {
synchronized (TaskServiceImpl.class) {
Iterator var3 = tasks.iterator(); Iterator var3 = tasks.iterator();
while (var3.hasNext()) { while (var3.hasNext()) {
@@ -1336,7 +1315,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return null; return null;
}
} }
@Override @Override
@@ -1351,7 +1329,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override @Override
public TaskDto findByStartCodeAndReady(String device_code) { public TaskDto findByStartCodeAndReady(String device_code) {
synchronized (TaskServiceImpl.class) {
Iterator var3 = tasks.iterator(); Iterator var3 = tasks.iterator();
while (var3.hasNext()) { while (var3.hasNext()) {
@@ -1365,12 +1342,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return null; return null;
}
} }
@Override @Override
public TaskDto findByStartCode(String device_code) { public TaskDto findByStartCode(String device_code) {
synchronized (TaskServiceImpl.class) {
Iterator var3 = tasks.iterator(); Iterator var3 = tasks.iterator();
while (var3.hasNext()) { while (var3.hasNext()) {
@@ -1380,7 +1355,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
return null; return null;
}
} }
@Override @Override
@@ -1522,7 +1496,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override @Override
public void updateByCodeFromCache(TaskDto dto) { public void updateByCodeFromCache(TaskDto dto) {
synchronized (TaskServiceImpl.class) {
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
TaskDto task = iterator.next(); TaskDto task = iterator.next();
@@ -1531,7 +1504,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
} }
tasks.add(dto); tasks.add(dto);
}
} }
@Override @Override
@@ -1577,7 +1549,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override @Override
public Integer querySameDeviceReadyTask(String start_device, String next_device, String status) { public Integer querySameDeviceReadyTask(String start_device, String next_device, String status) {
synchronized (TaskServiceImpl.class) {
int num = 0; int num = 0;
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -1590,12 +1561,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
return num; return num;
}
} }
@Override @Override
public Integer querySameTaskByType(String taskType) { public Integer querySameTaskByType(String taskType) {
synchronized (TaskServiceImpl.class) {
int num = 0; int num = 0;
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -1606,12 +1575,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
return num; return num;
}
} }
@Override @Override
public Integer querySameOriginTask(String code) { public Integer querySameOriginTask(String code) {
synchronized (TaskServiceImpl.class) {
int num = 0; int num = 0;
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -1622,12 +1589,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
} }
return num; return num;
}
} }
@Override @Override
public Integer querySameDestinationTask(String code) { public Integer querySameDestinationTask(String code) {
synchronized (TaskServiceImpl.class) {
int num = 0; int num = 0;
Iterator<TaskDto> iterator = tasks.iterator(); Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -1639,5 +1604,4 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
return num; return num;
} }
}
} }