Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelFunction/ActivityHttpTrigger.cs

@@ -15,6 +15,8 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.TEAMModelFunction;
+using System.Linq;
 
 namespace TEAMModelFunction
 {
@@ -387,6 +389,42 @@ namespace TEAMModelFunction
             return new OkObjectResult(new { });
         }
         /// <summary>
+        //获取题目摘要信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [ProducesDefaultResponseType]
+        //[AuthToken(Roles = "teacher")]
+        [FunctionName("fix-itemcond")]
+        public async Task<IActionResult> FixItemCond(
+            [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequest req,
+            ILogger log)
+        {
+            var client = _azureCosmos.GetCosmosClient();
+            List<ItemInfo> items = new List<ItemInfo>();
+            var queryslt = $"SELECT  value(c) FROM c ";
+            
+            await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<ItemInfo>(queryText: queryslt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Item-hbcn") }))
+            {
+                
+                items.Add(item);
+            }
+            List<ItemCond> itemConds = new List<ItemCond>();
+            items.GroupBy(x => x.periodId).ToList().ForEach( x=> {
+                ItemCond cond = new ItemCond() { id=x.Key,code=$"ItemCond-hbcn" };
+                x.ToList().ForEach(y => {
+                   ItemService.CountItemCond(y, null, cond);
+                });
+               
+                itemConds.Add(cond);
+            });
+            itemConds.ForEach(async cond =>
+            {
+                await client.GetContainer("TEAMModelOS", "School").UpsertItemAsync<ItemCond>(cond, new PartitionKey(cond.code));
+            });
+            return new OkObjectResult(new { itemConds });
+        }
+        /// <summary>
         /// 设置问卷调查未初始化学生列表的业务
         /// </summary>
         /// <param name="req"></param>

TEAMModelOS.SDK/Models/Cosmos/Common/Inner/SyllabusTree.cs

@@ -12,7 +12,7 @@ namespace TEAMModelOS.SDK.Models
     }
     public class SyllabusTreeNode{
         public string id { get; set; }
-        public string code { get; set; }
+       // public string code { get; set; }
         public string scope { get; set; }
         public SyllabusTreeNode() {
             trees = new List<SyllabusTree>();

TEAMModelOS.SDK/Models/Cosmos/Common/ItemCond.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.SDK.Models
+{
+    /// <summary>
+    /// 题目集合
+    /// </summary>
+    public class ItemCond : CosmosEntity
+    {
+        public ItemCond() {
+            pk = "ItemCond";
+        }
+        //key  学段id-科目id
+        public Dictionary<string, List<CondCount>> conds { get; set; } = new Dictionary<string, List<CondCount>>();
+    }
+    public class CondCount {
+        public KeyValuePair<string, int> grade { get; set; } = new KeyValuePair<string, int>();
+        public Dictionary<string, int> type { get; set; } = new Dictionary<string, int>();
+        public Dictionary<int, int> level { get; set; } = new Dictionary<int, int>();
+        public Dictionary<int, int> field { get; set; } = new Dictionary<int, int>();
+    }
+}

TEAMModelOS.SDK/Models/Cosmos/Common/Snode.cs

@@ -36,6 +36,11 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
         //public List<string> points { get; set; } = new List<string> { "" };
         public List<Rnode> rnodes { get; set; } = new List<Rnode>();
         public List<string> cids { get; set; } = new List<string>();
+        /// <summary>
+        /// 谁创建的该节点
+        /// </summary>
+        public string creatorId { get; set; }
+        public long updateTime { get; set; }
         //public string code { get; set; }
 
     }

TEAMModelOS.SDK/Models/Cosmos/Common/Syllabus.cs

@@ -9,9 +9,9 @@ using TEAMModelOS.SDK.Models.Cosmos.Common;
 namespace TEAMModelOS.SDK.Models
 {
     /// <summary>
-    /// Teaching materials 教学材料 ---课纲
+    /// Teaching materials 教学材料 ---课纲章节 数据结构
     /// </summary>
-    
+
     public class Syllabus : CosmosEntity
     {  
         /// <summary>
@@ -19,7 +19,6 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         [Required(ErrorMessage = "{0} 必须填写")]
         public List<Tnode> children { get; set; }
-      
-
+        public string volumeId { get; set; }
     }
 }

TEAMModelOS.SDK/Models/Cosmos/Student/Student.cs

@@ -23,6 +23,5 @@ namespace TEAMModelOS.SDK.Models
         //分组信息
         public string groupId { get; set; }
         public string groupName { get; set; }
-
     }
 }

TEAMModelOS.SDK/Models/Cosmos/Teacher/Favorite.cs

@@ -107,6 +107,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos
         /// </summary>
         [Required(ErrorMessage = "opt 必须设置")]
         public string opt { get; set; }
+
         [Required(ErrorMessage = "tmdid 必须设置")]
         public string tmdid { get; set; }
         /// <summary>
@@ -114,17 +115,17 @@ namespace TEAMModelOS.SDK.Models.Cosmos
         /// </summary>
         public string name { get; set; }
         /// <summary>
-        /// 课纲的id
+        /// 课纲册别的id
         /// </summary>
         [Required(ErrorMessage = "sid 必须设置")]
         public string sid { get; set; }
         /// <summary>
-        /// 课纲的分区键
+        /// 课纲册别的分区键
         /// </summary>
         [Required(ErrorMessage = "socde 必须设置")]
         public string scode { get; set; }
         /// <summary>
-        /// 课纲的名称
+        /// 课纲册别的名称
         /// </summary>
         [Required(ErrorMessage = "sname 必须设置")]
         public string sname { get; set; }

TEAMModelOS.SDK/Models/Service/ItemService.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using TEAMModelOS.SDK.Models;
+
+namespace TEAMModelOS.TEAMModelFunction
+{
+    public static class ItemService
+    {
+        /// <summary>
+        /// 计算题目的条件数量变化
+        /// </summary>
+        /// <param name="newItem"></param>
+        /// <param name="odlItem"></param>
+        /// <param name="cond"></param>
+        public static void CountItemCond(ItemInfo newItem, ItemInfo odlItem, ItemCond cond) {
+            //检查两个对象是否是同一条记录
+            if (newItem != null && odlItem == null)
+            {
+                string newKey = $"{newItem.subjectId}";
+                List<string> grade = newItem.gradeIds;
+                UpdateItemCond(cond, true,newKey, grade, newItem.type, newItem.level, newItem.field.HasValue?newItem.field.Value:0);
+            }
+            else if (newItem != null && odlItem != null)
+            {
+                //更新时 需要保证两个题的 id code 一致
+                if (newItem.id == odlItem.id && newItem.code == odlItem.code)
+                {
+                    //先增加
+                    string newKey = $"{newItem.subjectId}";
+                    List<string> newGrade = newItem.gradeIds;
+                    UpdateItemCond(cond, true, newKey, newGrade, newItem.type, newItem.level, newItem.field.HasValue ? newItem.field.Value : 0);
+                    //后变更删除
+                    string oldKey = $"{odlItem.subjectId}";
+                    List<string> oldGrade = odlItem.gradeIds;
+                    UpdateItemCond(cond, false, oldKey, oldGrade, odlItem.type, odlItem.level, odlItem.field.HasValue ? odlItem.field.Value : 0);
+                }
+            }
+            else if (newItem == null && odlItem != null)
+            {
+                string oldKey = $"{odlItem.subjectId}";
+                List<string> oldGrade = odlItem.gradeIds;
+                UpdateItemCond(cond, false, oldKey, oldGrade, odlItem.type, odlItem.level, odlItem.field.HasValue ? odlItem.field.Value : 0);
+            }
+            else {
+               // throw new Exception();
+            }
+        }
+        /// <summary>
+        /// opt=false  减  true 增
+        /// </summary>
+        /// <param name="cond"></param>
+        /// <param name="opt"></param>
+        public static void UpdateItemCond(ItemCond cond, bool opt,string key,List<string> grade,string type,int level,int field)
+        {
+            int count = 0;
+            if (opt)
+            {
+                count = 1;
+            }
+            else
+            {
+                //未计入的则默认0
+                count = -1;
+            }
+            if (cond.conds.ContainsKey(key))
+            {
+                foreach (var x in grade)
+                {
+                    var exCondCount= cond.conds[key].Where(y => y.grade.Key.Equals(x)).FirstOrDefault();
+                    if (exCondCount != null)
+                    {
+                        exCondCount.grade= new KeyValuePair<string, int> (x, exCondCount.grade.Value + count);
+                        if (exCondCount.type.ContainsKey(type))
+                        {
+                            exCondCount.type[type] = exCondCount.type[type] + count;
+                        }
+                        else {
+                            exCondCount.type.Add(type, count);
+                        }
+                        if (exCondCount.level.ContainsKey(level))
+                        {
+                            exCondCount.level[level] = exCondCount.level[level] + count;
+                        }
+                        else
+                        {
+                            exCondCount.level.Add(level, count);
+                        }
+                        if (exCondCount.field.ContainsKey(field))
+                        {
+                            exCondCount.field[field] = exCondCount.field[field] + count;
+                        }
+                        else
+                        {
+                            exCondCount.field.Add(field, count);
+                        }
+                    }
+                    else {
+                        CondCount condCount = new CondCount
+                        {
+                            grade = new KeyValuePair<string, int>(x, count),
+                            type = new Dictionary<string, int> { { type, count } },
+                            field = new Dictionary<int, int> { { field, count } },
+                            level = new Dictionary<int, int> { { level, count } }
+                        };
+                        cond.conds[key].Add(condCount);
+                    }
+                }
+            }
+            else {
+                List<CondCount> conds = new List<CondCount>();
+                foreach (var x in grade) {
+                    CondCount condCount = new CondCount {
+                        grade = new KeyValuePair<string, int>(x, count),
+                        type = new Dictionary<string, int> { { type, count } },
+                        field = new Dictionary<int, int> { { field, count } },
+                        level= new Dictionary<int, int> { { level, count } }
+                    };
+                    conds.Add(condCount);
+                }
+                cond.conds.Add(key, conds);
+            }
+        }
+
+    }
+}

TEAMModelFunction/StuListService.cs

@@ -1,5 +1,5 @@
 using Azure.Cosmos;
-using Microsoft.Azure.WebJobs;
+
 using System;
 using System.Collections.Generic;
 using System.Text;

TEAMModelOS/ClientApp/public/web/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEáCNS2-H

TEAMModelOS/ClientApp/public/web/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEá	ETen-B5-H`
 ^

TEAMModelOS/ClientApp/public/web/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!�º]aX!!]`�21�>	�p�z�$]‚�"R‚d�-Uƒ7�*„
4„%�+ „Z „{�/…%…<�9K…b�1]†.�"‡‰`]‡,�"]ˆ
+�"]ˆh�"]‰F�"]Š$�"]‹�"]‹`�"]Œ>�"]��"]�z�"]ŽX�"]�6�"]��"]�r�"]‘P�"]’.�"]“�"]“j�"]”H�"]•&�"]–�"]–b�"]—@�"]˜�"]˜|�"]™Z�"]š8�"]›�"]›t�"]œR�"]�0�"]ž�"]žl�"]ŸJ�"] (�"]¡�"]¡d�"]¢B�"]£ �"X£~�']¤W�"]¥5�"]¦�"]¦q�"]§O�"]¨-�"]©�"]©i�"]ªG�"]«%�"]¬�"]¬a�"]­?�"]®�"]®{�"]¯Y�"]°7�"]±�"]±s�"]²Q�"]³/�"]´
�"]´k�"]µI�"]¶'�"]·�"]·c�"]¸A�"]¹�"]¹}�"]º[�"]»9