新增回调查询接口

IMCS_CCS/Controllers/CcsController.cs

@@ -2,6 +2,7 @@
 using IMCS.CCS.Models;
 using IMCS.CCS.Models.vo;
 using IMCS.CCS.Services;
+using IMCS_CCS.Model.vo;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -264,6 +265,17 @@ namespace IMCS.CCS.Controllers
             return await _httpRequestService.UpdateDeviceState(req);
         }
 
+        /// <summary>
+        /// 获取任务回调列表： POST: api/GetCallBackList
+        /// </summary> 
+        /// <returns></returns>
+        [Route("api/GetCallBackList")]
+        [HttpPost]
+        public async Task<List<TaskCallback>> GetCallBackListByCondition(RequestCallBackData vo)
+        {
+            return await _httpRequestService.GetCallBackListByCondition(vo);
+        }
+
         /// <summary>
         /// 刀具接口列表： POST: api/GetTools
         /// </summary> 

IMCS_CCS/Repository/ITaskCallbackRepository.cs

@@ -11,6 +11,8 @@ namespace IMCS.CCS.Repository
         //根据条件查询
         Task<List<TaskCallback>> GetList(TaskCallback vo);
 
+        Task<List<TaskCallback>> GetListByCondition(TaskCallback vo);
+
         //查机器人动作列表
         Task<TaskCallback> GetRobotActionList(TaskCallback vo);
 

IMCS_CCS/Repository/TaskCallbackRepository.cs

@@ -42,6 +42,28 @@ namespace IMCS.CCS.Repository
 
         }
 
+        //查部列表
+        public async Task<List<TaskCallback>> GetListByCondition(TaskCallback vo)
+        {
+            IQueryable<TaskCallback> list = _context.TaskCallback;
+            if (!string.IsNullOrEmpty(vo.IP))
+            {
+                list = list.Where(x => x.IP == vo.IP);
+            }
+            if (!string.IsNullOrEmpty(vo.TaskId))
+            {
+                list = list.Where(x => x.TaskId == vo.TaskId);
+            }
+
+            if (!string.IsNullOrEmpty(vo.TaskNodeId))
+            {
+                list = list.Where(x => x.TaskNodeId == vo.TaskNodeId);
+            }
+
+            return await list.ToListAsync();
+
+        }
+
         //查机器人动作列表
         public async Task<TaskCallback> GetRobotActionList(TaskCallback vo)
         {

IMCS_CCS/Service/IHttpRequestService .cs

@@ -2,6 +2,7 @@
 using IMCS.CCS.Entitys;
 using IMCS.CCS.Models;
 using IMCS.CCS.Models.vo;
+using IMCS_CCS.Model.vo;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -135,5 +136,10 @@ namespace IMCS.CCS.Services
         /// 设备更新上线离线
         /// </summary> 
         Task<ResponseCommonData> UpdateDeviceState(RequestDeviceUpdateData req);
+
+        /// <summary>
+        /// 根据任务id查询回调列表
+        /// </summary> 
+        Task<List<TaskCallback>> GetCallBackListByCondition(RequestCallBackData vo);
     }
 }

IMCS_CCS/Service/ITaskCallbackService.cs

@@ -10,6 +10,7 @@ namespace IMCS.CCS.Services
 
         Task<List<TaskCallback>> GetAllList();
 
+        Task<List<TaskCallback>> GetListByCondition(TaskCallback vo);
         //查机器人动作列表
         Task<TaskCallback> GetRobotActionList(TaskCallback vo);
 

IMCS_CCS/Service/Impl/HttpRequestService.cs

@@ -2344,6 +2344,35 @@ namespace IMCS.CCS.Services
                 return responseData;
             }
         }
+        /// <summary>
+        /// 获取回调列表
+        /// </summary> 
+        public async Task<List<TaskCallback>> GetCallBackListByCondition(RequestCallBackData vo)
+        {
+            List<TaskCallback> list = new List<TaskCallback>();
+            try {
+                TaskCallback taskCallback = new TaskCallback();
+                if (!string.IsNullOrEmpty(vo.IP))
+                {
+                    taskCallback.IP = vo.IP;
+                } 
+                if (!string.IsNullOrEmpty(vo.TaskId))
+                {
+                    taskCallback.TaskId = vo.TaskId;
+                }
+                if (!string.IsNullOrEmpty(vo.TaskNodeId))
+                {
+                    taskCallback.TaskNodeId = vo.TaskNodeId;
+                }
+                list = await _taskCallbackService.GetListByCondition(taskCallback);
+
+            }
+            catch (Exception ex)
+            { 
+                return list;
+            }
+            return list;
+        }
 
         //移动取放 条件限制
         private async Task<bool> robotActionCondition(string ip ,string isAllowFlag,string currentAction)

IMCS_CCS/Service/Impl/TaskCallbackService.cs

@@ -31,6 +31,11 @@ namespace IMCS.CCS.Services
         {
             return await _repository.GetAllList();
         }
+
+        public async Task<List<TaskCallback>> GetListByCondition(TaskCallback vo)
+        {
+            return await _repository.GetListByCondition(vo);
+        }
         //查机器人动作列表
         public async Task<TaskCallback> GetRobotActionList(TaskCallback vo)
         {