lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

集团大屏数据

This commit is contained in:
夏菊 2025-06-05 01:08:26 +08:00
parent a143894ea8
commit 94e2ca6857
6 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs
View File

@ -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;
}

4
SGGL/Model/ZHGL/DataSync/WeldDineOutput.cs
View File

@ -11,10 +11,10 @@ namespace Model
/// <summary>
/// 达因数
/// </summary>
public decimal? Size { get; set; }
public double? Size { get; set; }
/// <summary>
/// 完成达因数
/// </summary>
public decimal? DoneDin { get; set; }
public double? DoneDin { get; set; }
}
}

4
SGGL/SGGL.sln
View File

@ -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

49
SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs
View File

@ -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
/// 获取质量统计数据
/// </summary>
/// <returns></returns>
public Model.ReturnData PostGetCQMSData()
public async Task<Model.ReturnData> 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
/// 获取焊接统计数据
/// </summary>
/// <returns></returns>
public Model.ReturnData PostGetHJGLData()
public async Task<ReturnData> 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
/// 获取安全统计数据
/// </summary>
/// <returns></returns>
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<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)
{
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;
}
/// <summary>
/// 获取安全统计数据成功后，回调通知上报成功
/// </summary>

16
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>06/04/2025 23:23:59</publishTime>
<publishTime>06/05/2025 00:45:55</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>06/04/2025 23:23:59</publishTime>
<publishTime>06/05/2025 00:45:55</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>06/04/2025 23:23:39</publishTime>
<publishTime>06/05/2025 00:45:34</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>06/04/2025 23:23:39</publishTime>
<publishTime>06/05/2025 00:45:34</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>06/04/2025 23:23:42</publishTime>
<publishTime>06/05/2025 00:45:37</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>06/04/2025 23:23:42</publishTime>
<publishTime>06/05/2025 00:45:37</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>06/04/2025 23:23:42</publishTime>
<publishTime>06/05/2025 00:45:37</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>06/04/2025 23:23:43</publishTime>
<publishTime>06/05/2025 00:45:38</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />