Browse Source

优化批量创校

Li 3 years ago
parent
commit
9aa0808b3a

+ 55 - 0
TEAMModelBI/Controllers/BIHome/AnalyseFileController.cs

@@ -0,0 +1,55 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TEAMModelBI.Controllers.BIHome
+{
+    [Route("analyse")]
+    [ApiController]
+    public class AnalyseFileController : ControllerBase
+    {
+        private readonly IWebHostEnvironment _environment; //读取文件流
+
+        public AnalyseFileController(IWebHostEnvironment environment) 
+        {
+            _environment = environment;
+        }
+
+        [HttpPost("get-visitjson")]
+        public async Task<IActionResult> GetVisitJson() 
+        {
+            var path = $"{_environment.ContentRootPath}/JsonFile/TempFile/PT1H.json";
+            StreamReader streamReader = new StreamReader(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), Encoding.UTF8);
+            List<object> objs = new(); 
+            StringBuilder visits = new("[");
+            string text;
+            while ((text = streamReader.ReadLine()) != null) 
+            {
+                objs.Add(text.ToString());
+                visits.Append($"{text},");
+            }
+
+            visits.Append("]");
+            streamReader.Close();
+            //var temp = visits.Split("||");
+
+            //var temp1 = string.Join("||");
+
+            return Ok(new { state = 200, objs, visits });
+        }
+
+
+
+        public record AGInfo 
+        {
+        
+        }
+
+
+    }
+}

+ 7 - 3
TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -195,14 +195,15 @@ namespace TEAMModelBI.Controllers.BISchool
                                 address = bischool.address,
                                 picture = "https://teammodelstorage.blob.core.chinacloudapi.cn/0-public/school/bbf54fb3-3fc8-43ae-a358-107281c174cc.png",
                                 timeZone = new TEAMModelOS.SDK.Models.TimeZone { label = "(UTC+08:00) 北京,重庆,香港特别行政区,乌鲁木齐", value = "+08:00" },
-                                type = bischool.type,
+                                type = string.IsNullOrEmpty(bischool.type.ToString()) ? 1 : bischool.type,
                                 pk = "School",
                                 ttl = -1,
                                 areaId = string.IsNullOrEmpty(bischool.areaId) ? "" : bischool.areaId,
+                                standard = string.IsNullOrEmpty(bischool.standard) ? "" : bischool.standard,
                                 schoolCode = createSchoolInfo.id,
                                 period = PresetSchoolPeriod(bischool.period, foundSchools.lang, campusId),
                                 scale = bischool.size >= 300 ? 500 : 0,
-                                createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()                                
+                                createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
                             };
 
                             stringBuilder.Append($"创建学校:{upSchool.name}【{upSchool.id}】");
@@ -1015,7 +1016,6 @@ namespace TEAMModelBI.Controllers.BISchool
             /// 县,区,郡
             /// </summary>
             public string dist { get; set; }
-
             /// <summary>
             /// 学校详细地址
             /// </summary>
@@ -1028,6 +1028,10 @@ namespace TEAMModelBI.Controllers.BISchool
             /// 区域ID
             /// </summary>
             public string areaId { get; set; }
+            /// <summary>
+            /// 区域标准
+            /// </summary>
+            public string standard { get; set; }
         }
 
         public record Exist()

File diff suppressed because it is too large
+ 4761 - 0
TEAMModelBI/JsonFile/TempFile/PT1H.json