jay.chang/ibms-dome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

Browse Source
This commit is contained in:
dev01 2022-11-09 11:06:22 +08:00
commit aabccca4b4
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FrontendWebApi/ApiControllers/AlertController.cs
View File

@ -25,7 +25,7 @@ namespace FrontendWebApi.ApiControllers
} }
[HttpPost] [HttpPost]
public FileResult OpeExportExcel(List<Alert> alerts) public FileResult OpeExportExcel([FromBody] List<Alert> alerts)
{ {
var workbook = new XSSFWorkbook(); var workbook = new XSSFWorkbook();
#region excel設定 #region excel設定
@ -169,7 +169,7 @@ namespace FrontendWebApi.ApiControllers
} }
[HttpPost] [HttpPost]
public async Task<ApiResult<List<Alert>>> AlertList(List<Alert> alerts) public async Task<ApiResult<List<Alert>>> AlertList([FromBody] List<Alert> alerts)
{ {
ApiResult<List<Alert>> apiResult = new ApiResult<List<Alert>>(); ApiResult<List<Alert>> apiResult = new ApiResult<List<Alert>>();
try try

8
FrontendWebApi/ApiControllers/GraphManageController.cs
View File

@ -140,9 +140,9 @@ namespace FrontendWebApi.ApiControllers
try try
{ {
var sqlString = @$"UPDATE graph_manage SET deleted = 1 WHERE code = @code AND sub_system_tag = @sub_system_tag AND main_system_tag = @main_system_tag"; var sqlString = @$"UPDATE graph_manage SET deleted = 1, updated_at = @time, updated_by = @user WHERE code = @code AND sub_system_tag = @sub_system_tag AND main_system_tag = @main_system_tag";
var param = new { @code = gi.code, @sub_system_tag = gi.sub_system_tag, @main_system_tag = gi.main_system_tag }; var param = new { @code = gi.code, @sub_system_tag = gi.sub_system_tag, @main_system_tag = gi.main_system_tag, @time = DateTime.Now, @user = myUser.userinfo_guid };
await backendRepository.ExecuteSql(sqlString, param); await backendRepository.ExecuteSql(sqlString, param);
apiResult.Code = "0000"; apiResult.Code = "0000";
@ -229,6 +229,8 @@ namespace FrontendWebApi.ApiControllers
graph_manage.Add("@name", gii.name); graph_manage.Add("@name", gii.name);
graph_manage.Add("@main_system_tag", gii.main_system_tag); graph_manage.Add("@main_system_tag", gii.main_system_tag);
graph_manage.Add("@sub_system_tag", gii.sub_system_tag); graph_manage.Add("@sub_system_tag", gii.sub_system_tag);
graph_manage.Add("@updated_at", DateTime.Now);
graph_manage.Add("@updated_by", myUser.userinfo_guid);
//graph_manage.Add("@priority", gii.priority); //graph_manage.Add("@priority", gii.priority);
await backendRepository.UpdateOneByCustomTable(graph_manage, "graph_manage", "code='" + gm.code + "'" + " and sub_system_tag ='" + gm.sub_system_tag + "' and main_system_tag = '" + gm.main_system_tag + "'"); await backendRepository.UpdateOneByCustomTable(graph_manage, "graph_manage", "code='" + gm.code + "'" + " and sub_system_tag ='" + gm.sub_system_tag + "' and main_system_tag = '" + gm.main_system_tag + "'");
@ -313,6 +315,8 @@ namespace FrontendWebApi.ApiControllers
graph_manage.Add("@name", gii.name); graph_manage.Add("@name", gii.name);
graph_manage.Add("@deleted", 0); graph_manage.Add("@deleted", 0);
graph_manage.Add("@priority", newPriority + 1); graph_manage.Add("@priority", newPriority + 1);
graph_manage.Add("@created_by", myUser.userinfo_guid );
graph_manage.Add("@created_at", DateTime.Now);
await backendRepository.AddOneByCustomTable(graph_manage, "graph_manage"); await backendRepository.AddOneByCustomTable(graph_manage, "graph_manage");
apiResult.Code = "0000"; apiResult.Code = "0000";

18
FrontendWebApi/ApiControllers/OperationController.cs
View File

@ -65,7 +65,7 @@ namespace FrontendWebApi.ApiControllers
} }
[HttpPost] [HttpPost]
public async Task<ApiResult<List<Variable>>> SubSysList(string main_system_tag) public async Task<ApiResult<List<Variable>>> SubSysList([FromBody] string main_system_tag)
{ {
ApiResult<List<Variable>> apiResult = new ApiResult<List<Variable>>(); ApiResult<List<Variable>> apiResult = new ApiResult<List<Variable>>();
List<Variable> sub_system_list = new List<Variable>(); List<Variable> sub_system_list = new List<Variable>();
@ -133,7 +133,7 @@ namespace FrontendWebApi.ApiControllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<ApiResult<List<Device>>> DevList(BuildingList bl) public async Task<ApiResult<List<Device>>> DevList([FromBody] BuildingList bl)
{ {
ApiResult<List<Device>> apiResult = new ApiResult<List<Device>>(); ApiResult<List<Device>> apiResult = new ApiResult<List<Device>>();
List<Device> d = new List<Device>(); List<Device> d = new List<Device>();
@ -165,7 +165,7 @@ namespace FrontendWebApi.ApiControllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public FileResult OpeExportExcel(byte? work_type) public FileResult OpeExportExcel([FromBody] byte? work_type)
{ {
var workbook = new XSSFWorkbook(); var workbook = new XSSFWorkbook();
#region excel設定 #region excel設定
@ -587,7 +587,7 @@ namespace FrontendWebApi.ApiControllers
/// </summary> /// </summary>
/// <param name="ofl"></param> /// <param name="ofl"></param>
/// <returns></returns> /// <returns></returns>
public async Task<ApiResult<List<Operation_Firm>>> OpeFirList(OperationFindList ofl) public async Task<ApiResult<List<Operation_Firm>>> OpeFirList([FromBody] OperationFindList ofl)
{ {
ApiResult<List<Operation_Firm>> apiResult = new ApiResult<List<Operation_Firm>>(); ApiResult<List<Operation_Firm>> apiResult = new ApiResult<List<Operation_Firm>>();
List<Operation_Firm> opList = new List<Operation_Firm>(); List<Operation_Firm> opList = new List<Operation_Firm>();
@ -648,7 +648,7 @@ namespace FrontendWebApi.ApiControllers
/// </summary> /// </summary>
/// <param name="of"></param> /// <param name="of"></param>
/// <returns></returns> /// <returns></returns>
public async Task<ApiResult<string>> SaveOpeFirm(Operation_Firm of) public async Task<ApiResult<string>> SaveOpeFirm([FromBody] Operation_Firm of)
{ {
ApiResult<string> apiResult = new ApiResult<string>(); ApiResult<string> apiResult = new ApiResult<string>();
@ -702,7 +702,7 @@ namespace FrontendWebApi.ApiControllers
/// </summary> /// </summary>
/// <param name="of"></param> /// <param name="of"></param>
/// <returns></returns> /// <returns></returns>
public async Task<ApiResult<string>> EdtOneOpeFirm(Operation_Firm of) public async Task<ApiResult<string>> EdtOneOpeFirm([FromBody] Operation_Firm of)
{ {
ApiResult<string> apiResult = new ApiResult<string>(); ApiResult<string> apiResult = new ApiResult<string>();
@ -767,7 +767,7 @@ namespace FrontendWebApi.ApiControllers
/// </summary> /// </summary>
/// <param name="ofl"></param> /// <param name="ofl"></param>
/// <returns></returns> /// <returns></returns>
public async Task<ApiResult<List<Operation_Record>>> OpeRecList(OperationFindList ofl) public async Task<ApiResult<List<Operation_Record>>> OpeRecList([FromBody] OperationFindList ofl)
{ {
ApiResult<List<Operation_Record>> apiResult = new ApiResult<List<Operation_Record>>(); ApiResult<List<Operation_Record>> apiResult = new ApiResult<List<Operation_Record>>();
List<Operation_Record> orl = new List<Operation_Record>(); List<Operation_Record> orl = new List<Operation_Record>();
@ -845,7 +845,7 @@ namespace FrontendWebApi.ApiControllers
/// </summary> /// </summary>
/// <param name="or"></param> /// <param name="or"></param>
/// <returns></returns> /// <returns></returns>
public async Task<ApiResult<string>> SavOpeRecord(Operation_Record or) public async Task<ApiResult<string>> SavOpeRecord([FromBody] Operation_Record or)
{ {
ApiResult<string> apiResult = new ApiResult<string>(); ApiResult<string> apiResult = new ApiResult<string>();
@ -1012,7 +1012,7 @@ namespace FrontendWebApi.ApiControllers
/// </summary> /// </summary>
/// <param name="or"></param> /// <param name="or"></param>
/// <returns></returns> /// <returns></returns>
public async Task<ApiResult<string>> DelOpeRecord(Operation_Record or) public async Task<ApiResult<string>> DelOpeRecord([FromBody] Operation_Record or)
{ {
ApiResult<string> apiResult = new ApiResult<string>(); ApiResult<string> apiResult = new ApiResult<string>();

2
FrontendWebApi/Models/GraphManage.cs
View File

@ -33,7 +33,7 @@ namespace FrontendWebApi.Models
public IFormFile donFile { get; set; } public IFormFile donFile { get; set; }
} }
public class GraphInfo public class GraphInfo: Actor
{ {
public string code { get; set; } public string code { get; set; }
public string main_system_tag { get; set; } public string main_system_tag { get; set; }