|
@@ -167,7 +167,7 @@ public class TaskWorkNode {
|
|
|
msgUtil.redis_set(CacheKey.PRESOURCE_CURRENT_TASK_OBJECT + "_" + tTask.getResourceId(), tTask);
|
|
|
}
|
|
|
//获取配置节点
|
|
|
- String autoProgrameUrl = getInterfaceUrl(taskNode);
|
|
|
+ String autoProgramUrl = getInterfaceUrl(taskNode);
|
|
|
|
|
|
//填充配置节点内容
|
|
|
ResourceAutoCode resourceAutoCode = resourceAutoCodeService.getById(taskNode.getAutoNode().getId());
|
|
@@ -191,7 +191,7 @@ public class TaskWorkNode {
|
|
|
taskNode.setExeStatus("2").setStartTime(new Date());
|
|
|
taskNodeMapper.updateAllById(taskNode);
|
|
|
|
|
|
- logger.info("===============================请求地址" + autoProgrameUrl);
|
|
|
+ logger.info("==================请求地址=============" + autoProgramUrl);
|
|
|
String returnData = "";
|
|
|
|
|
|
try {
|
|
@@ -249,22 +249,22 @@ public class TaskWorkNode {
|
|
|
* @return
|
|
|
*/
|
|
|
public String getInterfaceUrl(TaskNode taskNode) {
|
|
|
- String autoProgrameUrl = "";
|
|
|
+ String autoProgramUrl = "";
|
|
|
if (DictionaryKey.INTERFACETYPE_PLC.equals(taskNode.getInterfaceType())) {//总控
|
|
|
- autoProgrameUrl = UrlConfConstant.plcURL;
|
|
|
+ autoProgramUrl = UrlConfConstant.plcURL;
|
|
|
} else if (DictionaryKey.INTERFACETYPE_PRO.equals(taskNode.getInterfaceType())) {
|
|
|
//autoProgrameUrl = parameterService.getValue(ParameterKey.AUTOPROGRAMEURL, null);
|
|
|
- autoProgrameUrl = UrlConfConstant.plcURL;
|
|
|
+ autoProgramUrl = UrlConfConstant.plcURL;
|
|
|
} else if (DictionaryKey.INTERFACETYPE_AGV.equals(taskNode.getInterfaceType())) {
|
|
|
//autoProgrameUrl = parameterService.getValue(ParameterKey.AGVPROGRAMEURL, null);
|
|
|
- autoProgrameUrl = UrlConfConstant.agvURL;
|
|
|
+ autoProgramUrl = UrlConfConstant.agvURL;
|
|
|
} else if (DictionaryKey.INTERFACETYPE_WMS.equals(taskNode.getInterfaceType())) {
|
|
|
// autoProgrameUrl = parameterService.getValue(ParameterKey.AGVPROGRAMEURL, null);
|
|
|
- autoProgrameUrl = UrlConfConstant.url;
|
|
|
+ autoProgramUrl = UrlConfConstant.url;
|
|
|
}
|
|
|
//正式调试的时候注释掉
|
|
|
-// autoProgrameUrl = UrlConfConstant.url;
|
|
|
- return autoProgrameUrl;
|
|
|
+ //autoProgramUrl = UrlConfConstant.url;
|
|
|
+ return autoProgramUrl;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -407,6 +407,7 @@ public class TaskWorkNode {
|
|
|
nodeOperationService = new OtherNodeServiceImpl();
|
|
|
}
|
|
|
//初始化设备资源
|
|
|
+ logger.info("========设备资源初始化=======" + module.getName()+"====="+taskNode.getResourceId());
|
|
|
nodeOperationService.initResource(taskNode, task, map);
|
|
|
|
|
|
if (bizType == "0") {//正常节点类型
|