Browse Source

更新结构。

CrazyIter_Bin 3 years ago
parent
commit
cf6dd51271

+ 26 - 7
TEAMModelOS.SDK/Models/Cosmos/Common/SheetConfig.cs

@@ -90,18 +90,37 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         public List<ConfigContent> contents { get; set; }
     }
+    //public class ConfigContent
+    //{
+    //    public int index { get; set; }
+    //    public int count { get; set; }
+    //    public int type { get; set; }
+    //    public int x { get; set; }
+    //    public int y { get; set; }
+    //    public int width { get; set; }
+    //    public int height { get; set; }
+    //    public int pageNum { get; set; }
+    //    public int vblockCount { get; set; }
+    //    public int hblockCount { get; set; }
+    //    public int id { get; set; }        
+    //}
     public class ConfigContent
     {
         public int index { get; set; }
         public int count { get; set; }
         public int type { get; set; }
-        public int x { get; set; }
-        public int y { get; set; }
-        public int width { get; set; }
-        public int height { get; set; }
         public int pageNum { get; set; }
-        public int vblockCount { get; set; }
-        public int hblockCount { get; set; }
-        public int id { get; set; }        
+        public List<Pos> pos { get; set; } = new List<Pos>();
+        public List<Point> points = new List<Point>();
+    }
+    public  class Pos
+    {
+        public double x { get; set; }
+        public double y { get; set; }
+    }
+    public class Point { 
+        public string ans { get; set; }
+        public int row { get; set; }
+        public List<Pos> pos { get; set; } = new List<Pos>();
     }
 }

+ 282 - 259
TEAMModelOS/Controllers/Third/ScController.cs

@@ -105,7 +105,7 @@ namespace TEAMModelOS.Controllers.Third
             GetProjectInfoByTrainComID.code = Code;
             GetProjectInfoByTrainComID.title = "5.3.1.1获取项目列表";
 
-            /*
+          
             // 5.3.1.2获取学员名单
             Code = "GetTeachersListByProject";
             parameterMap = new Dictionary<string, object>();
@@ -141,45 +141,52 @@ namespace TEAMModelOS.Controllers.Third
             GetDiagnosisListByProject_V2.code = Code;
             GetDiagnosisListByProject_V2.title = "5.3.1.3通过项目编号获取学员测评能力项V2";
 
-
+            ScsResult UpdateTeacherSituation = null;
             // 5.3.1.4学员培训基本情况回写
-            Code = "UpdateTeacherSituation";
-            parameterMap = new Dictionary<string, object>();
-            parameterMap.Add("TrainComID", trainComID);
-            parameterMap.Add("PXID", "23");
-            parameterMap.Add("TID", "145504");
-            parameterMap.Add("TeacherName", "柏成伟");
-            parameterMap.Add("CourseHour", "50");
-            parameterMap.Add("ResearchText", "学习成果描述,字符长度<=300");
-            parameterMap.Add("ComPassed", "2");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
-            ScsResult UpdateTeacherSituation = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
-            UpdateTeacherSituation.code = Code;
-            UpdateTeacherSituation.title = "5.3.1.4学员培训基本情况回写";
-
-
-            // 5.3.1.5学员能力点测评结果回写
-            Code = "UpdateTeacherDiagnosis";
-            parameterMap = new Dictionary<string, object>();
-            parameterMap.Add("TrainComID", trainComID);
-            parameterMap.Add("PXID", "65314");
-            parameterMap.Add("TID", "17542");
-            parameterMap.Add("DiagnosisNum", "A3");
-            //0"未认定", 1"合格", 2"优秀", 3"不合格"
-            parameterMap.Add("zpresult", "1");
-            parameterMap.Add("hpresult", "1");
-            parameterMap.Add("xzpresult", "1");
-            List<Dictionary<string, string>> pfilesA = new List<Dictionary<string, string>>();
-            parameterMap.Add("pfiles", pfilesA);
-            Dictionary<string, string> pfileMapA = new Dictionary<string, string>();
-            pfileMapA.Add("url", "https://scnltsfiles.scedu.com.cn/upload/infofj/202104011628463774.pdf");
-            pfileMapA.Add("fileName", "XXX.pdf");
-            pfileMapA.Add("fileSize", "247767");
-            pfileMapA.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
-            pfileMapA.Add("fileType", "pdf");
-            pfilesA.Add(pfileMapA);
-            ScsResult UpdateTeacherDiagnosis = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
-            UpdateTeacherDiagnosis.code = Code;
-            UpdateTeacherDiagnosis.title = "5.3.1.5学员能力点测评结果回写";
+            try {
+                Code = "UpdateTeacherSituation";
+                parameterMap = new Dictionary<string, object>();
+                parameterMap.Add("TrainComID", trainComID);
+                parameterMap.Add("PXID", "23");
+                parameterMap.Add("TID", "145504");
+                parameterMap.Add("TeacherName", "柏成伟");
+                parameterMap.Add("CourseHour", "50");
+                parameterMap.Add("ResearchText", "学习成果描述,字符长度<=300");
+                parameterMap.Add("ComPassed", "2");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
+                UpdateTeacherSituation = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
+                UpdateTeacherSituation.code = Code;
+                UpdateTeacherSituation.title = "5.3.1.4学员培训基本情况回写";
+            } catch (Exception ex) { }
+            ScsResult UpdateTeacherDiagnosis = null;
+            try
+            {
+
+                // 5.3.1.5学员能力点测评结果回写
+                Code = "UpdateTeacherDiagnosis";
+                parameterMap = new Dictionary<string, object>();
+                parameterMap.Add("TrainComID", trainComID);
+                parameterMap.Add("PXID", "65314");
+                parameterMap.Add("TID", "17542");
+                parameterMap.Add("DiagnosisNum", "A3");
+                //0"未认定", 1"合格", 2"优秀", 3"不合格"
+                parameterMap.Add("zpresult", "1");
+                parameterMap.Add("hpresult", "1");
+                parameterMap.Add("xzpresult", "1");
+                List<Dictionary<string, string>> pfilesA = new List<Dictionary<string, string>>();
+                parameterMap.Add("pfiles", pfilesA);
+                Dictionary<string, string> pfileMapA = new Dictionary<string, string>();
+                pfileMapA.Add("url", "https://scnltsfiles.scedu.com.cn/upload/infofj/202104011628463774.pdf");
+                pfileMapA.Add("fileName", "XXX.pdf");
+                pfileMapA.Add("fileSize", "247767");
+                pfileMapA.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
+                pfileMapA.Add("fileType", "pdf");
+                pfilesA.Add(pfileMapA);
+                UpdateTeacherDiagnosis = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
+                UpdateTeacherDiagnosis.code = Code;
+                UpdateTeacherDiagnosis.title = "5.3.1.5学员能力点测评结果回写";
+            }
+            catch (Exception ex) { 
+            }
 
 
             // 5.3.1.6获取能力测评体系字典值数据
@@ -243,238 +250,254 @@ namespace TEAMModelOS.Controllers.Third
             GetSingleTeacherByProject.code = Code;
             GetSingleTeacherByProject.title = "5.3.1.11获取跳转学员信息";
 
-
-            // 5.3.1.12学员培训基本情况批量回写
-            Code = "UpdateTeacherListSituation";
+            ScsResult UpdateTeacherListSituation = null;
             Dictionary<string, object> parameterContent = new Dictionary<string, object>();
             List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
-            parameterContent.Add("TrainComID", trainComID);
-            parameterContent.Add("List", list);
-            // {"TrainComID":"39","List":[{"ResearchText":"","ComPassed":1,"PXID":"35455","CourseHour":"50.0","TID":"411105","TeacherName":"付绍令"}]}
-            {
-                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
-
-                parameterMapData.Add("PXID", "23");
-                parameterMapData.Add("TID", "145504");
-                parameterMapData.Add("TeacherName", "柏成伟");
-                parameterMapData.Add("CourseHour", "50");
-                parameterMapData.Add("ResearchText", "学习成果描述,字符长度<=300");
-                parameterMapData.Add("ComPassed", "2");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
-                list.Add(parameterMapData);
-                parameterMapData = new Dictionary<string, object>();
-
-                parameterMapData.Add("PXID", "23");
-                parameterMapData.Add("TID", "145504");
-                parameterMapData.Add("TeacherName", "柏成伟");
-                parameterMapData.Add("CourseHour", "50");
-                parameterMapData.Add("ResearchText", "学习成果描述,字符长度<=300");
-                parameterMapData.Add("ComPassed", "2");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
-                list.Add(parameterMapData);
-                parameterMapData = new Dictionary<string, object>();
-
-                parameterMapData.Add("PXID", "22");
-                parameterMapData.Add("TID", "21348");
-                parameterMapData.Add("TeacherName", "邓泽燕");
-                parameterMapData.Add("CourseHour", "50");
-                parameterMapData.Add("ResearchText", "学习成果描述,字符长度<=300");
-                parameterMapData.Add("ComPassed", "2");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
-                list.Add(parameterMapData);
-                parameterMapData = new Dictionary<string, object>();
-                parameterMapData.Add("PXID", "35546");
-                parameterMapData.Add("TID", "411182");
-                parameterMapData.Add("TeacherName", "刘晓莉");
-                parameterMapData.Add("CourseHour", "50");
-                parameterMapData.Add("ResearchText", "");
-                parameterMapData.Add("ComPassed", "1");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
-                list.Add(parameterMapData);
+            try
+            { // 5.3.1.12学员培训基本情况批量回写
+                Code = "UpdateTeacherListSituation";
+              
+              
+                parameterContent.Add("TrainComID", trainComID);
+                parameterContent.Add("List", list);
+                // {"TrainComID":"39","List":[{"ResearchText":"","ComPassed":1,"PXID":"35455","CourseHour":"50.0","TID":"411105","TeacherName":"付绍令"}]}
+                {
+                    Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+
+                    parameterMapData.Add("PXID", "23");
+                    parameterMapData.Add("TID", "145504");
+                    parameterMapData.Add("TeacherName", "柏成伟");
+                    parameterMapData.Add("CourseHour", "50");
+                    parameterMapData.Add("ResearchText", "学习成果描述,字符长度<=300");
+                    parameterMapData.Add("ComPassed", "2");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
+                    list.Add(parameterMapData);
+                    parameterMapData = new Dictionary<string, object>();
+
+                    parameterMapData.Add("PXID", "23");
+                    parameterMapData.Add("TID", "145504");
+                    parameterMapData.Add("TeacherName", "柏成伟");
+                    parameterMapData.Add("CourseHour", "50");
+                    parameterMapData.Add("ResearchText", "学习成果描述,字符长度<=300");
+                    parameterMapData.Add("ComPassed", "2");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
+                    list.Add(parameterMapData);
+                    parameterMapData = new Dictionary<string, object>();
+
+                    parameterMapData.Add("PXID", "22");
+                    parameterMapData.Add("TID", "21348");
+                    parameterMapData.Add("TeacherName", "邓泽燕");
+                    parameterMapData.Add("CourseHour", "50");
+                    parameterMapData.Add("ResearchText", "学习成果描述,字符长度<=300");
+                    parameterMapData.Add("ComPassed", "2");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
+                    list.Add(parameterMapData);
+                    parameterMapData = new Dictionary<string, object>();
+                    parameterMapData.Add("PXID", "35546");
+                    parameterMapData.Add("TID", "411182");
+                    parameterMapData.Add("TeacherName", "刘晓莉");
+                    parameterMapData.Add("CourseHour", "50");
+                    parameterMapData.Add("ResearchText", "");
+                    parameterMapData.Add("ComPassed", "1");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
+                    list.Add(parameterMapData);
+                }
+                UpdateTeacherListSituation = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterContent);
+                UpdateTeacherListSituation.code = Code;
+                UpdateTeacherListSituation.title = "5.3.1.12学员培训基本情况批量回写";
             }
-            ScsResult UpdateTeacherListSituation = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterContent);
-            UpdateTeacherListSituation.code = Code;
-            UpdateTeacherListSituation.title = "5.3.1.12学员培训基本情况批量回写";
-
-
-
-            // 5.3.1.13学员能力点测评结果批量回写
-            Code = "UpdateTeacherListDiagnosis";
-            parameterContent = new Dictionary<string, object>();
-            list = new List<Dictionary<string, object>>();
-            parameterContent.Add("TrainComID", trainComID);
-            parameterContent.Add("List", list);
-            {
-                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+            catch (Exception ex) { }
+
+            ScsResult UpdateTeacherListDiagnosis = null;
+            try
+            { // 5.3.1.13学员能力点测评结果批量回写
+                Code = "UpdateTeacherListDiagnosis";
+                parameterContent = new Dictionary<string, object>();
+                list = new List<Dictionary<string, object>>();
+                parameterContent.Add("TrainComID", trainComID);
+                parameterContent.Add("List", list);
+                {
+                    Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+
+                    parameterMapData.Add("PXID", "3079");
+                    parameterMapData.Add("TID", "14597");
+                    parameterMapData.Add("DiagnosisNum", "A6");
+                    //0"未认定", 1"合格", 2"优秀", 3"不合格"
+                    parameterMapData.Add("zpresult", "1");
+                    parameterMapData.Add("hpresult", "2");
+                    parameterMapData.Add("xzpresult", "2");
+                    List<Dictionary<string, object>> pfiles = new List<Dictionary<string, object>>();
+                    parameterMapData.Add("pfiles", pfiles);
+                    Dictionary<string, object> pfileMap = new Dictionary<string, object>();
+                    pfileMap.Add("url", "https://srt-read-online.3ren.cn/basebusiness/material/20210422/1619055398463iE97VWe36i001.mp4");
+                    pfileMap.Add("fileName", "697a58c2375f7a031456c893e1e1860c.mp4");
+                    pfileMap.Add("fileSize", "17036168");
+                    pfileMap.Add("md5", "");
+                    pfileMap.Add("fileType", "video");
+                    pfiles.Add(pfileMap);
+
+                    list.Add(parameterMapData);
+
+                    pfileMap = new Dictionary<string, object>();
+                    pfileMap.Add("url", "https://srt-read-online.3ren.cn/basebusiness/material/20210422/1619055446704gbKuNF8eas001.pdf");
+                    pfileMap.Add("fileName", "A6技术支持的课堂反思.pdf");
+                    pfileMap.Add("fileSize", "32192");
+                    pfileMap.Add("md5", "");
+                    pfileMap.Add("fileType", "pdf");
+                    pfiles.Add(pfileMap);
+
+                    list.Add(parameterMapData);
+                }
 
-                parameterMapData.Add("PXID", "3079");
-                parameterMapData.Add("TID", "14597");
-                parameterMapData.Add("DiagnosisNum", "A6");
-                //0"未认定", 1"合格", 2"优秀", 3"不合格"
-                parameterMapData.Add("zpresult", "1");
-                parameterMapData.Add("hpresult", "2");
-                parameterMapData.Add("xzpresult", "2");
-                List<Dictionary<string, object>> pfiles = new List<Dictionary<string, object>>();
-                parameterMapData.Add("pfiles", pfiles);
-                Dictionary<string, object> pfileMap = new Dictionary<string, object>();
-                pfileMap.Add("url", "https://srt-read-online.3ren.cn/basebusiness/material/20210422/1619055398463iE97VWe36i001.mp4");
-                pfileMap.Add("fileName", "697a58c2375f7a031456c893e1e1860c.mp4");
-                pfileMap.Add("fileSize", "17036168");
-                pfileMap.Add("md5", "");
-                pfileMap.Add("fileType", "video");
-                pfiles.Add(pfileMap);
-
-                list.Add(parameterMapData);
-
-                pfileMap = new Dictionary<string, object>();
-                pfileMap.Add("url", "https://srt-read-online.3ren.cn/basebusiness/material/20210422/1619055446704gbKuNF8eas001.pdf");
-                pfileMap.Add("fileName", "A6技术支持的课堂反思.pdf");
-                pfileMap.Add("fileSize", "32192");
-                pfileMap.Add("md5", "");
-                pfileMap.Add("fileType", "pdf");
-                pfiles.Add(pfileMap);
-
-                list.Add(parameterMapData);
+                {
+                    Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+
+                    parameterMapData.Add("PXID", "3062");
+                    parameterMapData.Add("TID", "401268");
+                    parameterMapData.Add("DiagnosisNum", "A1");
+                    //0"未认定", 1"合格", 2"优秀", 3"不合格"
+                    parameterMapData.Add("zpresult", "1");
+                    parameterMapData.Add("hpresult", "2");
+                    parameterMapData.Add("xzpresult", "2");
+                    List<Dictionary<string, object>> pfiles = new List<Dictionary<string, object>>();
+                    parameterMapData.Add("pfiles", pfiles);
+                    Dictionary<string, object> pfileMap = new Dictionary<string, object>();
+                    pfileMap.Add("url", "https://srt-read-online.3ren.cn/basebusiness/material/20210422/1619058650000bphKFbDVSa001.pdf");
+                    pfileMap.Add("fileName", "学情分析.pdf");
+                    pfileMap.Add("fileSize", "94926");
+                    pfileMap.Add("md5", "");
+                    pfileMap.Add("fileType", "pdf");
+                    pfiles.Add(pfileMap);
+
+                    list.Add(parameterMapData);
+
+                    pfileMap = new Dictionary<string, object>();
+                    pfileMap.Add("url", "https://srt-read-online.3ren.cn/basebusiness/material/20210422/1619058698452gF19jmiuML001.mp4");
+                    pfileMap.Add("fileName", "种子萌发学情分析.mp4");
+                    pfileMap.Add("fileSize", "12692368");
+                    pfileMap.Add("md5", "");
+                    pfileMap.Add("fileType", "video");
+                    pfiles.Add(pfileMap);
+                    list.Add(parameterMapData);
+                }
+                 UpdateTeacherListDiagnosis = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterContent);
+                UpdateTeacherListDiagnosis.code = Code;
+                UpdateTeacherListDiagnosis.title = "5.3.1.13学员能力点测评结果批量回写";
             }
-
-            {
-                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
-
-                parameterMapData.Add("PXID", "3062");
-                parameterMapData.Add("TID", "401268");
-                parameterMapData.Add("DiagnosisNum", "A1");
-                //0"未认定", 1"合格", 2"优秀", 3"不合格"
-                parameterMapData.Add("zpresult", "1");
-                parameterMapData.Add("hpresult", "2");
-                parameterMapData.Add("xzpresult", "2");
-                List<Dictionary<string, object>> pfiles = new List<Dictionary<string, object>>();
-                parameterMapData.Add("pfiles", pfiles);
-                Dictionary<string, object> pfileMap = new Dictionary<string, object>();
-                pfileMap.Add("url", "https://srt-read-online.3ren.cn/basebusiness/material/20210422/1619058650000bphKFbDVSa001.pdf");
-                pfileMap.Add("fileName", "学情分析.pdf");
-                pfileMap.Add("fileSize", "94926");
-                pfileMap.Add("md5", "");
-                pfileMap.Add("fileType", "pdf");
-                pfiles.Add(pfileMap);
-
-                list.Add(parameterMapData);
-
-                pfileMap = new Dictionary<string, object>();
-                pfileMap.Add("url", "https://srt-read-online.3ren.cn/basebusiness/material/20210422/1619058698452gF19jmiuML001.mp4");
-                pfileMap.Add("fileName", "种子萌发学情分析.mp4");
-                pfileMap.Add("fileSize", "12692368");
-                pfileMap.Add("md5", "");
-                pfileMap.Add("fileType", "video");
-                pfiles.Add(pfileMap);
-                list.Add(parameterMapData);
+            catch (Exception ex) { 
             }
-            ScsResult UpdateTeacherListDiagnosis = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterContent);
-            UpdateTeacherListDiagnosis.code = Code;
-            UpdateTeacherListDiagnosis.title = "5.3.1.13学员能力点测评结果批量回写";
-
 
 
-
-            // 5.3.1.14学员校本研修PDF回写
-            Code = "UploadSBTARPDF";
-            parameterMap = new Dictionary<string, object>();
-            parameterMap.Add("TrainComID", trainComID);
-            parameterMap.Add("PXID", "16");
-            parameterMap.Add("TID", "16");
-
-            parameterMap.Add("url", "http://image1.cersp.com.cn/scpx/images/article/file/20190318/upload__51f98fc8_1697695ae73__7ffe_00001297.pdf");
-            parameterMap.Add("fileName", "XXX.pdf");
-            parameterMap.Add("fileSize", "247767");
-            parameterMap.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
-            parameterMap.Add("fileType", "pdf");
-            ScsResult UploadSBTARPDF = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
-            UploadSBTARPDF.code = Code;
-            UploadSBTARPDF.title = "5.3.1.14学员校本研修PDF回写";
-
-
-
-            // 5.3.1.15学员校本教研PDF批量回写
-            Code = "UploadSBTARPDFList";
-            parameterContent = new Dictionary<string, object>();
-            list = new List<Dictionary<string, object>>();
-            parameterContent.Add("TrainComID", trainComID);
-            parameterContent.Add("List", list);
-            {
-                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
-                parameterMapData.Add("PXID", "65309");
-                parameterMapData.Add("TID", "253940");
-                parameterMapData.Add("url", "https://scnltsfiles.scedu.com.cn/upload/infofj/202104011628463774.pdf");
-                parameterMapData.Add("fileName", "XXX.pdf");
-                parameterMapData.Add("fileSize", "247767");
-                parameterMapData.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
-                parameterMapData.Add("fileType", "pdf");
-                list.Add(parameterMapData);
+            ScsResult UploadSBTARPDF = null;
+            try
+            {   // 5.3.1.14学员校本研修PDF回写
+                Code = "UploadSBTARPDF";
+                parameterMap = new Dictionary<string, object>();
+                parameterMap.Add("TrainComID", trainComID);
+                parameterMap.Add("PXID", "16");
+                parameterMap.Add("TID", "16");
+
+                parameterMap.Add("url", "http://image1.cersp.com.cn/scpx/images/article/file/20190318/upload__51f98fc8_1697695ae73__7ffe_00001297.pdf");
+                parameterMap.Add("fileName", "XXX.pdf");
+                parameterMap.Add("fileSize", "247767");
+                parameterMap.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
+                parameterMap.Add("fileType", "pdf");
+                UploadSBTARPDF = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
+                UploadSBTARPDF.code = Code;
+                UploadSBTARPDF.title = "5.3.1.14学员校本研修PDF回写";
             }
-            {
-                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
-                parameterMapData.Add("PXID", "65306");
-                parameterMapData.Add("TID", "32393");
-                parameterMapData.Add("url", "https://scnltsfiles.scedu.com.cn/upload/infofj/202104011628463774.pdf");
-                parameterMapData.Add("fileName", "XXX.pdf");
-                parameterMapData.Add("fileSize", "247767");
-                parameterMapData.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
-                parameterMapData.Add("fileType", "pdf");
-                list.Add(parameterMapData);
+            catch (Exception ex) { 
             }
-            ScsResult UploadSBTARPDFList = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterContent);
-            UploadSBTARPDFList.code = Code;
-            UploadSBTARPDFList.title = "5.3.1.15学员校本教研PDF批量回写";
-
 
-
-            // 5.3.1.16学员课堂实录回写
-            Code = "UploadKTSL";
-            parameterMap = new Dictionary<string, object>();
-            parameterMap.Add("TrainComID", trainComID);
-            parameterMap.Add("PXID", "16");
-            parameterMap.Add("TID", "16");
-            parameterMap.Add("url", "https://xxx.mp4");
-            parameterMap.Add("url2", "https://xxx.mp4");
-            parameterMap.Add("fileName", "XXX.mp4");
-            parameterMap.Add("fileSize", "247767");
-            parameterMap.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
-            parameterMap.Add("fileType", "mp4");
-            ScsResult UploadKTSL = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
-            UploadKTSL.code = Code;
-            UploadKTSL.title = "5.3.1.16学员课堂实录回写";
-
-
-            //  5.3.1.17学员课堂实录批量回写
-            Code = "UploadKTSLList";
-            parameterContent = new Dictionary<string, object>();
-            list = new List<Dictionary<string, object>>();
-            parameterContent.Add("TrainComID", trainComID);
-            parameterContent.Add("List", list);
-            {
-                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
-                parameterMapData.Add("PXID", "16");
-                parameterMapData.Add("TID", "16");
-                parameterMapData.Add("url", "https://xxx.mp4");
-                parameterMapData.Add("url2", "https://xxx.mp4");
-                parameterMapData.Add("fileName", "XXX.mp4");
-                parameterMapData.Add("fileSize", "247767");
-                parameterMapData.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
-                parameterMapData.Add("fileType", "mp4");
-                list.Add(parameterMapData);
+            ScsResult UploadSBTARPDFList = null;
+            try
+            { // 5.3.1.15学员校本教研PDF批量回写
+                Code = "UploadSBTARPDFList";
+                parameterContent = new Dictionary<string, object>();
+                list = new List<Dictionary<string, object>>();
+                parameterContent.Add("TrainComID", trainComID);
+                parameterContent.Add("List", list);
+                {
+                    Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+                    parameterMapData.Add("PXID", "65309");
+                    parameterMapData.Add("TID", "253940");
+                    parameterMapData.Add("url", "https://scnltsfiles.scedu.com.cn/upload/infofj/202104011628463774.pdf");
+                    parameterMapData.Add("fileName", "XXX.pdf");
+                    parameterMapData.Add("fileSize", "247767");
+                    parameterMapData.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
+                    parameterMapData.Add("fileType", "pdf");
+                    list.Add(parameterMapData);
+                }
+                {
+                    Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+                    parameterMapData.Add("PXID", "65306");
+                    parameterMapData.Add("TID", "32393");
+                    parameterMapData.Add("url", "https://scnltsfiles.scedu.com.cn/upload/infofj/202104011628463774.pdf");
+                    parameterMapData.Add("fileName", "XXX.pdf");
+                    parameterMapData.Add("fileSize", "247767");
+                    parameterMapData.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
+                    parameterMapData.Add("fileType", "pdf");
+                    list.Add(parameterMapData);
+                }
+                UploadSBTARPDFList = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterContent);
+                UploadSBTARPDFList.code = Code;
+                UploadSBTARPDFList.title = "5.3.1.15学员校本教研PDF批量回写";
             }
+            catch (Exception ex) { }
+            ScsResult UploadKTSL = null;
+            try
             {
-                Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
-                parameterMapData.Add("PXID", "16");
-                parameterMapData.Add("TID", "16");
-                parameterMapData.Add("url", "https://xxx.mp4");
-                parameterMapData.Add("url2", "https://xxx.mp4");
-                parameterMapData.Add("fileName", "XXX.mp4");
-                parameterMapData.Add("fileSize", "247767");
-                parameterMapData.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
-                parameterMapData.Add("fileType", "mp4");
-                list.Add(parameterMapData);
-            }
-            ScsResult UploadKTSLList = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterContent);
-            UploadKTSLList.code = Code;
-            UploadKTSLList.title = "5.3.1.17学员课堂实录批量回写";
-
+                // 5.3.1.16学员课堂实录回写
+                Code = "UploadKTSL";
+                parameterMap = new Dictionary<string, object>();
+                parameterMap.Add("TrainComID", trainComID);
+                parameterMap.Add("PXID", "16");
+                parameterMap.Add("TID", "16");
+                parameterMap.Add("url", "https://xxx.mp4");
+                parameterMap.Add("url2", "https://xxx.mp4");
+                parameterMap.Add("fileName", "XXX.mp4");
+                parameterMap.Add("fileSize", "247767");
+                parameterMap.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
+                parameterMap.Add("fileType", "mp4");
+                 UploadKTSL = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
+                UploadKTSL.code = Code;
+                UploadKTSL.title = "5.3.1.16学员课堂实录回写";
+            } catch (Exception ex) { }
+            ScsResult UploadKTSLList = null;
+            try
+            {
+                //  5.3.1.17学员课堂实录批量回写
+                Code = "UploadKTSLList";
+                parameterContent = new Dictionary<string, object>();
+                list = new List<Dictionary<string, object>>();
+                parameterContent.Add("TrainComID", trainComID);
+                parameterContent.Add("List", list);
+                {
+                    Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+                    parameterMapData.Add("PXID", "16");
+                    parameterMapData.Add("TID", "16");
+                    parameterMapData.Add("url", "https://xxx.mp4");
+                    parameterMapData.Add("url2", "https://xxx.mp4");
+                    parameterMapData.Add("fileName", "XXX.mp4");
+                    parameterMapData.Add("fileSize", "247767");
+                    parameterMapData.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
+                    parameterMapData.Add("fileType", "mp4");
+                    list.Add(parameterMapData);
+                }
+                {
+                    Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
+                    parameterMapData.Add("PXID", "16");
+                    parameterMapData.Add("TID", "16");
+                    parameterMapData.Add("url", "https://xxx.mp4");
+                    parameterMapData.Add("url2", "https://xxx.mp4");
+                    parameterMapData.Add("fileName", "XXX.mp4");
+                    parameterMapData.Add("fileSize", "247767");
+                    parameterMapData.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
+                    parameterMapData.Add("fileType", "mp4");
+                    list.Add(parameterMapData);
+                }
+                UploadKTSLList = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterContent);
+                UploadKTSLList.code = Code;
+                UploadKTSLList.title = "5.3.1.17学员课堂实录批量回写";
 
+            }
+            catch (Exception ex) { }
 
             // 5.3.1.18根据机构ID、项目ID、子项目ID返回学校列表
             Code = "GetSchoolList";
@@ -535,8 +558,8 @@ namespace TEAMModelOS.Controllers.Third
                 GetProjectDiagnosis,
                 GetSchoolDiagnosis
             });
-            */
-            return Ok(GetProjectInfoByTrainComID);
+            
+            //return Ok(GetProjectInfoByTrainComID);
         }
 
         public class ScsResult {

+ 1 - 1
TEAMModelOS/TEAMModelOS.csproj

@@ -84,5 +84,5 @@
     </ItemGroup>
   </Target>
 
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" clientapp_4package_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 </Project>

+ 12 - 12
TEAMModelOS/appsettings.Development.json

@@ -56,19 +56,19 @@
     }
   },
   "Third": {
-    //"scsyxpt": {
-    //  "passKey": "VgEQfEjwzfvFn8my", //机构安全码
-    //  "trainComID": "2065", //机构ID
-    //  "privateKey": "4DB15444DEEDBB28B718ACB09217B5FC", //机构 AES 密钥
-    //  "url": "http://testscts.scedu.com.cn/webservice/EduService.asmx/RequestService"
-    //  //"url": "https://scts.scedu.com.cn/webservice/EduService.asmx/RequestService" 
-    //},
     "scsyxpt": {
-      "passKey": "fst4clhyXqrhXblY", //机构安全码
-      "trainComID": "3069", //机构ID
-      "privateKey": "52C1C240E4BE086DD15DB10814E243E6", //机构 AES 密钥
-      //"url": "http://testscts.scedu.com.cn/webservice/EduService.asmx/RequestService"
-      "url": "https://scts.scedu.com.cn/webservice/EduService.asmx/RequestService"
+      "passKey": "VgEQfEjwzfvFn8my", //机构安全码
+      "trainComID": "2065", //机构ID 2065 65324
+      "privateKey": "4DB15444DEEDBB28B718ACB09217B5FC", //机构 AES 密钥
+      "url": "http://testscts.scedu.com.cn/webservice/EduService.asmx/RequestService"
+      //"url": "https://scts.scedu.com.cn/webservice/EduService.asmx/RequestService" 
     }
+    //"scsyxpt": {
+    //  "passKey": "fst4clhyXqrhXblY", //机构安全码
+    //  "trainComID": "3069", //机构ID
+    //  "privateKey": "52C1C240E4BE086DD15DB10814E243E6", //机构 AES 密钥
+    //  //"url": "http://testscts.scedu.com.cn/webservice/EduService.asmx/RequestService"
+    //  "url": "https://scts.scedu.com.cn/webservice/EduService.asmx/RequestService"
+    //}
   }
 }