dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan

Browse Source
DS7_JingHan
hanxuntao 2 years ago
parent c4025a3ba1 d5c16bffa0
commit 9208e00f86
12 changed files with 1073 additions and 158 deletions
Show Stats Download Patch File Download Diff File

4
.gitignore vendored
Unescape Escape View File

@ -56,3 +56,7 @@ DispatchWeb/DispatchWeb.csproj.user
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
/UpdateSQL/update.ldb /UpdateSQL/update.ldb
/DSWeb/EDIFiles/SeaeEdi /DSWeb/EDIFiles/SeaeEdi
/BookingJieFeng/BookingJieFeng.csproj.user
/BookingWeb/BookingWeb.csproj.user
/DispatchWeb/DispatchWeb.csproj.user
/DSWeb/DSWeb.csproj.user

39
BookingJieFeng/BookingJieFeng.csproj.user
Unescape Escape View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>

39
BookingWeb/BookingWeb.csproj.user
Unescape Escape View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>

31
DSWeb.Service.Output.DS7/DS7DataContext.cs
Unescape Escape View File

@ -39,6 +39,7 @@ namespace DSWeb.Service.Output.DS7
public DbSet<op_seae_edi_md> op_seae_edi { get; set; } public DbSet<op_seae_edi_md> op_seae_edi { get; set; }
public DbSet<op_seae_edi_ctn_md> op_seae_edi_ctn { get; set; } public DbSet<op_seae_edi_ctn_md> op_seae_edi_ctn { get; set; }
public DbSet<code_employee_md> code_employee { get; set; }
} }
[Table("op_seae")] [Table("op_seae")]
@ -1270,4 +1271,34 @@ namespace DSWeb.Service.Output.DS7
public string CTNOWNER { get; set; } public string CTNOWNER { get; set; }
} }
[Table("code_employee")]
public partial class code_employee_md
{
[Key]
public string GID { get; set; }
public string USERNAME { get; set; }
public string SEX { get; set; }
public DateTime? ENROLLTIME { get; set; }
public DateTime? BIRTHDAY { get; set; }
public string OFFICEPHONE { get; set; }
public string HOMEPHONE { get; set; }
public string MOBILE { get; set; }
public string EMAIL1 { get; set; }
public string EMAIL2 { get; set; }
public string HOMEADDRESS { get; set; }
public string DEPTNAME { get; set; }
public string STATUS { get; set; }
public DateTime? LEAVEOFFICETIME { get; set; }
public string CREATEUSER { get; set; }
public DateTime? CREATETIME { get; set; }
public string MODIFIEDUSER { get; set; }
public DateTime? MODIFIEDTIME { get; set; }
public string REMARK { get; set; }
public string CORPID { get; set; }
public string USERCODE { get; set; }
public string OFFICEADDR { get; set; }
}
} }

1
DSWeb.Service.Output.DS7/DSWeb.Service.Output.DS7.csproj
Unescape Escape View File

@ -121,6 +121,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="DS7DataContext.cs" /> <Compile Include="DS7DataContext.cs" />
<Compile Include="DingtalkUserListService.cs" />
<Compile Include="DS7Service.cs" /> <Compile Include="DS7Service.cs" />
<Compile Include="JobListener.cs" /> <Compile Include="JobListener.cs" />
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />

1010
DSWeb.Service.Output.DS7/DingtalkUserListService.cs
View File

File diff suppressed because it is too large Load Diff

4
DSWeb.Service.Output.DS7/说明.txt
Unescape Escape View File

@ -1 +1,3 @@
大简云数据（舱单、报关等），导出数据到东胜7专用服务 1：从大简云的公开消息队列，获取自己的业务，写入ds7经汉版的op_other表，作为舱单业务的数据
2：定时读取钉钉通讯录，向

11
DSWeb/Areas/CommMng/Controllers/PublicAPIController.cs
Unescape Escape View File

@ -15,6 +15,7 @@ using System.Text;
using DSWeb.Areas.CommMng.DAL; using DSWeb.Areas.CommMng.DAL;
using DSWeb.Areas.CommMng.Models; using DSWeb.Areas.CommMng.Models;
using DSWeb.Areas.MvcShipping.DAL; using DSWeb.Areas.MvcShipping.DAL;
using HcUtility.Comm;
namespace DSWeb.Areas.CommMng.Controllers namespace DSWeb.Areas.CommMng.Controllers
{ {
@ -96,7 +97,17 @@ namespace DSWeb.Areas.CommMng.Controllers
} }
} }
/// <summary>
/// 获取钉钉的通讯录
/// </summary>
/// <returns></returns>
[HttpPost]
public ContentResult DingTalkUserList() {
var result = new DBResult();
return BasicDataRefDAL.GetContentResult(result);
}
} }

12
DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
Unescape Escape View File

@ -6480,6 +6480,18 @@ namespace DSWeb.Areas.CommMng.DAL
} }
} }
#endregion #endregion
public static ContentResult GetContentResult(DBResult dbresult)
{
var jsonRespose = new JsonResponse
{
Success = dbresult.Success,
Message = dbresult.Message,
Data = null
};
if (dbresult.Data != null) jsonRespose.Data = dbresult.Data;
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
} }
} }

40
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>

38
DispatchWeb/DispatchWeb.csproj.user
Unescape Escape View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
Write Preview
Loading…
Cancel
Save