From b48280673b11f14e2ed7b0ecd8d25c589785c19c Mon Sep 17 00:00:00 2001 From: b110212000 Date: Wed, 16 Jun 2021 09:34:52 +0800 Subject: [PATCH 1/4] init --- SolarPower/Models/User.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SolarPower/Models/User.cs b/SolarPower/Models/User.cs index 78477d7..c380ccd 100644 --- a/SolarPower/Models/User.cs +++ b/SolarPower/Models/User.cs @@ -10,7 +10,7 @@ namespace SolarPower.Models.User Suspend = 0, //停權 Normal = 1, //正常 } - + //Base Class。如由其餘需求，使用繼承 public class User : Created { From 40396c8e8512ba94be4680538eae62dafbf355c9 Mon Sep 17 00:00:00 2001 From: b110212000 Date: Thu, 17 Jun 2021 14:31:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=81=8B=E7=B6=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PowerStationController.cs | 184 ++++++++++++++++++ SolarPower/Helper/DatabaseHelper.cs | 2 +- SolarPower/Models/PowerStation.cs | 22 +++ .../Implement/PowerStationRepository.cs | 110 +++++++++++ .../Repository/Implement/RepositoryBase.cs | 35 ++++ .../Interface/IPowerStationRepository.cs | 5 + .../Repository/Interface/IRepositoryBase.cs | 7 + .../PowerStation/PowerStationEdit.cshtml | 179 ++++++++++++++++- .../Views/PowerStation/_Operation.cshtml | 102 +++++----- SolarPower/Views/User/Index.cshtml | 4 +- 10 files changed, 602 insertions(+), 48 deletions(-) diff --git a/SolarPower/Controllers/PowerStationController.cs b/SolarPower/Controllers/PowerStationController.cs index 540ee3f..8d7b8ae 100644 --- a/SolarPower/Controllers/PowerStationController.cs +++ b/SolarPower/Controllers/PowerStationController.cs @@ -216,5 +216,189 @@ namespace SolarPower.Controllers return apiResult; } + /// + /// 新增/修改 運維資料 + /// + /// + /// + public async Task> SaveOperation(OperationInfo post) + { + ApiResult apiResult = new ApiResult(); + try + { + if (post.Id == 0) + { + OperationInfo operation = new OperationInfo() + { + Id = post.Id, + Email = post.Email, + Name = post.Name, + Phone = post.Phone, + CreatedBy = myUser.Id, + ContactPerson = post.ContactPerson, + PowerStationId = post.PowerStationId, + Type = post.Type + }; + List properties = new List() + { + "Id", + "Email", + "Name", + "Phone", + "CreatedBy", + "ContactPerson", + "PowerStationId", + "Type" + }; + await powerStationRepository.AddOperation(operation, properties); + + apiResult.Code = "0000"; + apiResult.Msg = "新增成功"; + } + else + { + OperationInfo operation = new OperationInfo() + { + Id = post.Id, + Email = post.Email, + Name = post.Name, + Phone = post.Phone, + CreatedBy = myUser.Id, + ContactPerson = post.ContactPerson, + PowerStationId = post.PowerStationId, + Type = post.Type + }; + List properties = new List() + { + "Id", + "Email", + "Name", + "Phone", + "CreatedBy", + "ContactPerson", + "PowerStationId", + "Type" + }; + await powerStationRepository.UpdateOperation(operation, properties); + apiResult.Code = "0000"; + apiResult.Msg = "儲存成功"; + } + + } + catch (Exception exception) + { + apiResult.Code = "9999"; + apiResult.Msg = exception.ToString(); + } + + return apiResult; + } + /// + /// 運維資料DataTable + /// + /// + /// + public async Task OperationTable(int stationId) + { + + List operationTable = new List(); + ApiResult> apiResult = new ApiResult>(); + try + { + apiResult.Code = "0000"; + operationTable = await powerStationRepository.OperationTable(stationId); + foreach(OperationTable a in operationTable) + { + a.Function = @" + + "; + if (a.Type == 0) + { + a.TypeName = "施工"; + } + else if(a.Type == 1) + { + a.TypeName = "清洗"; + } + else if (a.Type == 2) + { + a.TypeName = "運維"; + } + } + + apiResult.Data = operationTable; + + } + catch (Exception exception) + { + apiResult.Code = "9999"; + apiResult.Msg = exception.ToString(); + } + var result = Json(new + { + data = apiResult + }); + + return result; + } + /// + /// 取得一筆 運維 資料 + /// + /// + /// + public async Task> GetOneOperation(int id) + { + OperationInfo operation = new OperationInfo(); + ApiResult apiResult = new ApiResult(); + try + { + apiResult.Code = "0000"; + operation = await powerStationRepository.OneOperationInfo(id); + apiResult.Data = operation; + } + catch (Exception exception) + { + apiResult.Code = "9999"; + apiResult.Msg = exception.ToString(); + } + + return apiResult; + } + /// + /// 刪除 運維 資料 + /// + /// + /// + public async Task> DeleteOneOperation(int id) + { + ApiResult apiResult = new ApiResult(); + OperationInfo operation = new OperationInfo(); + try + { + operation = await powerStationRepository.OneOperationInfo(id); + + if (operation == null) + { + apiResult.Code = "9996"; + apiResult.Msg = errorCode.GetString(apiResult.Code); + return apiResult; + } + + await powerStationRepository.DeleteOneOtherTable(operation.Id, "operation_firm"); + + apiResult.Code = "0000"; + apiResult.Msg = "刪除成功"; + } + catch (Exception exception) + { + apiResult.Code = "9999"; + apiResult.Msg = errorCode.GetString(apiResult.Code); + Logger.LogError("【" + controllerName + "/" + actionName + "】" + "Id=" + id); + Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message); + } + + return apiResult; + } + } } diff --git a/SolarPower/Helper/DatabaseHelper.cs b/SolarPower/Helper/DatabaseHelper.cs index b359893..2e57aa3 100644 --- a/SolarPower/Helper/DatabaseHelper.cs +++ b/SolarPower/Helper/DatabaseHelper.cs @@ -37,7 +37,7 @@ namespace SolarPower.Helper var passwordStr = ed.DESDecrypt(dbConfig.Password); //var connStr = $"server={serverStr};database={databaseStr};user={rootStr};password={passwordStr};charset=utf8;"; - var connStr = @"server=127.0.0.1;database=solar_power;user=root;password=000000;charset=utf8;"; + var connStr = @"server=127.0.0.1;port=3308;database=solar_power;user=root;password=00000000;charset=utf8;"; this._connectionString = connStr; } diff --git a/SolarPower/Models/PowerStation.cs b/SolarPower/Models/PowerStation.cs index ac9c806..97f8c1c 100644 --- a/SolarPower/Models/PowerStation.cs +++ b/SolarPower/Models/PowerStation.cs @@ -78,4 +78,26 @@ namespace SolarPower.Models.PowerStation public string PhotovoltaicPanelSpecification { get; set; } //光電板規格 public int PhotovoltaicPanelAmount { get; set; } //光電板規格 } + + public class OperationInfo : Created + { + public int Id { get; set; } + public int PowerStationId { get; set; } + public int Type { get; set; } + public string Name { get; set; } + public string ContactPerson { get; set; } + public string Phone { get; set; } + public string Email { get; set; } + } + public class OperationStationId + { + public int stationId { get; set; } + } + public class OperationTable : OperationInfo + { + public string CreatedName { get; set; } + public string Function { get; set; } + public string TypeName { get; set; } + } + } diff --git a/SolarPower/Repository/Implement/PowerStationRepository.cs b/SolarPower/Repository/Implement/PowerStationRepository.cs index c86f08e..30fe3e0 100644 --- a/SolarPower/Repository/Implement/PowerStationRepository.cs +++ b/SolarPower/Repository/Implement/PowerStationRepository.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; +using System.Text; using System.Threading.Tasks; namespace SolarPower.Repository.Implement @@ -48,5 +49,114 @@ namespace SolarPower.Repository.Implement return result; } } + + public async Task AddOperation(OperationInfo operation, List properties) + { + using (IDbConnection conn = _databaseHelper.GetConnection()) + { + int count; + conn.Open(); + try + { + string sql = GenerateInsertQueryWithCustomTable(properties, "operation_firm"); + + count = await conn.ExecuteAsync(sql, operation); + + } + catch (Exception exception) + { + throw exception; + } + finally + { + conn.Close(); + } + + return count; + } + } + + public async Task> OperationTable (int stationId) + { + + using (IDbConnection conn = _databaseHelper.GetConnection()) + { + List operation = new List(); + conn.Open(); + try + { + string sql = @$"SELECT operation_firm.Name, + operation_firm.PowerStationId, + operation_firm.Id,operation_firm.ContactPerson,operation_firm.Phone,operation_firm.Email,user.Name AS CreatedName,operation_firm.CreatedAt,operation_firm.Type + FROM operation_firm LEFT JOIN user ON operation_firm.CreatedBy = user.id WHERE operation_firm.Deleted = 0 AND operation_firm.PowerStationId = @StationId"; + operation = (await conn.QueryAsync(sql, new { StationId = stationId })).ToList(); + + } + catch (Exception exception) + { + throw exception; + } + finally + { + conn.Close(); + } + return operation; + } + } + + public async Task OneOperationInfo (int id) + { + using (IDbConnection conn = _databaseHelper.GetConnection()) + { + OperationInfo operation; + conn.Open(); + try + { + string sql = @$"SELECT * FROM operation_firm WHERE Id = @Id"; + operation = await conn.QueryFirstOrDefaultAsync(sql, new { Id = id }); + + } + catch (Exception exception) + { + throw exception; + } + finally + { + conn.Close(); + } + return operation; + } + } + + public async Task UpdateOperation(OperationInfo operation , List properties) + { + using IDbConnection conn = _databaseHelper.GetConnection(); + conn.Open(); + var trans = conn.BeginTransaction(); + try + { + var updateQuery = new StringBuilder($"UPDATE operation_firm SET "); + properties.ForEach(property => + { + if (!property.Equals("Id")) + { + updateQuery.Append($"{property}=@{property},"); + } + }); + updateQuery.Remove(updateQuery.Length - 1, 1); //remove last comma + updateQuery.Append(" WHERE id = @Id"); + await conn.ExecuteAsync(updateQuery.ToString(), operation, trans); + trans.Commit(); + } + catch (Exception exception) + { + trans.Rollback(); + throw exception; + } + finally + { + conn.Close(); + } + } } } diff --git a/SolarPower/Repository/Implement/RepositoryBase.cs b/SolarPower/Repository/Implement/RepositoryBase.cs index ed47b6a..3eabe96 100644 --- a/SolarPower/Repository/Implement/RepositoryBase.cs +++ b/SolarPower/Repository/Implement/RepositoryBase.cs @@ -87,6 +87,7 @@ namespace SolarPower.Repository.Implement return id; } } + /// /// 透過Id，軟刪除單一筆資料 @@ -121,6 +122,40 @@ namespace SolarPower.Repository.Implement } } } + /// + /// 透過Id，軟刪除單一筆資料(不同資料表) + /// + /// + /// + /// + public virtual async Task DeleteOneOtherTable(int id,string table_name) + { + using (IDbConnection conn = this._databaseHelper.GetConnection()) + { + conn.Open(); + using (var trans = conn.BeginTransaction()) + { + try + { + var sql = $"UPDATE {table_name} SET deleted = 1 WHERE id = @Id"; + + await conn.ExecuteAsync(sql, new { Id = id }, trans); + + trans.Commit(); + } + catch (Exception exception) + { + trans.Rollback(); + throw exception; + } + finally + { + conn.Close(); + } + + } + } + } /// /// 取得所有資料 diff --git a/SolarPower/Repository/Interface/IPowerStationRepository.cs b/SolarPower/Repository/Interface/IPowerStationRepository.cs index 1673730..559dd5a 100644 --- a/SolarPower/Repository/Interface/IPowerStationRepository.cs +++ b/SolarPower/Repository/Interface/IPowerStationRepository.cs @@ -8,5 +8,10 @@ namespace SolarPower.Repository.Interface { public interface IPowerStationRepository : IRepositoryBase { + Task AddOperation(OperationInfo operation, List properties); + Task> OperationTable (int stationId); + Task OneOperationInfo (int stationId); + Task UpdateOperation(OperationInfo operation, List properties); + } } diff --git a/SolarPower/Repository/Interface/IRepositoryBase.cs b/SolarPower/Repository/Interface/IRepositoryBase.cs index b83be3f..3c4f7af 100644 --- a/SolarPower/Repository/Interface/IRepositoryBase.cs +++ b/SolarPower/Repository/Interface/IRepositoryBase.cs @@ -58,5 +58,12 @@ namespace SolarPower.Repository.Interface /// /// Task PurgeOneAsync(int id); + /// + /// 透過Id，軟刪除單一筆資料(不同資料表) + /// + /// + /// + /// + Task DeleteOneOtherTable(int id, string tablename); } } diff --git a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml index 5a93d45..3397f01 100644 --- a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml +++ b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml @@ -86,11 +86,92 @@ @section Scripts{ } \ No newline at end of file diff --git a/SolarPower/Views/PowerStation/_Operation.cshtml b/SolarPower/Views/PowerStation/_Operation.cshtml index cf9f2f3..129e62e 100644 --- a/SolarPower/Views/PowerStation/_Operation.cshtml +++ b/SolarPower/Views/PowerStation/_Operation.cshtml @@ -1,64 +1,78 @@ 

運維資料

- + + 新增 +
- +
- + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
廠商類別 廠商 聯絡人 電話emailEmail 建立日期 建立人 功能
施工台達電林先生0928-123456lin@tdd.com.tw2021/06/02周杰倫 - -
清洗潔寶暴風女0928-654321storm@mavel.com2021/06/03周杰倫 - -
維運華碩雷神索爾0937-123123thor@asus.com2021/06/04周杰倫 - -
+ +
+
+ \ No newline at end of file diff --git a/SolarPower/Views/User/Index.cshtml b/SolarPower/Views/User/Index.cshtml index 2f474cc..5de7e2a 100644 --- a/SolarPower/Views/User/Index.cshtml +++ b/SolarPower/Views/User/Index.cshtml @@ -612,14 +612,14 @@ }); //#endregion - //#region 編輯系統管理員 + //#region 編輯使用者管理員 $('#user_table').on("click", "button.edit-btn", function () { $("#user-modal .modal-title").html("人員基本資料 - 編輯"); selected_id = $(this).parents('tr').attr('data-id'); - //取得單一系統管理員 + //取得單一使用者管理員 var url = "/User/GetOneUser/"; var send_data = { From 0a9713fc94a68720de9a23ad226ff145248f9fa0 Mon Sep 17 00:00:00 2001 From: b110212000 Date: Thu, 17 Jun 2021 21:41:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A3=9D=E7=BD=AEdatatable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PowerStationController.cs | 124 ++++++++++++++- SolarPower/Models/PowerStation.cs | 59 +++++-- .../Implement/PowerStationRepository.cs | 107 ++++++++++++- .../Repository/Implement/RepositoryBase.cs | 23 +++ .../Interface/IPowerStationRepository.cs | 20 ++- .../Repository/Interface/IRepositoryBase.cs | 1 + .../PowerStation/PowerStationEdit.cshtml | 146 +++++++++++++++++- .../Views/PowerStation/_DeviceSetting.cshtml | 76 ++++++++- 8 files changed, 536 insertions(+), 20 deletions(-) diff --git a/SolarPower/Controllers/PowerStationController.cs b/SolarPower/Controllers/PowerStationController.cs index 8d7b8ae..5091616 100644 --- a/SolarPower/Controllers/PowerStationController.cs +++ b/SolarPower/Controllers/PowerStationController.cs @@ -67,6 +67,26 @@ namespace SolarPower.Controllers apiResult.Msg = errorCode.GetString(apiResult.Code); return apiResult; } + /// + /// 取裝置類型下拉選單 + /// + /// + public async Task>> GetDeviceTypeSelectOptionList() + { + ApiResult> apiResult = new ApiResult>(); + try + { + var userSelectItemLists = await powerStationRepository.DeviceType(); + apiResult.Code = "0000"; + apiResult.Data = userSelectItemLists; + } + catch (Exception exception) + { + apiResult.Code = "9999"; + Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message); + } + return apiResult; + } /// /// 取得單一電站基本資料 @@ -297,7 +317,7 @@ namespace SolarPower.Controllers /// 運維資料DataTable /// /// - /// + /// public async Task OperationTable(int stationId) { @@ -399,6 +419,108 @@ namespace SolarPower.Controllers return apiResult; } + /// + /// 新增 / 修改 裝置資料 + /// + /// + /// + public async Task> SaveDevice(DeviceInfo Device) + { + ApiResult apiResult = new ApiResult(); + try + { + if (Device.Id == 0) + { + Device DeviceInfo = new Device() + { + Brand = Device.Brand, + ColName = Device.ColName, + PowerStationId = Device.PowerStationId, + DBName = Device.DBName, + Id = Device.Id, + Name = Device.Name, + ProductModel = Device.ProductModel, + Remark = Device.Remark, + TableName = Device.TableName, + Type = Device.Type, + UID = Device.PowerStationId + "-" + Device.Type, + CreatedBy = myUser.Id + }; + List properties = new List() + { + "Brand", + "ColName", + "PowerStationId", + "DBName", + "Id", + "Name", + "ProductModel", + "Remark", + "TableName", + "Type", + "UID", + "CreatedBy" + }; + await powerStationRepository.AddDevice(DeviceInfo,properties); + apiResult.Code = "0000"; + apiResult.Msg = "新增成功"; + } + else + { + Device DeviceInfo = new Device() + { + Brand = Device.Brand, + ColName = Device.ColName, + PowerStationId = Device.PowerStationId, + DBName = Device.DBName, + Id = Device.Id, + Name = Device.Name, + ProductModel = Device.ProductModel, + Remark = Device.Remark, + TableName = Device.TableName, + Type = Device.Type, + UID = Device.PowerStationId + "-" + Device.Type, + CreatedBy = myUser.Id + }; + List properties = new List() + { + "Brand", + "ColName", + "PowerStationId", + "DBName", + "Id", + "Name", + "ProductModel", + "Remark", + "TableName", + "Type", + "UID", + "CreatedBy" + }; + await powerStationRepository.AddDevice(DeviceInfo, properties); + apiResult.Code = "0000"; + apiResult.Msg = "儲存成功"; + } + + } + catch (Exception exception) + { + apiResult.Code = "9999"; + apiResult.Msg = exception.ToString(); + } + return apiResult; + } + + public async Task DeviceTable(int stationId) + { + List deviceTables = new List(); + ApiResult> apiResult = new ApiResult>(); + var result = Json(new + { + data = apiResult + }); + return result; + } } } diff --git a/SolarPower/Models/PowerStation.cs b/SolarPower/Models/PowerStation.cs index 97f8c1c..e2caf70 100644 --- a/SolarPower/Models/PowerStation.cs +++ b/SolarPower/Models/PowerStation.cs @@ -82,12 +82,12 @@ namespace SolarPower.Models.PowerStation public class OperationInfo : Created { public int Id { get; set; } - public int PowerStationId { get; set; } - public int Type { get; set; } - public string Name { get; set; } - public string ContactPerson { get; set; } - public string Phone { get; set; } - public string Email { get; set; } + public int PowerStationId { get; set; }//電廠id + public int Type { get; set; }//廠商類別 + public string Name { get; set; }//名稱 + public string ContactPerson { get; set; }//聯絡人 + public string Phone { get; set; }//電話 + public string Email { get; set; }//Email } public class OperationStationId { @@ -95,9 +95,50 @@ namespace SolarPower.Models.PowerStation } public class OperationTable : OperationInfo { - public string CreatedName { get; set; } - public string Function { get; set; } + public string CreatedName { get; set; }//建立者名稱 + public string Function { get; set; }//功能 public string TypeName { get; set; } } - + /// + /// 設備裝置下拉選單 + /// + public class Type + { + public string Name { get; set; } + public string EName { get; set; } + } + public class Root + { + public List Type { get; set; } + } + public class Variable + { + public string name { get; set; } + public string value { get; set; } + } + /// + /// 設備 + /// + public class DeviceInfo + { + public int Id { get; set; } + public int PowerStationId { get; set; }//所屬電站編號 + public string Name { get; set; }//名稱 + public string Type { get; set; }//類型 + public string Brand { get; set; }//廠牌 + public string ProductModel { get; set; }//型號 + public string DBName { get; set; } + public string TableName { get; set; } + public string ColName { get; set; } + public string Remark { get; set; } + } + public class Device : DeviceInfo + { + public string UID { get; set; }//設備編號 + public int CreatedBy { get; set; }//建立者 + } + public class DeviceTable : DeviceInfo + { + public string Function { get; set; }//功能 + } } diff --git a/SolarPower/Repository/Implement/PowerStationRepository.cs b/SolarPower/Repository/Implement/PowerStationRepository.cs index 30fe3e0..1c25742 100644 --- a/SolarPower/Repository/Implement/PowerStationRepository.cs +++ b/SolarPower/Repository/Implement/PowerStationRepository.cs @@ -1,6 +1,7 @@ using Dapper; using SolarPower.Helper; using SolarPower.Models.PowerStation; +using SolarPower.Models.User; using SolarPower.Repository.Interface; using System; using System.Collections.Generic; @@ -8,6 +9,7 @@ using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Text.Json; namespace SolarPower.Repository.Implement { @@ -75,7 +77,11 @@ namespace SolarPower.Repository.Implement return count; } } - + /// + /// 運維DataTable + /// + /// + /// public async Task> OperationTable (int stationId) { @@ -103,7 +109,11 @@ namespace SolarPower.Repository.Implement return operation; } } - + /// + /// 選取單一運維 + /// + /// + /// public async Task OneOperationInfo (int id) { using (IDbConnection conn = _databaseHelper.GetConnection()) @@ -158,5 +168,98 @@ namespace SolarPower.Repository.Implement conn.Close(); } } + /// + /// 裝置類型下拉選單 + /// + /// + public async Task> DeviceType() + { + List result = new List(); + using IDbConnection conn = _databaseHelper.GetConnection(); + conn.Open(); + var trans = conn.BeginTransaction(); + try + { + string sql = @$"SELECT * FROM variable WHERE name = @name"; + var json = await conn.QueryFirstOrDefaultAsync(sql, new { name = "Type" }); + Root jsonfor = JsonSerializer.Deserialize(json.value); + foreach(Models.PowerStation.Type a in jsonfor.Type) + { + UserSelectItemList KeyValue = new UserSelectItemList + { + Value = a.EName, + Text = a.Name + }; + result.Add(KeyValue); + } + trans.Commit(); + } + catch (Exception exception) + { + trans.Rollback(); + throw exception; + } + finally + { + conn.Close(); + } + return result; + } + /// + /// 新增裝置資料 + /// + /// + /// + /// + public async Task AddDevice(Device DeviceInfo, List properties) + { + using IDbConnection conn = _databaseHelper.GetConnection(); + conn.Open(); + try + { + string sql = GenerateInsertQueryWithCustomTable(properties, "device"); + + await conn.ExecuteAsync(sql, DeviceInfo); + + } + catch (Exception exception) + { + throw exception; + } + finally + { + conn.Close(); + } + + } + /// + /// 修改裝置資料 + /// + /// + /// + /// + public async Task UpdateDevice(Device DeviceInfo, List properties) + { + using IDbConnection conn = _databaseHelper.GetConnection(); + conn.Open(); + var trans = conn.BeginTransaction(); + try + { + var updateQuery = GenerateUpdateQueryOtherTable(properties, "device"); + await conn.ExecuteAsync(updateQuery.ToString(), DeviceInfo, trans); + trans.Commit(); + } + catch (Exception exception) + { + trans.Rollback(); + throw exception; + } + finally + { + conn.Close(); + } + } + + } } diff --git a/SolarPower/Repository/Implement/RepositoryBase.cs b/SolarPower/Repository/Implement/RepositoryBase.cs index 3eabe96..8271081 100644 --- a/SolarPower/Repository/Implement/RepositoryBase.cs +++ b/SolarPower/Repository/Implement/RepositoryBase.cs @@ -344,5 +344,28 @@ namespace SolarPower.Repository.Implement return updateQuery.ToString(); } + + /// + /// 產生Update語句(不同資料表) + /// + /// + /// + protected string GenerateUpdateQueryOtherTable(List properties, string table_name) + { + var updateQuery = new StringBuilder($"UPDATE {table_name} SET "); + + properties.ForEach(property => + { + if (!property.Equals("Id")) + { + updateQuery.Append($"{property}=@{property},"); + } + }); + + updateQuery.Remove(updateQuery.Length - 1, 1); //remove last comma + updateQuery.Append(" WHERE id = @Id"); + + return updateQuery.ToString(); + } } } diff --git a/SolarPower/Repository/Interface/IPowerStationRepository.cs b/SolarPower/Repository/Interface/IPowerStationRepository.cs index 559dd5a..7e5553a 100644 --- a/SolarPower/Repository/Interface/IPowerStationRepository.cs +++ b/SolarPower/Repository/Interface/IPowerStationRepository.cs @@ -1,4 +1,5 @@ using SolarPower.Models.PowerStation; +using SolarPower.Models.User; using System; using System.Collections.Generic; using System.Linq; @@ -12,6 +13,23 @@ namespace SolarPower.Repository.Interface Task> OperationTable (int stationId); Task OneOperationInfo (int stationId); Task UpdateOperation(OperationInfo operation, List properties); - + /// + /// 裝置類型下拉式選單 + /// + /// + Task> DeviceType(); + /// + /// 新增 裝置 + /// + /// + /// + Task AddDevice(Device DeviceInfo, List properties); + /// + /// 修改 裝置 + /// + /// + /// + /// + Task UpdateDevice(Device DeviceInfo, List properties); } } diff --git a/SolarPower/Repository/Interface/IRepositoryBase.cs b/SolarPower/Repository/Interface/IRepositoryBase.cs index 3c4f7af..42f719d 100644 --- a/SolarPower/Repository/Interface/IRepositoryBase.cs +++ b/SolarPower/Repository/Interface/IRepositoryBase.cs @@ -65,5 +65,6 @@ namespace SolarPower.Repository.Interface /// /// Task DeleteOneOtherTable(int id, string tablename); + } } diff --git a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml index 3397f01..e87c877 100644 --- a/SolarPower/Views/PowerStation/PowerStationEdit.cshtml +++ b/SolarPower/Views/PowerStation/PowerStationEdit.cshtml @@ -171,6 +171,91 @@ } } }); + //#endregion + //#region 運維列表 DataTable + DeviceTable = $("#Device_table").DataTable({ + "paging": true, + "lengthChange": false, + "searching": false, + "ordering": true, + "info": true, + "autoWidth": false, + "responsive": true, + "order": [[9, "desc"]], + "columns": [{ + "data": "uID" + }, { + "data": "name" + }, { + "data": "type" + }, { + "data": "brand" + }, { + "data": "productModel" + }, { + "data": "dBName" + }, { + "data": "tableName" + }, { + "data": "colName" + }, { + "data": "remark" + },{ + "data": "function" + }], + "columnDefs": [{ + 'targets': 1, + 'searchable': false, + 'orderable': false, + 'className': 'dt-body-center' + }], + "language": { + "emptyTable": "無資料...", + "processing": "處理中...", + "loadingRecords": "載入中...", + "lengthMenu": "顯示 _MENU_ 項結果", + "zeroRecords": "沒有符合的結果", + "info": "顯示第 _START_ 至 _END_ 項結果，共 _TOTAL_ 項", + "infoEmpty": "顯示第 0 至 0 項結果，共 0 項", + "infoFiltered": "(從 _MAX_ 項結果中過濾)", + "infoPostFix": "", + "search": "搜尋:", + "paginate": { + "first": "第一頁", + "previous": "上一頁", + "next": "下一頁", + "last": "最後一頁" + }, + "aria": { + "sortAscending": ": 升冪排列", + "sortDescending": ": 降冪排列" + } + }, + 'createdRow': function (row, data, dataIndex) { + $(row).attr('data-id', data.id); + }, + "ajax": { + "url": "/PowerStation/DeviceTable", + "type": "POST", + "data": function (d) { + d.stationId = stationId; + }, + "dataSrc": function (rel) { + if (rel.data.code == "9999") { + toast_error(rel.data.msg); + return; + } + + data = rel.data.data; + + if (data == null || data.length == 0) { + this.data = []; + } + + return data; + } + } + }); //#endregion //#region 電站資料 view 控制 if (stationId == 'new') { @@ -206,7 +291,7 @@ $("#BoEPart").hide(); $("#land_buildingPart").hide(); - /*$("#tablist").hide();*/ + $("#tablist").hide(); } else { var url = "/PowerStation/GetOnePowerStation" @@ -255,7 +340,25 @@ $("#power_station_operation_personnel").val($("#power_station_operation_personnel option:first").val()); }); //#endregion + + + $('.js-example-basic-multiple').select2(); + + + var url_DeviceType = "/PowerStation/GetDeviceTypeSelectOptionList"; + $.get(url_DeviceType, function (rel) { + if (rel.code != "0000") { + toast_error(rel.msg); + return; + } + $("Device_Type_modal").empty(); + + $.each(rel.data, function (index, val) { + $("#Device_Type_modal").append($("