|
|
|
@ -35,6 +35,7 @@ import org.nl.acs.task.service.TaskFeedbackService; |
|
|
|
import org.nl.acs.task.service.TaskService; |
|
|
|
import org.nl.acs.task.service.dto.TaskDto; |
|
|
|
import org.nl.acs.task.service.dto.TaskFeedbackDto; |
|
|
|
import org.nl.acs.wsdl.org.tempuri.RTMSAGVSERVICE; |
|
|
|
import org.nl.modules.common.exception.BadRequestException; |
|
|
|
import org.nl.modules.common.utils.FileUtil; |
|
|
|
import org.nl.modules.common.utils.SecurityUtils; |
|
|
|
@ -70,16 +71,26 @@ import java.util.stream.Collectors; |
|
|
|
public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
List<TaskDto> tasks = new CopyOnWriteArrayList<>(); |
|
|
|
|
|
|
|
@Autowired DeviceAppService deviceAppService; |
|
|
|
@Autowired RouteLineService routelineserver; |
|
|
|
@Autowired AcsToWmsService acstowmsService; |
|
|
|
@Autowired TaskFeedbackService taskFeedbackService; |
|
|
|
@Autowired ParamService paramService; |
|
|
|
@Autowired XianGongAgvService agvService; |
|
|
|
@Autowired RouteLineService routeLineService; |
|
|
|
@Autowired DeviceAssignedService deviceAssignedService; |
|
|
|
@Autowired InstructionService instructionService; |
|
|
|
@Autowired StorageCellService storageCellService; |
|
|
|
@Autowired |
|
|
|
DeviceAppService deviceAppService; |
|
|
|
@Autowired |
|
|
|
RouteLineService routelineserver; |
|
|
|
@Autowired |
|
|
|
AcsToWmsService acstowmsService; |
|
|
|
@Autowired |
|
|
|
TaskFeedbackService taskFeedbackService; |
|
|
|
@Autowired |
|
|
|
ParamService paramService; |
|
|
|
@Autowired |
|
|
|
XianGongAgvService agvService; |
|
|
|
@Autowired |
|
|
|
RouteLineService routeLineService; |
|
|
|
@Autowired |
|
|
|
DeviceAssignedService deviceAssignedService; |
|
|
|
@Autowired |
|
|
|
InstructionService instructionService; |
|
|
|
@Autowired |
|
|
|
StorageCellService storageCellService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public void autoInitial() throws Exception { |
|
|
|
@ -144,7 +155,6 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
public Map<String, Object> queryAllByCache(Map whereJson, Pageable page) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.reload(); |
|
|
|
String task_code = (String) whereJson.get("task_code"); |
|
|
|
String vehicle_code = (String) whereJson.get("vehicle_code"); |
|
|
|
@ -155,7 +165,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
String task_type = (String) whereJson.get("task_type"); |
|
|
|
List<TaskDto> taskList = new ArrayList(); |
|
|
|
|
|
|
|
synchronized (TaskServiceImpl.class){ |
|
|
|
synchronized (TaskServiceImpl.class) { |
|
|
|
Iterator<TaskDto> it = tasks.iterator(); |
|
|
|
while (it.hasNext()) { |
|
|
|
TaskDto task = it.next(); |
|
|
|
@ -472,12 +482,15 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
dto.setMaterial(startdevice.getMaterial_type()); |
|
|
|
if (StrUtil.equals(createTaskCheck, "1")) { |
|
|
|
// 判断起点为输送设备
|
|
|
|
if (StrUtil.equals(DeviceType.conveyor.toString(), startDeviceType)) {} |
|
|
|
if (StrUtil.equals(DeviceType.conveyor.toString(), startDeviceType)) { |
|
|
|
} |
|
|
|
|
|
|
|
if (StrUtil.equals(DeviceType.conveyor.toString(), nextDeviceType)) {} |
|
|
|
if (StrUtil.equals(DeviceType.conveyor.toString(), nextDeviceType)) { |
|
|
|
} |
|
|
|
} else { |
|
|
|
// 判断起点为输送设备
|
|
|
|
if (StrUtil.equals(DeviceType.conveyor.toString(), startDeviceType)) {} |
|
|
|
if (StrUtil.equals(DeviceType.conveyor.toString(), startDeviceType)) { |
|
|
|
} |
|
|
|
|
|
|
|
if (StrUtil.equals(DeviceType.conveyor.toString(), nextDeviceType)) { |
|
|
|
// if (nextdevice.getDeviceDriver() instanceof
|
|
|
|
@ -525,12 +538,12 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
JSONObject json = (JSONObject) JSONObject.toJSON(dto); |
|
|
|
|
|
|
|
wo.insert(json); |
|
|
|
synchronized(TaskServiceImpl.class){ |
|
|
|
System.out.println("-------------------"+dto.getTask_code()); |
|
|
|
System.out.println("-------------1"+tasks.size()); |
|
|
|
synchronized (TaskServiceImpl.class) { |
|
|
|
System.out.println("-------------------" + dto.getTask_code()); |
|
|
|
System.out.println("-------------1" + tasks.size()); |
|
|
|
|
|
|
|
tasks.add(dto); |
|
|
|
System.out.println("-------------2"+tasks.size()); |
|
|
|
System.out.println("-------------2" + tasks.size()); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
@ -823,7 +836,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
request.put("TASKTYPE", entity.getTask_type()); |
|
|
|
request.put("METHOD", "5"); |
|
|
|
request.put("REQTIME", DateUtil.now()); |
|
|
|
acstowmsService.taskExecution(request); |
|
|
|
new RTMSAGVSERVICE().getBasicHttpBindingIRTMSAGVSERVICE().atrAgvCallback(request.toJSONString()); |
|
|
|
} catch (Exception e) { |
|
|
|
flag = true; |
|
|
|
message = e.getMessage(); |
|
|
|
@ -911,7 +924,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void cancel(String id) throws Exception { |
|
|
|
public void cancel(String id) { |
|
|
|
TaskDto entity = this.findById(id); |
|
|
|
if (entity == null) { |
|
|
|
throw new BadRequestException("被删除或无权限，操作失败!"); |
|
|
|
@ -951,7 +964,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
feed_jo.put("task_status", entity.getTask_status()); |
|
|
|
JSONArray ja = new JSONArray(); |
|
|
|
ja.add(feed_jo); |
|
|
|
acstowmsService.feedbackTaskStatusToWms(ja); |
|
|
|
HttpResponse response = acstowmsService.feedbackTaskStatusToWms(ja); |
|
|
|
response.close(); |
|
|
|
} |
|
|
|
List<RouteLineDto> shortPathsList = |
|
|
|
routeLineService.getShortPathLines( |
|
|
|
@ -962,7 +976,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
// != 0 为agv任务
|
|
|
|
if (!StrUtil.equals(type, "0")) { |
|
|
|
if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { |
|
|
|
agvService.markComplete(entity.getTask_code()); |
|
|
|
HttpResponse response = agvService.markComplete(entity.getTask_code()); |
|
|
|
response.close(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1263,7 +1278,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void createTaskByClick(JSONObject json) {} |
|
|
|
public void createTaskByClick(JSONObject json) { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public int checkAllowCreate(String devicecode) { |
|
|
|
@ -1613,5 +1629,16 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { |
|
|
|
} |
|
|
|
|
|
|
|
return num; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void cancelFromCode(String code) { |
|
|
|
TaskDto entity = this.findByCode(code); |
|
|
|
if (entity == null) { |
|
|
|
throw new BadRequestException("被删除或无权限，操作失败！"); |
|
|
|
} |
|
|
|
this.cancel(entity.getTask_id()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
张江玮
2 years ago