diff --git a/Backend/Controllers/DeviceImportController.cs b/Backend/Controllers/DeviceImportController.cs index fb0beb2..7b03b95 100644 --- a/Backend/Controllers/DeviceImportController.cs +++ b/Backend/Controllers/DeviceImportController.cs @@ -755,6 +755,7 @@ namespace Backend.Controllers public async Task> ImportDevForCor([FromBody] List post) { ApiResult apiResult = new ApiResult(); + var device_guid_record = ""; try { if (post != null) @@ -762,41 +763,46 @@ namespace Backend.Controllers if (post.Count > 0) { //清空device_node資料表 - //await backendRepository.TruncateTable("device_node"); + await backendRepository.TruncateTable("device_node"); - //int node_priority = 1; + int node_priority = 1; foreach(var idfc in post) { - //if(idfc.device_number.IndexOf("_LT_L1") > -1) - //{ - // //取得device_guid - // var sWhere = $@"where deleted = 0 and device_number = " + idfc.device_number; - // var device_guid = await backendRepository.GetOneAsync("device_node", sWhere, "device_guid"); + if (idfc.device_number.IndexOf("_LT_L1") > -1) + { + //取得device_guid + var sWhere = $@" deleted = 0 and device_number = '" + idfc.device_number + "'"; + var device_guid = await backendRepository.GetOneColAsync("device", sWhere, "device_guid"); + if(device_guid.ToString() != device_guid_record) + { + device_guid_record = device_guid.ToString(); + node_priority = 1; + } - // //燈具 - // Dictionary device = new Dictionary(); - // device.Add("@device_node_guid", Guid.NewGuid()); - // device.Add("@deleted", 0); - // device.Add("@device_guid", device_guid); - // device.Add("@device_node_coordinate_3d", idfc.device_coordinate_3d); - // device.Add("@forge_dbid", idfc.forge_dbid); - // device.Add("@priority", node_priority); - // device.Add("@created_by", myUserInfo.Userinfo_guid); - // device.Add("@created_at", DateTime.Now); + //燈具 + Dictionary device = new Dictionary(); + device.Add("@device_node_guid", Guid.NewGuid()); + device.Add("@deleted", 0); + device.Add("@device_guid", device_guid); + device.Add("@device_node_coordinate_3d", idfc.device_coordinate_3d); + device.Add("@forge_dbid", idfc.forge_dbid); + device.Add("@priority", node_priority); + device.Add("@created_by", myUserInfo.Userinfo_guid); + device.Add("@created_at", DateTime.Now); - // node_priority++; - // await backendRepository.AddOneByCustomTableReturnId(device, "device_node", false); - //} - //else - //{ + node_priority++; + await backendRepository.AddOneByCustomTableReturnId(device, "device_node", false); + } + else + { Dictionary device = new Dictionary(); device.Add("@device_coordinate_3d", idfc.device_coordinate_3d); device.Add("@forge_dbid", idfc.forge_dbid); await backendRepository.UpdateOneByCustomTable(device, "device", $@" device_number = '{idfc.device_number}'"); - //} - + } + + - } } apiResult.Code = "0000"; diff --git a/Backend/wwwroot/forgeDemo.html b/Backend/wwwroot/forgeDemo.html index 0e8b9fc..6bbdccb 100644 --- a/Backend/wwwroot/forgeDemo.html +++ b/Backend/wwwroot/forgeDemo.html @@ -184,7 +184,6 @@