|
@@ -93,13 +93,13 @@ namespace TEAMModelOS.Controllers
|
|
List<ScsResult> results = new List<ScsResult>();
|
|
List<ScsResult> results = new List<ScsResult>();
|
|
Dictionary<string, Dictionary<string, object>> pushDatas = new Dictionary<string, Dictionary<string, object>>();
|
|
Dictionary<string, Dictionary<string, object>> pushDatas = new Dictionary<string, Dictionary<string, object>>();
|
|
List<Dictionary<string, object>> dicts = new List<Dictionary<string, object>>();
|
|
List<Dictionary<string, object>> dicts = new List<Dictionary<string, object>>();
|
|
- int pages = (trains.Count + 19) / 20; //pages = (total + max -1) / max;
|
|
|
|
|
|
+ int pages = (trains.Count + 49) / 50; //pages = (total + max -1) / max;
|
|
|
|
|
|
var teammodelossas= _azureStorage.GetBlobContainerSAS99Year("teammodelos", Azure.Storage.Sas.BlobContainerSasPermissions.Read);
|
|
var teammodelossas= _azureStorage.GetBlobContainerSAS99Year("teammodelos", Azure.Storage.Sas.BlobContainerSasPermissions.Read);
|
|
var schoolsas = _azureStorage.GetBlobContainerSAS99Year($"{school}", Azure.Storage.Sas.BlobContainerSasPermissions.Read);
|
|
var schoolsas = _azureStorage.GetBlobContainerSAS99Year($"{school}", Azure.Storage.Sas.BlobContainerSasPermissions.Read);
|
|
for (int i = 0; i < pages; i++)
|
|
for (int i = 0; i < pages; i++)
|
|
{
|
|
{
|
|
- List<TeacherTrain> lists = trains.Skip((i) * 20).Take(20).ToList();
|
|
|
|
|
|
+ List<TeacherTrain> lists = trains.Skip((i) * 50).Take(50).ToList();
|
|
//5.3.1.12学员培训基本情况批量回写-UpdateTeacherListSituation
|
|
//5.3.1.12学员培训基本情况批量回写-UpdateTeacherListSituation
|
|
List<TeacherTrain> trains53112OK = new List<TeacherTrain>();
|
|
List<TeacherTrain> trains53112OK = new List<TeacherTrain>();
|
|
ScsResult UpdateTeacherListSituation = null;
|
|
ScsResult UpdateTeacherListSituation = null;
|
|
@@ -148,7 +148,7 @@ namespace TEAMModelOS.Controllers
|
|
string jsonTech = scTeacherDiagnoses.ToJsonString();
|
|
string jsonTech = scTeacherDiagnoses.ToJsonString();
|
|
ScTeacherDiagnosis diagnosis = scTeacherDiagnoses.Find(x => x.RowKey.Equals($"{t.PXID}"));
|
|
ScTeacherDiagnosis diagnosis = scTeacherDiagnoses.Find(x => x.RowKey.Equals($"{t.PXID}"));
|
|
(int t53112OK, List<KeyValuePair<string, string>> msgs53112) = ThirdService. check53112(x, msgs);
|
|
(int t53112OK, List<KeyValuePair<string, string>> msgs53112) = ThirdService. check53112(x, msgs);
|
|
- (int t53113OK, List<KeyValuePair<string, string>> msgs53113, List<AbilitySub> abilitySubs) = await ThirdService.check53113(_azureCosmos,x, diagnosis, msgs, $"{school}", schoolsas.uri, schoolsas.sas, _azureStorage);
|
|
|
|
|
|
+ (int t53113OK, List<KeyValuePair<string, string>> msgs53113, List<AbilitySub> abilitySubs, List<AbilitySub> allRightAbility) = await ThirdService.check53113(_azureCosmos,x, diagnosis, msgs, $"{school}", schoolsas.uri, schoolsas.sas, _azureStorage);
|
|
(int t53117OK, List<KeyValuePair<string, string>> msgs53117) = await ThirdService.check53117(x, msgs, $"{school}", schoolsas.uri, schoolsas.sas, _azureStorage);
|
|
(int t53117OK, List<KeyValuePair<string, string>> msgs53117) = await ThirdService.check53117(x, msgs, $"{school}", schoolsas.uri, schoolsas.sas, _azureStorage);
|
|
(int t53122OK, List<KeyValuePair<string, string>> msgs53122) = await ThirdService.check53122(x, msgs,$"{school}",schoolsas.uri,schoolsas.sas,_azureStorage);
|
|
(int t53122OK, List<KeyValuePair<string, string>> msgs53122) = await ThirdService.check53122(x, msgs,$"{school}",schoolsas.uri,schoolsas.sas,_azureStorage);
|
|
|
|
|
|
@@ -209,17 +209,18 @@ namespace TEAMModelOS.Controllers
|
|
List<Dictionary<string, object>> pfiles = new List<Dictionary<string, object>>();
|
|
List<Dictionary<string, object>> pfiles = new List<Dictionary<string, object>>();
|
|
parameterMapData.Add("pfiles", pfiles);
|
|
parameterMapData.Add("pfiles", pfiles);
|
|
|
|
|
|
- AbilitySub abilitySub = abilitySubs.Find(sub => sub.id.Equals(a.id));
|
|
|
|
- if (abilitySub != null)
|
|
|
|
|
|
+ AbilitySub allRight = allRightAbility.Find(sub => sub.id.Equals(a.id));
|
|
|
|
+ if (allRight != null)
|
|
{
|
|
{
|
|
- abilitySub.uploads.ForEach(upload => {
|
|
|
|
|
|
+ allRight.uploads.ForEach(upload => {
|
|
upload.urls.ForEach(url => {
|
|
upload.urls.ForEach(url => {
|
|
Dictionary<string, object> pfileMap = new Dictionary<string, object>();
|
|
Dictionary<string, object> pfileMap = new Dictionary<string, object>();
|
|
|
|
+ string fileext = url.url.Substring(url.url.LastIndexOf(".") > 0 ? url.url.LastIndexOf(".") + 1 : 0);
|
|
pfileMap.Add("url", $"{url.url}?{schoolsas.sas}");
|
|
pfileMap.Add("url", $"{url.url}?{schoolsas.sas}");
|
|
- pfileMap.Add("fileName", url.name);
|
|
|
|
|
|
+ pfileMap.Add("fileName", url.name.Length>95?$"{url.name.Substring(0, 95)}.{fileext}":url.name);
|
|
pfileMap.Add("fileSize", $"{url.size}");
|
|
pfileMap.Add("fileSize", $"{url.size}");
|
|
pfileMap.Add("md5", url.hash);
|
|
pfileMap.Add("md5", url.hash);
|
|
- string fileext = url.url.Substring(url.url.LastIndexOf(".") > 0 ? url.url.LastIndexOf(".") + 1 : 0);
|
|
|
|
|
|
+
|
|
pfileMap.Add("fileType", fileext);
|
|
pfileMap.Add("fileType", fileext);
|
|
pfiles.Add(pfileMap);
|
|
pfiles.Add(pfileMap);
|
|
});
|
|
});
|
|
@@ -316,14 +317,15 @@ namespace TEAMModelOS.Controllers
|
|
x.teacherClasses.ForEach(clss =>
|
|
x.teacherClasses.ForEach(clss =>
|
|
{
|
|
{
|
|
Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
|
|
Dictionary<string, object> parameterMapData = new Dictionary<string, object>();
|
|
|
|
+ string fileext = clss.url.Substring(clss.url.LastIndexOf(".") > 0 ? clss.url.LastIndexOf(".") + 1 : 0);
|
|
parameterMapData.Add("PXID", $"{t.PXID}");
|
|
parameterMapData.Add("PXID", $"{t.PXID}");
|
|
parameterMapData.Add("TID", $"{t.TID}");
|
|
parameterMapData.Add("TID", $"{t.TID}");
|
|
parameterMapData.Add("url", $"{clss.url}?{schoolsas.sas}");//添加访问授权
|
|
parameterMapData.Add("url", $"{clss.url}?{schoolsas.sas}");//添加访问授权
|
|
parameterMapData.Add("url2", $"{clss.url}?{schoolsas.sas}");
|
|
parameterMapData.Add("url2", $"{clss.url}?{schoolsas.sas}");
|
|
- parameterMapData.Add("fileName", clss.name);
|
|
|
|
|
|
+ parameterMapData.Add("fileName", clss.name.Length > 95 ? $"{clss.name.Substring(0, 95)}.{fileext}" : clss.name);
|
|
parameterMapData.Add("fileSize", $"{clss.size}");
|
|
parameterMapData.Add("fileSize", $"{clss.size}");
|
|
parameterMapData.Add("md5", clss.hash);
|
|
parameterMapData.Add("md5", clss.hash);
|
|
- string fileext = clss.url.Substring(clss.url.LastIndexOf(".") > 0 ? clss.url.LastIndexOf(".") + 1 : 0);
|
|
|
|
|
|
+
|
|
parameterMapData.Add("fileType", fileext);
|
|
parameterMapData.Add("fileType", fileext);
|
|
list53117.Add(parameterMapData);
|
|
list53117.Add(parameterMapData);
|
|
parameterMapDatas.Add(parameterMapData);
|
|
parameterMapDatas.Add(parameterMapData);
|
|
@@ -346,11 +348,12 @@ namespace TEAMModelOS.Controllers
|
|
if (!string.IsNullOrWhiteSpace(record.url))
|
|
if (!string.IsNullOrWhiteSpace(record.url))
|
|
{
|
|
{
|
|
Dictionary<string, object> fileMap = new Dictionary<string, object>();
|
|
Dictionary<string, object> fileMap = new Dictionary<string, object>();
|
|
|
|
+ string fileext = record.url.Substring(record.url.LastIndexOf(".") > 0 ? record.url.LastIndexOf(".") + 1 : 0);
|
|
fileMap.Add("url", $"{record.url}?{schoolsas.sas}");
|
|
fileMap.Add("url", $"{record.url}?{schoolsas.sas}");
|
|
- fileMap.Add("fileName", record.name);
|
|
|
|
|
|
+ fileMap.Add("fileName", record.name.Length > 95 ? $"{record.name.Substring(0, 95)}.{fileext}" : record.name);
|
|
fileMap.Add("fileSize", $"{record.size}");
|
|
fileMap.Add("fileSize", $"{record.size}");
|
|
fileMap.Add("md5", record.hash);
|
|
fileMap.Add("md5", record.hash);
|
|
- string fileext = record.url.Substring(record.url.LastIndexOf(".") > 0 ? record.url.LastIndexOf(".") + 1 : 0);
|
|
|
|
|
|
+
|
|
fileMap.Add("fileType", fileext);
|
|
fileMap.Add("fileType", fileext);
|
|
files.Add(fileMap);
|
|
files.Add(fileMap);
|
|
}
|
|
}
|