Commit 926c9af0 zshaohui

1.上架任务返回list集合

2.生成任务时,bug修复
1 个父辈 69d3450b
......@@ -192,7 +192,7 @@ public class TaskService {
if (!Strings.isNullOrEmpty(barcode) && task.getBarcode().equals(barcode)) {
log.info("二维码:[" + barcode + "]已在操作队列中,操作失败");
throw new ValidateException("smfcore.error.barcode.inQueue", "二维码[{0}]已在操作队列中,操作失败", new String[]{barcode});
} else if (task.getPosName().equals(posName)&& ObjectUtil.isNotEmpty(posName)) {
} else if (ObjectUtil.isNotEmpty(posName) && ObjectUtil.isNotEmpty(task.getPosName()) && task.getPosName().equals(posName)) {
log.info("位置:[" + posName + "]已在操作队列中,操作失败");
throw new ValidateException("smfcore.error.pos.inQueue", "位置:[{0}}]已在操作队列中,操作失败", new String[]{posName});
}
......
......@@ -151,7 +151,7 @@ public class HikVisionController {
dataLog = taskService.addTaskToExecute(dataLog);
Map<String, String> paramMap = new HashMap<>();
paramMap.put("taskCode", dataLog.getId());
return ApiResponse.apiResponse(reqCode, ResponseCode.SUCCESS.getCode(), paramMap, "smfcore.ok", null, "ok");
return ApiResponse.apiResponse(reqCode, ResponseCode.SUCCESS.getCode(), Arrays.asList(paramMap), "smfcore.ok", null, "ok");
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!