From 18ff465812ce1b11bd914df50d1acc999eab7c7c Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 7 Mar 2023 15:18:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../host-config/host-config.component.ts      | 94 +++++++++++++------
 .../huang-hai-config.component.ts             |  2 +-
 2 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/src/app/system-management/host-config/host-config.component.ts b/src/app/system-management/host-config/host-config.component.ts
index 7272430..d940d6d 100644
--- a/src/app/system-management/host-config/host-config.component.ts
+++ b/src/app/system-management/host-config/host-config.component.ts
@@ -1145,6 +1145,14 @@ rule_threshold:
 
   //黄海配置文件
   config() {
+    let invalid = this.listOfData.find((item) => {
+      return item.type !== 1 && !item.dimensionedPointsHuanghai;
+    });
+    if (invalid) {
+      this.message.info(`${invalid.name}未标注`);
+      return;
+    }
+
     let data = this.configJson();
     const modal = this.modal.create({
       nzTitle: '下发黄海config.json配置',
@@ -1170,7 +1178,7 @@ rule_threshold:
               this.message.success('文件保存成功');
               let params = {
                 edgeDeviceId: this.hostId,
-                fileName: 'source.yaml',
+                fileName: 'config.json',
               };
               this.http
                 .put('/api/EdgeDevices/Commands/PushFile', '', {
@@ -1216,20 +1224,31 @@ rule_threshold:
     };
     this.listOfData.forEach((item: any) => {
       if (item.type === 0) {
-        obj.sources.push({
+        let objitem: any = {
           nickName: '进出口',
           rtsp: item.uri,
-          carStopROI: pointsArrTransition(
+          cameraName: item.name,
+        };
+        if (
+          item.dimensionedPointsHuanghaiObj &&
+          item.dimensionedPointsHuanghaiObj.carStopROI.length !== 0
+        ) {
+          objitem.carStopROI = pointsArrTransition(
             item.dimensionedPointsHuanghaiObj.carStopROI
-          ),
-        });
+          );
+        }
+        obj.sources.push(objitem);
       }
       if (item.type === 1) {
         let objitem: any = {
           nickName: '加油区',
           rtsp: item.uri,
+          cameraName: item.name,
         };
-        if (item.dimensionedPointsHuanghaiObj.bulkoilROI.length !== 0) {
+        if (
+          item.dimensionedPointsHuanghaiObj &&
+          item.dimensionedPointsHuanghaiObj.bulkoilROI.length !== 0
+        ) {
           objitem.bulkoilROI = pointsArrTransition(
             item.dimensionedPointsHuanghaiObj.bulkoilROI
           );
@@ -1237,36 +1256,57 @@ rule_threshold:
         obj.sources.push(objitem);
       }
       if (item.type === 2) {
-        obj.sources.push({
+        let objitem: any = {
           nickName: '卸油区',
           rtsp: item.uri,
-          intrusionROI: pointsArrTransition(
+          cameraName: item.name,
+        };
+        if (
+          item.dimensionedPointsHuanghaiObj &&
+          item.dimensionedPointsHuanghaiObj.intrusionROI
+        ) {
+          objitem.intrusionROI = pointsArrTransition(
             item.dimensionedPointsHuanghaiObj.intrusionROI
-          ),
-          unloadingROI:
-            item.dimensionedPointsHuanghaiObj.unloadingROI.length !== 0
-              ? [
-                  item.dimensionedPointsHuanghaiObj.unloadingROI[0].x,
-                  item.dimensionedPointsHuanghaiObj.unloadingROI[0].y,
-                  item.dimensionedPointsHuanghaiObj.unloadingROI[0].x +
-                    item.dimensionedPointsHuanghaiObj.unloadingROI[0].width,
-                  item.dimensionedPointsHuanghaiObj.unloadingROI[0].y +
-                    item.dimensionedPointsHuanghaiObj.unloadingROI[0].height,
-                ]
-              : [],
-          carStopROI: pointsArrTransition(
+          );
+        }
+        if (
+          item.dimensionedPointsHuanghaiObj &&
+          item.dimensionedPointsHuanghaiObj.unloadingROI
+        ) {
+          objitem.unloadingROI = [
+            item.dimensionedPointsHuanghaiObj.unloadingROI[0].x,
+            item.dimensionedPointsHuanghaiObj.unloadingROI[0].y,
+            item.dimensionedPointsHuanghaiObj.unloadingROI[0].x +
+              item.dimensionedPointsHuanghaiObj.unloadingROI[0].width,
+            item.dimensionedPointsHuanghaiObj.unloadingROI[0].y +
+              item.dimensionedPointsHuanghaiObj.unloadingROI[0].height,
+          ];
+        }
+        if (
+          item.dimensionedPointsHuanghaiObj &&
+          item.dimensionedPointsHuanghaiObj.carStopROI
+        ) {
+          objitem.carStopROI = pointsArrTransition(
             item.dimensionedPointsHuanghaiObj.carStopROI
-          ),
-        });
+          );
+        }
+        obj.sources.push(objitem);
       }
       if (item.type === 3) {
-        obj.sources.push({
+        let objitem: any = {
           nickName: '便利店',
           rtsp: item.uri,
-          cashierROI: pointsArrTransition(
+          cameraName: item.name,
+        };
+        if (
+          item.dimensionedPointsHuanghaiObj &&
+          item.dimensionedPointsHuanghaiObj.cashierROI.length !== 0
+        ) {
+          objitem.cashierROI = pointsArrTransition(
             item.dimensionedPointsHuanghaiObj.cashierROI
-          ),
-        });
+          );
+        }
+        obj.sources.push(objitem);
       }
     });
     console.log(obj);
diff --git a/src/app/system-management/host-config/huang-hai-config/huang-hai-config.component.ts b/src/app/system-management/host-config/huang-hai-config/huang-hai-config.component.ts
index 74752da..0c5cb89 100644
--- a/src/app/system-management/host-config/huang-hai-config/huang-hai-config.component.ts
+++ b/src/app/system-management/host-config/huang-hai-config/huang-hai-config.component.ts
@@ -11,6 +11,6 @@ export class HuangHaiConfigComponent implements OnInit {
   constructor() {}
   datacopy;
   ngOnInit(): void {
-    this.datacopy = JSON.parse(JSON.stringify(this.data));
+    this.datacopy = JSON.stringify(JSON.parse(this.data), null, 2);
   }
 }