chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

运综刷新订舱记录

Browse Source
usertest
cjy 4 months ago
parent 8146a54fee
commit 7fbc5e49a5
5 changed files with 252 additions and 1 deletions
Show Stats Download Patch File Download Diff File

34
ds-wms-service/DS.Module.Core/Enums/WebCodeEnum.cs
Unescape Escape View File

@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.Module.Core.Enums
{
/// <summary>
/// 调用爬虫网站时的WebCode参数类型
/// </summary>
public enum WebCodeEnum
{
[Description("场站编码")]
YARD = 11,
[Description("互联网+(定时任务)")]
HLW_CD = 21,
//[Description("互联网主单回执")]
//HLW_ZH = 22,
//[Description("互联网分单回执")]
//HLW_FD = 23,
[Description("单船单票(可查页面)")]
YGT = 31,
//[Description("云港通运综(定时任务上传该代号)")]
//YGT_YZ = 32,
}
}

33
ds-wms-service/DS.WMS.Core/Op/Dtos/WebDataReq.cs
Unescape Escape View File

@ -0,0 +1,33 @@
using DS.Module.Core.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DS.WMS.Core.Op.Dtos
{
/// <summary>
///
/// </summary>
public class WebDataReq
{
/// <summary>
/// 提单号
/// </summary>
public string MBLNO { get; set; }
///// <summary>
///// 场站代码
///// </summary>
//public string YardCode { get; set; }
/// <summary>
/// 场站Id
/// </summary>
public long YardId { get; set; }
public WebCodeEnum WebCode { get; set; }
}
}

8
ds-wms-service/DS.WMS.Core/Op/Interface/ISeaExportService.cs
Unescape Escape View File

@ -226,4 +226,12 @@ public interface ISeaExportService
/// <param name="id">业务Id</param>
/// <returns></returns>
public Task<DataResult<List<OpBusinessLogRes>>> GetSeaExportLogList(string id);
/// <summary>
/// 获取订舱记录在指定网站的HTML数据
/// </summary>
/// <param name="id">业务Id</param>
/// <param name="webCode">网站编码；值为YARD或HLW_CD或YGT；YARD：获取订舱记录所属场站的网页数据；HLW_CD：获取互联网+的网页数据；YGT：获取云港通的网页数据</param>
/// <returns></returns>
public Task<DataResult<string>> GetWebData(string id, string webCode);
}

165
ds-wms-service/DS.WMS.Core/Op/Method/SeaExportYardService.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using DS.Module.Core;
using DS.Module.Core.Enums;
using DS.Module.Core.Extensions;
using DS.Module.Core.Helpers;
using DS.WMS.Core.Code.Entity;
@ -9,6 +10,7 @@ using DS.WMS.Core.Sys.Entity;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NPOI.OpenXmlFormats;
using SqlSugar;
namespace DS.WMS.Core.Op.Method
{
@ -46,6 +48,48 @@ namespace DS.WMS.Core.Op.Method
}
return await Task.FromResult(DataResult<string>.Success(JsonConvert.SerializeObject(data.Data)));
}
/// <summary>
/// 获取订舱记录在指定网站的HTML数据
/// </summary>
/// <param name="id">业务Id</param>
/// <param name="webCode">网站编码；值为YARD或HLW_CD或YGT；YARD：获取订舱记录所属场站的网页数据；HLW_CD：获取互联网+的网页数据；YGT：获取云港通的网页数据</param>
/// <returns></returns>
public async Task<DataResult<string>> GetWebData(string id, string webCode)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
var order = tenantDb.Queryable<SeaExport>().Where(x => x.Id == long.Parse(id)).First();
if (order.IsNull())
{
return await Task.FromResult(DataResult<string>.Failed("海运出口信息不存在!", MultiLanguageConst.SeaExportNotExist));
}
if (string.IsNullOrEmpty(order.Yard) || order.YardId == 0 || order.YardId.IsNull())
{
return await Task.FromResult(DataResult<string>.Failed("请先选择场站!", MultiLanguageConst.SeaExportNotExist));
}
WebCodeEnum codeEnum = webCode switch
{
"YARD" => WebCodeEnum.YARD,
"HLW_CD" => WebCodeEnum.HLW_CD,
"YGT" => WebCodeEnum.YGT,
_ => throw new Exception("webCode参数错误!")
};
var data = await GetWebData(new WebDataReq() {
MBLNO = order.MBLNO,
YardId = order.YardId,
WebCode = codeEnum,
});
if (!data.Succeeded)
{
return await Task.FromResult(DataResult<string>.Failed(data.Message));
}
return await Task.FromResult(DataResult<string>.Success(JsonConvert.SerializeObject(data.Data)));
}
/// <summary>
/// 从爬虫获取场站数据，并映射为系统中的箱型
/// </summary>
@ -164,6 +208,127 @@ namespace DS.WMS.Core.Op.Method
return await Task.FromResult(DataResult<string>.Success(rtnData));
}
}
/// <summary>
/// 异步调取网站HTML数据
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<DataResult<string>> GetWebData(WebDataReq req)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
//var account = seaComService.GetCodeThirdParty("BillTrace", user.UserId, tenantDb, req.YardId);
//tenantDb.Queryable<CodeThirdParty>().Where(x => x.CustomerId == req.YardId && x.AccountType == "BillTrace").First();
var userKey = db.Queryable<SysConfig>().Filter(null, true).Where(x => x.Code == "spiderUserKeyBilltrace" && x.TenantId == 1288018625843826688).First().Value;
var userSecret = db.Queryable<SysConfig>().Filter(null, true).Where(x => x.Code == "spiderUserSecretBilltrace" && x.TenantId == 1288018625843826688).First().Value;
var spiderServerUrl = db.Queryable<SysConfig>().Filter(null, true).Where(x => x.Code == "spiderServerUrlBillTraceNew" && x.TenantId == 1288018625843826688).First().Value;
var tenantName = db.Queryable<SysTenant>().Filter(null, true).Where(x => x.Id == long.Parse(user.TenantId)).First().Name;
//if (account.IsNull())
//{
// return await Task.FromResult(DataResult<string>.Failed("未配置出口运踪场站第三方账号信息!"));
//}
var webAcc = "";
var webPwd = "";
var newWebCode = "";
if (req.WebCode == WebCodeEnum.YARD)
{
var yardCode = seaComService.GetClientCode(req.YardId, tenantDb);
var needYgtAccountList = db.Queryable<SysDictData>().InnerJoin<SysDictType>((a, b) => a.TypeId == b.Id)
.Where((a, b) => b.Code == "YardListNeedYgtAccount").OrderBy((a, b) => a.OrderNo)
.Select<SysDictData>().ToList();
var needLhtAccountList = db.Queryable<SysDictData>().InnerJoin<SysDictType>((a, b) => a.TypeId == b.Id)
.Where((a, b) => b.Code == "YardListNeedLhtAccount").OrderBy((a, b) => a.OrderNo)
.Select<SysDictData>().ToList();
if (needYgtAccountList.Count(x => x.Value == yardCode) > 0)
{
var ygtAcc = seaComService.GetCodeThirdParty("YunGangTong", user.UserId, tenantDb);
if (ygtAcc == null || string.IsNullOrEmpty(ygtAcc.AppKey) || string.IsNullOrEmpty(ygtAcc.AppSecret))
{
return await Task.FromResult(DataResult<string>.Failed("未找到云港通账号、密码配置，请到第三方账号中添加!"));
}
webAcc = ygtAcc.AppKey;
webPwd = ygtAcc.AppSecret;
}
else if (needLhtAccountList.Count(x => x.Value == yardCode) > 0)
{
var lhtAcc = seaComService.GetCodeThirdParty("LuHaiTong", user.UserId, tenantDb);
if (lhtAcc == null || string.IsNullOrEmpty(lhtAcc.AppKey) || string.IsNullOrEmpty(lhtAcc.AppSecret))
{
return await Task.FromResult(DataResult<string>.Failed("未找到陆海通账号、密码配置，请到第三方账号中添加!"));
}
webAcc = lhtAcc.AppKey;
webPwd = lhtAcc.AppSecret;
}
else {
var account = seaComService.GetCodeThirdParty("BillTrace", user.UserId, tenantDb);
if (account.IsNull())
{
return await Task.FromResult(DataResult<string>.Failed("未配置出口运踪场站第三方账号信息!"));
}
webAcc = account.AppKey;
webAcc = account.AppSecret;
}
var yardMap = tenantDb.Queryable<MappingYard>().Where(x => x.LinkId == req.YardId && x.Module == "BillTrace").First();
if (yardMap.IsNull())
{
return await Task.FromResult(DataResult<string>.Failed($"场站代号配置未找到：{yardCode}"));
}
newWebCode = yardMap.MapCode;
}
else
{
newWebCode = req.WebCode.ToString();
}
var objSend = new
{
user_key = userKey,
user_secret = userSecret,
customer_id = user.TenantId,
customer_name = tenantName,
web_code = newWebCode,
bno = req.MBLNO,
req_type = "1" ,
web_user = webAcc,
web_psw = webPwd,
};
var urlYard = spiderServerUrl;
if (!urlYard.EndsWith("/"))
{
urlYard += "/";
}
urlYard += "real/query";
var res = RequestHelper.Post(JsonConvert.SerializeObject(objSend), urlYard);
var rtnObj = JObject.Parse(res);
if (rtnObj.GetIntValue("code") != 200)
{
return await Task.FromResult(DataResult<string>.Failed("获取场站数据失败:" + rtnObj.GetStringValue("msg")));
}
else
{
var rtnData = rtnObj.GetStringValue("data");
var viewstatehtml = GetDataHtmlList(rtnData, "__VIEWSTATE", "/>");
if (viewstatehtml != "")
{
rtnData = rtnData.Replace(viewstatehtml, "");
}
return await Task.FromResult(DataResult<string>.Success(rtnData));
}
}
public static string GetDataHtmlList(string html, string startstr, string endstr)
{
var subhtml = html;

13
ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs
Unescape Escape View File

@ -164,7 +164,18 @@ public class SeaExportController : ApiController
return await _invokeService.GetYardData(id, isWeb);
}
/// <summary>
/// 获取订舱记录在指定网站的HTML数据
/// </summary>
/// <param name="id">业务Id</param>
/// <param name="webCode">网站编码；值为YARD或HLW_CD或YGT；YARD：获取订舱记录所属场站的网页数据；HLW_CD：获取互联网+的网页数据；YGT：获取云港通的网页数据</param>
/// <returns></returns>
[HttpGet]
[Route("GetWebData")]
public async Task<DataResult<string>> GetWebData([FromQuery] string id, string webCode)
{
return await _invokeService.GetWebData(id, webCode);
}
/// <summary>
/// 发起运踪订阅或者更新提单号
/// </summary>

Write Preview
Loading…
Cancel
Save