diff --git a/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs b/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
index b7283866..cb1a5a8b 100644
--- a/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
@@ -318,7 +318,7 @@ namespace BLL
// 获取达因信息
var dineInfo = dineInfoDict.TryGetValue(projectid, out var dineData)
? dineData
- : new { TotalDineNum = (decimal?)0, CompleteDineNum = (decimal?)0 };
+ : new { TotalDineNum = (double?)0, CompleteDineNum = (double?)0 };
// 获取拍片信息
var chCheckItem = chCheckItemDict.TryGetValue(projectid, out var checkData)
@@ -442,8 +442,8 @@ namespace BLL
select new Model.WeldDineOutput()
{
ProjectId = g.Key,
- Size = g.Sum(x => Convert.ToDecimal(!string.IsNullOrEmpty(x.TotalWeldQuantity) ? Convert.ToDecimal(x.TotalWeldQuantity) : 0)),
- DoneDin = g.Sum(x => Convert.ToDecimal(!string.IsNullOrEmpty(x.TotalCompleted) ? Convert.ToDecimal(x.TotalCompleted) : 0))
+ Size = g.Sum(x => Convert.ToDouble(x.TotalWeldQuantity)),
+ DoneDin = g.Sum(x => Convert.ToDouble(x.TotalCompleted))
});
return result;
}
diff --git a/SGGL/Model/ZHGL/DataSync/WeldDineOutput.cs b/SGGL/Model/ZHGL/DataSync/WeldDineOutput.cs
index a3caa527..031bbe89 100644
--- a/SGGL/Model/ZHGL/DataSync/WeldDineOutput.cs
+++ b/SGGL/Model/ZHGL/DataSync/WeldDineOutput.cs
@@ -11,10 +11,10 @@ namespace Model
///
/// 达因数
///
- public decimal? Size { get; set; }
+ public double? Size { get; set; }
///
/// 完成达因数
///
- public decimal? DoneDin { get; set; }
+ public double? DoneDin { get; set; }
}
}
\ No newline at end of file
diff --git a/SGGL/SGGL.sln b/SGGL/SGGL.sln
index e1de09ac..8f67efb7 100644
--- a/SGGL/SGGL.sln
+++ b/SGGL/SGGL.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2026
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35013.160
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}"
EndProject
diff --git a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs
index 3a0c6ca1..10ac6444 100644
--- a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs
+++ b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs
@@ -3,6 +3,7 @@ using Model;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
using System.Web.Mvc;
@@ -18,7 +19,7 @@ namespace WebAPI.Controllers
/// 获取质量统计数据
///
///
- public Model.ReturnData PostGetCQMSData()
+ public async Task PostGetCQMSData()
{
var returnData = new Model.ReturnData();
returnData.type = "CQMS";
@@ -28,7 +29,7 @@ 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 = CQMSDataService.GetTodayCQMSData_CQMS();
+ returnData.data = await CQMSDataService.GetTodayCQMSData_CQMS();
}
else
{
@@ -69,7 +70,7 @@ namespace WebAPI.Controllers
/// 获取焊接统计数据
///
///
- public Model.ReturnData PostGetHJGLData()
+ public async Task PostGetHJGLData()
{
var returnData = new Model.ReturnData();
returnData.type = "HJGL";
@@ -79,7 +80,15 @@ 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 = HJGLData_HJGLService.GetTodayHJGLData_HJGLAsync();
+ try
+ {
+ returnData.data = await HJGLData_HJGLService.GetTodayHJGLData_HJGLAsync();
+ }
+ catch (Exception ex)
+ {
+ returnData.code = 0;
+ returnData.message = ex.ToString();
+ }
}
else
{
@@ -119,7 +128,7 @@ namespace WebAPI.Controllers
/// 获取安全统计数据
///
///
- public Model.ReturnData PostGetHSSEData()
+ /*public Model.ReturnData PostGetHSSEData()
{
var returnData = new Model.ReturnData();
returnData.type = "HSSE";
@@ -131,7 +140,7 @@ namespace WebAPI.Controllers
{
try
{
- returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE().Result;
+ returnData.data = HSSEData_HSSEService.StatisticalDataAsync().Result;
}
catch (Exception ex)
@@ -147,7 +156,35 @@ namespace WebAPI.Controllers
returnData.message = "token失效";
}
return returnData;
+ }*/
+ public async Task 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)
+ {
+ try
+ {
+ returnData.data = await HSSEData_HSSEService.GetTodayHSSEData_HSSE();
+ }
+ catch (Exception ex)
+ {
+ returnData.code = 0;
+ returnData.message = ex.ToString();
+ }
+ }
+ else
+ {
+ returnData.code = 500;
+ returnData.message = "token失效";
+ }
+ return returnData;
}
+
///
/// 获取安全统计数据成功后，回调通知上报成功
///
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index de18701c..93da232d 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -86,22 +86,22 @@
10/28/2024 14:02:50
- 06/04/2025 23:23:59
+ 06/05/2025 00:45:55
- 06/04/2025 23:23:59
+ 06/05/2025 00:45:55
12/06/2024 20:13:58
- 06/04/2025 23:23:39
+ 06/05/2025 00:45:34
12/26/2024 09:46:52
- 06/04/2025 23:23:39
+ 06/05/2025 00:45:34
12/18/2020 05:32:28
@@ -389,13 +389,13 @@
02/09/2013 00:42:28
- 06/04/2025 23:23:42
+ 06/05/2025 00:45:37
- 06/04/2025 23:23:42
+ 06/05/2025 00:45:37
- 06/04/2025 23:23:42
+ 06/05/2025 00:45:37
01/23/2014 21:57:34
@@ -479,7 +479,7 @@
10/28/2024 14:02:50
- 06/04/2025 23:23:43
+ 06/05/2025 00:45:38
10/28/2024 14:02:50
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 1a1a9a6c..17978b44 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
true