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:
GiteaAdmin 2023-04-21 02:06:48 +08:00
commit 46447193b7
6 changed files with 96 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Backend/Controllers/DeviceImportController.cs
View File

@ -578,6 +578,8 @@ namespace Backend.Controllers
-- OR ct.disaster_system_value != d.device_disaster"; -- OR ct.disaster_system_value != d.device_disaster";
} }
if (!string.IsNullOrEmpty(post.Building_tag) && !string.IsNullOrEmpty(post.System_category) && !string.IsNullOrEmpty(post.System_tag))
{
string sql_temp = $@" string sql_temp = $@"
SELECT SELECT
ct.device_number AS check_temp_device_number, ct.device_number AS check_temp_device_number,
@ -620,20 +622,20 @@ namespace Backend.Controllers
LEFT JOIN variable v2 ON v2.system_type = 'disaster' AND v2.system_value = ct.device_disaster LEFT JOIN variable v2 ON v2.system_type = 'disaster' AND v2.system_value = ct.device_disaster
{{0}} {{0}}
) ct ) ct
FULL JOIN ( LEFT JOIN (
SELECT SELECT
d.* , d.* ,
v.system_type, v.system_type,
v.system_key, v.system_key,
v.system_value, v.system_value,
(SELECT (SELECT
STRING_AGG( ISNULL(system_value, ' '), ',') GROUP_CONCAT( ifnull(system_value, ' '), ',')
FROM device_disaster dd FROM device_disaster dd
JOIN variable v ON v.deleted = 0 AND v.system_type = 'disaster' AND v.system_value = dd.device_system_value JOIN variable v ON v.deleted = 0 AND v.system_type = 'disaster' AND v.system_value = dd.device_system_value
WHERE dd.device_guid = d.device_guid WHERE dd.device_guid = d.device_guid
) AS device_disaster, ) AS device_disaster,
(SELECT (SELECT
STRING_AGG( ISNULL(system_key, ' '), ',') GROUP_CONCAT( ifnull(system_key, ' '), ',')
FROM device_disaster dd FROM device_disaster dd
JOIN variable v ON v.deleted = 0 AND v.system_type = 'disaster' AND v.system_value = dd.device_system_value JOIN variable v ON v.deleted = 0 AND v.system_type = 'disaster' AND v.system_value = dd.device_system_value
WHERE dd.device_guid = d.device_guid WHERE dd.device_guid = d.device_guid
@ -645,7 +647,7 @@ namespace Backend.Controllers
)d ON ct.device_number = d.device_number )d ON ct.device_number = d.device_number
{{2}} {{2}}
ORDER BY d.device_number　DESC ORDER BY d.device_number DESC
"; ";
var sql = string.Format(sql_temp, string.Format(sSubTableWhere, "ct"), string.Format(sSubTableWhere, "d"), sWhere); var sql = string.Format(sql_temp, string.Format(sSubTableWhere, "ct"), string.Format(sSubTableWhere, "d"), sWhere);
@ -673,6 +675,7 @@ namespace Backend.Controllers
apiResult.Code = "0000"; apiResult.Code = "0000";
apiResult.Data = deviceCheck; apiResult.Data = deviceCheck;
} }
}
catch (Exception exception) catch (Exception exception)
{ {
apiResult.Code = "9999"; apiResult.Code = "9999";

3
Backend/appsettings.json
View File

@ -17,7 +17,8 @@
"Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
//"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱 //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
} }

BIN
Backend/wwwroot/upload/build_map/092e12e3-b037-4156-bfc2-ee523fd7fb79.nwc Normal file
View File

Binary file not shown.

BIN
Backend/wwwroot/upload/build_map/0a626582-efd7-46d2-a0d7-b250241843bd.nwc Normal file
View File

Binary file not shown.

5
FrontendWebApi/appsettings.Development.json
View File

@ -16,7 +16,10 @@
"MySqlDBConfig": { "MySqlDBConfig": {
"Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30
//"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
//"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
} }

4
FrontendWebApi/appsettings.json
View File

@ -23,7 +23,9 @@
"Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
//"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱 //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
//"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
}, },