lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2024-12-25 15:43:38 +08:00
parent 0a2f9ea3a7
commit c0b489aaf4
79 changed files with 8536 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs
+98 -8
View File
@@ -26,7 +26,7 @@ namespace WebAPI.Controllers
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)
if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now)
{
returnData.data = CQMSDataService.GetTodayCQMSData_CQMS();
}
@@ -51,11 +51,11 @@ namespace WebAPI.Controllers
returnData.time = DateTime.Now.ToString();
foreach (var item in data.CQMSDataItems)
{
var cQMSData_CQMS= CQMSDataService.GetCQMSData_CQMSById(item.Id);
var cQMSData_CQMS = CQMSDataService.GetCQMSData_CQMSById(item.Id);
cQMSData_CQMS.State = Const.CNCEC_State_S;
CQMSDataService.UpdateCQMSData_CQMS(cQMSData_CQMS);
}
}
}
catch (Exception ex)
{
@@ -77,7 +77,7 @@ namespace WebAPI.Controllers
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)
if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now)
{
returnData.data = HJGLData_HJGLService.GetTodayHJGLData_HJGL();
}
@@ -102,7 +102,7 @@ namespace WebAPI.Controllers
returnData.time = DateTime.Now.ToString();
foreach (var item in data.HJGLDataItems)
{
var hJGLData_HJGL = HJGLData_HJGLService.GetHJGLData_HJGLById(item.Id);
var hJGLData_HJGL = HJGLData_HJGLService.GetHJGLData_HJGLById(item.Id);
hJGLData_HJGL.State = Const.CNCEC_State_S;
HJGLData_HJGLService.UpdateHJGLData_HJGL(hJGLData_HJGL);
}
@@ -129,7 +129,17 @@ namespace WebAPI.Controllers
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();
try
{
returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE().Result;
}
catch (Exception ex)
{
returnData.code = 0;
returnData.message = ex.ToString();
}
}
else
{
@@ -204,7 +214,7 @@ namespace WebAPI.Controllers
returnData.time = DateTime.Now.ToString();
foreach (var item in data.SYHSEDataItems)
{
var sYHSEData_SYHSE = SYHSEData_SYHSEService.GetSYHSEData_SYHSEById(item.Id);
var sYHSEData_SYHSE = SYHSEData_SYHSEService.GetSYHSEData_SYHSEById(item.Id);
sYHSEData_SYHSE.State = Const.CNCEC_State_S;
SYHSEData_SYHSEService.UpdateSYHSEData_SYHSE(sYHSEData_SYHSE);
}
@@ -220,5 +230,85 @@ namespace WebAPI.Controllers
}
return returnData;
}
#region 推送项目安全隐患风险数据
/// <summary>
/// 推送项目安全隐患风险数据
/// </summary>
/// <returns></returns>
//[HttpPost]
public Model.ResponeData PushProjectHSSEData()
{
var responeData = new Model.ResponeData();
try
{
var returndata = Project_HSSEData_HSSEService.PushProjectHSSEData();
responeData.code = returndata.code;
responeData.message = returndata.message;
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 推送项目质量数据
/// <summary>
/// 推送项目质量数据
/// </summary>
/// <returns></returns>
//[HttpPost]
public Model.ResponeData PushProjectCQMSData()
{
var responeData = new Model.ResponeData();
try
{
var returndata = Project_CQMSDataService.PushProjectCQMSData();
responeData.code = returndata.code;
responeData.message = returndata.message;
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 推送项目焊接数据数据
/// <summary>
/// 推送项目焊接数据数据
/// </summary>
/// <returns></returns>
//[HttpPost]
public Model.ResponeData PushProjectHJGLData()
{
var responeData = new Model.ResponeData();
try
{
var returndata = Project_HJGLData_HJGLService.PushProjectHJGLData();
responeData.code = returndata.code;
responeData.message = returndata.message;
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}
SGGL/WebAPI/Controllers/DataSync/EnvironmentalController.cs
+73
View File
@@ -0,0 +1,73 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Http;
namespace WebAPI.Controllers
{
/// <summary>
/// 上报环保数据接口
/// </summary>
public class EnvironmentalController : ApiController
{
#region 推送环境监测数据
/// <summary>
/// 推送环境监测数据
/// </summary>
/// <returns></returns>
[HttpPost]
public Model.ResponeData PushEnvironmentalCheckData()
{
var responeData = new Model.ResponeData();
try
{
var returndata = EnvironmentalCheckService.PushEnvironmentalCheckData();
responeData.code = returndata.code;
responeData.message = returndata.message;
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
/// <summary>
/// 保存环境监测数据
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
public Model.ResponeData SaveEnvironmentData(Model.EnvironmentalCheckInput input)
{
var responeData = new Model.ResponeData();
try
{
if (BLL.APIProjectService.getProjectByProjectId(input.ProjectId) != null)
{
responeData.data = LotAPIService.saveEnvironmentCheck(input);
}
else
{
responeData.code = 0;
responeData.message = "此项目不存在！";
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}
SGGL/WebAPI/Controllers/ProjectController.cs
+29 -1
View File
@@ -1,4 +1,5 @@
using System;
using BLL;
using System;
using System.Web.Http;
namespace WebAPI.Controllers
@@ -76,5 +77,32 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
#region 将项目推送到集团
/// <summary>
/// 将项目推送到集团
/// </summary>
/// <returns></returns>
public Model.ResponeData pushProject()
{
var responeData = new Model.ResponeData();
try
{
var code = CNCECHSSEWebService.PushProject();
if (code == "1")
{
responeData.message = "同步成功";
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}