新增监控操作日志查询接口

AutoTurnOver.DB/db_config.cs

 using AutoTurnOver.DB.Base;
 using AutoTurnOver.Models;
+using AutoTurnOver.Models.ApiDto;
 using AutoTurnOver.Models.auto;
 using AutoTurnOver.Models.Base;
 using AutoTurnOver.Models.Report;
@@ -638,7 +639,8 @@ left join dc_base_warehouse as dbw on dacp.warehouse_code = dbw.warehouse_code w
                     warehouse_code = turnover_item.warehouse_code,
                     date = DateTime.Now,
                     monitor_status = monitor_status.ToString(),
-                    user_name = user.UserName
+                    user_name = user.UserName,
+                    time_type = time_type
                 });
             }
 
@@ -2408,5 +2410,59 @@ where 1 = 1 ";
 
         #endregion
 
+        #region 监控操作日志查询
+        /// <summary>
+        /// 分页查询监控操作日志查询
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        public static Page<dc_base_monitor_status_log_output_dto> GetMonitorStatusLogPageList(dc_base_monitor_status_log_input_dto search)
+        {
+            System.Text.StringBuilder sqlText = new System.Text.StringBuilder();
+            search.page = (search.offset / search.limit)+1;
+            search.rows = search.limit;
+            sqlText.Append(@"
+                            select t1.user_name,CASE WHEN t1.monitor_status=0 THEN '开启监控' ELSE '停止监控' END monitor_status,
+                            DATE_FORMAT(t1.date,'%Y-%m-%d %H:%i::%s') create_time,t1.bailun_sku,t2.sku_title_cn,
+                            t1.warehouse_code,t3.warehouse_name,CASE WHEN t1.time_type =1 THEN '临时停止' WHEN t1.time_type = 2 THEN '永久停止' ELSE '' END time_type 
+                            from dc_base_monitor_status_log AS t1
+                            LEFT JOIN dc_base_sku AS t2 ON t2.bailun_sku = t1.bailun_sku
+                            LEFT JOIN dc_base_warehouse AS t3 ON t3.warehouse_code = t1.warehouse_code
+                            WHERE 1=1 
+                            ");
+            DynamicParameters parameters = new DynamicParameters();
+            if (search != null)
+            {
+                if (search.btime != null)
+                {
+                    sqlText.Append(" AND t1.date>=@btime  ");
+                    parameters.Add("btime", search.btime);
+                }
+                if (search.etime != null)
+                {
+                    sqlText.Append(" AND t1.date<=@etime ");
+                    parameters.Add("etime", search.etime);
+                }
+                if (!string.IsNullOrWhiteSpace(search.bailun_sku))
+                {
+                    sqlText.Append(" AND t1.bailun_sku=@bailun_sku ");
+                    parameters.Add("bailun_sku", search.bailun_sku);
+                }
+                if (!string.IsNullOrWhiteSpace(search.user_name))
+                {
+                    sqlText.Append(" AND t1.user_name=@user_name ");
+                    parameters.Add("user_name", search.user_name);
+                }
+                if (search.monitor_status.HasValue)
+                {
+                    sqlText.Append(" AND t1.monitor_status=@monitor_status ");
+                    parameters.Add("monitor_status", search.monitor_status);
+                }
+            }
+            search.sidx = "t1.date";
+            search.sord = "desc";
+            return _connection.Page<dc_base_monitor_status_log_output_dto>(sqlText.ToString(), search, parameters);
+        }
+        #endregion
     }
 }

AutoTurnOver.DB/dc_base_sku_fba_mapping_dao.cs

@@ -18,14 +18,14 @@ namespace AutoTurnOver.DB
             DynamicParameters parameters = new DynamicParameters();
             parameters.Add("bailun_sku", data.bailun_sku);
             parameters.Add("warehouse_code", data.warehouse_code);
-            var oldData = _connection.QueryFirstOrDefault(" SELECT * FROM dc_base_sku_fba_mapping WHERE bailun_sku = @bailun_sku AND warehouse_code = @warehouse_code; ", parameters);
+            var oldData = _connection.QuerySingleOrDefault<dc_base_sku_fba_mapping>(" SELECT * FROM dc_base_sku_fba_mapping WHERE bailun_sku = @bailun_sku AND warehouse_code = @warehouse_code; ", parameters);
             if (oldData == null)
             {
                 _connection.Insert(data);
             }
             else
             {
-                data.id = oldData.ID;
+                data.id = oldData.id;
                 _connection.Update(data);
             }
             return true;

AutoTurnOver.Models/ApiDto/dc_base_monitor_status_log_input_dto.cs

+using AutoTurnOver.Models.Base;
+using System;
+
+namespace AutoTurnOver.Models.ApiDto
+{
+    /// <summary>
+    /// 查询监控操作日志输入参数
+    /// </summary>
+    public class dc_base_monitor_status_log_input_dto: page_search_dto
+    {
+        public string user_name { get; set; }
+        public int? monitor_status { get; set; }
+        public DateTime date { get; set; }
+        public string bailun_sku { get; set; }
+        public string warehouse_code { get; set; }
+        public DateTime? btime { get; set; }
+        public DateTime? etime { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int offset { get; set; }
+
+        public int limit { get; set; }
+    }
+}

AutoTurnOver.Models/ApiDto/dc_base_monitor_status_log_output_dto.cs

+namespace AutoTurnOver.Models.ApiDto
+{
+    /// <summary>
+    /// 监控操作日志
+    /// </summary>
+    public class dc_base_monitor_status_log_output_dto : dc_base_monitor_status_log
+    {
+        /// <summary>
+        /// sku标题
+        /// </summary>
+        public string sku_title_cn { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string warehouse_name { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string create_time { get; set; }
+    }
+}

AutoTurnOver.Models/dc_base_monitor_status_log.cs

@@ -12,5 +12,10 @@ namespace AutoTurnOver.Models
         public DateTime date { get; set; }
         public string bailun_sku { get; set; }
         public string warehouse_code { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? time_type { get; set; }
     }
 }

AutoTurnOver.Services/ConfigServices.cs

@@ -10,6 +10,7 @@ using AutoTurnOver.Models.Report;
 using AutoTurnOver.Models.auto;
 using AutoTurnOver.DB;
 using Dapper;
+using AutoTurnOver.Models.ApiDto;
 
 namespace AutoTurnOver.Services
 {
@@ -429,6 +430,18 @@ namespace AutoTurnOver.Services
             }
             
         }
+
+        /// <summary>
+        /// 监控操作日志查询
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        public Page<dc_base_monitor_status_log_output_dto> GetMonitorStatusLogPageList(dc_base_monitor_status_log_input_dto search)
+        {
+            return db_config.GetMonitorStatusLogPageList(search);
+        }
+
+
         public string BatchClearanceStatus(string ids, int monitor_status, int time_type, UserData user)
         {
             try

AutoTurnOver/Controllers/ConfigController.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using AutoTurnOver.Common;
 using AutoTurnOver.Models;
+using AutoTurnOver.Models.ApiDto;
 using AutoTurnOver.Models.auto;
 using AutoTurnOver.Models.Report;
 using AutoTurnOver.Utility;
@@ -313,6 +314,25 @@ namespace AutoTurnOver.Controllers
         }
 
         /// <summary>
+        /// 监控操作日志查询
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [BrowseLog("Bailun_aims", "触发【百伦自动周转系统】->【自动下单管理】->【自动周转列表】->【查询监控操作日志查询】操作", 0)]
+        public JsonResult GetMonitorStatusLogPageList([FromQuery]dc_base_monitor_status_log_input_dto search)
+        {
+            var result = new Services.ConfigServices().GetMonitorStatusLogPageList(search);
+
+            return new JsonResult(new
+            {
+                rows = result.Items,
+                total = result.TotalItems,
+                pagecount = result.TotalPages
+            });
+        }
+
+        /// <summary>
         /// 批量修改
         /// </summary>
         /// <returns></returns>