提交修改

TEAMModelOS.Model/Core/Models/School.cs

@@ -6,9 +6,9 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 
 namespace TEAMModelOS.Model.Core.Models
 {
-    [TableSpace(Name = "Core")]
-    public class School :TableEntity
+    public class School
     {
+        public string id { get; set; }
         public string code { get; set; }
         public string name { get; set; }
         public string countryId { get; set; }

TEAMModelOS.Model/Core/Models/SchoolArea.cs

@@ -7,14 +7,13 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 
 namespace TEAMModelOS.Model.Core.Models
 {
-    [TableSpace(Name = "Core")]
-    
-    public class SchoolArea :TableEntity
+    public class SchoolArea
     {
         /// <summary>
         /// 智慧学区名称
         /// </summary>
         public string Name { get; set; }
         public int Code { get; set; }
+        public List<SchoolAreaMember> members { get; set; }
     }
 }

TEAMModelOS.Model/Core/Models/SchoolAreaMember.cs

@@ -10,18 +10,9 @@ namespace TEAMModelOS.Model.Core.Models
     /// <summary>
     /// 智慧学区成员学校
     /// </summary>
-    [TableSpace(Name = "Core")]
-    
-    public  class SchoolAreaMember: TableEntity
+    public  class SchoolAreaMember 
     {
-        /// <summary>
-        /// 智慧学区编码
-        /// </summary>
-        public string AreaCode { set; get; }
-        /// <summary>
-        /// 智慧学区名称
-        /// </summary>
-        public string AreaName { get; set; }
+         
         /// <summary>
         /// 智慧学区成员学校编码
         /// </summary>

TEAMModelOS.Model/Core/Models/SchoolCampus.cs

@@ -1,19 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Core.Models
-{
-    [TableSpace(Name = "Core")]
-    
-    public class SchoolCampus : TableEntity
-    {
-        public string Name { get; set; }
-        public int Code { get; set; }
-        public string SchoolCode { get; set; }
-        public string SchoolName { get; set; }
-    }
-}

TEAMModelOS.Model/Core/Models/SchoolClass.cs

@@ -1,79 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Core.Models
-{
-    [TableSpace(Name = "Core")]
-    
-    public class SchoolClass : TableEntity
-    {
-        /// <summary>
-        /// 班级名称
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// 班级code
-        /// </summary>
-        public string Code { get; set; }
-        /// <summary>
-        /// 学校编码
-        /// </summary>
-        public string SchoolCode { get; set; }
-        /// <summary>
-        /// 学校名称
-        /// </summary>
-        public string SchoolName { get; set; }
-        /// <summary>
-        /// 分校代码
-        /// </summary>
-        public string CampusCode { get; set; }
-        /// <summary>
-        /// 分校名称
-        /// </summary>
-        public string CampusName { get; set; }
-        /// <summary>
-        /// 学段编码
-        /// </summary>
-        public string PeriodCode { get; set; }
-        /// <summary>
-        /// 学段名称
-        /// </summary>
-        public string PeriodName { get; set; }
-        /// <summary>
-        /// 年级编码   1 2 3 4 5 6 
-        /// </summary>
-        public int GradeCode { get; set; }
-        /// <summary>
-        /// 年级名称  一年级 二年级
-        /// </summary>
-        public string GradeName { get; set; }
-        /// <summary>
-        /// 绑定 届数code  2019
-        /// </summary>
-        public int SessionCode { get; set; }
-        /// <summary>
-        /// 绑定 届数  2019届
-        /// </summary>
-        public string SessionName { get; set; }
-        /// <summary>
-        /// 绑定学期code
-        /// </summary>
-        public int TermCode { get; set; }
-        /// <summary>
-        /// 绑定学期名称
-        /// </summary>
-        public string TermName { get; set; }
-        /// <summary>
-        /// 选择开班时间201903  最小月份
-        /// </summary>
-        public int StartTime {get;set;}
-        /// <summary>
-        /// 选择结束时间201907  最小月份
-        /// </summary>
-        public int EndTime { get; set; }
-    }
-}

TEAMModelOS.Model/Core/Models/SchoolGrade.cs

@@ -1,29 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Core.Models
-{
-    [TableSpace(Name = "Core")]
-    
-    public class SchoolGrade:TableEntity
-    {
-        public string Name { get; set; }
-        public int Code { get; set; }
-        public string SchoolCode { get; set; }
-        public string SchoolName { get; set; }
-        public string PeriodCode { get; set; }
-        public string PeriodName { get; set; }
-        /// <summary>
-        /// 入学时间201909
-        /// </summary>
-        public int Enrollment { get; set; }
-        /// <summary>
-        /// 毕业时间202406
-        /// </summary>
-        public int Graduate { get; set; }
-    }
-}

TEAMModelOS.Model/Core/Models/SchoolGradeSubject.cs

@@ -1,26 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Core.Models
-{
-    /// <summary>
-    /// 暂不使用
-    /// </summary>
-    [TableSpace(Name = "Core")]
-    
-    public class SchoolGradeSubject :TableEntity
-    {
-        public string Name { get; set; }
-        public string Code { get; set; }
-        public string SchoolCode { get; set; }
-        public string SchoolName { get; set; }
-        public string PeriodCode { get; set; }
-        public string PeriodName { get; set; }
-        public string GradeCode { get; set; }
-        public string GradeName { get; set; }
-    }
-}

TEAMModelOS.Model/Core/Models/SchoolGradeTerm.cs

@@ -1,26 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Core.Models
-{
-    /// <summary>
-    /// 暂不使用
-    /// </summary>
-    [TableSpace(Name = "Core")]
-    
-    public  class SchoolGradeTerm :TableEntity
-    {
-        public string Name { get; set; }
-        public string Code { get; set; }
-        public string SchoolCode { get; set; }
-        public string SchoolName { get; set; }
-        public string PeriodCode { get; set; }
-        public string PeriodName { get; set; }
-        public string GradeCode { get; set; }
-        public string GradeName { get; set; }
-    }
-}

TEAMModelOS.Model/Core/Models/SchoolPeriod.cs

@@ -1,21 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Core.Models
-{
-    [TableSpace(Name = "Core")]
-    
-    public class SchoolPeriod : TableEntity
-    {
-        public string Name { get; set; }
-        public string Code { get; set; }
-        public string SchoolCode { get; set; }
-        public string SchoolName { get; set; }
-        public string PeriodType { get; set; }
-        public int PeriodCycle { get; set; }
-    }
-}

TEAMModelOS.Model/Core/Models/SchoolSubject.cs

@@ -1,41 +0,0 @@
-
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Core.Models
-{
-    [TableSpace(Name = "Core")]
-    
-    public class SchoolSubject :TableEntity
-    {
-        /// <summary>
-        /// 学科名称
-        /// </summary>
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string Name { get; set; }
-        /// <summary>
-        /// 学科编码
-        /// </summary>
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string Code { get; set; }
-        /// <summary>
-        /// 学校编码
-        /// </summary>
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string SchoolCode { get; set; }
-        /// <summary>
-        /// 学校名称
-        /// </summary>
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public string SchoolName { get; set; }
-        /// <summary>
-        /// 删除状态
-        /// </summary>
-        [Required(ErrorMessage = "{0} 必须填写")]
-        public int Status { get; set; } = 1;
-    }
-}

TEAMModelOS.Model/Core/Models/Subject.cs

@@ -1,16 +0,0 @@
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
-
-namespace TEAMModelOS.Model.Core.Models
-{
-    [TableSpace(Name = "Core")]
-    public class Subject : TableEntity
-    {
-        public string Name { get; set; }
-        //public string Code { get; set; }
-        //public string Lang { get; set; }
-    }
-}

TEAMModelOS.Model/Core/Models/TeamModelUser.cs

@@ -6,9 +6,9 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 
 namespace TEAMModelOS.Model.Core.Models
 {
-    [TableSpace(Name = "Core")]
-    public class TeamModelUser : TableEntity
-    {
+    public class TeamModelUser
+    { 
+        public string id { get; set; }
         /// <summary>
         /// 真实姓名
         /// </summary>
@@ -73,6 +73,7 @@ namespace TEAMModelOS.Model.Core.Models
         /// 注册时间
         /// </summary>
         public long RegisterTime { get; set; }
+        [PartitionKey]
         public string CountryCode { get; set; }
     }
 }

TEAMModelOS.Service/Core/Implements/BaseService.cs

@@ -4,12 +4,13 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.WindowsAzure.Storage.Table;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
+using TEAMModelOS.SDK.Module.AzureCosmosDB.Implements;
 using TEAMModelOS.SDK.Module.AzureTable.Implements;
 using TEAMModelOS.Service.Core.Interfaces;
 
 namespace TEAMModelOS.Service.Core.Implements
 {
-    public class BaseService : AzureTableDBRepository, IBaseService
+    public class BaseService : AzureTableDBRepository , IBaseService
     {
         public async Task<List<T>> FindListByDictHasAll<T>(Dictionary<string, object> dict) where T : TableEntity, new()
         {

TEAMModelOS.Service/Core/Implements/LoginInfoService.cs

@@ -1,42 +1,32 @@
 using IdentityModel;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.Model.Core.Dtos;
 using TEAMModelOS.Model.Core.Models;
-using TEAMModelOS.SDK.Context.Configuration;
-using TEAMModelOS.SDK.Context.Constant.Common;
 using TEAMModelOS.SDK.Context.Exception;
-using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
-using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Extension.HttpClient.Implements;
 using TEAMModelOS.SDK.Extension.JwtAuth.JwtHelper;
 using TEAMModelOS.SDK.Extension.JwtAuth.Models;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
-using TEAMModelOS.SDK.Helper.Common.JsonHelper;
-using TEAMModelOS.SDK.Helper.Network.HttpHelper;
-using TEAMModelOS.SDK.Module.AzureTable.Implements;
-using TEAMModelOS.SDK.Module.AzureTable.Interfaces;
+using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
 using TEAMModelOS.Service.Core.Interfaces;
 
 namespace TEAMModelOS.Service.Core.Implements
 {
     public class LoginInfoService : BaseService,  ILoginInfoService
     {
-        //private IAzureTableDBRepository _repository;
+        private IAzureCosmosDBRepository repository;
         private readonly IOptions<JwtSetting> _options;
         private readonly HttpClientUserInfo _httpClientService;
-        public LoginInfoService( IOptions<JwtSetting> options, HttpClientUserInfo httpClientService)
+        public LoginInfoService( IOptions<JwtSetting> options, HttpClientUserInfo httpClientService, IAzureCosmosDBRepository _repository)
         {
             _options = options;
-           // _repository = repository;
+            repository = _repository;
             _httpClientService = httpClientService;
         }
 
@@ -78,10 +68,14 @@ namespace TEAMModelOS.Service.Core.Implements
                     Ticket = ticketInfo.Ticket,
                     CountryCode ="86"
                 };
-                TeamModelUser user = await FindOneByKey<TeamModelUser>("TeamModelId", ticketInfo.TeamModelId);
-                if (user == null || string.IsNullOrEmpty(user.RowKey))
+                List<TeamModelUser> users = await repository.FindByparams<TeamModelUser>(new Dictionary<string, object>() { { "TeamModelId", ticketInfo.TeamModelId } });
+                TeamModelUser user = new TeamModelUser();
+                if (users.IsEmpty())
                 {
-                    user = new TeamModelUser { RowKey = Guid.NewGuid().ToString(), PartitionKey = loginInfo.CountryCode, RegisterTime = DateTimeHelper.ConvertToTimeStamp13(DateTime.Now) };
+                    user = new TeamModelUser { id = Guid.NewGuid().ToString(), CountryCode = loginInfo.CountryCode, RegisterTime = DateTimeHelper.ConvertToTimeStamp13(DateTime.Now) };
+                }
+                else {
+                    user = users[0];
                 }
                 user.Cellphone = "15283771540";
                 user.NickName = ticketInfo.Name;
@@ -96,7 +90,7 @@ namespace TEAMModelOS.Service.Core.Implements
                 loginInfo.Scope = jwtToken.Scope;
                 result.JwtToken = jwtToken;
                 await Save<LoginInfo>(loginInfo);
-                await SaveOrUpdate<TeamModelUser>(user);
+                await repository.Save<TeamModelUser>(user);
               //  JosnRPCResponse<TeamModelIdInfo> response = MessagePackHelper.JsonToObject<JosnRPCResponse<TeamModelIdInfo>>(jsonStr);
                 return result;
                 #endregion

TEAMModelOS.Service/Core/Interfaces/IBaseService.cs

@@ -3,11 +3,12 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
 using TEAMModelOS.SDK.Module.AzureTable.Interfaces;
 
 namespace TEAMModelOS.Service.Core.Interfaces
 {
-    public interface IBaseService: IBusinessService, IAzureTableDBRepository
+    public interface IBaseService: IBusinessService, IAzureTableDBRepository 
     {
         Task<List<T>> FindListByDictHasAll<T>(Dictionary<string, object> dict) where T : TableEntity, new();
         Task<int> DeleteAll<T>(Dictionary<string, object> dict) where T : TableEntity, new();

TEAMModelOS.Service/Evaluation/Implements/ImportExerciseService.cs

@@ -49,7 +49,6 @@ namespace TEAMModelOS.Service.Evaluation.Implements
             { "Single", "单选题|多选题" }, { "Multiple", "多选题|判断题" },
             { "Judge", "判断题|填空题" }, { "Complete", "填空题|主观题" },
             { "Subjective", "主观题|【完结】" } };
-        private readonly IAzureTableDBRepository azureTableDBRepository;
         private readonly IHttpContextAccessor httpContextAccessor;
         private readonly IAzureBlobDBRepository azureBlobDBRepository;
         public ImportExerciseService(IHttpContextAccessor _httpContextAccessor, IAzureBlobDBRepository _azureBlobDBRepository)