diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index e11f648ea..a0e155f4c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -250,7 +250,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu @Override public Instruction findByTaskcodeAndStatus(String code) { - synchronized (InstructionServiceImpl.class) { Iterator var3 = instructions.iterator(); while (var3.hasNext()) { Instruction instruction = (Instruction) var3.next(); @@ -260,7 +259,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } return null; - } } @Override @@ -1098,7 +1096,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu @Override public Instruction findByLinkNumSend(String code) { - synchronized (InstructionServiceImpl.class) { Iterator it = instructions.iterator(); while (it.hasNext()) { Instruction inst = it.next(); @@ -1106,14 +1103,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu return inst; } } - } return null; } @Override public List findByLinkNum(String code) { - synchronized (InstructionServiceImpl.class) { List list = new ArrayList<>(); Iterator it = instructions.iterator(); while (it.hasNext()) { @@ -1123,12 +1118,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } return list; - } } @Override public Instruction findByLinkNumNoSend(String code) { - synchronized (InstructionServiceImpl.class) { Iterator it = instructions.iterator(); while (it.hasNext()) { Instruction inst = it.next(); @@ -1138,12 +1131,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } return null; - } } @Override public Instruction findByCodeFromCache(String code) { - synchronized (InstructionServiceImpl.class) { Iterator it = instructions.iterator(); while (it.hasNext()) { Instruction inst = it.next(); @@ -1152,12 +1143,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } return null; - } } @Override public Instruction findByBarcodeFromCache(String barcode) { - synchronized (InstructionServiceImpl.class) { Iterator it = instructions.iterator(); while (it.hasNext()) { Instruction inst = it.next(); @@ -1166,12 +1155,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } return null; - } } @Override public Instruction findByIdFromCache(String id) { - synchronized (InstructionServiceImpl.class) { Iterator it = instructions.iterator(); while (it.hasNext()) { Instruction inst = it.next(); @@ -1180,7 +1167,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } return null; - } } @Override @@ -1256,7 +1242,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu @Override public Instruction findByDeviceCodeFromCache(String devicecode) { - synchronized (InstructionServiceImpl.class) { List instructionList = instructions; ListUtil.sort( instructionList, @@ -1274,7 +1259,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu return inst; } } - } return null; } @@ -1286,7 +1270,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu @Override public Integer querySameDestinationInst(String devicecode) { - synchronized (InstructionServiceImpl.class) { int num = 0; Iterator it = instructions.iterator(); while (it.hasNext()) { @@ -1302,12 +1285,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } return num; - } } @Override public Integer querySameInstType(String inst_type) { - synchronized (InstructionServiceImpl.class) { int num = 0; Iterator it = instructions.iterator(); while (it.hasNext()) { @@ -1318,11 +1299,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } return num; } - } @Override public Integer querySameOriginInst(String devicecode) { - synchronized (InstructionServiceImpl.class) { int num = 0; Iterator it = instructions.iterator(); while (it.hasNext()) { @@ -1337,12 +1316,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } return num; - } } @Override public boolean removeByCodeFromCache(String code) { - synchronized (InstructionServiceImpl.class) { CopyOnWriteArrayList instructions = (CopyOnWriteArrayList) this.instructions; instructions.removeIf((instruction) -> { instruction.getInstruction_code().equals(code); @@ -1356,7 +1333,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu // } // } return true; - } } @Override diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index a590928a3..64a8523b0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -298,7 +298,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { @Override public List queryTaskByDeviceCode(String device_code) { - synchronized (TaskServiceImpl.class) { List list = new ArrayList<>(); Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -309,12 +308,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return list; - } } @Override public List queryTaskByStartDeviceCode(String start_device_code) { - synchronized (TaskServiceImpl.class) { List list = new ArrayList<>(); Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -329,12 +326,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return list; - } } @Override public List queryTaskByBackDeviceCode(String back_start_device_code) { - synchronized (TaskServiceImpl.class) { List list = new ArrayList<>(); Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -348,12 +343,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return list; - } } @Override public List queryTaskByDeviceCodeAndStatus(String device_code) { - synchronized (TaskServiceImpl.class) { List list = new ArrayList<>(); Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -367,11 +360,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return list; - } } public List queryTaskByStartAndIntStatus(String head_start_device_code) { - synchronized (TaskServiceImpl.class) { List list = new ArrayList<>(); Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -389,11 +380,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return list; - } } public List queryTaskByNextAndIntStatus(String back_start_device_code) { - synchronized (TaskServiceImpl.class) { List list = new ArrayList<>(); Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -410,7 +399,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return list; - } } @Override @@ -677,7 +665,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { wo.update(json); - synchronized (TaskServiceImpl.class) { Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { 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")) { tasks.add(dto); } - } // 判断是否为WMS下发的任务,如果是反馈任务状态给WMS String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { @@ -1277,7 +1263,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { @Override public boolean removeByCodeFromCache(String code) { - synchronized (TaskServiceImpl.class) { Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { TaskDto task = iterator.next(); @@ -1287,7 +1272,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return false; - } } @Override @@ -1296,7 +1280,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } public TaskDto findByContainer(String container_code) { - synchronized (TaskServiceImpl.class) { Iterator var3 = tasks.iterator(); while (var3.hasNext()) { @@ -1307,11 +1290,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } return null; - } } public TaskDto findByCodeFromCache(String task_code) { - synchronized (TaskServiceImpl.class) { Iterator var3 = tasks.iterator(); while (var3.hasNext()) { @@ -1321,12 +1302,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return null; - } } @Override public TaskDto findByNextCode(String device_code) { - synchronized (TaskServiceImpl.class) { Iterator var3 = tasks.iterator(); while (var3.hasNext()) { @@ -1336,7 +1315,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return null; - } } @Override @@ -1351,7 +1329,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { @Override public TaskDto findByStartCodeAndReady(String device_code) { - synchronized (TaskServiceImpl.class) { Iterator var3 = tasks.iterator(); while (var3.hasNext()) { @@ -1365,12 +1342,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return null; - } } @Override public TaskDto findByStartCode(String device_code) { - synchronized (TaskServiceImpl.class) { Iterator var3 = tasks.iterator(); while (var3.hasNext()) { @@ -1380,7 +1355,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } return null; - } } @Override @@ -1522,7 +1496,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { @Override public void updateByCodeFromCache(TaskDto dto) { - synchronized (TaskServiceImpl.class) { Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { TaskDto task = iterator.next(); @@ -1531,7 +1504,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } } tasks.add(dto); - } } @Override @@ -1577,7 +1549,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { @Override public Integer querySameDeviceReadyTask(String start_device, String next_device, String status) { - synchronized (TaskServiceImpl.class) { int num = 0; Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -1590,12 +1561,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } return num; - } } @Override public Integer querySameTaskByType(String taskType) { - synchronized (TaskServiceImpl.class) { int num = 0; Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -1606,12 +1575,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } return num; - } } @Override public Integer querySameOriginTask(String code) { - synchronized (TaskServiceImpl.class) { int num = 0; Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -1622,12 +1589,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { } return num; - } } @Override public Integer querySameDestinationTask(String code) { - synchronized (TaskServiceImpl.class) { int num = 0; Iterator iterator = tasks.iterator(); while (iterator.hasNext()) { @@ -1639,5 +1604,4 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { return num; } - } }