首页数据拼接

langguanApi.xml

@@ -1716,6 +1716,11 @@
             注册日期
             </summary>
         </member>
+        <member name="P:langguanApi.Model.Transport.Goods">
+            <summary>
+            货物类型
+            </summary>
+        </member>
         <member name="M:langguanApi.Service.AlertService.Add(langguanApi.Model.AddAlertDto)">
             <summary>
             新加

langguanApi/Controllers/HJ212Controller.cs

@@ -9,7 +9,10 @@ namespace langguanApi.Controllers
     public class HJ212Controller : ControllerBase
     {
         private readonly Hj212Service _hj212Service;
-
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        /// <param name="hj212Service"></param>
         public HJ212Controller(Hj212Service hj212Service)
         {
             _hj212Service = hj212Service;

langguanApi/Service/AlertService.cs

@@ -38,17 +38,17 @@ namespace langguanApi.Service
         /// 首页数据,最近7天的
         /// </summary>
         /// <returns></returns>
-        public async Task<object> IndexData(int num = 50)
+        public async Task<List<alarm>> IndexData(int num = 50)
         {
             Expression<Func<Alert, bool>> exp = filter => filter.IsDelete == false;
             return (await base.GetListWithExp(exp))
                 .OrderByDescending(s => s.CreateDateTime)
                 .Take(num)
-                .Select(s => new
+                .Select(s => new alarm
                 {
-                    s.AlertContent,
+                    AlarmName = s.deviceName,
-                    s.deviceName,
+                    DeviceName = s.deviceName,
-                    s.CreateDateTime
+                    Time = s.CreateDateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                 }).ToList();
         }
         /// <summary>
@@ -66,7 +66,7 @@ namespace langguanApi.Service
             Dictionary<string, string> dic = new Dictionary<string, string>() { };
             dic.Add("BeginTime", start.Value.ToString("yyyy-MM-dd HH:mm:ss"));
             dic.Add("EndTime", end.Value.ToString("yyyy-MM-dd HH:mm:ss"));
-            var AlermResp = await _httpProxy.Get<RespModel<alarmList>>(dic,_configuration.GetValue<string>("Apis:AlertUrl"));
+            var AlermResp = await _httpProxy.Get<RespModel<alarmList>>(dic, _configuration.GetValue<string>("Apis:AlertUrl"));
             if (AlermResp.code == 0)
             {
                 var romte = AlermResp.data.List.Select(s => new Alert

langguanApi/Service/HomeService.cs

@@ -71,6 +71,10 @@ namespace langguanApi.Service
             var rateResp = await _httpProxy.Get<RespModel<List<Rate>>>(null, _configuration.GetValue<string>("Apis:RateUrl"));
             var rate = rateResp.data.ToList().Take(6);
             var AlermResp = await _httpProxy.Get<RespModel<alarmList>>(null, _configuration.GetValue<string>("Apis:AlertUrl"));
+            if (AlermResp.code == 0 && AlermResp.data.List.Any())
+            {
+                alerts.AddRange(AlermResp.data.List);
+            }
             //  alerts += await _httpProxy.Get<string>(null, _configuration.GetValue<string>("Apis:AlertUrl"));
             //    alerts += await _httpProxy.Get<string>(null, _configuration.GetValue<string>("Apis:RateUrl"));
 
@@ -103,7 +107,7 @@ namespace langguanApi.Service
                     ariQuality,
                     rate,
                     trend,
-                    alerts= AlermResp.data.List,
+                    alerts,
                     cleanData,
                     today,
                     getViewTop = "",