[設備管理][設備基本資料] 設備種類新增及修改程序調整完成
This commit is contained in:
parent
bb309d8613
commit
fc884ddb61
@ -201,7 +201,8 @@ namespace Backend.Controllers
|
||||
LEFT JOIN device_kind dk ON dk.device_building_tag = d.device_building_tag AND dk.device_system_tag = d.device_system_tag AND dk.device_name_tag = d.device_name_tag
|
||||
ORDER BY d.priority ASC, d.device_number ASC";
|
||||
|
||||
var devices = await backendRepository.GetAllAsync<Device>(sql, new {
|
||||
var devices = await backendRepository.GetAllAsync<Device>(sql, new
|
||||
{
|
||||
building_tag = post.building_tag,
|
||||
main_system_tag = post.device_system_tag,
|
||||
sub_system_tag = post.device_name_tag,
|
||||
@ -333,7 +334,7 @@ namespace Backend.Controllers
|
||||
{
|
||||
List<Dictionary<string, object>> deviceDics = new List<Dictionary<string, object>>();
|
||||
List<Dictionary<string, object>> device_disaster_dicts = new List<Dictionary<string, object>>();
|
||||
|
||||
PostDeviceKind postDeviceKind = new PostDeviceKind();
|
||||
using (var reader = new StreamReader(post.SelectedDevicesFile.OpenReadStream()))
|
||||
{
|
||||
string content = reader.ReadToEnd();
|
||||
@ -376,6 +377,14 @@ namespace Backend.Controllers
|
||||
{ "@created_by", myUserInfo.Userinfo_guid},
|
||||
};
|
||||
|
||||
postDeviceKind = new PostDeviceKind()
|
||||
{
|
||||
Device_building_tag = device_building_tag,
|
||||
Device_system_tag = device_system_tag,
|
||||
Device_floor_tag = device_floor_tag,
|
||||
Device_name_tag = device_name_tag,
|
||||
};
|
||||
|
||||
deviceDics.Add(deviceDic);
|
||||
|
||||
if (device.Device_disasters != null)
|
||||
@ -405,6 +414,8 @@ namespace Backend.Controllers
|
||||
|
||||
await ResetDeviceGroup(); //重新寫入設備群組
|
||||
|
||||
await AddDeviceKind(postDeviceKind);
|
||||
|
||||
apiResult.Code = "0000";
|
||||
apiResult.Msg = "修改成功";
|
||||
|
||||
@ -966,8 +977,8 @@ namespace Backend.Controllers
|
||||
FROM device d
|
||||
WHERE
|
||||
d.device_building_tag = @building_tag
|
||||
AND d.device_system_tag = @main_system_tag
|
||||
AND d.device_name_tag = @sub_system_tag
|
||||
AND d.device_system_tag = @device_system_tag
|
||||
AND d.device_name_tag = @device_name_tag
|
||||
-- AND d.floor_guid = @Floor_tag
|
||||
AND d.deleted = 0
|
||||
) d
|
||||
@ -1028,6 +1039,70 @@ namespace Backend.Controllers
|
||||
return apiResult;
|
||||
}
|
||||
|
||||
|
||||
public async Task AddDeviceKind(PostDeviceKind post)
|
||||
{
|
||||
|
||||
string sWhere = @$"device_building_tag = @building_tag and device_system_tag = @system_tag and device_name_tag = @name_tag";
|
||||
|
||||
object param = new { building_tag = post.Device_building_tag, system_tag = post.Device_system_tag, name_tag = post.Device_name_tag };
|
||||
|
||||
var deviceKind = await backendRepository.GetOneAsync<DeviceKind>("device_kind", sWhere, param);
|
||||
|
||||
if (deviceKind == null)
|
||||
{
|
||||
//新增
|
||||
//產生一組GUID
|
||||
var guid = Guid.NewGuid();
|
||||
|
||||
//抓出點位名稱
|
||||
//var point_name = new PointName();
|
||||
|
||||
//var sql_device_normal_point = @"SELECT n.points AS device_normal_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_id = @device_normal_point_guid) n";
|
||||
//point_name.Device_normal_point_name = await backendRepository.GetOneAsync<string>(sql_device_normal_point, new { device_normal_point_guid = post.Device_normal_point_guid });
|
||||
|
||||
//var sql_device_close_point = @"SELECT c.points AS device_close_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_guid = @device_close_point_guid) c";
|
||||
//point_name.Device_close_point_name = await backendRepository.GetOneAsync<string>(sql_device_close_point, new { device_close_point_guid = post.Device_close_point_guid });
|
||||
|
||||
//var sql_device_error_point = @"SELECT e.points AS device_error_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_guid = @device_error_point_guid) e";
|
||||
//point_name.Device_error_point_name = await backendRepository.GetOneAsync<string>(sql_device_error_point, new { device_error_point_guid = post.Device_error_point_guid });
|
||||
|
||||
Dictionary<string, object> deviceKindDic = new Dictionary<string, object>()
|
||||
{
|
||||
{ "@device_kind_guid", guid},
|
||||
{ "@device_building_tag", post.Device_building_tag},
|
||||
{ "@device_system_tag", post.Device_system_tag},
|
||||
//{ "@device_floor_tag", post.Device_floor_tag},
|
||||
{ "@device_name_tag", post.Device_name_tag},
|
||||
{ "@device_image", null },
|
||||
{ "@device_normal_text", post.Device_normal_text},
|
||||
{ "@device_normal_point_guid", post.Device_normal_point_guid},
|
||||
{ "@device_normal_point_name", null},
|
||||
{ "@device_normal_point_col", post.Device_normal_point_col},
|
||||
{ "@device_normal_point_value", post.Device_normal_point_value},
|
||||
{ "@device_normal_color", post.Device_normal_color},
|
||||
{ "@device_normal_flashing", post.Device_normal_flashing},
|
||||
{ "@device_close_text", post.Device_close_text},
|
||||
{ "@device_close_point_guid", post.Device_close_point_guid},
|
||||
{ "@device_close_point_name", null},
|
||||
{ "@device_close_point_col", post.Device_close_point_col},
|
||||
{ "@device_close_point_value", post.Device_close_point_value},
|
||||
{ "@device_close_color", post.Device_close_color},
|
||||
{ "@device_close_flashing", post.Device_close_flashing},
|
||||
{ "@device_error_text", post.Device_error_text},
|
||||
{ "@device_error_point_guid", post.Device_error_point_guid},
|
||||
{ "@device_error_point_name", null},
|
||||
{ "@device_error_point_col", post.Device_error_point_col},
|
||||
{ "@device_error_point_value", post.Device_error_point_value},
|
||||
{ "@device_error_color", post.Device_error_color},
|
||||
{ "@device_error_flashing", post.Device_error_flashing},
|
||||
{ "@device_error_independent", post.Device_error_independent},
|
||||
{ "@created_by", myUserInfo.Userinfo_guid}
|
||||
};
|
||||
await backendRepository.AddOneByCustomTable(deviceKindDic, "device_kind");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改 設備基本資料
|
||||
/// </summary>
|
||||
@ -1065,14 +1140,14 @@ namespace Backend.Controllers
|
||||
//抓出點位名稱
|
||||
var point_name = new PointName();
|
||||
|
||||
var sql_device_normal_point = @"SELECT n.points AS device_normal_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_guid = @device_normal_point_guid) n";
|
||||
point_name.Device_normal_point_name = await backendRepository.GetOneAsync<string>(sql_device_normal_point, new { device_normal_point_guid = post.Device_normal_point_guid });
|
||||
var sql_device_normal_point = @"SELECT n.points AS device_normal_point_name FROM (SELECT * FROM device_item di WHERE di.id = @device_normal_point_id) n";
|
||||
point_name.Device_normal_point_name = await backendRepository.GetOneAsync<string>(sql_device_normal_point, new { device_normal_point_id = post.Device_normal_point_guid });
|
||||
|
||||
var sql_device_close_point = @"SELECT c.points AS device_close_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_guid = @device_close_point_guid) c";
|
||||
point_name.Device_close_point_name = await backendRepository.GetOneAsync<string>(sql_device_close_point, new { device_close_point_guid = post.Device_close_point_guid });
|
||||
var sql_device_close_point = @"SELECT c.points AS device_close_point_name FROM (SELECT * FROM device_item di WHERE di.id = @device_close_point_id) c";
|
||||
point_name.Device_close_point_name = await backendRepository.GetOneAsync<string>(sql_device_close_point, new { device_close_point_id = post.Device_close_point_guid });
|
||||
|
||||
var sql_device_error_point = @"SELECT e.points AS device_error_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_guid = @device_error_point_guid) e";
|
||||
point_name.Device_error_point_name = await backendRepository.GetOneAsync<string>(sql_device_error_point, new { device_error_point_guid = post.Device_error_point_guid });
|
||||
var sql_device_error_point = @"SELECT e.points AS device_error_point_name FROM (SELECT * FROM device_item di WHERE di.id = @device_error_point_id) e";
|
||||
point_name.Device_error_point_name = await backendRepository.GetOneAsync<string>(sql_device_error_point, new { device_error_point_id = post.Device_error_point_guid });
|
||||
|
||||
Dictionary<string, object> deviceKindDic = new Dictionary<string, object>()
|
||||
{
|
||||
@ -1122,23 +1197,23 @@ namespace Backend.Controllers
|
||||
}
|
||||
|
||||
#region 新增至派送資料表
|
||||
List<Repository.Models.FileInfo> fileInfos = new List<Repository.Models.FileInfo>();
|
||||
if (post.Device_image_file != null)
|
||||
{
|
||||
var split = post.Device_image_file.FileName.Split(".");
|
||||
var fileName = guid + "." + split[split.Length - 1];
|
||||
//List<Repository.Models.FileInfo> fileInfos = new List<Repository.Models.FileInfo>();
|
||||
//if (post.Device_image_file != null)
|
||||
//{
|
||||
// var split = post.Device_image_file.FileName.Split(".");
|
||||
// var fileName = guid + "." + split[split.Length - 1];
|
||||
|
||||
var fullPath = Path.Combine(deviceKindFileSaveAsPath, fileName);
|
||||
// var fullPath = Path.Combine(deviceKindFileSaveAsPath, fileName);
|
||||
|
||||
Repository.Models.FileInfo fileInfo = new Repository.Models.FileInfo();
|
||||
fileInfo.Folder = "device_icon";
|
||||
fileInfo.OriginalFileName = null;
|
||||
fileInfo.FileName = fileName;
|
||||
fileInfo.File = fullPath;
|
||||
// Repository.Models.FileInfo fileInfo = new Repository.Models.FileInfo();
|
||||
// fileInfo.Folder = "device_icon";
|
||||
// fileInfo.OriginalFileName = null;
|
||||
// fileInfo.FileName = fileName;
|
||||
// fileInfo.File = fullPath;
|
||||
|
||||
fileInfos.Add(fileInfo);
|
||||
await backendRepository.ManualInsertFileBackgroundServiceTask("", "", "device_kind", fileInfos);
|
||||
}
|
||||
// fileInfos.Add(fileInfo);
|
||||
// await backendRepository.ManualInsertFileBackgroundServiceTask("", "", "device_kind", fileInfos);
|
||||
//}
|
||||
#endregion
|
||||
|
||||
apiResult.Code = "0000";
|
||||
@ -1163,14 +1238,14 @@ namespace Backend.Controllers
|
||||
//抓出點位名稱
|
||||
var point_name = new PointName();
|
||||
|
||||
var sql_device_normal_point = @"SELECT n.points AS device_normal_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_guid = @device_normal_point_guid) n";
|
||||
point_name.Device_normal_point_name = await backendRepository.GetOneAsync<string>(sql_device_normal_point, new { device_normal_point_guid = post.Device_normal_point_guid });
|
||||
var sql_device_normal_point = @"SELECT n.points AS device_normal_point_name FROM (SELECT * FROM device_item di WHERE di.id = @device_normal_point_id) n";
|
||||
point_name.Device_normal_point_name = await backendRepository.GetOneAsync<string>(sql_device_normal_point, new { device_normal_point_id = post.Device_normal_point_guid });
|
||||
|
||||
var sql_device_close_point = @"SELECT c.points AS device_close_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_guid = @device_close_point_guid) c";
|
||||
point_name.Device_close_point_name = await backendRepository.GetOneAsync<string>(sql_device_close_point, new { device_close_point_guid = post.Device_close_point_guid });
|
||||
var sql_device_close_point = @"SELECT c.points AS device_close_point_name FROM (SELECT * FROM device_item di WHERE di.id = @device_close_point_id) c";
|
||||
point_name.Device_close_point_name = await backendRepository.GetOneAsync<string>(sql_device_close_point, new { device_close_point_id = post.Device_close_point_guid });
|
||||
|
||||
var sql_device_error_point = @"SELECT e.points AS device_error_point_name FROM (SELECT * FROM device_item di WHERE di.device_item_guid = @device_error_point_guid) e";
|
||||
point_name.Device_error_point_name = await backendRepository.GetOneAsync<string>(sql_device_error_point, new { device_error_point_guid = post.Device_error_point_guid });
|
||||
var sql_device_error_point = @"SELECT e.points AS device_error_point_name FROM (SELECT * FROM device_item di WHERE di.id = @device_error_point_id) e";
|
||||
point_name.Device_error_point_name = await backendRepository.GetOneAsync<string>(sql_device_error_point, new { device_error_point_id = post.Device_error_point_guid });
|
||||
|
||||
Dictionary<string, object> deviceKindDic = new Dictionary<string, object>()
|
||||
{
|
||||
@ -1220,23 +1295,23 @@ namespace Backend.Controllers
|
||||
}
|
||||
|
||||
#region 新增至派送資料表
|
||||
List<Repository.Models.FileInfo> fileInfos = new List<Repository.Models.FileInfo>();
|
||||
if (post.Device_image_file != null)
|
||||
{
|
||||
var split = post.Device_image_file.FileName.Split(".");
|
||||
var fileName = image_guid + "." + split[split.Length - 1];
|
||||
//List<Repository.Models.FileInfo> fileInfos = new List<Repository.Models.FileInfo>();
|
||||
//if (post.Device_image_file != null)
|
||||
//{
|
||||
// var split = post.Device_image_file.FileName.Split(".");
|
||||
// var fileName = image_guid + "." + split[split.Length - 1];
|
||||
|
||||
var fullPath = Path.Combine(deviceKindFileSaveAsPath, fileName);
|
||||
// var fullPath = Path.Combine(deviceKindFileSaveAsPath, fileName);
|
||||
|
||||
Repository.Models.FileInfo fileInfo = new Repository.Models.FileInfo();
|
||||
fileInfo.Folder = "device_icon";
|
||||
fileInfo.OriginalFileName = deviceKind.Device_image;
|
||||
fileInfo.FileName = fileName;
|
||||
fileInfo.File = fullPath;
|
||||
// Repository.Models.FileInfo fileInfo = new Repository.Models.FileInfo();
|
||||
// fileInfo.Folder = "device_icon";
|
||||
// fileInfo.OriginalFileName = deviceKind.Device_image;
|
||||
// fileInfo.FileName = fileName;
|
||||
// fileInfo.File = fullPath;
|
||||
|
||||
fileInfos.Add(fileInfo);
|
||||
await backendRepository.ManualInsertFileBackgroundServiceTask("", "", "device_kind", fileInfos);
|
||||
}
|
||||
// fileInfos.Add(fileInfo);
|
||||
// await backendRepository.ManualInsertFileBackgroundServiceTask("", "", "device_kind", fileInfos);
|
||||
//}
|
||||
#endregion
|
||||
|
||||
apiResult.Code = "0000";
|
||||
@ -1585,7 +1660,7 @@ namespace Backend.Controllers
|
||||
|
||||
try
|
||||
{
|
||||
string sWhere = "deleted = 0 AND sub_system_tag = @Sub_system_tag";
|
||||
string sWhere = "deleted = 0 AND device_name_tag = @Sub_system_tag";
|
||||
|
||||
object param = new { Sub_system_tag = sub_system_tag };
|
||||
|
||||
|
||||
@ -175,7 +175,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-12" id="" name="drawing_extend">
|
||||
<div class="form-group col-12" id="build_menu_planimetric_modal_div" name="drawing_extend" >
|
||||
<div class="col-12 mb-2 custom-control custom-checkbox align-content-center" >
|
||||
<input type="checkbox" class="custom-control-input" name="planimetric_click" id="planimetric_click" value="1" />
|
||||
<label class="custom-control-label" for="planimetric_click">是否顯示平面圖</label>
|
||||
@ -263,7 +263,13 @@
|
||||
<label class="form-label"><span class="text-danger">*</span>預設頁面</label>
|
||||
<div class="row" id="build_menu_drawing_modal_r">
|
||||
<div class="col">
|
||||
<input type="radio" name="drawing_r" id="drawing_4_r" value="4" checked>
|
||||
<input type="radio" name="drawing_r" id="drawing_0_r" value="0" checked>
|
||||
<label for="drawing_0_r">
|
||||
不顯示
|
||||
</label>
|
||||
</div>
|
||||
<div class="col">
|
||||
<input type="radio" name="drawing_r" id="drawing_4_r" value="4">
|
||||
<label for="drawing_4_r">
|
||||
昇位圖
|
||||
</label>
|
||||
@ -294,7 +300,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-12" id="" name="drawing_extend_r">
|
||||
<div class="form-group col-12" id="build_menu_planimetric_modal_div_r" name="drawing_extend_r">
|
||||
<div class="col-12 mb-2 custom-control custom-checkbox align-content-center">
|
||||
<input type="checkbox" class="custom-control-input" name="planimetric_click_r" id="planimetric_click_r" value="1" />
|
||||
<label class="custom-control-label" for="planimetric_click_r">是否顯示平面圖</label>
|
||||
@ -973,7 +979,7 @@
|
||||
$(drawingParent).find('[id^=build_menu_icon_click_url_width_height_modal_div]').hide();
|
||||
$(drawingParent).find('[id^=build_menu_planimetric_floor_modal_div]').hide();
|
||||
$(drawingParent).find('[id^=build_menu_systemurl_modal_div]').hide();
|
||||
|
||||
$(drawingParent).find('[id^=build_menu_planimetric_modal_div]').show();
|
||||
if ($(value).val() == 2) {
|
||||
$(drawingParent).find('[id^=planimetric_click]').attr("disabled", false);
|
||||
$(drawingParent).find('[id^=build_menu_systemurl_modal_div]').show();
|
||||
@ -992,6 +998,8 @@
|
||||
$(drawingParent).find('[id^=build_menu_blankurl_modal_div]').show();
|
||||
} else if ($(value).val() == 3) {
|
||||
$(drawingParent).find('[id^=planimetric_click]').prop("checked", false).attr("disabled", true);
|
||||
} else {
|
||||
$(drawingParent).find('[id^=build_menu_planimetric_modal_div]').hide();
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
@ -1494,10 +1494,10 @@
|
||||
"url": "/DeviceManage/DeviceKindTableList",
|
||||
"type": "POST",
|
||||
"data": function (d) {
|
||||
d.Building_tag = selected_building_menu.building_tag ? selected_building_menu.building_tag : "";
|
||||
d.Main_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_tag : "";
|
||||
d.Sub_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||
d.Floor_tag = selected_floor_tag ? selected_floor_tag : "";
|
||||
d.building_tag = selected_building_menu.building_tag ? selected_building_menu.building_tag : "";
|
||||
d.device_system_tag = selected_building_menu.main_system ? selected_building_menu.main_system.main_system_tag : "";
|
||||
d.device_name_tag = selected_building_menu.main_system ? selected_building_menu.main_system.sub_system ? selected_building_menu.main_system.sub_system.sub_system_tag : "" : "";
|
||||
//d.Floor_tag = selected_floor_tag ? selected_floor_tag : "";
|
||||
},
|
||||
"dataSrc": function (rel) {
|
||||
if (rel.code == "9999") {
|
||||
@ -1574,9 +1574,9 @@
|
||||
$("#device_close_point_name_modal").append($("<option />").val("").text("未選擇"));
|
||||
$("#device_error_point_name_modal").append($("<option />").val("").text("未選擇"));
|
||||
$.each(rel.data, function (index, val) {
|
||||
$("#device_normal_point_name_modal").append($("<option />").val(val.device_item_guid).text(val.points));
|
||||
$("#device_close_point_name_modal").append($("<option />").val(val.device_item_guid).text(val.points));
|
||||
$("#device_error_point_name_modal").append($("<option />").val(val.device_item_guid).text(val.points));
|
||||
$("#device_normal_point_name_modal").append($("<option />").val(val.id).text(val.points));
|
||||
$("#device_close_point_name_modal").append($("<option />").val(val.id).text(val.points));
|
||||
$("#device_error_point_name_modal").append($("<option />").val(val.id).text(val.points));
|
||||
});
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Loading…
Reference in New Issue
Block a user