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/com/fzzy/igds/SnapConf.view.xml            |  586 ++++++++++++++++++++++++++++++++++++++++++--
 fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml               |    3 
 fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java             |    4 
 fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java              |   38 +-
 fzzy-igdss-view/src/main/java/models/core.model.xml                      |   59 ----
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/SnapConf.java         |    4 
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml          |   16 +
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java |   32 -
 8 files changed, 605 insertions(+), 137 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/SnapConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/SnapConf.java
index c2733d6..de9e7b5 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/SnapConf.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/SnapConf.java
@@ -40,6 +40,10 @@
     @TableField("camera_id")
     private String cameraId;
 
+    @Column(name = "camera_name", columnDefinition = "varchar(40) COMMENT '鎶撴媿鐩戞帶'")
+    @TableField("camera_name")
+    private String cameraName;
+
     @Column(name = "act_hour1", columnDefinition = "int(10) COMMENT '鎵ц鏃堕棿1'")
     @TableField("act_hour1")
     private int actHour1;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
index c5219bb..2447654 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java
@@ -25,31 +25,17 @@
     /**
      * 鏌ヨ鍒楄〃鏁版嵁
      *
-     * @param param 鏌ヨ鍙傛暟
+     * @param deptId 鏌ヨ鍙傛暟
      * @return 鏁版嵁鍒楄〃
      */
-    public List<SnapConf> selectList(SnapConf param) {
-        QueryWrapper<SnapConf> queryWrapper = getQueryWrapper(param);
-        return snapConfMapper.selectList(queryWrapper);
-    }
+    public List<SnapConf> selectList(String deptId) {
 
-    /**
-     * 灏佽鏌ヨ鏉′欢
-     *
-     * @param param 鏌ヨ鍙傛暟
-     * @return 鏌ヨ鏋勯�犲櫒
-     */
-    public QueryWrapper<SnapConf> getQueryWrapper(SnapConf param) {
         QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
-        if(null == param) param= new SnapConf();
-        // 璁剧疆鍏徃ID骞朵綔涓烘煡璇㈡潯浠�
-        param.setCompanyId(ContextUtil.getCompanyId());
-        queryWrapper.eq("company_id", param.getCompanyId());
 
-        // 鎸夋洿鏂版椂闂村�掑簭鎺掑簭
-        queryWrapper.orderByDesc("update_time");
-
-        return queryWrapper;
+        if(StringUtils.isNotBlank(deptId)){
+            queryWrapper.eq("dept_id", deptId);
+        }
+        return snapConfMapper.selectList(queryWrapper);
     }
 
     /**
@@ -71,9 +57,13 @@
     public BaseResp insertData(SnapConf param) {
         try {
             param.setId(ContextUtil.generateId());
-            param.setCompanyId(ContextUtil.getCompanyId());
+            if(StringUtils.isBlank(param.getCompanyId())){
+                param.setCompanyId(ContextUtil.getCompanyId());
+            }
             param.setCreateBy(ContextUtil.getLoginUserName());
             param.setCreateTime(new Date());
+            param.setUpdateBy(ContextUtil.getLoginUserName());
+            param.setUpdateTime(new Date());
             return snapConfMapper.insert(param) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
         } catch (Exception e) {
             log.error("鎻掑叆蹇媿閰嶇疆鏁版嵁寮傚父", e);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
index e7007b1..da119a6 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
@@ -156,7 +156,8 @@
     if(cur){&#xD;
         var deptId = cur.get(&quot;id&quot;);&#xD;
         var url = &quot;/com.fzzy.igds.SnapConf.d?deptId=&quot;+ deptId;&#xD;
-        window.$openTab(&quot;鎶撴媿閰嶇疆&quot;, url);
+        view.get(&quot;#iFrameSnap&quot;).set(&quot;path&quot;, url);&#xD;
+        view.get(&quot;#dialogSnap&quot;).show();&#xD;
     }else{&#xD;
         $notify(&quot;璇峰厛閫夋嫨搴撳尯鈥︹��&quot;);&#xD;
     }
@@ -220,5 +221,18 @@
         </DataColumn>
       </DataGrid>
     </Container>
+    <Dialog id="dialogSnap">
+      <Property name="width">50%</Property>
+      <Property name="height">90%</Property>
+      <Property name="iconClass">fa fa-tasks</Property>
+      <Property name="caption">鎶撴媿閰嶇疆</Property>
+      <Buttons/>
+      <Children>
+        <IFrame id="iFrameSnap">
+          <Property name="width">100%</Property>
+        </IFrame>
+      </Children>
+      <Tools/>
+    </Dialog>
   </View>
 </ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
index 628173e..fd4251a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
@@ -107,12 +107,13 @@
           <Property name="action">ajaxRefreshCache</Property>
         </ToolBarButton>
         <ToolBarButton>
-          <ClientEvent name="onClick">var url = &quot;com.fzzy.igds.sys.DepotStore.d&quot;;&#xD;
+          <ClientEvent name="onClick">var url = &quot;com.fzzy.igds.DepotStore.d&quot;;&#xD;
 var panelId = window.frameElement.getAttribute('data-id');
 window.parent.$.modal.openTab(&quot;搴撳瓨绠＄悊&quot;, url, false, panelId);</ClientEvent>
           <Property name="caption">搴撳瓨绠＄悊</Property>
           <Property name="iconClass">fa fa-book</Property>
           <Property name="exClassName">btn1</Property>
+          <Property name="visible">false</Property>
           <Property name="width">100</Property>
         </ToolBarButton>
       </ToolBar>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java
index 2187539..e8194e8 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SecCameraPR.java
@@ -52,8 +52,8 @@
 	 * @return
 	 */
 	@DataProvider
-	public List<Camera> listCamera() {
-		return secCameraService.listCamera(ContextUtil.getCompanyId(),ContextUtil.subDeptId(null));
+	public List<Camera> listCamera(String deptId) {
+		return secCameraService.listCamera(null,deptId);
 	}
 
 	/**
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConf.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConf.view.xml
index b451345..333f02b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConf.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConf.view.xml
@@ -2,63 +2,497 @@
 <ViewConfig>
   <Arguments/>
   <Context/>
-  <Model/>
+  <Model>
+    <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>
+      </PropertyDef>
+      <PropertyDef name="cameraName">
+        <Property></Property>
+        <Property name="label">鎶撴媿鐩戞帶</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="dtSecCamera">
+      <Property name="creationType">com.fzzy.igds.domain.Camera</Property>
+      <PropertyDef name="id">
+        <Property></Property>
+        <Property name="label">鐩戞帶缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property></Property>
+        <Property name="label">缁勭粐缂栫爜</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>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="type">
+        <Property></Property>
+        <Property name="label">璁惧绫诲瀷</Property>
+        <Property name="required">true</Property>
+        <Property name="mapping">
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="code">01</Property>
+                <Property name="name">01-鏋満</Property>
+              </Entity>
+              <Entity>
+                <Property name="code">02</Property>
+                <Property name="name">02-鐞冩満</Property>
+              </Entity>
+              <Entity>
+                <Property name="code">03</Property>
+                <Property name="name">03-鍗婄悆</Property>
+              </Entity>
+              <Entity>
+                <Property name="code">09</Property>
+                <Property name="name">09-鍏朵粬</Property>
+              </Entity>
+            </Collection>
+          </Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="brand">
+        <Property></Property>
+        <Property name="label">璁惧鍝佺墝</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;CAMERA_BRAND&quot;)}</Property>
+          <Property name="keyProperty">dictValue</Property>
+          <Property name="valueProperty">dictLabel</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="sn">
+        <Property></Property>
+        <Property name="label">搴忓垪鍙�</Property>
+      </PropertyDef>
+      <PropertyDef name="sort">
+        <Property name="label">閰嶅搴忓彿</Property>
+        <Property name="mapping">
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="code">1</Property>
+                <Property name="name">閰嶅搴忓彿#1</Property>
+              </Entity>
+              <Entity>
+                <Property name="code">2</Property>
+                <Property name="name">閰嶅搴忓彿#2</Property>
+              </Entity>
+            </Collection>
+          </Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="playType">
+        <Property></Property>
+        <Property name="label">鎾斁鏂瑰紡</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerPlayType&quot;).getResult()}</Property>
+          <Property name="keyProperty">dictValue</Property>
+          <Property name="valueProperty">dictLabel</Property>
+        </Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="loginId">
+        <Property></Property>
+        <Property name="label">甯愬彿</Property>
+      </PropertyDef>
+      <PropertyDef name="pwd">
+        <Property></Property>
+        <Property name="label">瀵嗙爜</Property>
+      </PropertyDef>
+      <PropertyDef name="ip">
+        <Property></Property>
+        <Property name="label">IP鍦板潃</Property>
+      </PropertyDef>
+      <PropertyDef name="controlPort">
+        <Property name="dataType">Integer</Property>
+        <Property name="label">鎺у埗绔彛</Property>
+        <Property name="defaultValue">554</Property>
+      </PropertyDef>
+      <PropertyDef name="webPort">
+        <Property name="dataType">Integer</Property>
+        <Property name="label">WEB绔彛</Property>
+        <Property name="defaultValue">80</Property>
+      </PropertyDef>
+      <PropertyDef name="chanNum">
+        <Property name="dataType">Integer</Property>
+        <Property name="label">閫氶亾鍙�</Property>
+        <Property name="defaultValue">1</Property>
+      </PropertyDef>
+      <PropertyDef name="urlIn">
+        <Property></Property>
+        <Property name="label">鍐呯綉鍦板潃</Property>
+      </PropertyDef>
+      <PropertyDef name="urlOut">
+        <Property></Property>
+        <Property name="label">澶栫綉鍦板潃</Property>
+      </PropertyDef>
+      <PropertyDef name="mediaAddr">
+        <Property></Property>
+        <Property name="label">RTSP鍦板潃</Property>
+      </PropertyDef>
+      <PropertyDef name="snapType">
+        <Property></Property>
+        <Property name="label">鎶撴媿鏂瑰紡</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerSnapType&quot;).getResult()}</Property>
+          <Property name="keyProperty">dictValue</Property>
+          <Property name="valueProperty">dictLabel</Property>
+        </Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="ptzType">
+        <Property></Property>
+        <Property name="label">浜戝彴鏂瑰紡</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerPtzType&quot;).getResult()}</Property>
+          <Property name="keyProperty">dictValue</Property>
+          <Property name="valueProperty">dictLabel</Property>
+        </Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="spjklx">
+        <Property></Property>
+        <Property name="label">涓氬姟绫诲瀷</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">1</Property>
+                <Property name="value">1-浠撳唴</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">2</Property>
+                <Property name="value">2-涓氬姟绫�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">3</Property>
+                <Property name="value">3-瀹夐槻绫�</Property>
+              </Entity>
+            </Collection>
+          </Property>
+        </Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="spdwlx">
+        <Property></Property>
+        <Property name="label">鐐逛綅绫诲瀷</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">key</Property>
+          <Property name="valueProperty">value</Property>
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="key">1</Property>
+                <Property name="value">1-鍑哄叆鍙�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">2</Property>
+                <Property name="value">2-鎵︽牱鏈�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">3</Property>
+                <Property name="value">3-鍖栭獙瀹�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">4</Property>
+                <Property name="value">4-缁撶畻瀹�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">5</Property>
+                <Property name="value">5-鍦扮瀹�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">6</Property>
+                <Property name="value">6-搴撳尯涓诲共閬�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">7</Property>
+                <Property name="value">7-浠撻棿鐩戞帶</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">8</Property>
+                <Property name="value">8-浠撳唴</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">9</Property>
+                <Property name="value">9-鑽搧鎴垮唴澶�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">10</Property>
+                <Property name="value">10-鍣ㄦ潗瀹ゅ唴澶�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">11</Property>
+                <Property name="value">11-鍒堕珮鐐�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">12</Property>
+                <Property name="value">12-娌瑰簱缃愬尯</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">13</Property>
+                <Property name="value">13-鏀跺彂娌硅澶�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">14</Property>
+                <Property name="value">14-娉垫埧</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">15</Property>
+                <Property name="value">15-娌瑰簱涓昏杈撻�佺閬�</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">16</Property>
+                <Property name="value">16-鍛ㄧ晫</Property>
+              </Entity>
+            </Collection>
+          </Property>
+        </Property>
+        <Property name="required">true</Property>
+      </PropertyDef>
+      <PropertyDef name="posX">
+        <Property></Property>
+        <Property name="label">鍧愭爣X</Property>
+        <Property name="dataType">Double</Property>
+      </PropertyDef>
+      <PropertyDef name="posY">
+        <Property></Property>
+        <Property name="label">鍧愭爣Y</Property>
+        <Property name="dataType">Double</Property>
+      </PropertyDef>
+      <PropertyDef name="screenShow">
+        <Property></Property>
+        <Property name="label">澶у睆鏄剧ず</Property>
+        <Property name="required">false</Property>
+        <Property name="defaultValue">N</Property>
+        <Property name="mapping">
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="code">Y</Property>
+                <Property name="name">灞曠ず</Property>
+              </Entity>
+              <Entity>
+                <Property name="code">N</Property>
+                <Property name="name">涓嶅睍绀�</Property>
+              </Entity>
+            </Collection>
+          </Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="phoneShowTag">
+        <Property></Property>
+        <Property name="label">APP鏄剧ず</Property>
+        <Property name="defaultValue">N</Property>
+        <Property name="mapping">
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="code">Y</Property>
+                <Property name="name">灞曠ず</Property>
+              </Entity>
+              <Entity>
+                <Property name="code">N</Property>
+                <Property name="name">涓嶅睍绀�</Property>
+              </Entity>
+            </Collection>
+          </Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="orderNum">
+        <Property></Property>
+        <Property name="label">鏄剧ず椤哄簭</Property>
+        <Property name="dataType">Integer</Property>
+      </PropertyDef>
+      <PropertyDef name="vld">
+        <Property></Property>
+        <Property name="label">鏄惁浣跨敤</Property>
+        <Property name="defaultValue">Y</Property>
+        <Property name="mapping">
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="code">Y</Property>
+                <Property name="name">鍚敤</Property>
+              </Entity>
+              <Entity>
+                <Property name="code">N</Property>
+                <Property name="name">绂佺敤</Property>
+              </Entity>
+            </Collection>
+          </Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="remark">
+        <Property></Property>
+        <Property name="label">澶囨敞璇存槑</Property>
+      </PropertyDef>
+      <PropertyDef name="createTime">
+        <Property name="dataType">DateTime</Property>
+        <Property name="label">鍒涘缓鏃堕棿</Property>
+        <Property name="readOnly">true</Property>
+      </PropertyDef>
+      <PropertyDef name="createBy">
+        <Property></Property>
+        <Property name="label">鍒涘缓浜�</Property>
+        <Property name="readOnly">true</Property>
+      </PropertyDef>
+      <PropertyDef name="updateTime">
+        <Property name="dataType">DateTime</Property>
+        <Property name="label">鏇存柊鏃堕棿</Property>
+        <Property name="readOnly">true</Property>
+      </PropertyDef>
+      <PropertyDef name="updateBy">
+        <Property></Property>
+        <Property name="label">鏇存柊浜�</Property>
+        <Property name="readOnly">true</Property>
+      </PropertyDef>
+    </DataType>
+  </Model>
   <View layout="padding:10">
+    <ClientEvent name="onReady">var deptId = &quot;${request.getParameter('deptId')}&quot;;&#xD;
+//鏌ヨ&#xD;
+query = function(){&#xD;
+    view.get(&quot;#dsConf&quot;).set(&quot;parameter&quot;,deptId).flushAsync();&#xD;
+};&#xD;
+query();&#xD;
+
+//鏌ヨ&#xD;
+query1 = function(){&#xD;
+    view.get(&quot;#dsParam&quot;).set(&quot;parameter&quot;,deptId).flushAsync();&#xD;
+};&#xD;
+query1();&#xD;
+//鏂板&#xD;
+add = function(){&#xD;
+    var cur = view.get(&quot;#dsParam.data:#&quot;);&#xD;
+    var actHour1 = cur.get(&quot;actHour1&quot;);&#xD;
+    var actHour2 = cur.get(&quot;actHour2&quot;);&#xD;
+    var actHour3 = cur.get(&quot;actHour3&quot;);&#xD;
+    view.get(&quot;#dsConf&quot;).insert({&#xD;
+       deptId:deptId,&#xD;
+       actHour1:actHour1,&#xD;
+       actHour2:actHour2,&#xD;
+       actHour3:actHour3&#xD;
+    });&#xD;
+};&#xD;
+    </ClientEvent>
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsConf">
-      <Property name="loadMode">lazy</Property>
+      <Property name="loadMode">manual</Property>
       <Property name="dataType">[dtSnapConf]</Property>
       <Property name="dataProvider">snapConfPR#selectList</Property>
     </DataSet>
     <DataSet id="dsParam">
-      <Property name="loadMode">lazy</Property>
+      <Property name="loadMode">manual</Property>
       <Property name="dataType">dtSnapConf</Property>
       <Property name="dataProvider">snapConfPR#getConfActHour</Property>
     </DataSet>
     <Container>
       <Property name="className">c-param</Property>
-      <FieldSet>
-        <Property name="caption">鎶撴媿鎽勫儚澶撮厤缃�</Property>
-        <Buttons>
-          <Button>
-            <ClientEvent name="onClick">view.get(&quot;#dsConf&quot;).insert();</ClientEvent>
-            <Property name="caption">鏂板閰嶇疆</Property>
-            <Property name="exClassName">bt1</Property>
-          </Button>
-          <Button>
-            <Property name="caption">淇濆瓨閰嶇疆</Property>
-            <Property name="action">updateConf</Property>
-            <Property name="exClassName">bt2</Property>
-          </Button>
-        </Buttons>
-        <Children>
-          <DataGrid id="dgMain">
-            <Property name="dataSet">dsConf</Property>
-            <Property name="height">400</Property>
-            <RowNumColumn/>
-            <DataColumn name="deptId">
-              <Property name="property">deptId</Property>
-            </DataColumn>
-            <DataColumn name="cameraId">
-              <Property name="property">cameraId</Property>
-            </DataColumn>
-          </DataGrid>
-        </Children>
-      </FieldSet>
-      <FieldSet>
+      <FieldSet layoutConstraint="padding:8">
         <Property name="caption">鎶撴媿鏃堕棿閰嶇疆</Property>
         <Buttons>
           <Button>
             <ClientEvent name="onClick">var data = view.get(&quot;#dsParam.data&quot;);&#xD;
-view.get(&quot;#ajaxSnapTime&quot;).set(&quot;parameter&quot;,data).execute();</ClientEvent>
-            <Property name="caption">淇濆瓨鎶撴椂闂�</Property>
-            <Property name="exClassName">bt4</Property>
+view.get(&quot;#ajaxSnapTime&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
+    if(result){&#xD;
+        $notify(result);&#xD;
+    }else{&#xD;
+        query();&#xD;
+        query1();&#xD;
+    }&#xD;
+});</ClientEvent>
+            <Property name="caption">淇濆瓨鏃堕棿</Property>
+            <Property name="iconClass">fa fa-check-circle</Property>
+            <Property name="exClassName">btn1</Property>
+            <Property name="width">120</Property>
           </Button>
         </Buttons>
         <Children>
           <AutoForm>
             <Property name="dataSet">dsParam</Property>
             <Property name="cols">*,*,*</Property>
+            <Property name="labelWidth">100</Property>
+            <Property name="labelAlign">right</Property>
+            <AutoFormElement layoutConstraint="colSpan:3">
+              <Property name="name">deptId</Property>
+              <Property name="property">deptId</Property>
+              <Property name="readOnly">true</Property>
+              <Editor/>
+            </AutoFormElement>
             <AutoFormElement>
               <Property name="name">actHour1</Property>
               <Property name="property">actHour1</Property>
@@ -80,6 +514,59 @@
           </AutoForm>
         </Children>
       </FieldSet>
+      <FieldSet layoutConstraint="padding:8">
+        <Property name="caption">鎶撴媿鐩戞帶閰嶇疆</Property>
+        <Buttons>
+          <Button>
+            <ClientEvent name="onClick">add();&#xD;</ClientEvent>
+            <Property name="caption">鏂板閰嶇疆</Property>
+            <Property name="iconClass">fa fa-pencil-square-o</Property>
+            <Property name="exClassName">btn2</Property>
+            <Property name="width">120</Property>
+          </Button>
+          <Button>
+            <ClientEvent name="onClick">
+view.get(&quot;#updateConf&quot;).execute(function(result){&#xD;
+    if(result){&#xD;
+        $notify(result);&#xD;
+    }else{&#xD;
+        query();&#xD;
+        query1();&#xD;
+    }&#xD;
+});</ClientEvent>
+            <Property name="caption">淇濆瓨鐩戞帶閰嶇疆</Property>
+            <Property name="iconClass">fa fa-check-circle</Property>
+            <Property name="exClassName">btn1</Property>
+            <Property name="width">120</Property>
+          </Button>
+        </Buttons>
+        <Children>
+          <DataGrid id="dgMain">
+            <Property name="dataSet">dsConf</Property>
+            <Property name="height">400</Property>
+            <RowNumColumn/>
+            <AutoFormElement>
+              <Property name="name">deptId</Property>
+              <Property name="property">deptId</Property>
+              <Property name="readOnly">true</Property>
+              <Property name="visible">false</Property>
+              <Editor/>
+            </AutoFormElement>
+            <DataColumn name="cameraId">
+              <Property name="property">cameraId</Property>
+              <Property name="editable">false</Property>
+              <Property name="readOnly">true</Property>
+              <Property name="align">center</Property>
+            </DataColumn>
+            <DataColumn name="cameraName">
+              <Property name="property">cameraName</Property>
+              <Property name="editable">false</Property>
+              <Property name="align">center</Property>
+              <Property name="trigger">ddCamera</Property>
+            </DataColumn>
+          </DataGrid>
+        </Children>
+      </FieldSet>
     </Container>
     <UpdateAction id="updateConf">
       <Property name="dataResolver">snapConfPR#updateConf</Property>
@@ -93,5 +580,34 @@
     <ListDropDown id="listHour">
       <Property name="items">0,7,8,9,10,11,12,13,14,15,16,17,18</Property>
     </ListDropDown>
+    <CustomDropDown id="ddCamera">
+      <Property name="minHeight">400</Property>
+      <Property name="assignmentMap">cameraId=id,cameraName=name</Property>
+      <Property name="minWidth">300</Property>
+      <Property name="autoOpen">true</Property>
+      <Container layout="regionPadding:5">
+        <DataSet id="dsCamera">
+          <Property name="dataProvider">secCameraPR#listCamera</Property>
+          <Property name="parameter">
+            <Entity>
+              <Property name="deptId">${request.getParameter('deptId')}</Property>
+            </Entity>
+          </Property>
+          <Property name="dataType">[dtSecCamera]</Property>
+        </DataSet>
+        <DataGrid>
+          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsCamera.data:#&quot;);&#xD;
+            if(data){&#xD;
+            view.get(&quot;#ddCamera&quot;).close(data.toJSON());&#xD;
+            }</ClientEvent>
+          <Property name="dataSet">dsCamera</Property>
+          <Property name="readOnly">true</Property>
+          <DataColumn name="name">
+            <Property name="property">name</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+        </DataGrid>
+      </Container>
+    </CustomDropDown>
   </View>
 </ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java
index eab1749..dfb4143 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java
@@ -3,6 +3,7 @@
 import com.bstek.dorado.annotation.DataProvider;
 import com.bstek.dorado.annotation.DataResolver;
 import com.bstek.dorado.annotation.Expose;
+import com.fzzy.igds.data.BaseResp;
 import com.fzzy.igds.domain.SnapConf;
 import com.fzzy.igds.service.SnapConfService;
 import com.fzzy.igds.utils.ContextUtil;
@@ -27,12 +28,8 @@
      * 蹇媿閰嶇疆鍒楄〃
      */
     @DataProvider
-    public List<SnapConf> selectList(SnapConf param) {
-        if (null == param) {
-            param = new SnapConf();
-            param.setCompanyId(ContextUtil.getCompanyId());
-        }
-        return snapConfService.selectList(param);
+    public List<SnapConf> selectList(String deptId) {
+        return snapConfService.selectList(deptId);
     }
 
     /**
@@ -42,12 +39,13 @@
      * @return
      */
     @DataProvider
-    public SnapConf getConfActHour() {
-        SnapConf param = new SnapConf();
-        param.setCompanyId(ContextUtil.getCompanyId());
-        List<SnapConf> list = snapConfService.selectList(param);
+    public SnapConf getConfActHour(String deptId) {
+
+        List<SnapConf> list = snapConfService.selectList(deptId);
         if (null == list || list.isEmpty()) {
-            return new SnapConf();
+            SnapConf conf = new SnapConf();
+            conf.setDeptId(deptId);
+            return conf;
         }
         return list.get(0);
     }
@@ -59,9 +57,9 @@
      * @param items
      */
     @DataResolver
-    public void updateConf(List<SnapConf> items) {
+    public String updateConf(List<SnapConf> items) {
         if (null == items || items.isEmpty()) {
-            return;
+            return "鏁版嵁涓虹┖锛屼繚瀛樺け璐�";
         }
         for (SnapConf conf : items) {
             if (StringUtils.isEmpty(conf.getId())) {
@@ -70,6 +68,7 @@
                 snapConfService.updateData(conf);
             }
         }
+        return null;
     }
 
 
@@ -79,7 +78,7 @@
      * @param conf
      */
     @Expose
-    public void updateActHour(SnapConf conf) {
+    public String updateActHour(SnapConf conf) {
 
         if (null == conf.getCompanyId()) {
             conf.setCompanyId(ContextUtil.getCompanyId());
@@ -87,9 +86,12 @@
         if (null == conf.getDeptId()) {
             conf.setDeptId(ContextUtil.subDeptId(null));
         }
-
-        //鍚屾鏇存柊鎵�鏈夌殑鎵ц鏃堕棿涓�鑷�
-        snapConfService.updateActHour(conf);
-
+        if (null == conf.getId()) {
+            snapConfService.insertData(conf);
+        }else {
+            //鍚屾鏇存柊鎵�鏈夌殑鎵ц鏃堕棿涓�鑷�
+            snapConfService.updateActHour(conf);
+        }
+        return null;
     }
 }
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 69a5b44..828ca0d 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -1208,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">

--
Gitblit v1.9.3