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 2023-06-07 17:12:35 +08:00
commit 08738f1e8f
6 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Backend/Controllers/BuildInfoController.cs
View File

@ -429,7 +429,7 @@ namespace Backend.Controllers
try try
{ {
var sqlString = @$"SELECT A.floor_guid, A.full_name, InitMapName + '.svg' AS 'initMapName', A.priority, A.created_at var sqlString = @$"SELECT A.floor_guid, A.full_name, CONCAT(InitMapName, '.svg') AS 'initMapName', A.priority, A.created_at
FROM floor A FROM floor A
WHERE deleted = @deleted WHERE deleted = @deleted
AND A.building_tag = @building_tag AND A.building_tag = @building_tag

43
BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs
View File

@ -87,12 +87,15 @@ namespace BackendWorkerService.Quartz.Jobs
{ {
foreach (var point in electricPoints) foreach (var point in electricPoints)
{ {
DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); if (electricMeter.device_building_tag == point.device_building_tag)
deviceNumberPoint.DeviceNumber = electricMeter.Device_number; {
deviceNumberPoint.Point = point.points; DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint();
deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", electricMeter.Device_number, point.points); deviceNumberPoint.DeviceNumber = electricMeter.Device_number;
deviceNumberPoint.Point = point.points;
deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", electricMeter.Device_number, point.points);
electricDeviceNumberPoints.Add(deviceNumberPoint); electricDeviceNumberPoints.Add(deviceNumberPoint);
}
} }
} }
#endregion 組合出所有電錶設備點位 #endregion 組合出所有電錶設備點位
@ -102,12 +105,15 @@ namespace BackendWorkerService.Quartz.Jobs
{ {
foreach (var point in waterPoints) foreach (var point in waterPoints)
{ {
DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); if (waterMeter.device_building_tag == point.device_building_tag)
deviceNumberPoint.DeviceNumber = waterMeter.Device_number; {
deviceNumberPoint.Point = point.points; DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint();
deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", waterMeter.Device_number, point.points); deviceNumberPoint.DeviceNumber = waterMeter.Device_number;
deviceNumberPoint.Point = point.points;
deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", waterMeter.Device_number, point.points);
waterDeviceNumberPoints.Add(deviceNumberPoint); waterDeviceNumberPoints.Add(deviceNumberPoint);
}
} }
} }
#endregion 組合出所有電錶設備點位 #endregion 組合出所有電錶設備點位
@ -159,7 +165,6 @@ namespace BackendWorkerService.Quartz.Jobs
archiveRequest.Method = "POST"; archiveRequest.Method = "POST";
archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.Headers.Add("Authorization", "Basic " + encoded);
archiveRequest.PreAuthenticate = true; archiveRequest.PreAuthenticate = true;
archiveRequest.Timeout = 3000;
byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter);
using (Stream reqStream = archiveRequest.GetRequestStream()) using (Stream reqStream = archiveRequest.GetRequestStream())
@ -171,7 +176,7 @@ namespace BackendWorkerService.Quartz.Jobs
archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd();
archiveResponse.Dispose(); archiveResponse.Dispose();
archiveResponse.Close(); archiveResponse.Close();
xmlDocument.LoadXml(archiveResponseContent); xmlDocument.LoadXml(archiveResponseContent);
archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); archiveJson = JsonConvert.SerializeXmlNode(xmlDocument);
archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson);
@ -217,7 +222,7 @@ namespace BackendWorkerService.Quartz.Jobs
archiveRequest.Method = "POST"; archiveRequest.Method = "POST";
archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.Headers.Add("Authorization", "Basic " + encoded);
archiveRequest.PreAuthenticate = true; archiveRequest.PreAuthenticate = true;
archiveRequest.Timeout = 3000;
byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter);
using (Stream reqStream = archiveRequest.GetRequestStream()) using (Stream reqStream = archiveRequest.GetRequestStream())
@ -628,7 +633,7 @@ namespace BackendWorkerService.Quartz.Jobs
archiveRequest.Method = "POST"; archiveRequest.Method = "POST";
archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.Headers.Add("Authorization", "Basic " + encoded);
archiveRequest.PreAuthenticate = true; archiveRequest.PreAuthenticate = true;
archiveRequest.Timeout = 3000;
byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter);
using (Stream reqStream = archiveRequest.GetRequestStream()) using (Stream reqStream = archiveRequest.GetRequestStream())
@ -685,8 +690,7 @@ namespace BackendWorkerService.Quartz.Jobs
archiveRequest.Method = "POST"; archiveRequest.Method = "POST";
archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.Headers.Add("Authorization", "Basic " + encoded);
archiveRequest.PreAuthenticate = true; archiveRequest.PreAuthenticate = true;
archiveRequest.Timeout = 3000;
byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter);
using (Stream reqStream = archiveRequest.GetRequestStream()) using (Stream reqStream = archiveRequest.GetRequestStream())
{ {
@ -994,14 +998,13 @@ namespace BackendWorkerService.Quartz.Jobs
archiveRequest.Method = "POST"; archiveRequest.Method = "POST";
archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.Headers.Add("Authorization", "Basic " + encoded);
archiveRequest.PreAuthenticate = true; archiveRequest.PreAuthenticate = true;
archiveRequest.Timeout = 3000;
byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter);
using (Stream reqStream = archiveRequest.GetRequestStream()) using (Stream reqStream = archiveRequest.GetRequestStream())
{ {
reqStream.Write(byteArray, 0, byteArray.Length); reqStream.Write(byteArray, 0, byteArray.Length);
} }
archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); archiveResponse = (HttpWebResponse)archiveRequest.GetResponse();
archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd();
archiveResponse.Dispose(); archiveResponse.Dispose();
@ -1051,7 +1054,7 @@ namespace BackendWorkerService.Quartz.Jobs
archiveRequest.Method = "POST"; archiveRequest.Method = "POST";
archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.Headers.Add("Authorization", "Basic " + encoded);
archiveRequest.PreAuthenticate = true; archiveRequest.PreAuthenticate = true;
archiveRequest.Timeout = 3000;
byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter);
using (Stream reqStream = archiveRequest.GetRequestStream()) using (Stream reqStream = archiveRequest.GetRequestStream())

3
BackendWorkerService/appsettings.Development.json
View File

@ -23,8 +23,9 @@
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
//"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30
//"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
//"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
}, },

3
BackendWorkerService/appsettings.json
View File

@ -23,8 +23,9 @@
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
//"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30
//"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
//"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
}, },

22
FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
View File

@ -108,7 +108,7 @@ namespace FrontendWebApi.ApiControllers
[HttpPost] [HttpPost]
[Route("api/EmergencyDevice")] [Route("api/EmergencyDevice")]
public async Task<ActionResult<ApiResult<List<deviceMenu>>>> EmergencyDevice(selectdevice selectdevice) public async Task<ActionResult<ApiResult<List<deviceMenu>>>> EmergencyDevice([FromBody] selectdevice selectdevice)
{ {
ApiResult<List<deviceMenu>> apiResult = new ApiResult<List<deviceMenu>>(); ApiResult<List<deviceMenu>> apiResult = new ApiResult<List<deviceMenu>>();
if (!jwtlife) if (!jwtlife)
@ -120,6 +120,16 @@ namespace FrontendWebApi.ApiControllers
try try
{ {
string deviceQue = "";
string disasQue = "";
if (selectdevice.selectbuilding != null && selectdevice.selectbuilding.Count > 0)
deviceQue += $" AND d.device_building_tag in @building_tag ";
if (selectdevice.select_Floors != null && selectdevice.select_Floors.Count > 0)
deviceQue += $" AND d.device_floor_tag in @floor ";
if (selectdevice.select_Layer3 != null && selectdevice.select_Layer3.Count > 0)
deviceQue += $" AND d.device_name_tag IN @layer3 ";
if (selectdevice.select_disasters != null && selectdevice.select_disasters.Count > 0)
disasQue = " where dd.device_system_value IN @disasters ";
var sqlString = @$"select var sqlString = @$"select
d.device_guid, d.device_guid,
@ -140,9 +150,8 @@ namespace FrontendWebApi.ApiControllers
(SELECT * (SELECT *
FROM device d FROM device d
WHERE d.deleted = 0 WHERE d.deleted = 0
AND d.device_building_tag = '{selectdevice.selectbuilding}' {deviceQue}
AND d.device_floor_tag in @floor ) d
AND d.device_name_tag IN @layer3) d
left join floor on floor.full_name = d.device_floor_tag and floor.building_tag = d.device_building_tag left join floor on floor.full_name = d.device_floor_tag and floor.building_tag = d.device_building_tag
left join ( left join (
SELECT SELECT
@ -158,10 +167,11 @@ namespace FrontendWebApi.ApiControllers
left join device_disaster dd on dd.device_guid = d.device_guid left join device_disaster dd on dd.device_guid = d.device_guid
left join (select * from variable v where v.system_type = 'disaster') ddd on ddd.system_value = dd.device_system_value left join (select * from variable v where v.system_type = 'disaster') ddd on ddd.system_value = dd.device_system_value
LEFT JOIN building b ON b.deleted = 0 AND d.device_building_tag = b.building_tag LEFT JOIN building b ON b.deleted = 0 AND d.device_building_tag = b.building_tag
where dd.device_system_value IN @disasters {disasQue}
ORDER BY d.device_number ORDER BY d.device_number
"; ";
Variable = await backendRepository.GetAllAsync<deviceMenu>(sqlString, new { disasters= selectdevice.select_disasters, floor = selectdevice.select_Floors, layer3 = selectdevice.select_Layer3 }); Variable = await backendRepository.GetAllAsync<deviceMenu>(sqlString, new { disasters= selectdevice.select_disasters, building_tag = selectdevice.selectbuilding,
floor = selectdevice.select_Floors, layer3 = selectdevice.select_Layer3 });
apiResult.Code = "0000"; apiResult.Code = "0000";
apiResult.Data = Variable; apiResult.Data = Variable;

2
FrontendWebApi/Models/EmergencyDevice.cs
View File

@ -106,7 +106,7 @@ namespace FrontendWebApi.Models
public class selectdevice public class selectdevice
{ {
public List<int> select_disasters { get; set; } public List<int> select_disasters { get; set; }
public string selectbuilding { get; set; } public List<string> selectbuilding { get; set; }
public List<string> select_Floors { get; set; } public List<string> select_Floors { get; set; }
public List<string> select_Layer3 { get; set; } public List<string> select_Layer3 { get; set; }
} }