Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

sgj

2025-12-26 28c49925c98713465db8cd64899d984d6cd0f7ad

Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

 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;

 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());
            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);

 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>

 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>

 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);
    }

    /**

 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>

 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));
        }

        if (null == conf.getId()) {
            snapConfService.insertData(conf);
        }else {
        //同步更新所有的执行时间一致
        snapConfService.updateActHour(conf);

        }
        return null;
    }
}

 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">