From c6c912c9a0b1235805dea4fbb471e26a7f13a47d Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 21 三月 2023 14:14:10 +0800
Subject: [PATCH] 解决众毅连续两次调用计算保持方案接口问题
---
Application/IStation.Application.LinuxTest/test/MonitorRecord_Controller.cs | 148 +++----------------------------------------------
1 files changed, 9 insertions(+), 139 deletions(-)
diff --git a/Application/IStation.Application.LinuxTest/test/MonitorRecord_Controller.cs b/Application/IStation.Application.LinuxTest/test/MonitorRecord_Controller.cs
index 57142b1..86d0718 100644
--- a/Application/IStation.Application.LinuxTest/test/MonitorRecord_Controller.cs
+++ b/Application/IStation.Application.LinuxTest/test/MonitorRecord_Controller.cs
@@ -12,6 +12,7 @@
using Microsoft.AspNetCore.Authorization;
using Furion.DataEncryption;
using Furion.FriendlyException;
+using MySqlX.XDevAPI.Common;
namespace IStation.Application
{
@@ -21,70 +22,34 @@
[AllowAnonymous]
[Route("LinuxTest/MonitorRecord")]
[ApiDescriptionSettings("LinuxTest", Name = "鐩戞祴璁板綍", Order = 999)]
- public class MonitorRecord_Controller : IDynamicApiController, ITransient
+ public class MonitorRecord_Controller : IDynamicApiController, ITransient
{
private readonly IHttpContextAccessor _httpContextAccessor;
/// <summary>
///
/// </summary>
- public MonitorRecord_Controller(IHttpContextAccessor httpContextAccessor)
+ public MonitorRecord_Controller(IHttpContextAccessor httpContextAccessor)
{
- _httpContextAccessor = httpContextAccessor;
+ _httpContextAccessor = httpContextAccessor;
}
//鏈嶅姟
private readonly Service.MonitorRecord _service = new Service.MonitorRecord();
-
- #region Insert
/// <summary>
/// 鎻掑叆涓�鏉�
/// </summary>
[Route("Insert@V1.0")]
[HttpPost]
- public bool Insert([Required] AddMonitorRecordInput input)
+ public string Insert([Required] AddMonitorRecordInput input)
{
- if (input == null)
- return default;
- var model = input.Adapt<AddMonitorRecordInput, Model.MonitorRecord>();
- var bol = _service.InsertLastRecord(model);
- return bol;
+ var redisHelper = new RedisClientHelper();
+ var bol = redisHelper.HashSet("lxjxxx", "hashdddd", "dddddddd");
+ return bol.ToString();
}
- /// <summary>
- /// 鎻掑叆澶氭潯
- /// </summary>
- [Route("Inserts@V1.0")]
- [HttpPost]
- public bool Inserts([Required] List<AddMonitorRecordInput> inputList)
- {
- if (inputList == null || inputList.Count < 1)
- return false;
- var list = inputList.Select(x => x.Adapt<AddMonitorRecordInput, Model.MonitorRecord>()).ToList();
- var bol = _service.InsertsLastRecord(list);
- return bol;
- }
- #endregion
-
- #region 鑾峰彇鎵�鏈�
-
- /// <summary>
- /// 鑾峰彇鎵�鏈�
- /// </summary>
- [Route("GetAll")]
- [HttpGet]
- public List<MonitorRecordDto> GetAll()
- {
- var list = _service.GetAll();
- var vmList = list?.Select(x => new MonitorRecordDto(x)).ToList();
- return vmList;
- }
-
- #endregion
-
- #region 鑾峰彇鏈�杩戣褰�
/// <summary>
/// 閫氳繃 MonitorPointID 鑾峰彇鏈�杩戜竴鏉℃暟鎹�
@@ -93,106 +58,11 @@
[HttpGet]
public MonitorRecordDto GetLastRecordByMonitorPointID([FromQuery][Required] MonitorPointIDInput input)
{
- var model = _service.GetLastRecord( input.MonitorPointID);
+ var model = _service.GetLastRecord(input.MonitorPointID);
if (model == null)
return default;
return new MonitorRecordDto(model);
}
-
- /// <summary>
- /// 閫氳繃 MonitorPointIds 鑾峰彇鏈�杩戜竴鏉℃暟鎹�
- /// </summary>
- [Route("GetLastRecordByMonitorPointIds")]
- [HttpGet]
- public List<MonitorRecordDto> GetLastRecordByMonitorPointIds([FromQuery][Required] MonitorPointIdsInput input)
- {
- var ids = LongListHelper.ToList(input.MonitorPointIds);
- var list = _service.GetLastRecord(ids);
- var vmList = list?.Select(x => new MonitorRecordDto(x)).ToList();
- return vmList;
- }
-
- #endregion
-
- #region 閫氳繃娴嬬偣鏍囪瘑鑾峰彇
-
- /// <summary>
- /// 閫氳繃 MonitorPointID 鑾峰彇鏌愬ぉ鐨勬暟鎹�
- /// </summary>
- [Route("GetByMonitorPointIDOfDay")]
- [HttpGet]
- public List<MonitorRecordDto> GetByMonitorPointIDOfDay
- (
- [Required, Range(1, long.MaxValue, ErrorMessage = "MonitorPointID 蹇呴』澶т簬0")]
- long MonitorPointID,
- [Required]
- DateTime Day
- )
- {
- var list = _service.GetByMonitorPointIDOfDay( MonitorPointID, Day);
- var vmList = list?.Select(x => new MonitorRecordDto(x)).ToList();
- return vmList;
- }
-
- /// <summary>
- /// 閫氳繃 MonitorPointID 鑾峰彇鏃ユ湡鍖洪棿鍐呯殑鏁版嵁
- /// </summary>
- [Route("GetByMonitorPointIDOfDayRange")]
- [HttpGet]
- public List<MonitorRecordDto> GetByMonitorPointIDOfDayRange
- (
- [Required, Range(1, long.MaxValue, ErrorMessage = "MonitorPointID 蹇呴』澶т簬0")]
- long MonitorPointID,
- [Required]
- DateTime StartDay,
- [Required]
- DateTime EndDay
- )
- {
- if (StartDay.Date > EndDay.Date)
- {
- return default;
- }
- var list = _service.GetByMonitorPointIDOfDayRange( MonitorPointID, StartDay, EndDay);
- var vmList = list?.Select(x => new MonitorRecordDto(x)).ToList();
- return vmList;
- }
-
- /// <summary>
- /// 閫氳繃 MonitorPointID 鑾峰彇鏃堕棿鍖洪棿鍐呯殑鏁版嵁
- /// </summary>
- [Route("GetByMonitorPointIDOfTimeRange")]
- [HttpGet]
- public List<MonitorRecordDto> GetByMonitorPointIDOfTimeRange
- (
- [Required, Range(1, long.MaxValue, ErrorMessage = "MonitorPointID 蹇呴』澶т簬0")]
- long MonitorPointID,
- [Required]
- DateTime StartTime,
- [Required]
- DateTime EndTime
- )
- {
- if (StartTime > EndTime)
- {
- return default;
- }
- var list = _service.GetByMonitorPointIDOfTimeRange( MonitorPointID, StartTime, EndTime);
- var vmList = list?.Select(x => new MonitorRecordDto(x)).ToList();
- return vmList;
- }
-
- #endregion
-
-
-
-
-
-
-
-
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3