From 2b8ff1a35c450293e4abb46702e1c4a9257cf69a Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Tue, 9 May 2023 18:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2023-05-09.sql | 7 + .../版本日志/SGGLDB_WH_2023-05-09版本日志.txt | 3 + .../DataSync/CNCECServerController.cs | 224 ++++++++++++++++++ SGGL/WebAPI/WebAPI.csproj | 1 + 4 files changed, 235 insertions(+) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-05-09.sql create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-05-09版本日志.txt create mode 100644 SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2023-05-09.sql b/DataBase/版本日志/SGGLDB_WH_2023-05-09.sql new file mode 100644 index 00000000..31901b92 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-05-09.sql @@ -0,0 +1,7 @@ +/****** Object: Index [NonClusteredIndex-CostControlId-ProjectId] Script Date: 2023/5/6 9:14:19 ******/ +CREATE NONCLUSTERED INDEX [NonClusteredIndex-CostControlId-ProjectId] ON [dbo].[WBS_CostControl] +( + [CostControlId] ASC, + [ProjectId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +GO \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_2023-05-09版本日志.txt b/DataBase/版本日志/SGGLDB_WH_2023-05-09版本日志.txt new file mode 100644 index 00000000..e7f51c77 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-05-09版本日志.txt @@ -0,0 +1,3 @@ +--ADD BY GaoFei 2023-05-09 +1、增加进度数据表索引 +--END \ No newline at end of file diff --git a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs new file mode 100644 index 00000000..5d467e30 --- /dev/null +++ b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs @@ -0,0 +1,224 @@ +using BLL; +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Http; +using System.Web.Mvc; + +namespace WebAPI.Controllers +{ + /// + /// 上报集团数据接口 + /// + public class CNCECServerController : ApiController + { + /// + /// 获取质量统计数据 + /// + /// + public Model.ReturnData PostGetCQMSData() + { + var returnData = new Model.ReturnData(); + returnData.type = "CQMS"; + returnData.time = DateTime.Now.ToString(); + ServerService.GetToken(); + returnData.token = BLL.SysConstSetService.CNCECToken; + returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime; + if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime)&& DateTime.Parse(returnData.expiryTime)>DateTime.Now) + { + returnData.data = CQMSDataService.GetTodayCQMSData_CQMS(); + } + else + { + returnData.code = 500; + returnData.message = "token失效"; + } + return returnData; + } + /// + /// 获取质量统计数据成功后,回调通知上报成功 + /// + /// + /// + public Model.ReturnData PostGetCQMSData_CallBalk([FromBody] CQMSData data) + { + var returnData = new Model.ReturnData(); + try + { + returnData.type = "CQMS_Back"; + returnData.time = DateTime.Now.ToString(); + foreach (var item in data.CQMSDataItems) + { + var cQMSData_CQMS= CQMSDataService.GetCQMSData_CQMSById(item.Id); + cQMSData_CQMS.State = Const.CNCEC_State_S; + CQMSDataService.UpdateCQMSData_CQMS(cQMSData_CQMS); + } + + } + catch (Exception ex) + { + + returnData.code = 404; + returnData.message = ex.ToString(); + } + return returnData; + } + /// + /// 获取焊接统计数据 + /// + /// + public Model.ReturnData PostGetHJGLData() + { + var returnData = new Model.ReturnData(); + returnData.type = "HJGL"; + returnData.time = DateTime.Now.ToString(); + ServerService.GetToken(); + returnData.token = BLL.SysConstSetService.CNCECToken; + returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime; + if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime)&&DateTime.Parse(returnData.expiryTime) > DateTime.Now) + { + returnData.data = HJGLData_HJGLService.GetTodayHJGLData_HJGL(); + } + else + { + returnData.code = 500; + returnData.message = "token失效"; + } + return returnData; + } + /// + /// 获取焊接统计数据 成功后,回调通知上报成功 + /// + /// + /// + public Model.ReturnData PostGetHJGLData_CallBalk([FromBody] Model.HJGLData data) + { + var returnData = new Model.ReturnData(); + try + { + returnData.type = "HJGL_Back"; + returnData.time = DateTime.Now.ToString(); + foreach (var item in data.HJGLDataItems) + { + var hJGLData_HJGL = HJGLData_HJGLService.GetHJGLData_HJGLById(item.Id); + hJGLData_HJGL.State = Const.CNCEC_State_S; + HJGLData_HJGLService.UpdateHJGLData_HJGL(hJGLData_HJGL); + } + } + catch (Exception ex) + { + + returnData.code = 404; + returnData.message = ex.ToString(); + } + return returnData; + } + /// + /// 获取安全统计数据 + /// + /// + public Model.ReturnData PostGetHSSEData() + { + var returnData = new Model.ReturnData(); + returnData.type = "HSSE"; + returnData.time = DateTime.Now.ToString(); + ServerService.GetToken(); + returnData.token = BLL.SysConstSetService.CNCECToken; + returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime; + if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now) + { + returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE(); + } + else + { + returnData.code = 500; + returnData.message = "token失效"; + } + return returnData; + } + /// + /// 获取安全统计数据成功后,回调通知上报成功 + /// + /// + /// + public Model.ReturnData PostGetHSSEData_CallBalk([FromBody] HSSEData data) + { + var returnData = new Model.ReturnData(); + try + { + returnData.type = "HSSE_Back"; + returnData.time = DateTime.Now.ToString(); + + foreach (var item in data.HSSEDataItems) + { + var hSSEData_HSSE = HSSEData_HSSEService.GetHSSEData_HSSEById(item.Id); + hSSEData_HSSE.State = Const.CNCEC_State_S; + HSSEData_HSSEService.UpdateHSSEData_HSSE(hSSEData_HSSE); + } + } + catch (Exception ex) + { + + returnData.code = 404; + returnData.message = ex.ToString(); + } + return returnData; + } + + /// + /// 获取实业统计数据 + /// + /// + public Model.ReturnData PostGetSYHSEData() + { + var returnData = new Model.ReturnData(); + returnData.type = "SYHSE"; + returnData.time = DateTime.Now.ToString(); + ServerService.GetToken(); + returnData.token = BLL.SysConstSetService.CNCECToken; + returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime; + if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now) + { + returnData.data = SYHSEData_SYHSEService.GetTodaySYHSEData_SYHSE(); + } + else + { + returnData.code = 500; + returnData.message = "token失效"; + } + return returnData; + } + /// + /// 获取实业统计数据成功后,回调通知上报成功 + /// + /// + /// + public Model.ReturnData PostGetSYHSEData_CallBalk([FromBody] SYHSEData data) + { + var returnData = new Model.ReturnData(); + try + { + returnData.type = "SYHSE_Back"; + returnData.time = DateTime.Now.ToString(); + foreach (var item in data.SYHSEDataItems) + { + var sYHSEData_SYHSE = SYHSEData_SYHSEService.GetSYHSEData_SYHSEById(item.Id); + sYHSEData_SYHSE.State = Const.CNCEC_State_S; + SYHSEData_SYHSEService.UpdateSYHSEData_SYHSE(sYHSEData_SYHSE); + } + //SYHSEData_SYHSE data = _data; + //data.State = Const.CNCEC_State_S; + //SYHSEData_SYHSEService.UpdateSYHSEData_SYHSE(data); + } + catch (Exception ex) + { + + returnData.code = 404; + returnData.message = ex.ToString(); + } + return returnData; + } + } +} \ No newline at end of file diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 1226b895..0ecde293 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -174,6 +174,7 @@ +