抓拍配置页面修改

sgj

2 天以前 5cc86ac9bc9d24e947d28542a1023e9c063a2a12

抓拍配置页面修改

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapConfService.java

@@ -41,13 +41,13 @@
     */
    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("create_time");
        // æŒ‰æ›´æ–°æ—¶é—´å€’序排序
        queryWrapper.orderByDesc("update_time");

        return queryWrapper;
    }
@@ -66,39 +66,67 @@
     * æ’入新数据
     *
     * @param param æ•°æ®å®žä½“
     * @return å½±å“è¡Œæ•°
     * @return æ“ä½œç»“æžœ
     */
    public int insertData(SnapConf param) {
        param.setId(ContextUtil.generateId());
        param.setCompanyId(ContextUtil.getCompanyId());
        param.setUpdateBy(ContextUtil.getLoginUserName());
        param.setUpdateTime(new Date());
        param.setCreateBy(ContextUtil.getLoginUserName());
        param.setCreateTime(new Date());
        return snapConfMapper.insert(param);
    public BaseResp insertData(SnapConf param) {
        try {
            param.setId(ContextUtil.generateId());
            param.setCompanyId(ContextUtil.getCompanyId());
            param.setCreateBy(ContextUtil.getLoginUserName());
            param.setCreateTime(new Date());
            return snapConfMapper.insert(param) > 0 ? BaseResp.success() : BaseResp.error("添加失败");
        } catch (Exception e) {
            log.error("插入快拍配置数据异常", e);
            return BaseResp.error("添加失败：" + e.getMessage());
        }
    }

    /**
     * æ›´æ–°å·²æœ‰æ•°æ®
     *
     * @param param æ•°æ®å®žä½“
     * @return å½±å“è¡Œæ•°
     * @return æ“ä½œç»“æžœ
     */
    public int updateData(SnapConf param) {
        param.setUpdateBy(ContextUtil.getLoginUserName());
        param.setUpdateTime(new Date());
        return snapConfMapper.updateById(param);
    public BaseResp updateData(SnapConf param) {
        try {
            param.setUpdateBy(ContextUtil.getLoginUserName());
            param.setUpdateTime(new Date());
            return snapConfMapper.updateById(param) > 0 ? BaseResp.success() : BaseResp.error("更新失败");
        } catch (Exception e) {
            log.error("更新快拍配置数据异常", e);
            return BaseResp.error("更新失败：" + e.getMessage());
        }
    }

    /**
     * åˆ é™¤æŒ‡å®šID的数据
     *
     * @param ids è¦åˆ é™¤çš„记录ID集合（逗号分隔）
     * @param param è¦åˆ é™¤çš„记录
     * @return æ“ä½œç»“æžœ
     */
    public void deleteDataById(String ids) {
        String[] recordIds = Convert.toStrArray(ids);
        for (String recordId : recordIds) {
            snapConfMapper.deleteById(recordId);
        }
    public BaseResp deleteData(SnapConf param) {
        return snapConfMapper.deleteById(param) > 0 ? BaseResp.success() : BaseResp.error("删除失败");
    }


    /**
     * æ›´æ–°æ‰§è¡Œæ—¶é—´
     *
     */
    public void updateActHour(SnapConf param) {
        // åˆ›å»ºæ›´æ–°æ¡ä»¶åŒ…装器
        QueryWrapper<SnapConf> queryWrapper = new QueryWrapper<>();
        // è®¾ç½®ç»„织ID条件
        queryWrapper.eq("company_id", param.getCompanyId());
        // åˆ›å»ºæ›´æ–°å®žä½“，只更新执行时间相关字段
        SnapConf updateEntity = new SnapConf();
        updateEntity.setActHour1(param.getActHour1());
        updateEntity.setActHour2(param.getActHour2());
        updateEntity.setActHour3(param.getActHour3());
        updateEntity.setUpdateTime(new Date());
        updateEntity.setUpdateBy(ContextUtil.getLoginUserName());
        // æ‰§è¡Œæ‰¹é‡æ›´æ–°
        snapConfMapper.update(updateEntity, queryWrapper);
    }

}

 fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConf.view.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model/>
  <View layout="padding:10">
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsConf">
      <Property name="loadMode">lazy</Property>
      <Property name="dataType">[dtSnapConf]</Property>
      <Property name="dataProvider">snapConfPR#selectList</Property>
    </DataSet>
    <DataSet id="dsParam">
      <Property name="loadMode">lazy</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>
        <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>
          </Button>
        </Buttons>
        <Children>
          <AutoForm>
            <Property name="dataSet">dsParam</Property>
            <Property name="cols">*,*,*</Property>
            <AutoFormElement>
              <Property name="name">actHour1</Property>
              <Property name="property">actHour1</Property>
              <Property name="trigger">listHour</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">actHour2</Property>
              <Property name="property">actHour2</Property>
              <Property name="trigger">listHour</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">actHour3</Property>
              <Property name="property">actHour3</Property>
              <Property name="trigger">listHour</Property>
              <Editor/>
            </AutoFormElement>
          </AutoForm>
        </Children>
      </FieldSet>
    </Container>
    <UpdateAction id="updateConf">
      <Property name="dataResolver">snapConfPR#updateConf</Property>
      <UpdateItem>
        <Property name="dataSet">dsConf</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxSnapTime">
      <Property name="service">snapConfPR#updateActHour</Property>
    </AjaxAction>
    <ListDropDown id="listHour">
      <Property name="items">0,7,8,9,10,11,12,13,14,15,16,17,18</Property>
    </ListDropDown>
  </View>
</ViewConfig>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/SnapConfPR.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,95 @@
package com.fzzy.igds;

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.igds.domain.SnapConf;
import com.fzzy.igds.service.SnapConfService;
import com.fzzy.igds.utils.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.List;

/**
 * å¿«æ‹é…ç½®ç®¡ç†
 * Created by fzzy on 2017/5/23.
 */
@Component
public class SnapConfPR {

    @Resource
    private SnapConfService snapConfService;

    /**
     * snapConfPR#selectList
     * å¿«æ‹é…ç½®åˆ—表
     */
    @DataProvider
    public List<SnapConf> selectList(SnapConf param) {
        if (null == param) {
            param = new SnapConf();
            param.setCompanyId(ContextUtil.getCompanyId());
        }
        return snapConfService.selectList(param);
    }

    /**
     * snapConfPR#getConfActHour
     * é»˜è®¤èŽ·å–第一条数据的配置信息，如果没有就返回一个空的对象
     *
     * @return
     */
    @DataProvider
    public SnapConf getConfActHour() {
        SnapConf param = new SnapConf();
        param.setCompanyId(ContextUtil.getCompanyId());
        List<SnapConf> list = snapConfService.selectList(param);
        if (null == list || list.isEmpty()) {
            return new SnapConf();
        }
        return list.get(0);
    }


    /**
     * snapConfPR#updateConf
     *
     * @param items
     */
    @DataResolver
    public void updateConf(List<SnapConf> items) {
        if (null == items || items.isEmpty()) {
            return;
        }
        for (SnapConf conf : items) {
            if (StringUtils.isEmpty(conf.getId())) {
                snapConfService.insertData(conf);
            } else {
                snapConfService.updateData(conf);
            }
        }
    }


    /**
     * snapConfPR#updateActHour
     *
     * @param conf
     */
    @Expose
    public void updateActHour(SnapConf conf) {

        if (null == conf.getCompanyId()) {
            conf.setCompanyId(ContextUtil.getCompanyId());
        }
        if (null == conf.getDeptId()) {
            conf.setDeptId(ContextUtil.subDeptId(null));
        }

        //同步更新所有的执行时间一致
        snapConfService.updateActHour(conf);

    }
}

 fzzy-igdss-view/src/main/java/models/core.model.xml

@@ -1195,18 +1195,26 @@
    <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">执行时间1</Property>
      <Property name="label">第一次</Property>
      <Property name="displayFormat"># ç‚¹</Property>
    </PropertyDef>
    <PropertyDef name="actHour2">
      <Property name="dataType">int</Property>
      <Property name="label">执行时间2</Property>
      <Property name="label">第二次</Property>
      <Property name="displayFormat"># ç‚¹</Property>
    </PropertyDef>
    <PropertyDef name="actHour3">
      <Property name="dataType">int</Property>
      <Property name="label">执行时间3</Property>
      <Property name="label">第三次</Property>
      <Property name="displayFormat"># ç‚¹</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtNoticeDto">

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SnapConfController.java

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SnapConfManager.java

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js

@@ -288,6 +288,14 @@
    });
}
function openConf() {
    var url = ctx + "security/snap/snapConf";
    $.modal.openTab("抓拍配置", url);
    var url = ctx + "com.fzzy.igds.SnapConf.d";
    var options = {
        title: "抓拍配置",
        url: url,
        btn: 0,
        yes: function (index, layero) {
            $.modal.close(index);
        }
    };
    $.modal.openOptions(options);
}