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("");