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:
dev02 2023-05-31 18:12:20 +08:00
commit ed02fcdec8
5 changed files with 1624 additions and 1460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FrontendWebApi/ApiControllers/LightScheduleController.cs
View File

@ -136,9 +136,9 @@ namespace FrontendWebApi.ApiControllers
};
ScheduleDevices.Add(ScheduleDevice);
}
opeInput.parameter = JsonConvert.SerializeObject(saveSchedule);
await backendRepository.AddMutiByCustomTable(ScheduleDevices, "schedule_device");
saveSchedule.light_schedule_guid = newguid.ToString();
opeInput.parameter = JsonConvert.SerializeObject(saveSchedule);
await InsertOperation(opeInput);
}
else
@ -184,7 +184,7 @@ namespace FrontendWebApi.ApiControllers
// 兩邊設備 guid 排序後比較
saveSchedule.devicelist.Sort();
targetScheduleDevice.Sort();
if (saveSchedule.devicelist != targetScheduleDevice) {
if (!saveSchedule.devicelist.SequenceEqual(targetScheduleDevice)) {
saveSchedule.changeNames.Add("設備變更");
}

1462
FrontendWebApi/ApiControllers/OperationController.cs
View File

File diff suppressed because it is too large Load Diff

1450
FrontendWebApi/ApiControllers/OperationLogController.cs
View File

File diff suppressed because it is too large Load Diff

8
FrontendWebApi/Models/Operation.cs
View File

@ -168,5 +168,13 @@ namespace FrontendWebApi.Models
public string building_tag{ get; set; }
public short operation_type { get; set; }
}
public class OperationLogExportInput {
public bool isNiagara { get; set; }
public string exportOpeTypeName { get; set; }
public PageResult<OperationLogInput> listInput { get; set; }
public List<OperationLogOutput> exportList { get; set; }
}
}

2
FrontendWebApi/Models/Share.cs
View File

@ -294,5 +294,7 @@ namespace FrontendWebApi.Models
public class PageResult<T> : BasePageResult
{
public T data { get; set; }
public bool isEnable { get; set; }
}
}