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 | 142 ++++++++++++++++++++++++++--------------------
1 files changed, 80 insertions(+), 62 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 9b2565b..828ca0d 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -194,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>
@@ -227,6 +227,15 @@
<Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStoreType").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("bankPR#listAll").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
<PropertyDef name="storageMax">
@@ -1199,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("deptPR#getAllData").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("secCameraPR#listCamera").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">
@@ -1407,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">
@@ -1432,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>
@@ -1853,4 +1812,63 @@
<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("deptPR#getAllData").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