From 94ed0d75cd4aa090fa8421af6609066682028943 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 02 八月 2024 19:08:36 +0800
Subject: [PATCH] 修改日志文件
---
DAL/IStation.DAL.Paras/长江水位/book/TideFromBookHelper.cs | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 deletions(-)
diff --git "a/DAL/IStation.DAL.Paras/\351\225\277\346\261\237\346\260\264\344\275\215/book/TideFromBookHelper.cs" "b/DAL/IStation.DAL.Paras/\351\225\277\346\261\237\346\260\264\344\275\215/book/TideFromBookHelper.cs"
index b3de647..58852bf 100644
--- "a/DAL/IStation.DAL.Paras/\351\225\277\346\261\237\346\260\264\344\275\215/book/TideFromBookHelper.cs"
+++ "b/DAL/IStation.DAL.Paras/\351\225\277\346\261\237\346\260\264\344\275\215/book/TideFromBookHelper.cs"
@@ -5,31 +5,32 @@
using System.Text;
using IStation.Model;
-namespace IStation.Common
+namespace IStation.Common
{
public class TideFromBookHelper
{
/// <summary>
/// 鑾峰彇娼睈鏁版嵁
/// </summary>
- static public List<Model.TileLevel> GetByDay1(
- DateTime startday,
+ public static List<Model.TileLevel> GetByDay1(
+ DateTime startday,
out string error)
{
error = null;
- return ReadList(startday );
+ return ReadList(startday);
}
+
/// <summary>
- ///
+ ///
/// </summary>
/// <param name="startday"></param>
/// <param name="error"></param>
/// <returns></returns>
- static public List<Model.TimeWaterLevel> GetByDay2(DateTime startday, out string error)
+ public static List<Model.TimeWaterLevel> GetByDay2(DateTime startday, out string error)
{
var waterLevels闀挎睙 = new List<TimeWaterLevel>();
error = null;
- var list = ReadList(startday );
+ var list = ReadList(startday);
if (list != null)
{
foreach (var h in list)
@@ -46,20 +47,19 @@
return waterLevels闀挎睙;
}
-
/// <summary>
- /// 璇诲彇
+ /// 璇诲彇
/// </summary>
/// <param name="Startday"></param>
/// <param name="Endday"></param>
/// <param name="folder"></param>
/// <returns></returns>
- static public List<Model.TimeWaterLevel> GetByDayRange(DateTime Startday, DateTime Endday, out string error)
+ public static List<Model.TimeWaterLevel> GetByDayRange(DateTime Startday, DateTime Endday, out string error)
{
var waterLevels闀挎睙 = new List<TimeWaterLevel>();
for (DateTime currentDate = Startday; currentDate <= Endday; currentDate = currentDate.AddDays(1))
{
- var list1 = ReadList(currentDate );
+ var list1 = ReadList(currentDate);
if (list1 != null && list1.Count > 0)
{
for (int h = 0; h < 24; h++)
@@ -69,15 +69,15 @@
new DateTime(currentDate.Year, currentDate.Month, currentDate.Day, h, 0, 0),
list1[h].Level));
}
- }
+ }
}
error = null;
return waterLevels闀挎睙;
}
- static private List<Model.TileLevel> ReadList(DateTime day )
+ private static List<Model.TileLevel> ReadList(DateTime day)
{
- var list = new List<Model.TileLevel>();
+ var list = new List<Model.TileLevel>();
var folder = System.IO.Path.Combine(IStation.DataFolderHelper.GetRootPath(),
"Tide", "FromBook",
day.Year.ToString(),
@@ -105,9 +105,8 @@
string[] arr = tempText.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
//涓�鑸涓�琛屼负鏍囬锛屾墍浠ュ彇鍑烘潵浣滀负鏍囧ご
-
- list.Add(new Model.TileLevel(Convert.ToInt32(arr[0]), Convert.ToDouble(arr[1])));
-
+
+ list.Add(new Model.TileLevel(Convert.ToInt32(arr[0]), Convert.ToDouble(arr[1])));
}
//鍏抽棴娴�
@@ -121,10 +120,10 @@
/// </summary>
/// <param name="day"></param>
/// <param name="list"></param>
- static public bool SaveList(DateTime day, List<Model.TileLevel> list)
+ public static bool SaveList(DateTime day, List<Model.TileLevel> list)
{
if (list == null)
- return false ;
+ return false;
try
{
var folder = System.IO.Path.Combine(IStation.DataFolderHelper.GetRootPath(),
@@ -134,17 +133,13 @@
if (!System.IO.Directory.Exists(folder))
{
System.IO.Directory.CreateDirectory(folder);
-
}
var fileName = System.IO.Path.Combine(folder,
string.Format("{0}.csv", day.ToString("yyyy-MM-dd")));
-
StreamWriter streamWriter = new StreamWriter(fileName, false, System.Text.Encoding.GetEncoding("gb2312"));
StringBuilder StringBuilder = new StringBuilder();
-
-
// 鍐欏嚭鏁版嵁
foreach (var m in list)
@@ -158,12 +153,11 @@
}
catch (Exception ex)
{
- IStation.LogHelper.WriteError("write tide file error:" + ex.Message, ex);
- return false ;
+ IStation.LogHelper.Error("write tide file error:" + ex.Message, ex);
+ return false;
}
- return true ;
+ return true;
}
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3