1、给NPOI降级版本来解决现场同一个代码，同一个服务器，会出现格式不对的问题
2、解决能效-复费率接口跨年数据不对的bug
This commit is contained in:
parent
4413be623e
commit
34c3b86836
|
|
@ -317,7 +317,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
|
|||
// }
|
||||
//}
|
||||
var year_count = Convert.ToInt32(now.Year) - 2023;
|
||||
for (int i = 0; i < year_count; i++)
|
||||
var time_count = GetUsedMonth1("月", startDate, endDate);
|
||||
for (int i = 0; i <= time_count; i++)
|
||||
{
|
||||
var month = startDate.AddMonths(i);
|
||||
//当前月
|
||||
|
|
|
|||
|
|
@ -43,58 +43,62 @@ namespace LonglslandExhibitionCenter.Controllers.api
|
|||
var fileName = file.FileName;
|
||||
var fileExtension = Path.GetExtension(fileName);
|
||||
var year = fileName.Substring(0, 4);
|
||||
var list = ExcelToDataStringTable(file.InputStream, fileExtension, year);
|
||||
if (list != null)
|
||||
string msg = "";
|
||||
using (var fileStream = file.InputStream)
|
||||
{
|
||||
if (list.Count > 0)
|
||||
var list = ExcelToDataStringTable(fileStream, fileExtension, year, out msg);
|
||||
if (list != null)
|
||||
{
|
||||
var rate_list = bll.GetModelList(string.Format(" Year='{0}' ", year));
|
||||
var add_list = new List<DataService.Model.electricity_rate>();
|
||||
var update_list = new List<DataService.Model.electricity_rate>();
|
||||
foreach (var item in list)
|
||||
if (list.Count > 0)
|
||||
{
|
||||
var rate_model = rate_list.Where(a => a.Month == item.Month && a.StartPeriodTime == item.StartPeriodTime && a.EndPeriodTime == item.EndPeriodTime).FirstOrDefault();
|
||||
if (rate_model == null)
|
||||
var rate_list = bll.GetModelList(string.Format(" Year='{0}' ", year));
|
||||
var add_list = new List<DataService.Model.electricity_rate>();
|
||||
var update_list = new List<DataService.Model.electricity_rate>();
|
||||
foreach (var item in list)
|
||||
{
|
||||
add_list.Add(item);
|
||||
var rate_model = rate_list.Where(a => a.Month == item.Month && a.StartPeriodTime == item.StartPeriodTime && a.EndPeriodTime == item.EndPeriodTime).FirstOrDefault();
|
||||
if (rate_model == null)
|
||||
{
|
||||
add_list.Add(item);
|
||||
}
|
||||
else
|
||||
{
|
||||
item.ElectricityId = rate_model.ElectricityId;
|
||||
update_list.Add(item);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
item.ElectricityId = rate_model.ElectricityId;
|
||||
update_list.Add(item);
|
||||
}
|
||||
}
|
||||
|
||||
if (add_list.Count > 0 || update_list.Count > 0)
|
||||
{
|
||||
if (bll.OperationAdd(add_list, update_list) > 0)
|
||||
if (add_list.Count > 0 || update_list.Count > 0)
|
||||
{
|
||||
res.code = 200;
|
||||
res.msg = "成功";
|
||||
if (bll.OperationAdd(add_list, update_list) > 0)
|
||||
{
|
||||
res.code = 200;
|
||||
res.msg = "成功";
|
||||
}
|
||||
else
|
||||
{
|
||||
res.code = 201;
|
||||
res.msg = "失败";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
res.code = 201;
|
||||
res.msg = "失败";
|
||||
res.msg = "无数据";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
res.code = 201;
|
||||
res.msg = "无数据";
|
||||
res.msg = "无数据或格式不对";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
res.code = 201;
|
||||
res.msg = "无数据或格式不对";
|
||||
res.msg = "格式不对，" + msg;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
res.code = 201;
|
||||
res.msg = "格式不对";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -107,7 +111,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
|
|||
return result;
|
||||
}
|
||||
|
||||
public List<DataService.Model.electricity_rate> ExcelToDataStringTable(Stream fs, string suffix, string year)
|
||||
public List<DataService.Model.electricity_rate> ExcelToDataStringTable(Stream fs, string suffix, string year, out string msg)
|
||||
{
|
||||
IWorkbook workbook = null;
|
||||
ISheet sheet = null;
|
||||
|
|
@ -120,7 +124,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
|
|||
// 2003版本
|
||||
else if (suffix == ".xls")
|
||||
workbook = new HSSFWorkbook(fs);
|
||||
|
||||
//
|
||||
if (workbook != null)
|
||||
{
|
||||
sheet = workbook.GetSheetAt(0); // 假设数据在第一个工作表中
|
||||
|
|
@ -145,7 +149,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
|
|||
short format = cell.CellStyle.DataFormat;
|
||||
// 对时间格式（2015.12.5、2015 / 12 / 5、2015 - 12 - 5等）的处理
|
||||
if (format == 14 || format == 31 || format == 20 || format == 57 || format == 58)
|
||||
content = cell.DateCellValue != null ? cell.DateCellValue.Value.ToString("yyyy-MM-dd HH:mm:ss") : null;
|
||||
content = cell.DateCellValue != null ? cell.DateCellValue.ToString("yyyy-MM-dd HH:mm:ss") : null;
|
||||
else
|
||||
content = cell.NumericCellValue.ToString();
|
||||
break;
|
||||
|
|
@ -169,7 +173,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
|
|||
short format = cellEndTime.CellStyle.DataFormat;
|
||||
// 对时间格式（2015.12.5、2015 / 12 / 5、2015 - 12 - 5等）的处理
|
||||
if (format == 14 || format == 31 || format == 20 || format == 57 || format == 58)
|
||||
endTimeStr = cellEndTime.DateCellValue != null ? cellEndTime.DateCellValue.Value.ToString("yyyy-MM-dd HH:mm:ss") : null;
|
||||
endTimeStr = cellEndTime.DateCellValue != null ? cellEndTime.DateCellValue.ToString("yyyy-MM-dd HH:mm:ss") : null;
|
||||
else
|
||||
endTimeStr = cellEndTime.NumericCellValue.ToString();
|
||||
break;
|
||||
|
|
@ -212,18 +216,12 @@ namespace LonglslandExhibitionCenter.Controllers.api
|
|||
}
|
||||
}
|
||||
}
|
||||
if (fs != null)
|
||||
{
|
||||
fs.Close();
|
||||
}
|
||||
msg = "";
|
||||
return data;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
if (fs != null)
|
||||
{
|
||||
fs.Close();
|
||||
}
|
||||
msg = ex.Message + "，报错行：" + ex.StackTrace;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,9 @@
|
|||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
|
||||
</Reference>
|
||||
|
|
@ -54,8 +57,8 @@
|
|||
<Reference Include="ExtendedNumerics.BigDecimal, Version=2025.1001.2.129, Culture=neutral, PublicKeyToken=65f1315a45ad8949, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\ExtendedNumerics.BigDecimal.2025.1001.2.129\lib\net472\ExtendedNumerics.BigDecimal.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
|
||||
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
|
|
@ -71,23 +74,23 @@
|
|||
<Reference Include="MQTTnet, Version=4.1.4.563, Culture=neutral, PublicKeyToken=fdb7629f2e364a63, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MQTTnet.4.1.4.563\lib\net461\MQTTnet.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI.Core, Version=2.7.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.7.1\lib\net472\NPOI.Core.dll</HintPath>
|
||||
<Reference Include="NPOI, Version=2.5.2.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.5.2\lib\net45\NPOI.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI.OOXML, Version=2.7.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.7.1\lib\net472\NPOI.OOXML.dll</HintPath>
|
||||
<Reference Include="NPOI.OOXML, Version=2.5.2.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.5.2\lib\net45\NPOI.OOXML.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI.OpenXml4Net, Version=2.7.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.7.1\lib\net472\NPOI.OpenXml4Net.dll</HintPath>
|
||||
<Reference Include="NPOI.OpenXml4Net, Version=2.5.2.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.5.2\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NPOI.OpenXmlFormats, Version=2.7.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.7.1\lib\net472\NPOI.OpenXmlFormats.dll</HintPath>
|
||||
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.2.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NPOI.2.5.2\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SixLabors.Fonts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SixLabors.Fonts.1.0.1\lib\netstandard2.0\SixLabors.Fonts.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SixLabors.ImageSharp, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SixLabors.ImageSharp.2.1.8\lib\net472\SixLabors.ImageSharp.dll</HintPath>
|
||||
<HintPath>..\packages\SixLabors.ImageSharp.2.1.9\lib\net472\SixLabors.ImageSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
|
|
@ -109,11 +112,11 @@
|
|||
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Pkcs, Version=6.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Pkcs.6.0.3\lib\net461\System.Security.Cryptography.Pkcs.dll</HintPath>
|
||||
<Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Xml, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Xml.6.0.1\lib\net461\System.Security.Cryptography.Xml.dll</HintPath>
|
||||
<Reference Include="System.Security.Cryptography.Xml, Version=8.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Xml.8.0.2\lib\net462\System.Security.Cryptography.Xml.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<UseGlobalApplicationHostFile />
|
||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||
<NameOfLastUsedPublishProfile>F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
|
||||
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
|
||||
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<_PublishTargetUrl>F:\项目\长岛展览馆\发布文件</_PublishTargetUrl>
|
||||
<History>True|2024-11-06T09:50:52.1366136Z;True|2024-11-06T17:38:02.9494823+08:00;True|2024-11-06T16:22:33.8030507+08:00;True|2024-10-18T15:40:22.1071380+08:00;True|2024-10-18T10:43:40.6685613+08:00;True|2024-10-18T10:42:14.0970919+08:00;True|2024-09-19T14:04:55.6320188+08:00;True|2024-09-19T09:42:19.8527457+08:00;True|2024-08-27T21:03:21.5928516+08:00;True|2024-08-21T11:09:27.6586574+08:00;True|2024-08-19T10:17:16.4446095+08:00;True|2024-08-15T13:20:14.7663530+08:00;True|2024-08-14T10:07:28.2388461+08:00;True|2024-08-14T10:07:03.3134871+08:00;True|2024-08-14T10:06:43.4199921+08:00;True|2024-08-14T10:05:39.6303984+08:00;True|2024-08-14T10:00:18.4168360+08:00;True|2024-08-14T09:50:15.7791885+08:00;True|2024-08-11T20:53:54.5556138+08:00;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;</History>
|
||||
<History>True|2025-01-20T01:26:18.9967273Z;True|2024-11-06T17:50:52.1366136+08:00;True|2024-11-06T17:38:02.9494823+08:00;True|2024-11-06T16:22:33.8030507+08:00;True|2024-10-18T15:40:22.1071380+08:00;True|2024-10-18T10:43:40.6685613+08:00;True|2024-10-18T10:42:14.0970919+08:00;True|2024-09-19T14:04:55.6320188+08:00;True|2024-09-19T09:42:19.8527457+08:00;True|2024-08-27T21:03:21.5928516+08:00;True|2024-08-21T11:09:27.6586574+08:00;True|2024-08-19T10:17:16.4446095+08:00;True|2024-08-15T13:20:14.7663530+08:00;True|2024-08-14T10:07:28.2388461+08:00;True|2024-08-14T10:07:03.3134871+08:00;True|2024-08-14T10:06:43.4199921+08:00;True|2024-08-14T10:05:39.6303984+08:00;True|2024-08-14T10:00:18.4168360+08:00;True|2024-08-14T09:50:15.7791885+08:00;True|2024-08-11T20:53:54.5556138+08:00;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;</History>
|
||||
<LastFailureDetails />
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -78,14 +78,17 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
<File Include="bin/Antlr3.Runtime.pdb">
|
||||
<publishTime>08/13/2024 17:44:44</publishTime>
|
||||
</File>
|
||||
<File Include="bin/BouncyCastle.Crypto.dll">
|
||||
<publishTime>02/24/2020 15:29:24</publishTime>
|
||||
</File>
|
||||
<File Include="bin/BouncyCastle.Cryptography.dll">
|
||||
<publishTime>05/08/2024 00:05:28</publishTime>
|
||||
</File>
|
||||
<File Include="bin/DataService.dll">
|
||||
<publishTime>11/06/2024 16:22:24</publishTime>
|
||||
<publishTime>12/18/2024 14:28:03</publishTime>
|
||||
</File>
|
||||
<File Include="bin/DataService.pdb">
|
||||
<publishTime>11/06/2024 16:22:24</publishTime>
|
||||
<publishTime>12/18/2024 14:28:03</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Enums.NET.dll">
|
||||
<publishTime>11/19/2022 06:40:50</publishTime>
|
||||
|
|
@ -97,19 +100,19 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
<publishTime>05/08/2024 18:03:54</publishTime>
|
||||
</File>
|
||||
<File Include="bin/ICSharpCode.SharpZipLib.dll">
|
||||
<publishTime>01/29/2023 22:59:00</publishTime>
|
||||
<publishTime>08/09/2019 08:40:22</publishTime>
|
||||
</File>
|
||||
<File Include="bin/ICSharpCode.SharpZipLib.pdb">
|
||||
<publishTime>01/29/2023 22:59:00</publishTime>
|
||||
<publishTime>08/09/2019 08:40:22</publishTime>
|
||||
</File>
|
||||
<File Include="bin/log4net.dll">
|
||||
<publishTime>08/13/2024 17:44:43</publishTime>
|
||||
</File>
|
||||
<File Include="bin/LonglslandExhibitionCenter.dll">
|
||||
<publishTime>11/06/2024 17:50:50</publishTime>
|
||||
<publishTime>01/20/2025 14:06:15</publishTime>
|
||||
</File>
|
||||
<File Include="bin/LonglslandExhibitionCenter.pdb">
|
||||
<publishTime>11/06/2024 17:50:50</publishTime>
|
||||
<publishTime>01/20/2025 14:06:15</publishTime>
|
||||
</File>
|
||||
<File Include="bin/MathNet.Numerics.dll">
|
||||
<publishTime>04/03/2022 22:02:06</publishTime>
|
||||
|
|
@ -139,28 +142,31 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
<publishTime>08/13/2024 17:44:45</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.Core.dll">
|
||||
<publishTime>07/02/2024 15:54:46</publishTime>
|
||||
<publishTime>11/09/2024 07:00:58</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.Core.pdb">
|
||||
<publishTime>07/02/2024 15:54:46</publishTime>
|
||||
<publishTime>11/09/2024 07:00:58</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.dll">
|
||||
<publishTime>12/05/2020 19:53:54</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.OOXML.dll">
|
||||
<publishTime>07/02/2024 15:55:30</publishTime>
|
||||
<publishTime>12/05/2020 19:54:02</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.OOXML.pdb">
|
||||
<publishTime>07/02/2024 15:55:30</publishTime>
|
||||
<publishTime>11/09/2024 07:01:30</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.OpenXml4Net.dll">
|
||||
<publishTime>07/02/2024 15:55:02</publishTime>
|
||||
<publishTime>12/05/2020 19:53:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.OpenXml4Net.pdb">
|
||||
<publishTime>07/02/2024 15:55:02</publishTime>
|
||||
<publishTime>11/09/2024 07:01:00</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.OpenXmlFormats.dll">
|
||||
<publishTime>07/02/2024 15:55:24</publishTime>
|
||||
<publishTime>12/05/2020 19:54:00</publishTime>
|
||||
</File>
|
||||
<File Include="bin/NPOI.OpenXmlFormats.pdb">
|
||||
<publishTime>07/02/2024 15:55:24</publishTime>
|
||||
<publishTime>11/09/2024 07:01:08</publishTime>
|
||||
</File>
|
||||
<File Include="bin/roslyn/csc.exe">
|
||||
<publishTime>08/13/2024 17:44:45</publishTime>
|
||||
|
|
@ -313,7 +319,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
<publishTime>09/15/2023 18:31:50</publishTime>
|
||||
</File>
|
||||
<File Include="bin/SixLabors.ImageSharp.dll">
|
||||
<publishTime>04/11/2024 14:27:12</publishTime>
|
||||
<publishTime>07/22/2024 18:15:54</publishTime>
|
||||
</File>
|
||||
<File Include="bin/System.Buffers.dll">
|
||||
<publishTime>02/19/2020 10:05:18</publishTime>
|
||||
|
|
@ -334,10 +340,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
<publishTime>10/22/2021 23:45:08</publishTime>
|
||||
</File>
|
||||
<File Include="bin/System.Security.Cryptography.Pkcs.dll">
|
||||
<publishTime>05/20/2023 04:54:14</publishTime>
|
||||
<publishTime>09/17/2024 07:15:08</publishTime>
|
||||
</File>
|
||||
<File Include="bin/System.Security.Cryptography.Xml.dll">
|
||||
<publishTime>07/14/2022 01:46:04</publishTime>
|
||||
<publishTime>09/17/2024 07:14:38</publishTime>
|
||||
</File>
|
||||
<File Include="bin/System.Security.Principal.Windows.dll">
|
||||
<publishTime>10/19/2020 18:46:28</publishTime>
|
||||
|
|
@ -652,7 +658,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
<publishTime>08/13/2024 17:44:43</publishTime>
|
||||
</File>
|
||||
<File Include="Web.config">
|
||||
<publishTime>08/27/2024 21:03:16</publishTime>
|
||||
<publishTime>01/20/2025 14:06:15</publishTime>
|
||||
</File>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -74,6 +74,10 @@
|
|||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.2.0.246" newVersion="1.2.0.246" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<system.codedom>
|
||||
|
|
|
|||
|
|
@ -29,17 +29,18 @@
|
|||
<package id="Modernizr" version="2.8.3" targetFramework="net472" />
|
||||
<package id="MQTTnet" version="4.1.4.563" targetFramework="net472" />
|
||||
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
|
||||
<package id="NPOI" version="2.7.1" targetFramework="net472" />
|
||||
<package id="SharpZipLib" version="1.4.2" targetFramework="net472" />
|
||||
<package id="NPOI" version="2.5.2" targetFramework="net472" />
|
||||
<package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net472" />
|
||||
<package id="SharpZipLib" version="1.2.0" targetFramework="net472" />
|
||||
<package id="SixLabors.Fonts" version="1.0.1" targetFramework="net472" />
|
||||
<package id="SixLabors.ImageSharp" version="2.1.8" targetFramework="net472" />
|
||||
<package id="SixLabors.ImageSharp" version="2.1.9" targetFramework="net472" />
|
||||
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
|
||||
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
|
||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
|
||||
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Pkcs" version="6.0.3" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Xml" version="6.0.1" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Xml" version="8.0.2" targetFramework="net472" />
|
||||
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
|
||||
<package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net472" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net472" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,73 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<!-- UAC 清单选项
|
||||
如果想要更改 Windows 用户帐户控制级别，请使用
|
||||
以下节点之一替换 requestedExecutionLevel 节点。
|
||||
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
|
||||
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
|
||||
|
||||
指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
|
||||
如果你的应用程序需要此虚拟化来实现向后兼容性，则移除此
|
||||
元素。
|
||||
-->
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
</requestedPrivileges>
|
||||
<applicationRequestMinimum>
|
||||
<PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
|
||||
<defaultAssemblyRequest permissionSetReference="Custom" />
|
||||
</applicationRequestMinimum>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
|
||||
Windows 版本的列表。取消评论适当的元素，
|
||||
Windows 将自动选择最兼容的环境。 -->
|
||||
<!-- Windows Vista -->
|
||||
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
|
||||
<!-- Windows 7 -->
|
||||
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
|
||||
<!-- Windows 8 -->
|
||||
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
|
||||
<!-- Windows 8.1 -->
|
||||
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
|
||||
<!-- Windows 10 -->
|
||||
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
|
||||
</application>
|
||||
</compatibility>
|
||||
<!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
|
||||
自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
|
||||
选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
|
||||
在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
|
||||
|
||||
将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
|
||||
<!--
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings>
|
||||
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
|
||||
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
-->
|
||||
<!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
|
||||
<!--
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="Microsoft.Windows.Common-Controls"
|
||||
version="6.0.0.0"
|
||||
processorArchitecture="*"
|
||||
publicKeyToken="6595b64144ccf1df"
|
||||
language="*"
|
||||
/>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
-->
|
||||
</assembly>
|
||||
|
|
@ -56,10 +56,16 @@
|
|||
<ManifestKeyFile>Security_TemporaryKey.pfx</ManifestKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<GenerateManifests>true</GenerateManifests>
|
||||
<GenerateManifests>false</GenerateManifests>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignManifests>true</SignManifests>
|
||||
<SignManifests>false</SignManifests>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetZone>LocalIntranet</TargetZone>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DataService">
|
||||
|
|
@ -109,7 +115,7 @@
|
|||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
<None Include="packages.config" />
|
||||
<None Include="Security_TemporaryKey.pfx" />
|
||||
<None Include="Properties\app.manifest" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="ProjectInstaller.resx">
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
BIN
packages/Portable.BouncyCastle.1.8.6/lib/netstandard2.0/BouncyCastle.Crypto.dll
vendored
Normal file
BIN
packages/Portable.BouncyCastle.1.8.6/lib/netstandard2.0/BouncyCastle.Crypto.dll
vendored
Normal file
Binary file not shown.
26179
packages/Portable.BouncyCastle.1.8.6/lib/netstandard2.0/BouncyCastle.Crypto.xml
vendored
Normal file
26179
packages/Portable.BouncyCastle.1.8.6/lib/netstandard2.0/BouncyCastle.Crypto.xml
vendored
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 5.3 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue