合并考试系统代码分支

Hotline.sln

@@ -65,13 +65,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hotline.Pdf", "src\Hotline.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure", "src\Exam.Infrastructure\Exam.Infrastructure.csproj", "{91CD58E7-C314-43FD-BC64-D47F7537833F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Data", "src\Exam.Infrastructure.Data\Exam.Infrastructure.Data.csproj", "{B338A97A-BBF1-457D-B9BB-53D1C7E8C2E6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Data", "src\Exam.Infrastructure.Data\Exam.Infrastructure.Data.csproj", "{6A4399E0-6816-3A7F-3442-EE5BFB0076F9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Validation", "src\Exam.Infrastructure.Validation\Exam.Infrastructure.Validation.csproj", "{E3F7E52F-516D-472F-B63D-E2435F2174A2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Validation", "src\Exam.Infrastructure.Validation\Exam.Infrastructure.Validation.csproj", "{3A181C2E-3AA2-2FAC-6EE1-630BB8F69606}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Web", "src\Exam.Infrastructure.Web\Exam.Infrastructure.Web.csproj", "{F76BA67E-DC5D-41DB-B6DA-369385779FB4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Insfrastructure.Service", "src\Exam.Insfrastructure.Service\Exam.Insfrastructure.Service.csproj", "{94CD17C7-78A2-4D66-A1F7-1714984180F0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exam.Infrastructure.Web", "src\Exam.Infrastructure.Web\Exam.Infrastructure.Web.csproj", "{46010D33-5AF0-693B-3C0B-3CCC7F66547A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -175,26 +173,18 @@ Global
 		{3AB75B51-A69D-4145-A564-1D9D1695992E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3AB75B51-A69D-4145-A564-1D9D1695992E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AB75B51-A69D-4145-A564-1D9D1695992E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91CD58E7-C314-43FD-BC64-D47F7537833F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91CD58E7-C314-43FD-BC64-D47F7537833F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91CD58E7-C314-43FD-BC64-D47F7537833F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91CD58E7-C314-43FD-BC64-D47F7537833F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B338A97A-BBF1-457D-B9BB-53D1C7E8C2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B338A97A-BBF1-457D-B9BB-53D1C7E8C2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B338A97A-BBF1-457D-B9BB-53D1C7E8C2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B338A97A-BBF1-457D-B9BB-53D1C7E8C2E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3F7E52F-516D-472F-B63D-E2435F2174A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3F7E52F-516D-472F-B63D-E2435F2174A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3F7E52F-516D-472F-B63D-E2435F2174A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3F7E52F-516D-472F-B63D-E2435F2174A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F76BA67E-DC5D-41DB-B6DA-369385779FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F76BA67E-DC5D-41DB-B6DA-369385779FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F76BA67E-DC5D-41DB-B6DA-369385779FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F76BA67E-DC5D-41DB-B6DA-369385779FB4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94CD17C7-78A2-4D66-A1F7-1714984180F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94CD17C7-78A2-4D66-A1F7-1714984180F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94CD17C7-78A2-4D66-A1F7-1714984180F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94CD17C7-78A2-4D66-A1F7-1714984180F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A4399E0-6816-3A7F-3442-EE5BFB0076F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A4399E0-6816-3A7F-3442-EE5BFB0076F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A4399E0-6816-3A7F-3442-EE5BFB0076F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A4399E0-6816-3A7F-3442-EE5BFB0076F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A181C2E-3AA2-2FAC-6EE1-630BB8F69606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A181C2E-3AA2-2FAC-6EE1-630BB8F69606}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A181C2E-3AA2-2FAC-6EE1-630BB8F69606}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A181C2E-3AA2-2FAC-6EE1-630BB8F69606}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46010D33-5AF0-693B-3C0B-3CCC7F66547A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46010D33-5AF0-693B-3C0B-3CCC7F66547A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46010D33-5AF0-693B-3C0B-3CCC7F66547A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46010D33-5AF0-693B-3C0B-3CCC7F66547A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -228,11 +218,9 @@ Global
 		{8E4F64EF-314A-45BA-8BB2-46FF5B06F7D5} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
 		{31855124-4EFC-47B9-A4D5-64822DE036E6} = {08D63205-1445-430F-A4AB-EF1744E3AC11}
 		{3AB75B51-A69D-4145-A564-1D9D1695992E} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
-		{91CD58E7-C314-43FD-BC64-D47F7537833F} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
-		{B338A97A-BBF1-457D-B9BB-53D1C7E8C2E6} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
-		{E3F7E52F-516D-472F-B63D-E2435F2174A2} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
-		{F76BA67E-DC5D-41DB-B6DA-369385779FB4} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
-		{94CD17C7-78A2-4D66-A1F7-1714984180F0} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
+		{6A4399E0-6816-3A7F-3442-EE5BFB0076F9} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
+		{3A181C2E-3AA2-2FAC-6EE1-630BB8F69606} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
+		{46010D33-5AF0-693B-3C0B-3CCC7F66547A} = {D041C554-B78E-4AAF-B597-E309DC8EEF4F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B8EA790-BD13-4422-8D63-D6DBB77B823F}

src/Exam.Infrastructure.Web/Exam.Infrastructure.Web.csproj

@@ -7,8 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Hotline.Repository.SqlSugar\Hotline.Repository.SqlSugar.csproj" />
-    <ProjectReference Include="..\Exam.Infrastructure\Exam.Infrastructure.csproj" />
+    <ProjectReference Include="..\Hotline.Repository.SqlSugar\Hotline.Repository.SqlSugar.csproj" />
   </ItemGroup>
 
 </Project>

src/Hotline.Api/Controllers/Exam/ExamTagController.cs

@@ -25,7 +25,7 @@ namespace Hotline.Api.Controllers.Exam
         }
 
         /// <summary>
-        /// 新增课件类型
+        /// 新增考试标签
         /// </summary>
         /// <param name="examTagDto"></param>
         /// <returns></returns>
@@ -37,7 +37,7 @@ namespace Hotline.Api.Controllers.Exam
         }
 
         /// <summary>
-        /// 修改课件类型
+        /// 修改考试标签
         /// </summary>
         /// <param name="examTagDto"></param>
         /// <returns></returns>
@@ -49,7 +49,7 @@ namespace Hotline.Api.Controllers.Exam
         }
 
         /// <summary>
-        /// 删除课件类型
+        /// 删除考试标签
         /// </summary>
         /// <param name="entityQueryRequest"></param>
         /// <returns></returns>

src/Hotline.Application/Hotline.Application.csproj

@@ -13,7 +13,7 @@
     <PackageReference Include="Quartz.Jobs" Version="3.13.1" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\01.Infrastructure\Exam.Infrastructure.Web\Exam.Infrastructure.Web.csproj" />
+    <ProjectReference Include="..\Exam.Infrastructure.Web\Exam.Infrastructure.Web.csproj" />
     <ProjectReference Include="..\Hotline.Ai.Jths\Hotline.Ai.Jths.csproj" />
     <ProjectReference Include="..\Hotline.Ai.XingTang\Hotline.Ai.XingTang.csproj" />
     <ProjectReference Include="..\Hotline.Application.Contracts\Hotline.Application.Contracts.csproj" />

src/Hotline.Repository.SqlSugar/Hotline.Repository.SqlSugar.csproj

@@ -12,6 +12,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\01.Infrastructure\Exam.Infrastructure.Validation\Exam.Infrastructure.Validation.csproj" />
+    <ProjectReference Include="..\Exam.Infrastructure.Validation\Exam.Infrastructure.Validation.csproj" />
+    <ProjectReference Include="..\Exam.Infrastructure\Exam.Infrastructure.csproj" />
     <ProjectReference Include="..\Hotline\Hotline.csproj" />
   </ItemGroup>
 

src/Hotline.Repository.SqlSugar/Interfaces/IExamTagRepository.cs

@@ -0,0 +1,19 @@
+using Exam.ExamManages;
+using Hotline.Repository.SqlSugar;
+using Hotline.Repository.SqlSugar.Interface;
+using System.ComponentModel;
+using XF.Domain.Repository;
+
+namespace Hotline.Repository.Sqlsugar
+{
+    /// <summary>
+    /// 考试标签仓储接口
+    /// </summary>
+    [Description("考试标签仓储接口")]
+    public interface IExamTagRepository:IRepository<ExamTag>,IExamRepository<ExamTag,HotlineDbContext>
+    {
+       
+    }
+}
+
+

src/Hotline.Share/Hotline.Share.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\01.Infrastructure\Exam.Infrastructure.Data\Exam.Infrastructure.Data.csproj" />
+    <ProjectReference Include="..\Exam.Infrastructure.Data\Exam.Infrastructure.Data.csproj" />
   </ItemGroup>
 
 </Project>

src/Hotline/Permissions/EPermission.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2018 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 
@@ -2900,6 +2901,27 @@ namespace Hotline.Permissions
 
         #endregion
 
+        #region 考试系统(15,00,00)
+        /// <summary>
+        /// 课件分类
+        /// </summary>
+        [Display(GroupName = "课件分类", Name = "课件分类", Description = "课件分类")]
+        SourcewareCategory=150001,
+
+        /// <summary>
+        /// 课件
+        /// </summary>
+        [Display(GroupName = "课件", Name = "课件", Description = "课件")]
+        Sourceware = 150002,
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+        [Display(GroupName = "标签", Name = "标签", Description = "标签")]
+        ExamTag = 150003,
+
+        #endregion
+
         #region 公用（99，00,00）
 
         #region 话机操作面板权限