细节调整
This commit is contained in:
		
							parent
							
								
									7574049a3f
								
							
						
					
					
						commit
						25b9d20cb3
					
				| 
						 | 
					@ -316,7 +316,7 @@ namespace LY.App.Service
 | 
				
			||||||
        /// <returns></returns>
 | 
					        /// <returns></returns>
 | 
				
			||||||
        public async Task<ApiResult> GetPage(AlarmReq input)
 | 
					        public async Task<ApiResult> GetPage(AlarmReq input)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            var result = await CreatePage(input);
 | 
					            var result = await CreateHistoryPage(input);
 | 
				
			||||||
            return new ApiResult()
 | 
					            return new ApiResult()
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                code = 0,
 | 
					                code = 0,
 | 
				
			||||||
| 
						 | 
					@ -417,7 +417,6 @@ namespace LY.App.Service
 | 
				
			||||||
                    startTime = SqlFunc.AggregateMin(st.CreateTime),
 | 
					                    startTime = SqlFunc.AggregateMin(st.CreateTime),
 | 
				
			||||||
                    endTime = SqlFunc.AggregateMax(st.CreateTime),
 | 
					                    endTime = SqlFunc.AggregateMax(st.CreateTime),
 | 
				
			||||||
                    sn = st.serial_number,
 | 
					                    sn = st.serial_number,
 | 
				
			||||||
                    Frequency = 0,
 | 
					 | 
				
			||||||
                    duration = (SqlFunc.AggregateMax(st.CreateTime) - SqlFunc.AggregateMin(st.CreateTime)).TotalSeconds,
 | 
					                    duration = (SqlFunc.AggregateMax(st.CreateTime) - SqlFunc.AggregateMin(st.CreateTime)).TotalSeconds,
 | 
				
			||||||
                    model = st.device_type,
 | 
					                    model = st.device_type,
 | 
				
			||||||
                    IsWhitelist = SqlFunc.AggregateMax(st.IsWhitelist),
 | 
					                    IsWhitelist = SqlFunc.AggregateMax(st.IsWhitelist),
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue