调整包结构

TEAMModelOS.Service/Models/Evaluation/Models/SimpleExam.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 
-namespace TEAMModelOS.Model.Evaluation.Models
+namespace TEAMModelOS.Service.Model.Evaluation.Models
 {
     [CosmosDB(RU = 400, Name = "SimpleExam")]
     public class SimpleExam

TEAMModelOS.Service/Models/PowerPoint/Border.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public  class Border
     {

TEAMModelOS.Service/Models/PowerPoint/Chart.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public   class Chart : Item
     {

TEAMModelOS.Service/Models/PowerPoint/Connector.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
 
     public class Connector : Item

TEAMModelOS.Service/Models/PowerPoint/Diagram.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public class Diagram :Item
     {

TEAMModelOS.Service/Models/PowerPoint/Fill.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public class Fill
     {

TEAMModelOS.Service/Models/PowerPoint/FontStyle.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public  class FontStyle
     {

TEAMModelOS.Service/Models/PowerPoint/Group.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public  class Group : Item
     {

TEAMModelOS.Service/Models/PowerPoint/Pptx.cs

@@ -2,11 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
-    public class Pptx
+    public class Htex
     {
-        public Pptx() {
+        public Htex() {
             //slides = new List<Slide>();
             //size = new PptSize();
             //FontStyles = new Dictionary<string, FontStyle>();
@@ -16,7 +16,7 @@ namespace HiTeachCC.Model.PowerPoint
             //Borders = new Dictionary<string, Border>();
 
         }
-        public PptSize Size { get; set; }
+        public HtexSize Size { get; set; }
         //缩略图
         public string Thumbnail { get; set; }
         //PPT幻灯片集合
@@ -33,7 +33,8 @@ namespace HiTeachCC.Model.PowerPoint
         //public Dictionary<string, BuChar> BuChars { get; set; }
         //public Dictionary<string, Border> Borders { get; set; }
     }
-    public class PptSize {
+    public class HtexSize
+    {
         //宽度
         public double Width { get; set; }
         //高度

TEAMModelOS.Service/Models/PowerPoint/Inner/WarpObj.cs

@@ -1,4 +1,4 @@
-using HiTeachCC.Model.PowerPoint;
+using TEAMModelOS.Service.Model.PowerPoint;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -19,7 +19,7 @@ namespace TEAMModelOS.Service.Models.PowerPoint.Inner
         public XmlNode slideMasterContent { get; set; }
         public XmlNode themeContent { get; set; }
         public XmlNode tableStyles { get; set; }
-        public Pptx pptx { get; set; }
+        public Htex htex { get; set; }
     }
 
 

TEAMModelOS.Service/Models/PowerPoint/Item.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public abstract class Item
     {

TEAMModelOS.Service/Models/PowerPoint/Math.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public class Math : Item
     {

TEAMModelOS.Service/Models/PowerPoint/Media.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public   class Media : Item
     {

TEAMModelOS.Service/Models/PowerPoint/Paragraph.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public class Paragraph
     {

TEAMModelOS.Service/Models/PowerPoint/Position.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public class Position
     {

TEAMModelOS.Service/Models/PowerPoint/Shape.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
      public class Shape : Item
     { 

TEAMModelOS.Service/Models/PowerPoint/Slide.cs

@@ -2,17 +2,15 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using TEAMModelOS.Service.Models.Core;
+using TEAMModelOS.Service.Models.Evaluation.Models;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public class Slide
     {
         public Slide()
         {
-            Item = new List<Item>();
-            Answer = new List<string>();
-            Points = new List<string>();
-            Option = new List<CodeValue>();
+            
         }
         public List<Item> Item { get; set; }
         public Fill Fill { get; set; }
@@ -21,20 +19,7 @@ namespace HiTeachCC.Model.PowerPoint
         public double Width { get; set; }
         //高度
         public double Height { get; set; }
-        //问题
-        public string Question { get; set; }
-        //答案
-        public List<string> Answer { get; set; }
-        //解析
-        public string Explain { get; set; }
-        //题目类型
-        public string Type { get; set; }
-        //知识点
-        public List<string> Points { get; set; }
-        // 选项
-        public List<CodeValue> Option { get; set; }
-        //认知层次
-        public string Cognition { get; set; }
+        public ItemInfo Exercise { get; set; }
         //PPTX  WORD  来源
         public string Source { get; set; }
         /// <summary>
@@ -42,8 +27,6 @@ namespace HiTeachCC.Model.PowerPoint
         /// </summary>
         public int Flag { get; set; }
     }
-    public class Question { 
-    
-    }
+     
 
 }

TEAMModelOS.Service/Models/PowerPoint/Table.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace HiTeachCC.Model.PowerPoint
+namespace TEAMModelOS.Service.Model.PowerPoint
 {
     public class Table :Item
     {

TEAMModelOS.Service/Services/Analysis/Implements/AchievementService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using TEAMModelOS.Model.Evaluation.Models;
+using TEAMModelOS.Service.Model.Evaluation.Models;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;
 using TEAMModelOS.Service.Analysis.Interfaces;

TEAMModelOS.Service/Services/Analysis/Interfaces/IAchievementService.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using TEAMModelOS.Model.Evaluation.Models;
+using TEAMModelOS.Service.Model.Evaluation.Models;
 using TEAMModelOS.SDK.Context.Configuration;
 using TEAMModelOS.Service.Models.Core;
 

TEAMModelOS.Service/Services/PowerPoint/Implement/PowerPointService.cs

@@ -1,6 +1,6 @@
 using DocumentFormat.OpenXml.Packaging;
-using HiTeachCC.Model.PowerPoint;
-using HiTeachCC.Service.PowerPoint.Interface;
+using TEAMModelOS.Service.Model.PowerPoint;
+using TEAMModelOS.Service.PowerPoint.Interface;
 using Microsoft.AspNetCore.Http;
 using System;
 using System.Collections.Generic;
@@ -13,17 +13,16 @@ using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.Context.Constant.Common;
 using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
-using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Security.ShaHash;
 using TEAMModelOS.SDK.Module.AzureBlob.Container;
 using TEAMModelOS.SDK.Module.AzureBlob.Interfaces;
-using TEAMModelOS.Service.Models.PowerPoint.Inner;
-using TEAMModelOS.Service.Services.PowerPoint.Implement;
-using Fill = HiTeachCC.Model.PowerPoint.Fill;
-using Media = HiTeachCC.Model.PowerPoint.Media;
-using Position = HiTeachCC.Model.PowerPoint.Position;
+using TEAMModelOS.Service.Models.PowerPoint.Inner; 
+using Fill = TEAMModelOS.Service.Model.PowerPoint.Fill;
+using Media = TEAMModelOS.Service.Model.PowerPoint.Media;
+using Position = TEAMModelOS.Service.Model.PowerPoint.Position;
+using TEAMModelOS.Service.Services.PowerPoint.Interface;
 
-namespace HiTeachCC.Service.PowerPoint.Implement
+namespace TEAMModelOS.Service.Services.PowerPoint.Implement
 {
     public class PowerPointService : IPowerPointService
     {
@@ -102,9 +101,9 @@ namespace HiTeachCC.Service.PowerPoint.Implement
         /// </summary>
         /// <param name="presentationFile"></param>
         /// <returns></returns>
-        public async Task<Pptx> ProcessPPTX(XmlDocument xdoc, string shaCode)
+        public async Task<Htex> ProcessPPTX(XmlDocument xdoc, string shaCode)
         {
-            Pptx pptx = new Pptx();
+            Htex pptx = new Htex();
           //  List<Dictionary<string, object>> post_ary = new List<Dictionary<string, object>>();
             Dictionary<string, object> post_ary = new Dictionary<string, object>();
             var dateBefore = DateTimeOffset.Now.UtcTicks;
@@ -118,7 +117,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
             var slideLayoutNodes = xdoc.GetTextByPathList("//pkg:part[@pkg:contentType='application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml']");
             //获取ppt的宽高
             var slideSize = ShapeHelper.GetSlideSize(xdoc);
-            pptx.Size = new PptSize { Width = slideSize.width, Height = slideSize.height };
+            pptx.Size = new HtexSize { Width = slideSize.width, Height = slideSize.height };
          //   post_ary.Add( "slideSize", slideSize  );
             //加载当前PPT使用到的PPT节点
             var themeContent = LoadTheme(xdoc);
@@ -163,7 +162,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
         //    return cssText;
         //}
 
-        public async Task<Slide> ProcessSingleSlide(XmlDocument xdoc, XmlNode xnode, string sldFileName, int index, dynamic slideSize, XmlNode themeContent, XmlNode tableStyles,Pptx pptx)
+        public async Task<Slide> ProcessSingleSlide(XmlDocument xdoc, XmlNode xnode, string sldFileName, int index, dynamic slideSize, XmlNode themeContent, XmlNode tableStyles,Htex pptx)
         {
 
             var resName = sldFileName.Replace("slides/slide", "slides/_rels/slide") + ".rels";
@@ -294,7 +293,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                 slideMasterContent = slideMasterContent,
                 themeContent = themeContent,
                 tableStyles = tableStyles,
-                pptx = pptx
+                htex = pptx
             };
             var bgColor = await GetSlideBackgroundFill(slideContent, index, warpObj);
             //string sha = null;
@@ -1400,7 +1399,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
                     spY = System.Math.Round(double.Parse(startPoint.GetTextByPath("@y").Value) * 96 / 914400,degree);
                 }
                 var d = "M" + spX + "," + spY;
-                // List<HiTeachCC.Model.PowerPoint.Path> Paths = new List<Model.PowerPoint.Path>();
+                // List<TEAMModelOS.Service.Model.PowerPoint.Path> Paths = new List<Model.PowerPoint.Path>();
                 XmlNodeList pathChildNodes = pathLstNode.GetTextByPath("a:path").ChildNodes;
                 foreach (XmlNode childNode in pathChildNodes)
                 {

TEAMModelOS.Service/Services/PowerPoint/Implement/ShapeHelper.cs

@@ -1,5 +1,5 @@
-using HiTeachCC.Model.PowerPoint;
-using HiTeachCC.Service.PowerPoint.Implement;
+using TEAMModelOS.Service.Model.PowerPoint;
+using TEAMModelOS.Service.PowerPoint.Implement;
 using System;
 using System.Collections.Generic;
 using System.Drawing;

TEAMModelOS.Service/Services/PowerPoint/Implement/ShapeSvg.cs

@@ -1,5 +1,4 @@
-using HiTeachCC.Model.PowerPoint;
-using HiTeachCC.Service.PowerPoint.Implement;
+using TEAMModelOS.Service.Model.PowerPoint; 
 using System;
 using System.Collections.Generic;
 using System.Text;

TEAMModelOS.Service/Services/PowerPoint/Interface/IPowerPointService.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Context.Configuration;
 
-namespace HiTeachCC.Service.PowerPoint.Interface
+namespace TEAMModelOS.Service.Services.PowerPoint.Interface
 {
     public interface IPowerPointService : IBusinessService
     {

TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.Model.Evaluation.Models;
+using TEAMModelOS.Service.Model.Evaluation.Models;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;

TEAMModelOS/Controllers/Analysis/ChangeController.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using TEAMModelOS.Helper.Common.FileHelper;
-using TEAMModelOS.Model.Evaluation.Models;
+using TEAMModelOS.Service.Model.Evaluation.Models;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper.JsonPath;
 using TEAMModelOS.SDK.Module.AzureCosmosDB.Interfaces;

TEAMModelOS/Controllers/Core/FileController.cs

@@ -1,4 +1,4 @@
-using HiTeachCC.Service.PowerPoint.Interface;
+using TEAMModelOS.Service.PowerPoint.Interface;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System;

TEAMModelOS/Startup.cs

@@ -4,8 +4,8 @@ using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using HiTeachCC.Service.PowerPoint.Implement;
-using HiTeachCC.Service.PowerPoint.Interface;
+using TEAMModelOS.Service.PowerPoint.Implement;
+using TEAMModelOS.Service.PowerPoint.Interface;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -16,15 +16,12 @@ using Microsoft.AspNetCore.SpaServices;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.IdentityModel.Tokens;
-using Newtonsoft.Json;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.Context.Configuration;
 using TEAMModelOS.SDK.Context.Filter;
 using TEAMModelOS.SDK.Extension.JwtAuth;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
 using TEAMModelOS.SDK.Module.AzureCosmosDB.Configuration;
-using TEAMModelOS.SDK.Module.AzureTable.Configuration;
 using TEAMModelOS.SDK.Module.AzureTable.Implements;
 using TEAMModelOS.SDK.Module.AzureTable.Interfaces;
 using VueCliMiddleware;