This commit is contained in:
b110212000 2021-06-17 14:31:23 +08:00
parent b48280673b
commit 40396c8e85
10 changed files with 602 additions and 48 deletions

View File

@ -216,5 +216,189 @@ namespace SolarPower.Controllers
return apiResult;
}
/// <summary>
/// 新增/修改 運維資料
/// </summary>
/// <param name="post"></param>
/// <returns></returns>
public async Task<ApiResult<string>> SaveOperation(OperationInfo post)
{
ApiResult<string> apiResult = new ApiResult<string>();
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<string> properties = new List<string>()
{
"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<string> properties = new List<string>()
{
"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;
}
/// <summary>
/// 運維資料DataTable
/// </summary>
/// <param name="stationId"></param>
/// <returns></returns>
public async Task<ActionResult> OperationTable(int stationId)
{
List<OperationTable> operationTable = new List<OperationTable>();
ApiResult<List<OperationTable>> apiResult = new ApiResult<List<OperationTable>>();
try
{
apiResult.Code = "0000";
operationTable = await powerStationRepository.OperationTable(stationId);
foreach(OperationTable a in operationTable)
{
a.Function = @"
<button type='button' class='btn btn-primary btn-pills waves-effect waves-themed edit-btn'></button>
<button type='button' class='btn btn-danger btn-pills waves-effect waves-themed del-btn'></button>";
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;
}
/// <summary>
/// 取得一筆 運維 資料
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<ApiResult<OperationInfo>> GetOneOperation(int id)
{
OperationInfo operation = new OperationInfo();
ApiResult<OperationInfo> apiResult = new ApiResult<OperationInfo>();
try
{
apiResult.Code = "0000";
operation = await powerStationRepository.OneOperationInfo(id);
apiResult.Data = operation;
}
catch (Exception exception)
{
apiResult.Code = "9999";
apiResult.Msg = exception.ToString();
}
return apiResult;
}
/// <summary>
/// 刪除 運維 資料
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<ApiResult<string>> DeleteOneOperation(int id)
{
ApiResult<string> apiResult = new ApiResult<string>();
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;
}
}
}

View File

@ -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;
}

View File

@ -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; }
}
}

View File

@ -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<int> AddOperation(OperationInfo operation, List<string> 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<List<OperationTable>> OperationTable (int stationId)
{
using (IDbConnection conn = _databaseHelper.GetConnection())
{
List<OperationTable> operation = new List<OperationTable>();
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<OperationTable>(sql, new { StationId = stationId })).ToList();
}
catch (Exception exception)
{
throw exception;
}
finally
{
conn.Close();
}
return operation;
}
}
public async Task<OperationInfo> 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<OperationInfo>(sql, new { Id = id });
}
catch (Exception exception)
{
throw exception;
}
finally
{
conn.Close();
}
return operation;
}
}
public async Task UpdateOperation(OperationInfo operation , List<string> 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();
}
}
}
}

View File

@ -87,6 +87,7 @@ namespace SolarPower.Repository.Implement
return id;
}
}
/// <summary>
/// 透過Id軟刪除單一筆資料
@ -121,6 +122,40 @@ namespace SolarPower.Repository.Implement
}
}
}
/// <summary>
/// 透過Id軟刪除單一筆資料(不同資料表)
/// </summary>
/// <param name="id"></param>
/// <param name="tablename"></param>
/// <returns></returns>
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();
}
}
}
}
/// <summary>
/// 取得所有資料

View File

@ -8,5 +8,10 @@ namespace SolarPower.Repository.Interface
{
public interface IPowerStationRepository : IRepositoryBase<PowerStation>
{
Task<int> AddOperation(OperationInfo operation, List<string> properties);
Task<List<OperationTable>> OperationTable (int stationId);
Task<OperationInfo> OneOperationInfo (int stationId);
Task UpdateOperation(OperationInfo operation, List<string> properties);
}
}

View File

@ -58,5 +58,12 @@ namespace SolarPower.Repository.Interface
/// <param name="Id"></param>
/// <returns></returns>
Task PurgeOneAsync(int id);
/// <summary>
/// 透過Id軟刪除單一筆資料(不同資料表)
/// </summary>
/// <param name="id"></param>
/// <param name="tablename"></param>
/// <returns></returns>
Task DeleteOneOtherTable(int id, string tablename);
}
}

View File

@ -86,11 +86,92 @@
@section Scripts{
<script>
var stationId;
var selected_id = 0;
$(function () {
var url = new URL(location.href);
stationId = url.searchParams.get('stationId');
//#region 運維列表 DataTable
OperationTable = $("#Operation_table").DataTable({
"paging": true,
"lengthChange": false,
"searching": false,
"ordering": true,
"info": true,
"autoWidth": false,
"responsive": true,
"order": [[7, "desc"]],
"columns": [{
"data": "typeName"
}, {
"data": "name"
}, {
"data": "contactPerson"
}, {
"data": "phone"
}, {
"data": "email"
}, {
"data": "createdAt"
}, {
"data": "createdName"
}, {
"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/OperationTable",
"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') {
//#region 電站基本資料
@ -125,7 +206,7 @@
$("#BoEPart").hide();
$("#land_buildingPart").hide();
$("#tablist").hide();
/*$("#tablist").hide();*/
} else {
var url = "/PowerStation/GetOnePowerStation"
@ -189,6 +270,8 @@
});
//#endregion
function SaveStationInfo() {
var url = "/PowerStation/SavePowerStationInfo";
@ -478,7 +561,101 @@
}
//#endregion
//#region 新增維運資料
function AddOperation()
{
$("#Operation-modal .modal-title").html("運維廠商資料 - 新增");
$("#Operation-form").trigger("reset");
$("#Operation-modal").modal();
}
//#endregion
//#region 儲存運維資料
function SaveOperation() {
if ($("#Operation-form").valid()) {
var url = "/PowerStation/SaveOperation";
var send_data = {
Id: selected_id,
PowerStationId: stationId,
Type: $("#Operation_role_modal").val(),
Name: $("#Operation_factory_modal").val(),
ContactPerson: $("#Operation_name_modal").val(),
Phone: $("#Operation_phone_modal").val(),
Email: $("#Operation_email_modal").val(),
}
$.post(url, send_data, function (rel) {
if (rel.code != "0000") {
toast_error(rel.msg);
return;
}
else
{
toast_ok(rel.msg);
$('#Operation-modal').modal('hide');
OperationTable.ajax.reload();
return;
}
}, 'json');
}
}
//#endregion
//#region 取一筆運維
$('#Operation_table').on("click", "button.edit-btn", function () {
$("#Operation-modal .modal-title").html("運維廠商資料 - 編輯");
selected_id = $(this).parents('tr').attr('data-id');
//取得單一運維基本資料
var url = "/PowerStation/GetOneOperation/";
var send_data = {
id: selected_id
}
$.post(url, send_data, function (rel) {
if (rel.code != "0000") {
toast_error(rel.msg);
return;
}
$("#Operation_role_modal").val(rel.data.type);
$("#Operation_factory_modal").val(rel.data.name);
$("#Operation_name_modal").val(rel.data.contactPerson);
$("#Operation_phone_modal").val(rel.data.phone);
$("#Operation_email_modal").val(rel.data.email);
$("#Operation-modal").modal();
}, 'json');
});
//#endregion
//#region 刪除運維
$('#Operation_table').on("click", "button.del-btn", function () {
selected_id = $(this).parents('tr').attr('data-id');
var url = "/PowerStation/DeleteOneOperation/";
var send_data = {
Id: selected_id
}
$.post(url, send_data, function (rel) {
if (rel.code == "9999") {
toast_error(rel.msg);
return;
}
toast_ok(rel.msg);
OperationTable.ajax.reload();
}, 'json');
});
//#endregion
</script>
}

View File

@ -1,64 +1,78 @@
<div class="row mb-5">
<div class="col-6"><h3>運維資料</h3></div>
<div class="col-6 text-right">
<button type="button" class="btn btn-success waves-effect waves-themed mb-3">
<span class="fal fa-plus mr-1"></span>
新增
</button>
<a href="javascript:;" class="btn btn-success waves-effect waves-themed mb-3" id="addOperation-btn" onclick="AddOperation()">
<span class="fal fa-plus mr-1"></span>新增
</a>
</div>
<div class="w-100">
<table class="table table-bordered table-hover m-0 text-center">
<table id="Operation_table" class="table table-bordered table-hover m-0 text-center">
<thead class="thead-themed">
<tr>
<th>廠商類別</th>
<th>廠商</th>
<th>聯絡人</th>
<th>電話</th>
<th>email</th>
<th>Email</th>
<th>建立日期</th>
<th>建立人</th>
<th>功能</th>
</tr>
</thead>
<tbody>
<tr>
<th scope="row">施工</th>
<td>台達電</td>
<td>林先生</td>
<td>0928-123456</td>
<td>lin@tdd.com.tw</td>
<td>2021/06/02</td>
<td>周杰倫</td>
<td>
<button type="button" class="btn btn-primary btn-pills waves-effect waves-themed">修改</button>
</td>
</tr>
<tr>
<th scope="row">清洗</th>
<td>潔寶</td>
<td>暴風女</td>
<td>0928-654321</td>
<td>storm@mavel.com</td>
<td>2021/06/03</td>
<td>周杰倫</td>
<td>
<button type="button" class="btn btn-primary btn-pills waves-effect waves-themed">修改</button>
</td>
</tr>
<tr>
<th scope="row">維運</th>
<td>華碩</td>
<td>雷神索爾</td>
<td>0937-123123</td>
<td>thor@asus.com</td>
<td>2021/06/04</td>
<td>周杰倫</td>
<td>
<button type="button" class="btn btn-primary btn-pills waves-effect waves-themed">修改</button>
</td>
</tr>
</tbody>
</table>
</table >
</div>
</div>
<div class="modal fade" id="Operation-modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">
運維廠商資料 - 新增
</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true"><i class="fal fa-times"></i></span>
</button>
</div>
<div class="modal-body">
<form class="Operation-form" id="Operation-form">
<div class="row">
<div class="form-group col-lg-6">
<label class="form-label" for="Operation_role_modal"><span class="text-danger">*</span>廠商類別</label>
<select class="form-control" id="Operation_role_modal">
<option value="0">施工</option>
<option value="1">清洗</option>
<option value="2">維運</option>
</select>
</div>
<div class="form-group col-lg-6">
<label class="form-label" for="Operation_factory_modal"><span class="text-danger">*</span>廠商</label>
<input type="text" id="Operation_factory_modal" name="Operation_factory_modal" class="form-control">
</div>
<div class="form-group col-lg-6">
<label class="form-label" for="Operation_name_modal"><span class="text-danger">*</span>聯絡人</label>
<input type="text" id="Operation_name_modal" name="Operation_name_modal" class="form-control">
</div>
<div class="form-group col-lg-6">
<label class="form-label" for="Operation_phone_modal"><span class="text-danger">*</span>電話</label>
<input type="text" id="Operation_phone_modal" name="Operation_phone_modal" class="form-control">
</div>
<div class="form-group col-lg-6">
<div style="margin-bottom: 0.3rem">
<label class="form-label" for="Operation_email_modal"><span class="text-danger">*</span>Email</label>
<input type="text" id="Operation_email_modal" name="Operation_email_modal" class="form-control">
</div>
</div>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary" onclick="SaveOperation()">確定</button>
</div>
</div>
</div>
</div>

View File

@ -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 = {