Boonlive_RD_Web/Web_HotelServices_Prod
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改一些BUG

Browse Source
This commit is contained in:
TianMaiCheng
2026-03-11 14:23:30 +08:00
parent 0564b8c1f3
commit a499f24350
7 changed files with 5738 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
WebUI/Controllers/publicApiController.cs
View File

@@ -13,6 +13,7 @@ using System.Linq;
using System.Text;
using WebUI.Model;
using System.Security.Cryptography;
using NLog;
namespace WebUI.Controllers
{
@@ -87,7 +88,7 @@ namespace WebUI.Controllers
/// <returns></returns>
[HttpPost]
[Route("OTApi/SyncData")]
public IActionResult SyncData(string Pwd, int stepid=0)
public IActionResult SyncData(string Pwd, int stepid = 0)
{
if (Pwd == "fs%sd")
{
@@ -110,7 +111,7 @@ namespace WebUI.Controllers
Status = false
});
}
}
else
return Json(new
@@ -281,10 +282,10 @@ namespace WebUI.Controllers
#region 获取对应的文件下发
[HttpPost]
[Route("OTApi/GainFiles")]
public IActionResult GainFile1s(int RoomTypeid,int DataType)
public IActionResult GainFile1s(int RoomTypeid, int DataType)
{
FTPOperation operation = new FTPOperation();
HexFile hexFile = new HexFile();
@@ -295,8 +296,8 @@ namespace WebUI.Controllers
//状态
bool Status = false;
//最后获取的文件
List<string> FileName = new List<string> ();
List<string> FileName = new List<string>();
//错误信息
string MrrMsg = null;
//机型
@@ -308,7 +309,7 @@ namespace WebUI.Controllers
//房型名称
string RoomTypeName = "";
//项目id
int hotelId=0;
int hotelId = 0;
//项目名称
string hotelName = "";
//文件数量
@@ -366,15 +367,17 @@ namespace WebUI.Controllers
if (selectdata.CONFIG_BIN != null)
{
//校验MD5
if (MD5Verify.getMD5Hash(operation.BytesToStream(operation.GetFile("Config/" + selectdata.HOTEL_GROUP_NAME + @"/" + selectdata.PROJECT_NUMBER + "-" + selectdata.HOTEL_NAME_CN + @"/" + selectdata.CONFIG_BIN))) == selectdata.CONFIG_BIN_MD5)
var NNN = "Config/" + selectdata.HOTEL_GROUP_NAME + @"/" + selectdata.PROJECT_NUMBER + "-" + selectdata.HOTEL_NAME_CN + @"/" + selectdata.CONFIG_BIN;
logger.Error("开始校验配置文件MD5，文件路径：" + NNN);
if (MD5Verify.getMD5Hash(operation.BytesToStream(operation.GetFile(NNN))) == selectdata.CONFIG_BIN_MD5)
{
var sety = operation.GetFile("Config/" + selectdata.HOTEL_GROUP_NAME + @"/" + selectdata.PROJECT_NUMBER + "-" + selectdata.HOTEL_NAME_CN + @"/" + selectdata.CONFIG_BIN);
var btys= operation.ByteArrayToHexStr(sety);
var ssety= HexFile.Crc16(sety,4, sety.Length);
byte[] suz= new byte[10000];
var ssety2 = HexFile.NetCRC16_Data(sety, sety.Length, 4);
var btys = operation.ByteArrayToHexStr(sety);
var ssety = HexFile.Crc16(sety, 4, sety.Length);
byte[] suz = new byte[10000];
var ssety2 = HexFile.NetCRC16_Data(sety, sety.Length, 4);
HexFile.StrToHex(suz ,sety, 100);
HexFile.StrToHex(suz, sety, 100);
//找到文件头
if ((sety[0] == 0xCC) && (sety[1] == 0xC0))
@@ -404,8 +407,8 @@ namespace WebUI.Controllers
var zunsons = vaslen.Skip(157).Take(64).ToArray();
var seyu = operation.ByteArrayToHexStr(zunsons);
var setysssy = operation.UnHexs(seyu);
setysssy = setysssy.Replace("\0",null);
setysssy = setysssy.Replace("_","-");
setysssy = setysssy.Replace("\0", null);
setysssy = setysssy.Replace("_", "-");
ModelName = setysssy;
data = Convert.ToBase64String(sety);
FileName.Add(selectdata.CONFIG_BIN);
@@ -728,7 +731,7 @@ namespace WebUI.Controllers
eqlog.Succeed = Status;
foreach (var item in FileName)
{
sum +=item+"/";
sum += item + "/";
}
eqlog.Content = "房间类型id是:" + RoomTypeid + ",升级类型是:" + DataType + ",luncher版本是:" + LuncherVer + ",升级文件名:" + sum + ",机型是:" + ModelName;
_db.TBL_EQUIPMENTISSUELOGs.AddRange(eqlog);
@@ -762,16 +765,17 @@ namespace WebUI.Controllers
//}
}
catch (Exception ex)
catch (Exception ex)
{
logger.Error(ex.Message);
logger.Error(ex.StackTrace);
return Json(new
{
RoomTypeid,
RoomTypeName,
hotelId,
hotelName,
Status =false,
Status = false,
ModelName,
//FileName,
FileCount,
@@ -795,6 +799,7 @@ namespace WebUI.Controllers
});
}
public static Logger logger = LogManager.GetCurrentClassLogger();
/// <summary>
/// 获取文件名
/// </summary>
@@ -803,7 +808,7 @@ namespace WebUI.Controllers
/// <returns></returns>
[HttpPost]
[Route("OTApi/GainFileName")]
public IActionResult GainFileName(int RoomTypeid,int DataType)
public IActionResult GainFileName(int RoomTypeid, int DataType)
{
FTPOperation operation = new FTPOperation();
HexFile hexFile = new HexFile();
@@ -814,8 +819,8 @@ namespace WebUI.Controllers
//状态
bool Status = false;
//最后获取的文件
List<string> FileName = new List<string> ();
List<string> FileName = new List<string>();
//错误信息
string MrrMsg = null;
//机型
@@ -827,7 +832,7 @@ namespace WebUI.Controllers
//房型名称
string RoomTypeName = "";
//项目id
int hotelId=0;
int hotelId = 0;
//项目名称
string hotelName = "";
//文件数量
@@ -888,12 +893,12 @@ namespace WebUI.Controllers
if (MD5Verify.getMD5Hash(operation.BytesToStream(operation.GetFile("Config/" + selectdata.HOTEL_GROUP_NAME + @"/" + selectdata.PROJECT_NUMBER + "-" + selectdata.HOTEL_NAME_CN + @"/" + selectdata.CONFIG_BIN))) == selectdata.CONFIG_BIN_MD5)
{
var sety = operation.GetFile("Config/" + selectdata.HOTEL_GROUP_NAME + @"/" + selectdata.PROJECT_NUMBER + "-" + selectdata.HOTEL_NAME_CN + @"/" + selectdata.CONFIG_BIN);
var btys= operation.ByteArrayToHexStr(sety);
var ssety= HexFile.Crc16(sety,4, sety.Length);
byte[] suz= new byte[10000];
var ssety2 = HexFile.NetCRC16_Data(sety, sety.Length, 4);
var btys = operation.ByteArrayToHexStr(sety);
var ssety = HexFile.Crc16(sety, 4, sety.Length);
byte[] suz = new byte[10000];
var ssety2 = HexFile.NetCRC16_Data(sety, sety.Length, 4);
HexFile.StrToHex(suz ,sety, 100);
HexFile.StrToHex(suz, sety, 100);
//找到文件头
if ((sety[0] == 0xCC) && (sety[1] == 0xC0))
@@ -923,8 +928,8 @@ namespace WebUI.Controllers
var zunsons = vaslen.Skip(157).Take(64).ToArray();
var seyu = operation.ByteArrayToHexStr(zunsons);
var setysssy = operation.UnHexs(seyu);
setysssy = setysssy.Replace("\0",null);
setysssy = setysssy.Replace("_","-");
setysssy = setysssy.Replace("\0", null);
setysssy = setysssy.Replace("_", "-");
ModelName = setysssy;
//data = Convert.ToBase64String(sety);
FileName.Add(selectdata.CONFIG_BIN);
@@ -1237,7 +1242,7 @@ namespace WebUI.Controllers
eqlog.Succeed = Status;
foreach (var item in FileName)
{
sum +=item+"/";
sum += item + "/";
}
eqlog.Content = "房间类型id是:" + RoomTypeid + ",升级类型是:" + DataType + ",luncher版本是:" + LuncherVer + ",升级文件名:" + sum + ",机型是:" + ModelName;
_db.TBL_EQUIPMENTISSUELOGs.AddRange(eqlog);
@@ -1261,16 +1266,16 @@ namespace WebUI.Controllers
}
}
catch (Exception ex)
catch (Exception ex)
{
return Json(new
{
RoomTypeid,
RoomTypeName,
hotelId,
hotelName,
Status =false,
Status = false,
ModelName,
FileCount,
datalist,
@@ -1307,7 +1312,7 @@ namespace WebUI.Controllers
var result = new StringBuilder(32);
for (int i = 0; i < lstHash.Length; i++)
{
result.Append(lstHash[i].ToString("x2").ToUpper());
result.Append(lstHash[i].ToString("x2").ToUpper());
}
return result.ToString();
}
@@ -1583,16 +1588,17 @@ namespace WebUI.Controllers
[HttpPost]
[Route("OTApi/RoomChange")]
public IActionResult RoomChange(string projectCode,string roomNumber,string roomLayout,string projectName)
public IActionResult RoomChange(string projectCode, string roomNumber, string roomLayout, string projectName)
{
var db = new DbHelperSQL(DbHelperSQL.DBSel.BLV_RCU_DB);
if (!string.IsNullOrEmpty(projectCode)&& !string.IsNullOrEmpty(roomNumber)&& !string.IsNullOrEmpty(roomLayout)&&!string.IsNullOrEmpty(projectName))
if (!string.IsNullOrEmpty(projectCode) && !string.IsNullOrEmpty(roomNumber) && !string.IsNullOrEmpty(roomLayout) && !string.IsNullOrEmpty(projectName))
{
var selectdata = (
from a in _db.TBL_HOTEL_BASIC_INFOS where a.HOTEL_NAME_CN == projectName
from a in _db.TBL_HOTEL_BASIC_INFOS
where a.HOTEL_NAME_CN == projectName
select new
{
a.HOTEL_ID
a.HOTEL_ID
}).FirstOrDefault();
var roomdata = (
from a in _db.TBL_ROOM_TYPE_LISTS
@@ -1615,8 +1621,8 @@ namespace WebUI.Controllers
{
return Json(new
{
retmsg="参数不可为空",
retcode="404"
retmsg = "参数不可为空",
retcode = "404"
});
}
return Json("");

5317
WebUI/NLog.xsd Normal file
View File

File diff suppressed because it is too large Load Diff

2
WebUI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\fb</_PublishTargetUrl>
<History>True|2025-06-21T09:52:05.3312975Z||;True|2025-06-21T16:43:56.1227037+08:00||;True|2023-09-22T14:50:21.6808369+08:00||;True|2023-09-22T14:49:24.8627239+08:00||;True|2023-09-22T14:34:33.4006499+08:00||;True|2023-09-22T12:00:40.3343199+08:00||;True|2023-09-22T11:41:16.0270994+08:00||;True|2023-09-21T16:17:57.6106908+08:00||;True|2022-11-09T13:38:52.2600692+08:00||;True|2022-11-04T18:08:15.3464350+08:00||;True|2022-09-02T11:52:51.6838354+08:00||;True|2022-08-26T15:14:03.1654649+08:00||;True|2022-08-25T15:27:04.1982767+08:00||;True|2022-08-24T17:50:37.3706175+08:00||;True|2022-08-24T17:16:24.7353563+08:00||;True|2022-08-22T14:12:08.9426677+08:00||;True|2022-08-19T10:29:29.4848915+08:00||;True|2022-08-19T10:24:37.3114106+08:00||;True|2022-08-19T09:55:19.1414504+08:00||;True|2022-08-19T09:40:59.9958103+08:00||;True|2022-08-19T09:33:37.6904208+08:00||;True|2022-08-19T09:28:36.3093517+08:00||;True|2022-08-19T09:22:06.8115880+08:00||;True|2022-08-19T09:13:37.9585905+08:00||;True|2022-08-17T15:10:05.3411660+08:00||;False|2022-08-17T15:08:06.4809616+08:00||;True|2022-06-01T19:33:05.4481344+08:00||;True|2022-05-25T14:24:10.1817614+08:00||;True|2022-05-25T09:23:06.2835677+08:00||;True|2022-05-25T09:02:15.3730215+08:00||;True|2022-05-24T21:19:00.5074933+08:00||;True|2022-05-13T17:54:16.9766250+08:00||;True|2022-05-12T17:59:35.6658572+08:00||;True|2022-05-12T17:45:56.8037279+08:00||;True|2022-05-11T18:02:44.6830705+08:00||;True|2022-05-11T15:11:44.2123306+08:00||;True|2022-05-10T10:14:03.1340627+08:00||;True|2022-05-09T18:11:38.7936836+08:00||;False|2022-05-09T18:09:23.9786371+08:00||;False|2022-05-09T18:09:11.8760404+08:00||;False|2022-05-09T18:07:17.4893920+08:00||;False|2022-05-09T18:06:24.0063875+08:00||;False|2022-05-09T18:05:19.0501822+08:00||;True|2022-05-09T10:32:23.0075871+08:00||;True|2022-05-06T17:57:46.6102126+08:00||;True|2022-05-05T19:26:02.1665879+08:00||;True|2022-05-05T18:35:49.6113434+08:00||;True|2022-05-05T18:23:09.7528455+08:00||;True|2022-05-03T18:16:55.2075231+08:00||;True|2022-05-03T17:38:58.8338071+08:00||;True|2022-04-26T13:55:48.6376957+08:00||;True|2022-04-26T09:08:43.8393049+08:00||;True|2022-04-23T10:24:41.7805502+08:00||;True|2022-04-23T09:59:02.7983739+08:00||;True|2022-04-23T09:46:47.0183590+08:00||;True|2022-04-23T09:21:57.0873811+08:00||;True|2022-04-21T20:01:57.5291853+08:00||;True|2022-04-21T19:17:57.1270857+08:00||;True|2022-04-21T19:15:38.6532410+08:00||;True|2022-04-21T19:13:59.1467307+08:00||;True|2022-04-21T19:08:19.2196334+08:00||;True|2022-04-21T18:21:58.1340503+08:00||;True|2022-04-21T18:01:33.3247434+08:00||;True|2022-04-21T17:52:25.1456343+08:00||;True|2022-04-21T10:05:58.9005370+08:00||;True|2022-04-20T20:00:05.8521460+08:00||;True|2022-04-11T16:08:04.2469358+08:00||;True|2022-04-07T15:22:53.5415688+08:00||;True|2022-04-06T09:41:40.8698606+08:00||;True|2022-04-02T10:36:16.9912313+08:00||;True|2022-03-29T16:13:23.9031232+08:00||;True|2022-03-29T16:08:28.6250221+08:00||;True|2022-03-29T14:58:43.5548350+08:00||;True|2022-03-29T14:46:07.0032400+08:00||;True|2022-03-29T10:45:41.4892896+08:00||;True|2022-03-28T18:04:53.4880071+08:00||;True|2022-03-16T17:45:58.4167087+08:00||;</History>
<History>True|2026-01-28T08:21:24.3919331Z||;True|2026-01-28T16:17:34.0814293+08:00||;True|2026-01-28T16:07:34.3703823+08:00||;True|2025-06-21T17:52:05.3312975+08:00||;True|2025-06-21T16:43:56.1227037+08:00||;True|2023-09-22T14:50:21.6808369+08:00||;True|2023-09-22T14:49:24.8627239+08:00||;True|2023-09-22T14:34:33.4006499+08:00||;True|2023-09-22T12:00:40.3343199+08:00||;True|2023-09-22T11:41:16.0270994+08:00||;True|2023-09-21T16:17:57.6106908+08:00||;True|2022-11-09T13:38:52.2600692+08:00||;True|2022-11-04T18:08:15.3464350+08:00||;True|2022-09-02T11:52:51.6838354+08:00||;True|2022-08-26T15:14:03.1654649+08:00||;True|2022-08-25T15:27:04.1982767+08:00||;True|2022-08-24T17:50:37.3706175+08:00||;True|2022-08-24T17:16:24.7353563+08:00||;True|2022-08-22T14:12:08.9426677+08:00||;True|2022-08-19T10:29:29.4848915+08:00||;True|2022-08-19T10:24:37.3114106+08:00||;True|2022-08-19T09:55:19.1414504+08:00||;True|2022-08-19T09:40:59.9958103+08:00||;True|2022-08-19T09:33:37.6904208+08:00||;True|2022-08-19T09:28:36.3093517+08:00||;True|2022-08-19T09:22:06.8115880+08:00||;True|2022-08-19T09:13:37.9585905+08:00||;True|2022-08-17T15:10:05.3411660+08:00||;False|2022-08-17T15:08:06.4809616+08:00||;True|2022-06-01T19:33:05.4481344+08:00||;True|2022-05-25T14:24:10.1817614+08:00||;True|2022-05-25T09:23:06.2835677+08:00||;True|2022-05-25T09:02:15.3730215+08:00||;True|2022-05-24T21:19:00.5074933+08:00||;True|2022-05-13T17:54:16.9766250+08:00||;True|2022-05-12T17:59:35.6658572+08:00||;True|2022-05-12T17:45:56.8037279+08:00||;True|2022-05-11T18:02:44.6830705+08:00||;True|2022-05-11T15:11:44.2123306+08:00||;True|2022-05-10T10:14:03.1340627+08:00||;True|2022-05-09T18:11:38.7936836+08:00||;False|2022-05-09T18:09:23.9786371+08:00||;False|2022-05-09T18:09:11.8760404+08:00||;False|2022-05-09T18:07:17.4893920+08:00||;False|2022-05-09T18:06:24.0063875+08:00||;False|2022-05-09T18:05:19.0501822+08:00||;True|2022-05-09T10:32:23.0075871+08:00||;True|2022-05-06T17:57:46.6102126+08:00||;True|2022-05-05T19:26:02.1665879+08:00||;True|2022-05-05T18:35:49.6113434+08:00||;True|2022-05-05T18:23:09.7528455+08:00||;True|2022-05-03T18:16:55.2075231+08:00||;True|2022-05-03T17:38:58.8338071+08:00||;True|2022-04-26T13:55:48.6376957+08:00||;True|2022-04-26T09:08:43.8393049+08:00||;True|2022-04-23T10:24:41.7805502+08:00||;True|2022-04-23T09:59:02.7983739+08:00||;True|2022-04-23T09:46:47.0183590+08:00||;True|2022-04-23T09:21:57.0873811+08:00||;True|2022-04-21T20:01:57.5291853+08:00||;True|2022-04-21T19:17:57.1270857+08:00||;True|2022-04-21T19:15:38.6532410+08:00||;True|2022-04-21T19:13:59.1467307+08:00||;True|2022-04-21T19:08:19.2196334+08:00||;True|2022-04-21T18:21:58.1340503+08:00||;True|2022-04-21T18:01:33.3247434+08:00||;True|2022-04-21T17:52:25.1456343+08:00||;True|2022-04-21T10:05:58.9005370+08:00||;True|2022-04-20T20:00:05.8521460+08:00||;True|2022-04-11T16:08:04.2469358+08:00||;True|2022-04-07T15:22:53.5415688+08:00||;True|2022-04-06T09:41:40.8698606+08:00||;True|2022-04-02T10:36:16.9912313+08:00||;True|2022-03-29T16:13:23.9031232+08:00||;True|2022-03-29T16:08:28.6250221+08:00||;True|2022-03-29T14:58:43.5548350+08:00||;True|2022-03-29T14:46:07.0032400+08:00||;True|2022-03-29T10:45:41.4892896+08:00||;True|2022-03-28T18:04:53.4880071+08:00||;True|2022-03-16T17:45:58.4167087+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

2
WebUI/WebUI.csproj
View File

@@ -43,6 +43,8 @@
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
<PackageReference Include="NLog" Version="6.0.7" />
<PackageReference Include="NLog.Schema" Version="6.0.7" />
<PackageReference Include="Quartz" Version="3.4.0" />
<PackageReference Include="UtilsSharp" Version="2.5.0" />
</ItemGroup>

2
WebUI/WebUI.csproj.user
View File

@@ -4,7 +4,7 @@
<View_SelectedScaffolderID>RazorViewEmptyScaffolder</View_SelectedScaffolderID>
<View_SelectedScaffolderCategoryPath>root/Common/MVC/View</View_SelectedScaffolderCategoryPath>
<ActiveDebugProfile>WebUI</ActiveDebugProfile>
<NameOfLastUsedPublishProfile>E:\Project\HotelServices\WebUI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>E:\tian\chongxin\NewGit\Web_HotelServices_Prod\WebUI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ViewDialogWidth>650</WebStackScaffolding_ViewDialogWidth>

35
WebUI/nlog.config Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- enable asp.net core layout renderers -->
<targets>
<!--项目日志保存文件路径说明fileName="${basedir}/保存目录，以年月日的格式创建/${shortdate}/${记录器名称}-${单级记录}-${shortdate}.txt"-->
<target name="info_file" xsi:type="File"
fileName="${basedir}/Logs/${shortdate}/info_${shortdate}.txt"
layout="${longdate}|${level:uppercase=true}|${logger}|${message}|${exception:format=ToString} ${newline} ${stacktrace} ${newline}"
archiveFileName="${basedir}/archives/info_${shortdate}-{#####}.txt"
archiveAboveSize="102400"
archiveNumbering="Sequence"
concurrentWrites="true"
keepFileOpen="false" />
<target name="error_file" xsi:type="File"
fileName="${basedir}/Logs/${shortdate}/error_${shortdate}.txt"
layout="${longdate}|${level:uppercase=true}|${logger}|${message}|${exception:format=ToString} ${newline} ${stacktrace} ${newline}"
archiveFileName="${basedir}/archives/error_${shortdate}-{#####}.txt"
archiveAboveSize="102400"
archiveNumbering="Sequence"
concurrentWrites="true"
keepFileOpen="false" />
</targets>
<!--规则配置,final - 最终规则匹配后不处理任何规则-->
<!--规则配置,final - 最终规则匹配后不处理任何规则-->
<!--定义使用哪个target输出-->
<rules>
<!-- 优先级从高到低依次为：OFF、FATAL、ERROR、WARN、INFO、DEBUG、TRACE、 ALL -->
<!-- 将所有日志输出到文件 -->
<logger name="*" minlevel="FATAL" maxlevel="FATAL" writeTo="info_file" />
<logger name="*" minlevel="Error" writeTo="error_file" />
</rules>
</nlog>