From 74ab9465837f8a6f9eae854059e9783eff24e173 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 14 七月 2025 18:06:24 +0800
Subject: [PATCH] 多组织修改
---
MESApplication/Controllers/QC/PcbTestDataController.cs | 907 ++++++++++++++++++++++++++++----------------------------
1 files changed, 456 insertions(+), 451 deletions(-)
diff --git a/MESApplication/Controllers/QC/PcbTestDataController.cs b/MESApplication/Controllers/QC/PcbTestDataController.cs
index 185694b..94bfc1e 100644
--- a/MESApplication/Controllers/QC/PcbTestDataController.cs
+++ b/MESApplication/Controllers/QC/PcbTestDataController.cs
@@ -1,4 +1,3 @@
-using System;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -9,500 +8,506 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers.QC
+namespace MESApplication.Controllers.QC;
+
+/// <summary>
+/// PCB妫�娴嬫暟鎹帶鍒跺櫒
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class PcbTestDataController : ControllerBase
{
+ private readonly MessageCenterManager _manager = new();
+ private readonly PcbTestDataService _service = new();
+
+ private readonly string METHOD = "POST";
+ private readonly string TableName = "MES_PCB_TEST_DATA";
+ private readonly string URL = "http://localhost:10054/api/PcbTestData/";
+
/// <summary>
- /// PCB妫�娴嬫暟鎹帶鍒跺櫒
+ /// 淇濆瓨鏁存澘妫�娴嬫暟鎹�
/// </summary>
- [Route("api/[controller]")]
- [ApiController]
- public class PcbTestDataController : ControllerBase
+ /// <param name="dto">鏁存澘妫�娴嬫暟鎹瓺TO</param>
+ /// <returns>淇濆瓨缁撴灉</returns>
+ [HttpPost("SaveWholeboardData")]
+ public ResponseResult SaveWholeboardData(
+ [FromBody] WholeboardGenerateDto dto)
{
- private readonly MessageCenterManager _manager = new();
- private readonly PcbTestDataService _service = new();
-
- private readonly string METHOD = "POST";
- private readonly string TableName = "MES_PCB_TEST_DATA";
- private readonly string URL = "http://localhost:10054/api/PcbTestData/";
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveWholeboardData";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(dto);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
- /// <summary>
- /// 淇濆瓨鏁存澘妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="dto">鏁存澘妫�娴嬫暟鎹瓺TO</param>
- /// <returns>淇濆瓨缁撴灉</returns>
- [HttpPost("SaveWholeboardData")]
- public ResponseResult SaveWholeboardData([FromBody] WholeboardGenerateDto dto)
+ try
{
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveWholeboardData";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(dto);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
+ dynamic resultInfos = new ExpandoObject();
+ var result = _service.SaveWholeboardData(dto);
+ resultInfos.result = result;
+ resultInfos.message = result ? "鏁存澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鏁存澘妫�娴嬫暟鎹繚瀛樺け璐�";
+
+ entity.Result = result ? (short)1 : (short)0;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- var result = _service.SaveWholeboardData(dto);
- resultInfos.result = result;
- resultInfos.message = result ? "鏁存澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鏁存澘妫�娴嬫暟鎹繚瀛樺け璐�";
-
- entity.Result = result ? (short)1 : (short)0;
- entity.DealWith = 1;
- _manager.save(entity);
-
+ status = result ? 0 : 1,
+ message = result ? "OK" : "FAIL",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨鍗曟澘妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="dto">鍗曟澘妫�娴嬫暟鎹瓺TO</param>
+ /// <returns>淇濆瓨缁撴灉</returns>
+ [HttpPost("SaveSingleBoardData")]
+ public ResponseResult SaveSingleBoardData(
+ [FromBody] SingleBoardGenerateDto dto)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveSingleBoardData";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(dto);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var result = _service.SaveSingleBoardData(dto);
+ resultInfos.result = result;
+ resultInfos.message = result ? "鍗曟澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鍗曟澘妫�娴嬫暟鎹繚瀛樺け璐�";
+
+ entity.Result = result ? (short)1 : (short)0;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = result ? 0 : 1,
+ message = result ? "OK" : "FAIL",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨPCB妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">鏌ヨ璇锋眰</param>
+ /// <returns>鍒嗛〉鏁版嵁</returns>
+ [HttpPost("GetPage")]
+ public ResponseResult GetPage([FromBody] JObject request)
+ {
+ try
+ {
+ var dataType = request["dataType"]?.ToString();
+ var deviceName = request["deviceName"]?.ToString();
+ var pcbSn = request["pcbSn"]?.ToString();
+ var startTime = request["startTime"]?.ToString();
+ var endTime = request["endTime"]?.ToString();
+ var pageIndex = request["pageIndex"]?.ToObject<int>() ?? 1;
+ var pageSize = request["pageSize"]?.ToObject<int>() ?? 20;
+
+ DateTime? startDateTime = null;
+ DateTime? endDateTime = null;
+
+ if (StringUtil.IsNotNullOrEmpty(startTime) &&
+ DateTime.TryParse(startTime, out var start))
+ startDateTime = start;
+
+ if (StringUtil.IsNotNullOrEmpty(endTime) &&
+ DateTime.TryParse(endTime, out var end))
+ endDateTime = end;
+
+ var (items, totalCount) = _service.GetPcbTestDataPage(
+ dataType, deviceName, pcbSn, startDateTime, endDateTime,
+ pageIndex, pageSize);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.items = items;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos,
+ TotalCount = totalCount
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID鑾峰彇PCB妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>PCB妫�娴嬫暟鎹�</returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById([FromBody] JObject request)
+ {
+ try
+ {
+ var id = request["id"]?.ToObject<decimal>();
+ if (!id.HasValue)
return new ResponseResult
{
- status = result ? 0 : 1,
- message = result ? "OK" : "FAIL",
- data = resultInfos
+ status = 1,
+ message = "ID涓嶈兘涓虹┖",
+ data = null
};
- }
- catch (Exception ex)
+
+ var testData = _service.GetPcbTestDataById(id.Value);
+ var componentData = _service.GetComponentDataByTestDataId(id.Value);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.testData = testData;
+ resultInfos.componentData = componentData;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁PCB鏉＄爜鑾峰彇妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>妫�娴嬫暟鎹垪琛�</returns>
+ [HttpPost("GetByPcbSn")]
+ public ResponseResult GetByPcbSn([FromBody] JObject request)
+ {
+ try
+ {
+ var pcbSn = request["pcbSn"]?.ToString();
+ if (StringUtil.IsNullOrEmpty(pcbSn))
+ return new ResponseResult
+ {
+ status = 1,
+ message = "PCB鏉＄爜涓嶈兘涓虹┖",
+ data = null
+ };
+
+ var testDataList = _service.GetPcbTestDataByPcbSn(pcbSn);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.testDataList = testDataList;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍣ㄤ欢妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>鍣ㄤ欢妫�娴嬫暟鎹�</returns>
+ [HttpPost("GetComponentData")]
+ public ResponseResult GetComponentData([FromBody] JObject request)
+ {
+ try
+ {
+ var testDataId = request["testDataId"]?.ToObject<decimal>();
+ if (!testDataId.HasValue)
+ return new ResponseResult
+ {
+ status = 1,
+ message = "娴嬭瘯鏁版嵁ID涓嶈兘涓虹┖",
+ data = null
+ };
+
+ var componentData =
+ _service.GetComponentDataByTestDataId(testDataId.Value);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.componentData = componentData;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇妫�娴嬬粺璁℃暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>缁熻鏁版嵁</returns>
+ [HttpPost("GetStatistics")]
+ public ResponseResult GetStatistics([FromBody] JObject request)
+ {
+ try
+ {
+ var dataType = request["dataType"]?.ToString();
+ var deviceName = request["deviceName"]?.ToString();
+ var startTime = request["startTime"]?.ToString();
+ var endTime = request["endTime"]?.ToString();
+
+ DateTime? startDateTime = null;
+ DateTime? endDateTime = null;
+
+ if (StringUtil.IsNotNullOrEmpty(startTime) &&
+ DateTime.TryParse(startTime, out var start))
+ startDateTime = start;
+
+ if (StringUtil.IsNotNullOrEmpty(endTime) &&
+ DateTime.TryParse(endTime, out var end))
+ endDateTime = end;
+
+ var statistics = _service.GetTestStatistics(dataType, deviceName,
+ startDateTime, endDateTime);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.statistics = statistics;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎PCB妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>鍒犻櫎缁撴灉</returns>
+ [HttpPost("Delete")]
+ public ResponseResult Delete([FromBody] JObject request)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Delete";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(request);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+
+ try
+ {
+ var id = request["id"]?.ToObject<decimal>();
+ if (!id.HasValue)
{
entity.Result = 0;
entity.DealWith = 0;
- entity.ResultData = ex.Message;
+ entity.ResultData = "ID涓嶈兘涓虹┖";
_manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
- /// <summary>
- /// 淇濆瓨鍗曟澘妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="dto">鍗曟澘妫�娴嬫暟鎹瓺TO</param>
- /// <returns>淇濆瓨缁撴灉</returns>
- [HttpPost("SaveSingleBoardData")]
- public ResponseResult SaveSingleBoardData([FromBody] SingleBoardGenerateDto dto)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveSingleBoardData";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(dto);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var result = _service.SaveSingleBoardData(dto);
- resultInfos.result = result;
- resultInfos.message = result ? "鍗曟澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鍗曟澘妫�娴嬫暟鎹繚瀛樺け璐�";
-
- entity.Result = result ? (short)1 : (short)0;
- entity.DealWith = 1;
- _manager.save(entity);
-
return new ResponseResult
{
- status = result ? 0 : 1,
- message = result ? "OK" : "FAIL",
- data = resultInfos
+ status = 1,
+ message = "ID涓嶈兘涓虹┖",
+ data = null
};
}
- catch (Exception ex)
+
+ var result = _service.DeletePcbTestData(id.Value);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.result = result;
+ resultInfos.message = result ? "鍒犻櫎鎴愬姛" : "鍒犻櫎澶辫触";
+
+ entity.Result = result ? (short)1 : (short)0;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = result ? 0 : 1,
+ message = result ? "OK" : "FAIL",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 缁熶竴淇濆瓨鎺ュ彛锛堣嚜鍔ㄨ瘑鍒暣鏉挎垨鍗曟澘鏁版嵁锛�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>淇濆瓨缁撴灉</returns>
+ [HttpPost("SaveTestData")]
+ public ResponseResult SaveTestData([FromBody] JObject request)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveTestData";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(request);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+
+ try
+ {
+ var dataType = request["dataType"]?.ToString();
+
+ if (StringUtil.IsNullOrEmpty(dataType))
{
entity.Result = 0;
entity.DealWith = 0;
- entity.ResultData = ex.Message;
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨPCB妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">鏌ヨ璇锋眰</param>
- /// <returns>鍒嗛〉鏁版嵁</returns>
- [HttpPost("GetPage")]
- public ResponseResult GetPage([FromBody] JObject request)
- {
- try
- {
- var dataType = request["dataType"]?.ToString();
- var deviceName = request["deviceName"]?.ToString();
- var pcbSn = request["pcbSn"]?.ToString();
- var startTime = request["startTime"]?.ToString();
- var endTime = request["endTime"]?.ToString();
- var pageIndex = request["pageIndex"]?.ToObject<int>() ?? 1;
- var pageSize = request["pageSize"]?.ToObject<int>() ?? 20;
-
- DateTime? startDateTime = null;
- DateTime? endDateTime = null;
-
- if (StringUtil.IsNotNullOrEmpty(startTime) && DateTime.TryParse(startTime, out var start))
- startDateTime = start;
-
- if (StringUtil.IsNotNullOrEmpty(endTime) && DateTime.TryParse(endTime, out var end))
- endDateTime = end;
-
- var (items, totalCount) = _service.GetPcbTestDataPage(
- dataType, deviceName, pcbSn, startDateTime, endDateTime, pageIndex, pageSize);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.items = items;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos,
- TotalCount = totalCount
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁ID鑾峰彇PCB妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>PCB妫�娴嬫暟鎹�</returns>
- [HttpPost("GetById")]
- public ResponseResult GetById([FromBody] JObject request)
- {
- try
- {
- var id = request["id"]?.ToObject<decimal>();
- if (!id.HasValue)
- {
- return new ResponseResult
- {
- status = 1,
- message = "ID涓嶈兘涓虹┖",
- data = null
- };
- }
-
- var testData = _service.GetPcbTestDataById(id.Value);
- var componentData = _service.GetComponentDataByTestDataId(id.Value);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.testData = testData;
- resultInfos.componentData = componentData;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁PCB鏉＄爜鑾峰彇妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>妫�娴嬫暟鎹垪琛�</returns>
- [HttpPost("GetByPcbSn")]
- public ResponseResult GetByPcbSn([FromBody] JObject request)
- {
- try
- {
- var pcbSn = request["pcbSn"]?.ToString();
- if (StringUtil.IsNullOrEmpty(pcbSn))
- {
- return new ResponseResult
- {
- status = 1,
- message = "PCB鏉＄爜涓嶈兘涓虹┖",
- data = null
- };
- }
-
- var testDataList = _service.GetPcbTestDataByPcbSn(pcbSn);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.testDataList = testDataList;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇鍣ㄤ欢妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>鍣ㄤ欢妫�娴嬫暟鎹�</returns>
- [HttpPost("GetComponentData")]
- public ResponseResult GetComponentData([FromBody] JObject request)
- {
- try
- {
- var testDataId = request["testDataId"]?.ToObject<decimal>();
- if (!testDataId.HasValue)
- {
- return new ResponseResult
- {
- status = 1,
- message = "娴嬭瘯鏁版嵁ID涓嶈兘涓虹┖",
- data = null
- };
- }
-
- var componentData = _service.GetComponentDataByTestDataId(testDataId.Value);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.componentData = componentData;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇妫�娴嬬粺璁℃暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>缁熻鏁版嵁</returns>
- [HttpPost("GetStatistics")]
- public ResponseResult GetStatistics([FromBody] JObject request)
- {
- try
- {
- var dataType = request["dataType"]?.ToString();
- var deviceName = request["deviceName"]?.ToString();
- var startTime = request["startTime"]?.ToString();
- var endTime = request["endTime"]?.ToString();
-
- DateTime? startDateTime = null;
- DateTime? endDateTime = null;
-
- if (StringUtil.IsNotNullOrEmpty(startTime) && DateTime.TryParse(startTime, out var start))
- startDateTime = start;
-
- if (StringUtil.IsNotNullOrEmpty(endTime) && DateTime.TryParse(endTime, out var end))
- endDateTime = end;
-
- var statistics = _service.GetTestStatistics(dataType, deviceName, startDateTime, endDateTime);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.statistics = statistics;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鍒犻櫎PCB妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- [HttpPost("Delete")]
- public ResponseResult Delete([FromBody] JObject request)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Delete";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(request);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
- {
- var id = request["id"]?.ToObject<decimal>();
- if (!id.HasValue)
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = "ID涓嶈兘涓虹┖";
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 1,
- message = "ID涓嶈兘涓虹┖",
- data = null
- };
- }
-
- var result = _service.DeletePcbTestData(id.Value);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.result = result;
- resultInfos.message = result ? "鍒犻櫎鎴愬姛" : "鍒犻櫎澶辫触";
-
- entity.Result = result ? (short)1 : (short)0;
- entity.DealWith = 1;
+ entity.ResultData = "鏁版嵁绫诲瀷涓嶈兘涓虹┖锛岃鎸囧畾WHOLE鎴朣INGLE";
_manager.save(entity);
return new ResponseResult
{
- status = result ? 0 : 1,
- message = result ? "OK" : "FAIL",
- data = resultInfos
+ status = 1,
+ message = "鏁版嵁绫诲瀷涓嶈兘涓虹┖锛岃鎸囧畾WHOLE鎴朣INGLE",
+ data = null
};
}
- catch (Exception ex)
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = ex.Message;
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
- /// <summary>
- /// 缁熶竴淇濆瓨鎺ュ彛锛堣嚜鍔ㄨ瘑鍒暣鏉挎垨鍗曟澘鏁版嵁锛�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>淇濆瓨缁撴灉</returns>
- [HttpPost("SaveTestData")]
- public ResponseResult SaveTestData([FromBody] JObject request)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveTestData";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(request);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
+ dynamic resultInfos = new ExpandoObject();
+ var result = false;
+ var message = "";
+
+ switch (dataType.ToUpper())
{
- var dataType = request["dataType"]?.ToString();
-
- if (StringUtil.IsNullOrEmpty(dataType))
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = "鏁版嵁绫诲瀷涓嶈兘涓虹┖锛岃鎸囧畾WHOLE鎴朣INGLE";
- _manager.save(entity);
-
- return new ResponseResult
+ case "WHOLE":
+ var wholeboardDto = request["data"]
+ ?.ToObject<WholeboardGenerateDto>();
+ if (wholeboardDto == null)
{
- status = 1,
- message = "鏁版嵁绫诲瀷涓嶈兘涓虹┖锛岃鎸囧畾WHOLE鎴朣INGLE",
- data = null
- };
- }
-
- dynamic resultInfos = new ExpandoObject();
- bool result = false;
- string message = "";
-
- switch (dataType.ToUpper())
- {
- case "WHOLE":
- var wholeboardDto = request["data"]?.ToObject<WholeboardGenerateDto>();
- if (wholeboardDto == null)
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = "鏁存澘鏁版嵁涓嶈兘涓虹┖";
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 1,
- message = "鏁存澘鏁版嵁涓嶈兘涓虹┖",
- data = null
- };
- }
- result = _service.SaveWholeboardData(wholeboardDto);
- message = result ? "鏁存澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鏁存澘妫�娴嬫暟鎹繚瀛樺け璐�";
- break;
-
- case "SINGLE":
- var singleBoardDto = request["data"]?.ToObject<SingleBoardGenerateDto>();
- if (singleBoardDto == null)
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = "鍗曟澘鏁版嵁涓嶈兘涓虹┖";
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 1,
- message = "鍗曟澘鏁版嵁涓嶈兘涓虹┖",
- data = null
- };
- }
- result = _service.SaveSingleBoardData(singleBoardDto);
- message = result ? "鍗曟澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鍗曟澘妫�娴嬫暟鎹繚瀛樺け璐�";
- break;
-
- default:
entity.Result = 0;
entity.DealWith = 0;
- entity.ResultData = "涓嶆敮鎸佺殑鏁版嵁绫诲瀷锛岃鎸囧畾WHOLE鎴朣INGLE";
+ entity.ResultData = "鏁存澘鏁版嵁涓嶈兘涓虹┖";
_manager.save(entity);
-
+
return new ResponseResult
{
status = 1,
- message = "涓嶆敮鎸佺殑鏁版嵁绫诲瀷锛岃鎸囧畾WHOLE鎴朣INGLE",
+ message = "鏁存澘鏁版嵁涓嶈兘涓虹┖",
data = null
};
- }
+ }
- resultInfos.result = result;
- resultInfos.message = message;
+ result = _service.SaveWholeboardData(wholeboardDto);
+ message = result ? "鏁存澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鏁存澘妫�娴嬫暟鎹繚瀛樺け璐�";
+ break;
- entity.Result = result ? (short)1 : (short)0;
- entity.DealWith = 1;
- _manager.save(entity);
+ case "SINGLE":
+ var singleBoardDto = request["data"]
+ ?.ToObject<SingleBoardGenerateDto>();
+ if (singleBoardDto == null)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = "鍗曟澘鏁版嵁涓嶈兘涓虹┖";
+ _manager.save(entity);
- return new ResponseResult
- {
- status = result ? 0 : 1,
- message = result ? "OK" : "FAIL",
- data = resultInfos
- };
+ return new ResponseResult
+ {
+ status = 1,
+ message = "鍗曟澘鏁版嵁涓嶈兘涓虹┖",
+ data = null
+ };
+ }
+
+ result = _service.SaveSingleBoardData(singleBoardDto);
+ message = result ? "鍗曟澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鍗曟澘妫�娴嬫暟鎹繚瀛樺け璐�";
+ break;
+
+ default:
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = "涓嶆敮鎸佺殑鏁版嵁绫诲瀷锛岃鎸囧畾WHOLE鎴朣INGLE";
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 1,
+ message = "涓嶆敮鎸佺殑鏁版嵁绫诲瀷锛岃鎸囧畾WHOLE鎴朣INGLE",
+ data = null
+ };
}
- catch (Exception ex)
+
+ resultInfos.result = result;
+ resultInfos.message = message;
+
+ entity.Result = result ? (short)1 : (short)0;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
{
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = ex.Message;
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
+ status = result ? 0 : 1,
+ message = result ? "OK" : "FAIL",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3