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

更新缓存查询

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-02-03 23:11:28 +08:00
parent a5e728d4d8
commit 9f0f2dc969
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1227,18 +1227,28 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
public Instruction findByDeviceCodeFromCache(String devicecode) { public Instruction findByDeviceCodeFromCache(String devicecode) {
List<Instruction> instructionList = instructions; List<Instruction> instructionList = instructions;
ListUtil.sort(instructionList, new Comparator<Instruction>() { try {
ListUtil.sort(
instructionList,
new Comparator<Instruction>() {
@Override @Override
public int compare(Instruction o1, Instruction o2) { public int compare(Instruction o1, Instruction o2) {
return o1.getCreate_time().compareTo(o2.getCreate_time()); return o1.getCreate_time().compareTo(o2.getCreate_time());
} }
}); });
for (int i = 0; i < instructionList.size(); i++) { Iterator<Instruction> it = instructions.iterator();
Instruction inst = instructionList.get(i); while (it.hasNext()) {
if (StrUtil.equals(devicecode, inst.getStart_device_code()) && inst.getInstruction_status().equals("0")) { Instruction inst = it.next();
if (StrUtil.equals(devicecode, inst.getStart_device_code())
&& inst.getInstruction_status().equals("0")) {
return inst; return inst;
} }
} }
} catch (Exception e) {
log.warn("指令排序按照创建时间执执行失败!重新执行");
//失败之后重新查找指令
return findByDeviceCodeFromCache(devicecode);
}
return null; return null;
} }