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-05 09:58:45 +08:00
parent 7628b30236
commit 609c95e3d0
5 changed files with 1726 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
View File

@@ -728,7 +728,10 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
requireSucess = true;
applySucess = false;
} else {
if (jo.get("message")!=null){
message = jo.get("message").toString();
}
List list = new ArrayList();
Map map = new HashMap();
map.put("code","to_target");

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

@@ -1,7 +1,5 @@
package org.nl.acs.instruction.service.impl;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
@@ -64,7 +62,7 @@ import java.util.stream.Collectors;
* @author ldjun
* @description 服务实现
* @date 2021-03-18
**/
*/
@Service
@RequiredArgsConstructor
@Slf4j
@@ -72,18 +70,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
List<Instruction> instructions = new CopyOnWriteArrayList();
@Autowired
DeviceAppService deviceAppService;
@Autowired
NDCAgvService ndcAgvService;
@Autowired
ParamService paramService;
@Autowired
RouteLineService routeLineService;
@Autowired
TaskService taskService;
@Autowired
AcsToLiKuService acsToLiKuService;
@Autowired DeviceAppService deviceAppService;
@Autowired NDCAgvService ndcAgvService;
@Autowired ParamService paramService;
@Autowired RouteLineService routeLineService;
@Autowired TaskService taskService;
@Autowired AcsToLiKuService acsToLiKuService;
@Override
public void autoInitial() {
@@ -135,10 +127,15 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
Integer currentPageNumber = page.getPageNumber() + 1;
Integer pageMaxSize = page.getPageSize();
final JSONObject jo = WQL.getWO("QINST_QUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
final JSONObject jo =
WQL.getWO("QINST_QUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
JSONArray jsonArray = jo.getJSONArray("content");
List<Instruction> instructions = jsonArray.toJavaList(Instruction.class);
List<Instruction> instDtoList = instructions.stream().skip((currentPageNumber - 1) * pageMaxSize).limit(pageMaxSize).collect(Collectors.toList());
List<Instruction> instDtoList =
instructions.stream()
.skip((currentPageNumber - 1) * pageMaxSize)
.limit(pageMaxSize)
.collect(Collectors.toList());
jo.put("content", instDtoList);
jo.put("totalElements", jsonArray.size());
return jo;
@@ -175,7 +172,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
map.put("end_time", end_time);
}
final JSONObject jo = WQL.getWO("QINST_QUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time desc");
final JSONObject jo =
WQL.getWO("QINST_QUERY")
.addParamMap(map)
.pageQuery(WqlUtil.getHttpContext(page), "create_time desc");
return jo;
}
@@ -251,6 +251,7 @@ 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();
@@ -262,6 +263,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return null;
}
}
@Override
public Instruction findByTaskid(String id, String wherecaluse) {
if (!StrUtil.isEmpty(wherecaluse)) {
@@ -322,7 +325,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
// }
// 起点设备与终点设备相同则为初始指令
if (StrUtil.equals(task.getStart_device_code(), dto.getStart_device_code())) {
if (!StrUtil.equals(dto.getCompound_inst(), "0") && StrUtil.equals(task.getCompound_task(), "1")) {
if (!StrUtil.equals(dto.getCompound_inst(), "0")
&& StrUtil.equals(task.getCompound_task(), "1")) {
dto.setCompound_inst("1");
dto.setCompound_inst_data(task.getCompound_task_data());
}
@@ -347,7 +351,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;
if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
hongXiangConveyorDeviceDriver =
(HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
hongXiangConveyorDeviceDriver.writing(3, Integer.valueOf(dto.getInstruction_code()));
}
@@ -355,13 +360,16 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
String start_device_code = dto.getStart_device_code();
String next_device_code = dto.getNext_device_code();
String route_plan_code = task.getRoute_plan_code();
List<RouteLineDto> shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code);
List<RouteLineDto> shortPathsList =
routeLineService.getShortPathLines(
start_device_code, next_device_code, route_plan_code);
RouteLineDto route = null;
for (int i = 0; i < shortPathsList.size(); i++) {
RouteLineDto routeLineDto = shortPathsList.get(i);
String route_device = routeLineDto.getDevice_code();
String route_next_device = routeLineDto.getNext_device_code();
if (route_device.equals(dto.getStart_device_code()) && route_next_device.equals(dto.getNext_device_code())) {
if (route_device.equals(dto.getStart_device_code())
&& route_next_device.equals(dto.getNext_device_code())) {
route = routeLineDto;
break;
}
@@ -371,7 +379,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
if (StrUtil.equals(shortPathsList.get(0).getType(), "1")) {
// 0为输送、立库任务 1 1楼叉车系统 2 2楼1区域AGV系统 3 2楼2区域AGV系统
if (!StrUtil.equals(task.getAgv_system_type(), "0") && ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
if (!StrUtil.equals(task.getAgv_system_type(), "0")
&& ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
} else {
@@ -398,7 +407,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
}
@Override
public void create2(Instruction dto) throws Exception {
Class var2 = TaskInstructionLock.class;
@@ -436,10 +444,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
dto.setInstruction_type("3");
}
// 起点设备与终点设备相同则为初始指令
if (StrUtil.equals(task.getStart_device_code(), dto.getStart_device_code())) {
if (!StrUtil.equals(dto.getCompound_inst(), "0") && StrUtil.equals(task.getCompound_task(), "1")) {
if (!StrUtil.equals(dto.getCompound_inst(), "0")
&& StrUtil.equals(task.getCompound_task(), "1")) {
dto.setCompound_inst("1");
dto.setCompound_inst_data(task.getCompound_task_data());
}
@@ -464,7 +472,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;
if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
hongXiangConveyorDeviceDriver =
(HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
hongXiangConveyorDeviceDriver.writing(3, Integer.valueOf(dto.getInstruction_code()));
}
@@ -472,13 +481,16 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
String start_device_code = dto.getStart_device_code();
String next_device_code = dto.getNext_device_code();
String route_plan_code = task.getRoute_plan_code();
List<RouteLineDto> shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code);
List<RouteLineDto> shortPathsList =
routeLineService.getShortPathLines(
start_device_code, next_device_code, route_plan_code);
RouteLineDto route = null;
for (int i = 0; i < shortPathsList.size(); i++) {
RouteLineDto routeLineDto = shortPathsList.get(i);
String route_device = routeLineDto.getDevice_code();
String route_next_device = routeLineDto.getNext_device_code();
if (route_device.equals(dto.getStart_device_code()) && route_next_device.equals(dto.getNext_device_code())) {
if (route_device.equals(dto.getStart_device_code())
&& route_next_device.equals(dto.getNext_device_code())) {
route = routeLineDto;
break;
}
@@ -488,7 +500,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
if (StrUtil.equals(shortPathsList.get(0).getType(), "1")) {
// 0为输送、立库任务 1 1楼叉车系统 2 2楼1区域AGV系统 3 2楼2区域AGV系统
if (!StrUtil.equals(task.getAgv_system_type(), "0") && ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
if (!StrUtil.equals(task.getAgv_system_type(), "0")
&& ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
} else {
@@ -508,8 +521,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
}
@Override
public void createAgain(Instruction dto) throws Exception {
Class var2 = TaskInstructionLock.class;
@@ -528,19 +539,34 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
if (StrUtil.isEmpty(dto.getInstruction_id())) {
dto.setInstruction_id(IdUtil.simpleUUID());
}
List<RouteLineDto> shortPathsList = routeLineService.getShortPathLines(dto.getStart_device_code(), dto.getNext_device_code(), dto.getRoute_plan_code());
List<RouteLineDto> shortPathsList =
routeLineService.getShortPathLines(
dto.getStart_device_code(), dto.getNext_device_code(), dto.getRoute_plan_code());
if (ObjectUtils.isEmpty(shortPathsList)) {
throw new Exception(dto.getStart_device_code() + "->" + dto.getNext_device_code() + "路由不通");
}
String type = shortPathsList.get(0).getType();
if (!StrUtil.equals(type, "0")) {
JSONObject instcheckjson = instwo.query(" instruction_status <3 and next_point_code= '" + dto.getNext_point_code() + "'" + " and start_point_code = '" + dto.getStart_point_code() + "'" + " and task_id = '" + dto.getTask_id() + "'").uniqueResult(0);
JSONObject instcheckjson =
instwo
.query(
" instruction_status <3 and next_point_code= '"
+ dto.getNext_point_code()
+ "'"
+ " and start_point_code = '"
+ dto.getStart_point_code()
+ "'"
+ " and task_id = '"
+ dto.getTask_id()
+ "'")
.uniqueResult(0);
if (instcheckjson != null) {
throw new Exception(dto.getTask_code() + ":该任务已存在待完成指令!");
}
}
if (!StrUtil.equals(dto.getCompound_inst(), "0") && StrUtil.equals(task.getCompound_task(), "1")) {
if (!StrUtil.equals(dto.getCompound_inst(), "0")
&& StrUtil.equals(task.getCompound_task(), "1")) {
dto.setCompound_inst("1");
dto.setCompound_inst_data(task.getCompound_task_data());
}
@@ -555,7 +581,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
wo.insert(json);
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
Device startdevice = appService.findDeviceByCode(dto.getStart_device_code());
Device nextdevice = appService.findDeviceByCode(dto.getNext_device_code());
@@ -566,17 +591,18 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
if (!ObjectUtils.isEmpty(nextdevice.getExtraValue().get("link_three_lamp"))) {
String lamd_device = nextdevice.getExtraValue().get("link_three_lamp").toString();
Device lamddevice = appService.findDeviceByCode(lamd_device);
}
// != 0 为agv任务
// if(!StrUtil.equals(type,"0")){
// if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "1")) {
// if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "1"))
// {
// agvService.sendAgvInstToMagic(dto);
// } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "2")) {
// } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(),
// "2")) {
// agvService.sendAgvInstToNDC(dto);
// } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) {
// } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(),
// "3")) {
// agvService.addOrderSequences(dto);
// }
// }
@@ -587,7 +613,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
@Override
@Transactional(rollbackFor = Exception.class)
public void update(Instruction dto) {
Class var2 = TaskInstructionLock.class;
synchronized (TaskInstructionLock.class) {
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
@@ -598,16 +623,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
wo.update(json);
// Iterator<Instruction> iterator = instructions.iterator();
// while (iterator.hasNext()) {
// Instruction instruction = iterator.next();
// if (instruction.getInstruction_code().equals(dto.getInstruction_code())) {
// iterator.remove();
// }
// }
// if (StrUtil.equals(dto.getInstruction_status(), "0") || StrUtil.equals(dto.getInstruction_status(), "1")) {
// instructions.add(dto);
// }
this.reload();
}
}
@@ -779,7 +794,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
// 如果是无光电的设备 放货任务完成需要变更有货状态
// StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
// if(device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
// standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
// standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver)
// device.getDeviceDriver();
// standardOrdinarySiteDeviceDriver.setMove(2);
// }
@@ -812,7 +828,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
JSONObject taskjson = taskwo.query("task_id ='" + dto.getTask_id() + "'").uniqueResult(0);
TaskDto acsTask = taskjson.toJavaObject(TaskDto.class);
RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineServiceImpl.class);
List<RouteLineDto> list = routeLineService.getShortPathLines(dto.getNext_device_code(), acsTask.getNext_device_code(), acsTask.getRoute_plan_code());
List<RouteLineDto> list =
routeLineService.getShortPathLines(
dto.getNext_device_code(), acsTask.getNext_device_code(), acsTask.getRoute_plan_code());
if (ObjectUtils.isEmpty(list)) {
throw new BadRequestException("路由不通");
}
@@ -830,8 +848,20 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
String start_device_code = dto.getNext_device_code();
String start_point_code = null;
String next_point_code = null;
String start_device = deviceAppService.findDeviceByCode(start_device_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name();
String next_device = deviceAppService.findDeviceByCode(next_device_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name();
String start_device =
deviceAppService
.findDeviceByCode(start_device_code)
.getDeviceDriverDefination()
.getFitDeviceTypes()
.get(0)
.name();
String next_device =
deviceAppService
.findDeviceByCode(next_device_code)
.getDeviceDriverDefination()
.getFitDeviceTypes()
.get(0)
.name();
if (StrUtil.equals("storage", start_device)) {
start_point_code = start_device_code + "-" + acsTask.getFrom_y() + "-" + acsTask.getFrom_z();
} else {
@@ -900,7 +930,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
} else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")
&& !StrUtil.equals(entity.getSend_status(), "2")) {
XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);
XianGongAgvService xianGongAgvService =
SpringContextHolder.getBean(XianGongAgvService.class);
xianGongAgvService.deleteXZAgvInst(entity.getInstruction_code());
flag = true;
} else {
@@ -932,7 +963,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
acsToLiKuService.cancelTask(cancelTaskRequest);
}
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
entity.setUpdate_time(now);
@@ -949,7 +979,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
jo.put("device_code", entity.getStart_device_code());
if (StrUtil.equals(entity.getMaterial(), "1")) {
jo.put("hasGoodStatus", "1");
} else if (!StrUtil.equals(entity.getMaterial(), "1") && !StrUtil.isEmpty(entity.getMaterial())) {
} else if (!StrUtil.equals(entity.getMaterial(), "1")
&& !StrUtil.isEmpty(entity.getMaterial())) {
jo.put("hasGoodStatus", "2");
} else {
jo.put("hasGoodStatus", "0");
@@ -1008,7 +1039,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
jo.put("device_code", entity.getStart_device_code());
if (StrUtil.equals(entity.getMaterial(), "1")) {
jo.put("hasGoodStatus", "1");
} else if (!StrUtil.equals(entity.getMaterial(), "1") && !StrUtil.isEmpty(entity.getMaterial())) {
} else if (!StrUtil.equals(entity.getMaterial(), "1")
&& !StrUtil.isEmpty(entity.getMaterial())) {
jo.put("hasGoodStatus", "2");
} else {
jo.put("hasGoodStatus", "0");
@@ -1034,10 +1066,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
removeByCodeFromCache(entity.getInstruction_code());
}
}
@Override
public void cancelNOSendAgv(String id) throws Exception {
Class var2 = TaskInstructionLock.class;
@@ -1068,7 +1098,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
jo.put("device_code", entity.getStart_device_code());
if (StrUtil.equals(entity.getMaterial(), "1")) {
jo.put("hasGoodStatus", "1");
} else if (!StrUtil.equals(entity.getMaterial(), "1") && !StrUtil.isEmpty(entity.getMaterial())) {
} else if (!StrUtil.equals(entity.getMaterial(), "1")
&& !StrUtil.isEmpty(entity.getMaterial())) {
jo.put("hasGoodStatus", "2");
} else {
jo.put("hasGoodStatus", "0");
@@ -1097,9 +1128,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
}
@Override
public Instruction findByLinkNumSend(String code) {
synchronized (InstructionServiceImpl.class) {
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
Instruction inst = it.next();
@@ -1107,13 +1138,14 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return inst;
}
}
}
return null;
}
@Override
public List<Instruction> findByLinkNum(String code) {
synchronized (InstructionServiceImpl.class){
List<Instruction> list = new ArrayList<>();
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
@@ -1125,8 +1157,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return list;
}
}
@Override
public Instruction findByLinkNumNoSend(String code) {
synchronized (InstructionServiceImpl.class){
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
Instruction inst = it.next();
@@ -1138,8 +1174,11 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return null;
}
}
@Override
public Instruction findByCodeFromCache(String code) {
synchronized (InstructionServiceImpl.class){
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
Instruction inst = it.next();
@@ -1151,8 +1190,11 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
}
@Override
public Instruction findByBarcodeFromCache(String barcode) {
synchronized (InstructionServiceImpl.class){
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
Instruction inst = it.next();
@@ -1162,9 +1204,11 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
return null;
}
}
@Override
public Instruction findByIdFromCache(String id) {
synchronized (InstructionServiceImpl.class){
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
Instruction inst = it.next();
@@ -1174,6 +1218,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
return null;
}
}
@Override
public Instruction foramte(Instruction inst) {
@@ -1200,7 +1245,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
inst.setFrom_y(start_point[1]);
inst.setFrom_z(start_point[2]);
} else {
String start_device = deviceAppService.findDeviceByCode(start_device_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name();
String start_device =
deviceAppService
.findDeviceByCode(start_device_code)
.getDeviceDriverDefination()
.getFitDeviceTypes()
.get(0)
.name();
if (StrUtil.equals("storage", start_device)) {
String[] start_point = start_point_code.split("-");
inst.setFrom_x(start_point[0]);
@@ -1220,7 +1271,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
inst.setTo_z(next_point[2]);
} else {
String next_device = deviceAppService.findDeviceByCode(next_device_code).getDeviceDriverDefination().getFitDeviceTypes().get(0).name();
String next_device =
deviceAppService
.findDeviceByCode(next_device_code)
.getDeviceDriverDefination()
.getFitDeviceTypes()
.get(0)
.name();
if (StrUtil.equals("storage", next_device)) {
String[] next_point = start_point_code.split("-");
inst.setTo_x(next_point[0]);
@@ -1236,9 +1293,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
@Override
public Instruction findByDeviceCodeFromCache(String devicecode) {
synchronized (InstructionServiceImpl.class) {
List<Instruction> instructionList = instructions;
try {
ListUtil.sort(
instructionList,
new Comparator<Instruction>() {
@@ -1255,11 +1311,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return inst;
}
}
} catch (Exception e) {
log.warn("指令排序按照创建时间执执行失败!重新执行");
//失败之后重新查找指令
return findByDeviceCodeFromCache(devicecode);
}
return null;
}
@@ -1268,9 +1321,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return instructions;
}
@Override
public Integer querySameDestinationInst(String devicecode) {
synchronized (InstructionServiceImpl.class) {
int num = 0;
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
@@ -1287,9 +1340,11 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return num;
}
}
@Override
public Integer querySameInstType(String inst_type) {
synchronized (InstructionServiceImpl.class){
int num = 0;
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
@@ -1301,8 +1356,11 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return num;
}
}
@Override
public Integer querySameOriginInst(String devicecode) {
synchronized (InstructionServiceImpl.class){
int num = 0;
Iterator<Instruction> it = instructions.iterator();
while (it.hasNext()) {
@@ -1319,9 +1377,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return num;
}
}
@Override
public boolean removeByCodeFromCache(String code) {
synchronized (InstructionServiceImpl.class){
Iterator<Instruction> iterator = instructions.iterator();
while (iterator.hasNext()) {
Instruction instruction = iterator.next();
@@ -1332,6 +1393,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
return false;
}
}
@Override
@@ -1416,20 +1479,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
}
}
public Instruction findByContainer(String container_code) {
Iterator var3 = instructions.iterator();
while (var3.hasNext()) {
Instruction instruction = (Instruction) var3.next();
if (StrUtil.equals(instruction.getVehicle_code(), container_code)) {
return instruction;
}
}
return null;
}
/*
* 判断是否为整数
* @param str 传入的字符串

19
acs/nladmin-system/src/main/java/org/nl/acs/log/service/impl/DeviceExecuteLogServiceImpl.java
View File

@@ -1,11 +1,10 @@
package org.nl.acs.log.service.impl;
import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.opc.OpcUtl;
import org.slf4j.MDC;
import org.springframework.stereotype.Service;
@@ -13,31 +12,29 @@ import org.springframework.stereotype.Service;
* @author loujf
* @description 服务实现
* @date 2022-02-25
**/
*/
@Service
@RequiredArgsConstructor
@Slf4j
public class DeviceExecuteLogServiceImpl implements DeviceExecuteLogService {
@Override
public void deviceItemValue(String device_code, String key, String value) {
String now = DateUtil.now();
}
@Override
public void deviceExecuteLog(String device_code, String vehicle_code, String inst_code, String message) {
public void deviceExecuteLog(
String device_code, String vehicle_code, String inst_code, String message) {
try {
MDC.put("device_code_log", device_code);
log.info("{},{}", device_code, message);
} catch (Exception e) {
e.printStackTrace();
}
finally {
} finally {
MDC.remove("device_code_log");
System.out.println("successNum:" + OpcUtl.successNum);
System.out.println("errNum:" + OpcUtl.errNum);
}
}
@@ -53,5 +50,3 @@ public class DeviceExecuteLogServiceImpl implements DeviceExecuteLogService {
}
}
}

10
acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java
View File

@@ -18,10 +18,14 @@ import java.util.concurrent.Executors;
@Slf4j
public class OpcUtl {
private static int timeout = 300000;
private static int timeout = 1*60*1000;
private static String key = "rpc.socketTimeout";
private static int successNum=0;
private static int errNum=0;
public static int successNum=0;
public static int errNum=0;
static {
checkTimeout();
}
public static void checkTimeout() {
if (Integer.getInteger(key, 0).intValue() != timeout) {

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

@@ -138,6 +138,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override
public Map<String, Object> queryAllByCache(Map whereJson, Pageable page) {
synchronized (TaskServiceImpl.class){
this.reload();
String task_code = (String) whereJson.get("task_code");
String vehicle_code = (String) whereJson.get("vehicle_code");
@@ -202,6 +205,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
jo.put("totalElements", taskList.size());
return jo;
}
}
@Override
public Map<String, Object> getAll(Map whereJson, Pageable page) {
@@ -288,6 +292,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override
public List<TaskDto> queryTaskByDeviceCode(String device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -299,9 +304,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return list;
}
}
@Override
public List<TaskDto> queryTaskByStartDeviceCode(String start_device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -317,9 +324,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return list;
}
}
@Override
public List<TaskDto> queryTaskByBackDeviceCode(String back_start_device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -334,9 +343,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return list;
}
}
@Override
public List<TaskDto> queryTaskByDeviceCodeAndStatus(String device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -351,8 +362,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return list;
}
}
public List<TaskDto> queryTaskByStartAndIntStatus(String head_start_device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -371,8 +384,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return list;
}
}
public List<TaskDto> queryTaskByNextAndIntStatus(String back_start_device_code) {
synchronized (TaskServiceImpl.class) {
List<TaskDto> list = new ArrayList<>();
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -390,6 +405,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return list;
}
}
@Override
public TaskDto queryTaskByLinkNum(String link_num) {
@@ -637,6 +653,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override
@Transactional(rollbackFor = Exception.class)
public void update(TaskDto dto) {
synchronized (TaskServiceImpl.class) {
TaskDto entity = this.findById(dto.getTask_id());
if (entity == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
@@ -751,6 +768,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
}
}
}
@Override
@Transactional(rollbackFor = Exception.class)
@@ -1251,6 +1269,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override
public boolean removeByCodeFromCache(String code) {
synchronized (TaskServiceImpl.class) {
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
TaskDto task = iterator.next();
@@ -1261,6 +1280,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return false;
}
}
@Override
public List<TaskDto> findAllTaskFromCache() {
@@ -1268,6 +1288,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
public TaskDto findByContainer(String container_code) {
synchronized (TaskServiceImpl.class) {
Iterator var3 = tasks.iterator();
while (var3.hasNext()) {
@@ -1279,8 +1300,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
return null;
}
}
public TaskDto findByCodeFromCache(String task_code) {
synchronized (TaskServiceImpl.class) {
Iterator var3 = tasks.iterator();
while (var3.hasNext()) {
@@ -1291,9 +1314,11 @@ 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()) {
@@ -1304,6 +1329,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return null;
}
}
@Override
public List<TaskDto> findAllByNextCode(String device_code) {
@@ -1317,6 +1343,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override
public TaskDto findByStartCodeAndReady(String device_code) {
synchronized (TaskServiceImpl.class) {
Iterator var3 = tasks.iterator();
while (var3.hasNext()) {
@@ -1331,9 +1358,11 @@ 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()) {
@@ -1344,6 +1373,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
return null;
}
}
@Override
public TaskDto foramte(TaskDto task) {
@@ -1484,6 +1514,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override
public void updateByCodeFromCache(TaskDto dto) {
synchronized (TaskServiceImpl.class) {
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
TaskDto task = iterator.next();
@@ -1493,6 +1524,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
}
tasks.add(dto);
}
}
@Override
public String queryAssignedByDevice(String device_code, String task_nextdeice_code) {
@@ -1537,6 +1569,7 @@ 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<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -1550,9 +1583,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
return num;
}
}
@Override
public Integer querySameTaskByType(String taskType) {
synchronized (TaskServiceImpl.class) {
int num = 0;
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -1564,9 +1599,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
return num;
}
}
@Override
public Integer querySameOriginTask(String code) {
synchronized (TaskServiceImpl.class) {
int num = 0;
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -1578,9 +1615,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
return num;
}
}
@Override
public Integer querySameDestinationTask(String code) {
synchronized (TaskServiceImpl.class) {
int num = 0;
Iterator<TaskDto> iterator = tasks.iterator();
while (iterator.hasNext()) {
@@ -1593,3 +1632,4 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
return num;
}
}
}