From 28c49925c98713465db8cd64899d984d6cd0f7ad Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 26 十二月 2025 17:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

---
 fzzy-igdss-view/src/main/java/models/core.model.xml |  237 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 174 insertions(+), 63 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index b1f557d..828ca0d 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -66,7 +66,12 @@
     </PropertyDef>
     <PropertyDef name="companyId">
       <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
+      <Property name="label">鏀跺偍鍏徃</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">dwmc</Property>
+      </Property>
     </PropertyDef>
     <PropertyDef name="deptId">
       <Property></Property>
@@ -79,6 +84,12 @@
     </PropertyDef>
     <PropertyDef name="depotId">
       <Property></Property>
+      <Property name="label">浠撳簱</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtArea">
@@ -183,7 +194,7 @@
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">kqmc</Property>
       </Property>
-      <Property name="readOnly">true</Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="name">
       <Property></Property>
@@ -216,6 +227,15 @@
         <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerStoreType&quot;).getResult()}</Property>
         <Property name="keyProperty">dictValue</Property>
         <Property name="valueProperty">dictLabel</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeBank">
+      <Property></Property>
+      <Property name="label">鐩戠閾惰</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;bankPR#listAll&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
       </Property>
     </PropertyDef>
     <PropertyDef name="storageMax">
@@ -1188,65 +1208,6 @@
       <Property name="label">鐓х墖璺緞</Property>
     </PropertyDef>
   </DataType>
-  <DataType name="dtSnapConf">
-    <Property name="creationType">com.fzzy.igds.domain.SnapConf</Property>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鍒涘缓浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-      <Property name="label">鏇存柊浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鏇存柊鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="id">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="deptId">
-      <Property></Property>
-      <Property name="label">鎵�灞炲簱鍖�</Property>
-      <Property name="mapping">
-        <Property name="valueProperty">kqmc</Property>
-        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="cameraId">
-      <Property></Property>
-      <Property name="label">鎶撴媿鐩戞帶</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;secCameraPR#listCamera&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="actHour1">
-      <Property name="dataType">int</Property>
-      <Property name="label">绗竴娆�</Property>
-      <Property name="displayFormat"># 鐐�</Property>
-    </PropertyDef>
-    <PropertyDef name="actHour2">
-      <Property name="dataType">int</Property>
-      <Property name="label">绗簩娆�</Property>
-      <Property name="displayFormat"># 鐐�</Property>
-    </PropertyDef>
-    <PropertyDef name="actHour3">
-      <Property name="dataType">int</Property>
-      <Property name="label">绗笁娆�</Property>
-      <Property name="displayFormat"># 鐐�</Property>
-    </PropertyDef>
-  </DataType>
   <DataType name="dtNoticeDto">
     <Property name="creationType">com.fzzy.igds.data.NoticeDto</Property>
     <PropertyDef name="id">
@@ -1396,9 +1357,14 @@
       <Property name="label">缃戝叧IP</Property>
       <Property name="required">true</Property>
     </PropertyDef>
-    <PropertyDef name="port">
+    <PropertyDef name="apiPort">
       <Property name="dataType">Integer</Property>
-      <Property name="label">缃戝叧绔彛</Property>
+      <Property name="label">API绔彛</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="webRtcPort">
+      <Property name="dataType">Integer</Property>
+      <Property name="label">WebRtc绔彛</Property>
       <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="status">
@@ -1421,6 +1387,10 @@
     <PropertyDef name="ptzUrl">
       <Property></Property>
       <Property name="label">浜戝彴璺緞</Property>
+    </PropertyDef>
+    <PropertyDef name="playUrl">
+      <Property></Property>
+      <Property name="label">鎾斁璺緞</Property>
     </PropertyDef>
     <PropertyDef name="remark">
       <Property></Property>
@@ -1760,4 +1730,145 @@
       <Property name="label">鏇存柊浜�</Property>
     </PropertyDef>
   </DataType>
+  <DataType name="dtSlogan">
+    <Property name="creationType">com.fzzy.igds.domain.Slogan</Property>
+    <PropertyDef name="id">
+      <Property></Property>
+      <Property name="label">缂栧彿</Property>
+    </PropertyDef>
+    <PropertyDef name="companyId">
+      <Property></Property>
+      <Property name="label">缁勭粐缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="name">
+      <Property></Property>
+      <Property name="label">鍚嶇О</Property>
+    </PropertyDef>
+    <PropertyDef name="content">
+      <Property></Property>
+      <Property name="label">鏍囪鍐呭</Property>
+    </PropertyDef>
+    <PropertyDef name="status">
+      <Property></Property>
+      <Property name="label">鐘舵��</Property>
+      <Property name="mapping">
+        <Property name="mapValues">
+          <Collection>
+            <Entity>
+              <Property name="key">N</Property>
+              <Property name="value">鏈娇鐢�</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">Y</Property>
+              <Property name="value">姝ｅ湪浣跨敤</Property>
+            </Entity>
+          </Collection>
+        </Property>
+        <Property name="keyProperty">key</Property>
+        <Property name="valueProperty">value</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="color">
+      <Property name="mapping">
+        <Property name="mapValues">
+          <Collection>
+            <Entity>
+              <Property name="key">default</Property>
+              <Property name="value">榛樿</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">red</Property>
+              <Property name="value">绾㈣壊</Property>
+            </Entity>
+          </Collection>
+        </Property>
+        <Property name="keyProperty">key</Property>
+        <Property name="valueProperty">value</Property>
+      </Property>
+      <Property name="label">棰滆壊</Property>
+    </PropertyDef>
+    <PropertyDef name="pushUser">
+      <Property></Property>
+      <Property name="label">鎺ㄩ�佷汉</Property>
+    </PropertyDef>
+    <PropertyDef name="pushTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">鍙戝竷鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="createTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">鍒涘缓鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="createBy">
+      <Property></Property>
+      <Property name="label">鍒涘缓浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="updateTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">淇敼鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="updateBy">
+      <Property></Property>
+      <Property name="label">淇敼浜�</Property>
+    </PropertyDef>
+  </DataType>
+  <DataType name="dtPatrolConf">
+    <Property name="matchType">com.fzzy.igds.domain.PatrolConf</Property>
+    <PropertyDef name="id">
+      <Property></Property>
+    </PropertyDef>
+    <PropertyDef name="deptId">
+      <Property></Property>
+      <Property name="label">鎵�灞炲簱鍖�</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">kqmc</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="name">
+      <Property></Property>
+      <Property name="label">鐝鍚嶇О</Property>
+    </PropertyDef>
+    <PropertyDef name="companyId">
+      <Property></Property>
+      <Property name="label">缁勭粐缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="userId">
+      <Property></Property>
+      <Property name="label">宸￠�讳汉</Property>
+    </PropertyDef>
+    <PropertyDef name="userName">
+      <Property></Property>
+      <Property name="label">宸￠�讳汉</Property>
+    </PropertyDef>
+    <PropertyDef name="start">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">鐝璧峰鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="end">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">鐝鎴鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="remark">
+      <Property></Property>
+      <Property name="label">澶囨敞淇℃伅</Property>
+    </PropertyDef>
+    <PropertyDef name="createBy">
+      <Property></Property>
+      <Property name="label">鍒涘缓浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="createTime">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">鍒涘缓鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="updateBy">
+      <Property></Property>
+      <Property name="label">鏇存柊浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="updateTime">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">鏇存柊鏃堕棿</Property>
+    </PropertyDef>
+  </DataType>
 </Model>

--
Gitblit v1.9.3