|
@@ -11,6 +11,8 @@ import com.fdkk.sxz.util.OkHttpUtils;
|
|
|
import com.fdkk.sxz.util.RabbitMqUtil;
|
|
|
import com.fdkk.sxz.util.RedisUtil;
|
|
|
import com.fdkk.sxz.vo.request.RequestQueue;
|
|
|
+import com.fdkk.sxz.vo.request.RequestQueueCheckList;
|
|
|
+import com.fdkk.sxz.vo.request.RequestQueueList;
|
|
|
import com.fdkk.sxz.webApi.service.IModelUploadOfflineService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -59,10 +61,10 @@ public class QueueController {
|
|
|
@RequestMapping(value = "/dataHandle", method = RequestMethod.POST)
|
|
|
@NoAuthentication
|
|
|
@AroundLog(name = "数据处理任务接收")
|
|
|
- public Result dataHandle(@RequestBody List<RequestQueue> params) throws IOException {
|
|
|
- QueueController.log.info("数据处理任务接收:{}", params);
|
|
|
+ public Result dataHandle(@RequestBody RequestQueueList params) throws IOException {
|
|
|
+ QueueController.log.info("数据处理任务接收:{}", params.getUploadInfos());
|
|
|
|
|
|
- for (RequestQueue param : params) {
|
|
|
+ for (RequestQueue param : params.getUploadInfos()) {
|
|
|
Message message = MessageBuilder.withPayload(param).build();
|
|
|
|
|
|
ModelUploadOfflineEntity modelUploadOfflineEntity = new ModelUploadOfflineEntity();
|
|
@@ -122,8 +124,8 @@ public class QueueController {
|
|
|
@RequestMapping(value = "/getUploadInfo", method = RequestMethod.POST)
|
|
|
@NoAuthentication
|
|
|
@AroundLog(name = "获取上传任务状态")
|
|
|
- public Result getUploadInfo(@RequestBody List<RequestQueue> params) {
|
|
|
- List<String> names = params.stream().map(RequestQueue::getName).collect(Collectors.toList());
|
|
|
+ public Result getUploadInfo(@RequestBody RequestQueueCheckList params) {
|
|
|
+ List<String> names = params.getCheckInfos().stream().map(RequestQueue::getName).collect(Collectors.toList());
|
|
|
ModelUploadOfflineEntity modelUploadOfflineEntity = modelUploadOfflineService.findByName(names);
|
|
|
|
|
|
return Result.success("成功", modelUploadOfflineEntity);
|