From 788de7f2aa2382dfb6c23896c7cbd0154df5ffc9 Mon Sep 17 00:00:00 2001 From: b110212000 Date: Wed, 23 Jun 2021 09:44:23 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=AE=9A=E6=9C=9F=E8=A8=88=E7=95=AB"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f789f3dbbb37f3a22a12c2dabc95f4cf83bb3375. --- SolarPower/Controllers/OperationController.cs | 122 +++++------------- SolarPower/Models/Operation.cs | 35 +---- .../Implement/OperationRepository.cs | 32 +---- .../Interface/IOperationRepository.cs | 2 - SolarPower/Views/Operation/Index.cshtml | 40 +----- 5 files changed, 39 insertions(+), 192 deletions(-) diff --git a/SolarPower/Controllers/OperationController.cs b/SolarPower/Controllers/OperationController.cs index 688381f..593ee6a 100644 --- a/SolarPower/Controllers/OperationController.cs +++ b/SolarPower/Controllers/OperationController.cs @@ -67,78 +67,41 @@ namespace SolarPower.Controllers ApiResult apiResult = new ApiResult(); try { - if(post.Id == 0) + var now = DateTime.Now.ToString("yyyy-MM-dd"); + var finalid = await operationRepository.GetCurrentSerialNumber("operation_plan_create", $"PowerStationId = {post.PowerStationId} AND CreatedAt LIKE '%{now}%'"); + var newSerialNumber = GetLastSerialNumber(finalid); + var OperationPlan = new OperationCreatePlan() { - var now = DateTime.Now.ToString("yyyy-MM-dd"); - var finalid = await operationRepository.GetCurrentSerialNumber("operation_plan_create", $"PowerStationId = {post.PowerStationId} AND CreatedAt LIKE '%{now}%'"); - var newSerialNumber = GetLastSerialNumber(finalid); - var OperationPlan = new OperationCreatePlan() - { - EmailType = post.EmailType, - ScheduleNum = post.ScheduleNum, - Description = post.Description, - WorkDay = post.WorkDay, - ScheduleType = post.ScheduleType, - SerialNumber = newSerialNumber, - StartTime = post.StartTime, - PowerStationId = post.PowerStationId, - Type = post.Type, - PlanId = DateTime.Now.ToString("yyyyMMdd") + newSerialNumber, - CreatedBy = myUser.Id - }; - List properties = new List() - { - "EmailType", - "ScheduleNum", - "Description", - "WorkDay", - "ScheduleType", - "SerialNumber", - "StartTime", - "PowerStationId", - "Type", - "PlanId", - "CreatedBy" - }; - await operationRepository.AddOperationPlan(OperationPlan, properties); - apiResult.Code = "0000"; - apiResult.Msg = "新增成功"; - } - else + EmailType = post.EmailType, + ScheduleNum = post.ScheduleNum, + Description = post.Description, + WorkDay = post.WorkDay, + ScheduleType = post.ScheduleType, + SerialNumber = newSerialNumber, + StartTime = post.StartTime, + PowerStationId = post.PowerStationId, + Type = post.Type, + PlanId = DateTime.Now.ToString("yyyyMMdd") + newSerialNumber, + CreatedBy = myUser.Id + }; + List properties = new List() { - var OperationPlan = new OperationCreatePlan() - { - Id = post.Id, - EmailType = post.EmailType, - ScheduleNum = post.ScheduleNum, - Description = post.Description, - WorkDay = post.WorkDay, - ScheduleType = post.ScheduleType, - StartTime = post.StartTime, - PowerStationId = post.PowerStationId, - Type = post.Type, - UpdateBy = myUser.Id - }; - List properties = new List() - { - "Id", - "EmailType", - "ScheduleNum", - "Description", - "WorkDay", - "ScheduleType", - "StartTime", - "PowerStationId", - "Type", - "UpdateBy" - }; - await operationRepository.UpdateOperationPlan(OperationPlan, properties); - apiResult.Code = "0000"; - apiResult.Msg = "編輯成功"; - } + "EmailType", + "ScheduleNum", + "Description", + "WorkDay", + "ScheduleType", + "SerialNumber", + "StartTime", + "PowerStationId", + "Type", + "PlanId", + "CreatedBy" + }; + await operationRepository.AddOperationPlan(OperationPlan, properties); - - + apiResult.Code = "0000"; + apiResult.Msg = "新增成功"; } catch (Exception exception) { @@ -194,7 +157,7 @@ namespace SolarPower.Controllers a.Schedule = "每" + a.ScheduleNum.ToString() + "年"; } - a.StartTimeString = a.StartTime; + a.StartTimeString = a.StartTime.ToString("yyyy-MM-dd"); var crst = a.CreatedAt.Split(" "); a.CreateTimeString = crst[0]; @@ -270,24 +233,5 @@ namespace SolarPower.Controllers return apiResult; } - public async Task> GetOneOperationPlan(int Id) - { - ApiResult apiResult = new ApiResult(); - OperationCreatePlan operationCreatePlan = new OperationCreatePlan(); - try - { - apiResult.Code = "0000"; - operationCreatePlan = await operationRepository.GetOneOperation(Id); - apiResult.Data = operationCreatePlan; - } - catch (Exception exception) - { - apiResult.Code = "9999"; - apiResult.Msg = exception.ToString(); - Logger.LogError("【" + controllerName + "/" + actionName + "】" + "Id=" + Id); - Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message); - } - return apiResult; - } } } diff --git a/SolarPower/Models/Operation.cs b/SolarPower/Models/Operation.cs index 956f386..4ddacba 100644 --- a/SolarPower/Models/Operation.cs +++ b/SolarPower/Models/Operation.cs @@ -26,44 +26,16 @@ namespace SolarPower.Models public string Text { get; set; } public string Value { get; set; } } - public class OperationCreatePlanModal : Created { - private string startTime = "", endTime = ""; public int Id { get; set; } public int PowerStationId { get; set; } public int Type { get; set; } public int ScheduleNum { get; set; } public int ScheduleType { get; set; } public int WorkDay { get; set; } - public string StartTime { - get - { - if (!string.IsNullOrEmpty(startTime)) - { - return Convert.ToDateTime(startTime).ToString("yyyy-MM-dd"); - } - else - { - return null; - } - } - set { startTime = value; } - } - public string EndTime { - get - { - if (!string.IsNullOrEmpty(endTime)) - { - return Convert.ToDateTime(endTime).ToString("yyyy-MM-dd"); - } - else - { - return null; - } - } - set { endTime = value; } - } + public DateTime StartTime { get; set; } + public DateTime EndTime { get; set; } public string Description { get; set; } public int EmailType { get; set; } } @@ -71,9 +43,6 @@ namespace SolarPower.Models { public string PlanId { get; set; } public string SerialNumber { get; set; } - private string updateAt; - public int UpdateBy { get; set; } //修改者 - public string UpdateAt { get { return Convert.ToDateTime(updateAt).ToString("yyyy-MM-dd HH:mm:ss"); } set { updateAt = value; } } //修改時間 } public class OperationPlanTable : OperationCreatePlan { diff --git a/SolarPower/Repository/Implement/OperationRepository.cs b/SolarPower/Repository/Implement/OperationRepository.cs index 6e46ac3..063c5ad 100644 --- a/SolarPower/Repository/Implement/OperationRepository.cs +++ b/SolarPower/Repository/Implement/OperationRepository.cs @@ -35,6 +35,7 @@ namespace SolarPower.Repository.Implement return result; } } + public async Task AddOperationPlan(OperationCreatePlan OperationPlan, List properties) { using (IDbConnection conn = _databaseHelper.GetConnection()) @@ -79,11 +80,9 @@ namespace SolarPower.Repository.Implement { try { - var sql = @$"SELECT oc.Id,oc.PlanId,oc.PowerStationId,oc.Type, - oc.ScheduleNum,oc.ScheduleType,oc.WorkDay,oc.StartTime, - oc.EmailType,oc.Description,oc.CreatedAt,ps.Name AS PowerStationName ,us.Name AS CreatedPerson FROM operation_plan_create oc LEFT JOIN power_station ps + var sql = @$"SELECT *,ps.Name AS PowerStationName ,us.Name AS CreatedPerson FROM operation_plan_create oc LEFT JOIN power_station ps ON oc.PowerStationId = ps.Id LEFT JOIN user us - ON us.Id = oc.CreatedBy WHERE ({Wheresql}) AND oc.Deleted = 0"; + ON us.Id = oc.CreatedBy WHERE {Wheresql} AND oc.Deleted = 0"; result = (await conn.QueryAsync(sql)).ToList(); } catch (Exception exception) @@ -117,30 +116,5 @@ namespace SolarPower.Repository.Implement return result; } } - public async Task UpdateOperationPlan(OperationCreatePlan OperationPlan, List properties) - { - using (IDbConnection conn = _databaseHelper.GetConnection()) - { - conn.Open(); - var trans = conn.BeginTransaction(); - try - { - var sql = GenerateUpdateQuery(properties); - await conn.ExecuteAsync(sql, OperationPlan, trans); - - trans.Commit(); - } - catch (Exception exception) - { - trans.Rollback(); - throw exception; - } - finally - { - conn.Close(); - } - - } - } } } diff --git a/SolarPower/Repository/Interface/IOperationRepository.cs b/SolarPower/Repository/Interface/IOperationRepository.cs index b4b7292..284afb2 100644 --- a/SolarPower/Repository/Interface/IOperationRepository.cs +++ b/SolarPower/Repository/Interface/IOperationRepository.cs @@ -12,8 +12,6 @@ namespace SolarPower.Repository.Interface Task AddOperationPlan(OperationCreatePlan OperationPlan, List properties); Task> OperationPlanTable(List id); Task GetOneOperation(int id); - Task UpdateOperationPlan(OperationCreatePlan OperationPlan, List properties); - } } diff --git a/SolarPower/Views/Operation/Index.cshtml b/SolarPower/Views/Operation/Index.cshtml index a82e2d8..a4d9d53 100644 --- a/SolarPower/Views/Operation/Index.cshtml +++ b/SolarPower/Views/Operation/Index.cshtml @@ -357,8 +357,8 @@ //#region 儲存定時計畫資料 function SaveOperationPlan() { var url = "/Operation/SaveOperationPlan"; + var send_data = { - id: selected_id, PowerStationId: $("#operation_powerStationselect_modal").val(), Type: $("#operation_type_modal").val(), ScheduleNum: $("#operation_scheduleNum_modal").val(), @@ -413,44 +413,6 @@ }); }); //#endregion - //#region 取一筆定時計畫 - $('#OperationPlan_table').on("click", "button.edit-btn", function () { - $("#Operation-modal .modal-title").html("定時計劃 - 編輯"); - selected_id = $(this).parents('tr').attr('data-id'); - - //取得單一異常設定資料 - var url = "/Operation/GetOneOperationPlan/"; - - var send_data = { - id: selected_id - } - - - $.post(url, send_data, function (rel) { - if (rel.code != "0000") { - toast_error(rel.msg); - return; - } - - $("#operation_powerStationselect_modal").val(rel.data.powerStationId); - $("#operation_type_modal").val(rel.data.type); - $("#operation_scheduleNum_modal").val(rel.data.scheduleNum); - $("#operation_scheduleType_modal").val(rel.data.scheduleType); - $("#operation_workDay_modal").val(rel.data.workDay); - var start = rel.data.startTime.split(' '); - $("#operation_startTime_modal").val(start[0]); - $("#operation_description_modal").val(rel.data.description); - $("#operation_emailType_modal").val(rel.data.emailType); - - var dat = new Date(start); - var day = new Date(dat.setDate(dat.getDate() + Number(rel.data.workDay))).toISOString().split("T"); - document.getElementById("operation_endTime_modal").innerHTML = day[0]; - - $("#Operation-modal").modal(); - }, 'json'); - - }); - //#endregion } \ No newline at end of file