Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

Merge remote-tracking branch 'origin/master'

 igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java

@@ -99,7 +99,7 @@
                return ThreeRespUtil.error(ThreeCodeEnum.CODE_1111, "未查询到此uid的配置信息，请联系管理员！", req);
            }
            List<Depot> depotList = threeMapper.getDepotList(req.getCompanyId(), req.getDeptId(), threeConf.getDepotId());
            if(list.size() > 0){
            if(null != depotList && depotList.size() > 0){
                data1001 = new Data1001();
                data1001.setUid(threeConf.getUid());
                data1001.setDepotName(depotList.get(0).getName());

 igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java

@@ -12,6 +12,7 @@
import com.ld.igds.phone.service.PhoneService;
import com.ld.igds.phone.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +27,8 @@

    @Autowired
    private SecManager securityManager;
    @Autowired
    private CoreSecCameraService secCameraService;

    @Override
    public String getInterfaceId() {
@@ -43,19 +46,23 @@
        if(param == null || StringUtils.isEmpty(param.getCameraId()) || StringUtils.isEmpty(param.getPlayType())){
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"参数异常，请重试！");
        }
        // æ ¹æ®id获取设备信息
//        SecCameraDto camera = securityManager.getCameraById(authUser.getCompanyId(), param.getCameraId(), true);
        SecCameraDto cameraParam = new SecCameraDto();
        cameraParam.setId(param.getCameraId());
        cameraParam.setCompanyId(authUser.getCompanyId());
        SecCameraDto camera = securityManager.getPlayAddr(cameraParam);

        if (camera == null) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"未查询到相关设备！");
        if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"系统未配置当前摄像头播放方式，不执行预览");
        }

        if (CameraUtil.PLAY_TYPE_DEFAULT.equals(camera.getPlayType())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"系统未配置当前摄像头播放方式，不执行预览");
        //获取设备信息
        SecCameraDto camera = secCameraService.getCameraById(authUser.getCompanyId(), param.getCameraId());
        if(null == camera){
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"未查询到相关设备！");
        }
        if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
            camera.setPlayAddr(camera.getPhoneAddr());
            return PhoneRespUtil.success(camera, req);
        }

        camera = securityManager.getPlayAddr(camera);
        if (camera == null) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"未查询到相关设备！");
        }

        return PhoneRespUtil.success(camera, req);

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java

@@ -12,6 +12,7 @@
import com.ld.igds.phone35.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.manager.SecManager;
import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,12 +26,14 @@
public class Phone35ServiceImpl5605 implements Phone35Service {
    @Autowired
    private SecManager securityManager;

    @Autowired
    private CoreSecCameraService secCameraService;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5605;
    }

    @SuppressWarnings("unchecked")
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //转化对象
@@ -42,20 +45,24 @@
        if (StringUtils.isEmpty(param.getId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "系统未配置当前摄像头播放方式，不执行预览");
        }

        SecCameraDto cameraParam = new SecCameraDto();
        cameraParam.setId(param.getId());
        cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
        SecCameraDto camera = securityManager.getPlayAddr(cameraParam);

        //获取设备信息
        SecCameraDto camera = secCameraService.getCameraById(phone35AuthUser.getCompanyId(), param.getId());
        if (camera == null) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "未查询到相关设备！");
        }
        if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
            camera.setPlayAddr(camera.getPhoneAddr());
            return PhoneRespUtil.success(camera, req);
        }

        camera = securityManager.getPlayAddr(camera);
        if (camera == null) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"未查询到相关设备！");
        }

        return PhoneRespUtil.success(camera, req);
    }

 igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java

@@ -196,7 +196,7 @@
     */
    public static void main(String[] args) {
        try {
            String password = "";
            String password = "Fzzy@#$%5432..K";
            System.out.println("明文密码: " + password);
            //私钥
            String privateKey = DEFAULT_PRIVATE_KEY_STRING;

 igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java

@@ -247,6 +247,10 @@
        // èŽ·å–分机信息
        DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(),
                depotConf.getGrainSer());
        // è‹¥è™«å®³åˆ†æœºé…ç½®ä¸ä¸ºç©ºï¼Œåˆ™èŽ·å–虫害的分机
        if(StringUtils.isNotEmpty(depotConf.getPestSer())){
            deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getPestSer());
        }

        CheckPestRequest request = new CheckPestRequest();
        request.setDepotId(param.getDepotId());

 igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java

@@ -65,7 +65,7 @@
        }

        String countHql = "select count(*) " + hql;
        hql += " order by batchId desc";
        hql += " order by receiveDate desc";

        this.pagingQuery(page, hql, countHql, args);
    }

 igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml

@@ -436,7 +436,7 @@
      </Container>
    </CustomDropDown>
    <ListDropDown id="listSymbol">
      <Property name="items">>=,&lt;=,=</Property>
      <Property name="items">>=,&lt;=,==</Property>
    </ListDropDown>
  </View>
</ViewConfig>

 igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java

@@ -70,7 +70,7 @@
            item = new CheckItemData();
            BeanUtils.copyProperties(data, item);
            item.setCheckId(checkId);
            if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
            if (null != data.getUpperLimit() && data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
                item.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
            }
            result.add(item);

 igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java

@@ -3,8 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import org.springframework.stereotype.Component;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -16,6 +14,8 @@
 * @Author: YYC
 * @Description:账面库存
 * @DateTime: 2023/10/20 14:07
 *
 * æŒ‰ä»“库进行统计，每个月低统计一次(因上海市账面库存接口为按货位统计)
 **/
@Data
@Entity
@@ -34,9 +34,13 @@
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Column(name = "kqdm", length = 21)
    @Column(name = "DEPT_ID_", length = 20)
    @PropertyDef(label = "库区代码")
    private String kqdm;
    private String deptId;

    @Column(name = "DEPOT_ID_", length = 30)
    @PropertyDef(label = "仓库编码")
    private String depotId;

    @Column(name = "lspzdm", length = 7)
    @PropertyDef(label = "粮食品种代码")
@@ -74,10 +78,6 @@
    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "业务日期")
    private Date ywrq;

    @Column(name = "czbz", length = 1)
    @PropertyDef(label = "操作标志")
    private String czbz;

    @Column(name = "zhgxsj")
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")

 igds-core/src/main/java/com/ld/igds/models/SecCamera.java

@@ -52,9 +52,13 @@
    @PropertyDef(label = "抓拍方式")
    private String snapType;

    @Column(name = "azwzlx", length = 2)
    @PropertyDef(label = "安装位置类型")
    private String azwzlx;
    @Column(name = "spjklx", length = 1)
    @PropertyDef(label = "视频监控类型")
    private String spjklx;

    @Column(name = "spdwlx", length = 2)
    @PropertyDef(label = "视频点位类型")
    private String spdwlx;

    @Column(name = "NAME_", length = 50)
    @PropertyDef(label = "名称")
@@ -92,6 +96,10 @@
    @PropertyDef(label = "流媒体地址")
    private String mediaAddr;

    @Column(name = "PHONE_ADDR_", length = 100)
    @PropertyDef(label = "手机直播地址")
    private String phoneAddr;

    @Column(name = "REMARK_", length = 300)
    @PropertyDef(label = "备注")
    private String remark;
@@ -115,14 +123,6 @@
    @Column(name = "UPDATE_TIME_", length = 1)
    @PropertyDef(label = "更新时间")
    private Date updateTime;

    @Column(name = "spjklx", length = 1)
    @PropertyDef(label = "视频监控类型")
    private String spjklx;

    @Column(name = "spdwlx", length = 2)
    @PropertyDef(label = "视频监控类型")
    private String spdwlx;

    public int getChanNum() {
        return chanNum;

 igds-core/src/main/java/com/ld/igds/models/SecureManager.java

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

import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;

/**
 * å®‰å…¨ç®¡ç†
 *
 * @author czt
 * @data 2023/10/30
 */
@Data
@Entity
@Table(name = "D_M_SECURE_MANAGER")
public class SecureManager implements Serializable {

    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "fxdbm", length = 12)
    @PropertyDef(label = "风险点编码", description = "8位风险识别日期（YYYYMMDD）+4位风险顺序号")
    private String fxdbm;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Column(name = "DEPT_ID_", length = 40)
    @PropertyDef(label = "库区编码")
    private String deptId;

    @Column(name = "dd", length = 200)
    @PropertyDef(label = "地点")
    private String dd;

    @Column(name = "sbr", length = 50)
    @PropertyDef(label = "识别人")
    private String sbr;

    @Column(name = "hjbw", length = 200)
    @PropertyDef(label = "环节/部位")
    private String hjbw;

    @Column(name = "fxxx", length = 200)
    @PropertyDef(label = "风险信息")
    private String fxxx;

    @Column(name = "fxlx", length = 1)
    @PropertyDef(label = "风险类型")
    private String fxlx;

    @PropertyDef(label = "风险等级")
    @Column(name = "fxfj", length = 1)
    private String fxfj;

    @Column(name = "fxglcs", length = 200)
    @PropertyDef(label = "风险管控措施")
    private String fxglcs;

    @Column(name = "yhxx", length = 200)
    @PropertyDef(label = "隐患信息")
    private String yhxx;

    @Column(name = "yhpcxx", length = 200)
    @PropertyDef(label = "隐患排查信息")
    private String yhpcxx;

    @Column(name = "yhzgxx", length = 200)
    @PropertyDef(label = "隐患整改信息")
    private String yhzgxx;

    @Column(name = "yhysxx", length = 200)
    @PropertyDef(label = "隐患整改验收信息")
    private String yhysxx;

    @Column(name = "sgjbxx", length = 200)
    @PropertyDef(label = "事故基本信息")
    private String sgjbxx;

    @Column(name = "zgsx", length = 200)
    @PropertyDef(label = "整改时限")
    private String zgsx;

    @Column(name = "zrdw", length = 200)
    @PropertyDef(label = "责任单位")
    private String zrdw;

    @Column(name = "zrr", length = 200)
    @PropertyDef(label = "责任人")
    private String zrr;

    @Column(name = "zgysxx", length = 200)
    @PropertyDef(label = "整改验收信息")
    private String zgysxx;

    @Column(name = "fxgzjgzrr", length = 50)
    @PropertyDef(label = "风险跟踪监管责任人")
    private String fxgzjgzrr;

    @Column(name = "updateTime")
    @PropertyDef(label = "最后更新时间")
    private Date updateTime;

}

 igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml

@@ -12,13 +12,29 @@
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">库区代码</Property>
        <Property name="label">所属分库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </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>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="lspzdm">
        <Property></Property>
        <Property name="label">粮食品种代码</Property>
        <Property name="label">粮食品种</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="keyProperty">code</Property>
@@ -44,24 +60,25 @@
        <Property name="dataType">Double</Property>
        <Property name="label">期初数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#,##0 KG</Property>
      </PropertyDef>
      <PropertyDef name="bqsrsl">
        <Property name="dataType">Double</Property>
        <Property name="label">本期收入数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000KG</Property>
        <Property name="displayFormat">#,##0 KG</Property>
      </PropertyDef>
      <PropertyDef name="bqzcsl">
        <Property name="dataType">Double</Property>
        <Property name="label">本期支出数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000KG</Property>
        <Property name="displayFormat">#,##0 KG</Property>
      </PropertyDef>
      <PropertyDef name="qmye">
        <Property name="dataType">Double</Property>
        <Property name="label">期末数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000KG</Property>
        <Property name="displayFormat">#,##0 KG</Property>
      </PropertyDef>
      <PropertyDef name="yjbz">
        <Property name="dataType">Integer</Property>
@@ -88,30 +105,6 @@
        <Property name="dataType">Date</Property>
        <Property name="label">业务日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <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">i</Property>
                <Property name="value">新增数据</Property>
              </Entity>
              <Entity>
                <Property name="key">u</Property>
                <Property name="value">修改数据</Property>
              </Entity>
              <Entity>
                <Property name="key">d</Property>
                <Property name="value">删除数据</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="zhgxsj">
        <Property name="dataType">DateTime</Property>
@@ -220,6 +213,10 @@
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <RowNumColumn/>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="lspzdm">
          <Property name="property">lspzdm</Property>
          <Property name="align">center</Property>
@@ -250,14 +247,6 @@
        </DataColumn>
        <DataColumn name="yjbz">
          <Property name="property">yjbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ywrq">
          <Property name="property">ywrq</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="zhgxsj">
@@ -308,6 +297,16 @@
          <Property name="cols">*,*</Property>
          <Property name="labelWidth">120</Property>
          <AutoFormElement>
            <Property name="name">depotId</Property>
            <Property name="property">depotId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lspzdm</Property>
            <Property name="property">lspzdm</Property>
            <Editor/>
@@ -352,11 +351,6 @@
          <AutoFormElement>
            <Property name="name">ywrq</Property>
            <Property name="property">ywrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>

 igds-core/src/main/java/com/ld/igds/view/Granary.view.xml

@@ -104,14 +104,6 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <PropertyDef name="depotId">
        <Property name="label">所属仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;buildingPR#getCacheBuilding&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="name">
        <Property name="label">廒间名称</Property>
      </PropertyDef>
@@ -170,11 +162,6 @@
      <AutoForm>
        <Property name="dataSet">dsParam</Property>
        <Property name="cols">*,*,*,*</Property>
        <AutoFormElement>
          <Property name="name">depotId</Property>
          <Property name="property">depotId</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">name</Property>
          <Property name="property">name</Property>

 igds-core/src/main/java/com/ld/igds/view/GranaryPR.java

@@ -5,10 +5,12 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.Granary;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.view.service.HGranaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.HashMap;
import java.util.Map;

/**
@@ -32,6 +34,12 @@
    @DataProvider
    public void pageGranary(Page<Granary> page, Map<String, Object> param)
            throws Exception {
        if(null == param){
            param = new HashMap<>();
        }
        if(null == param.get("deptId")){
            param.put("deptId", ContextUtil.subDeptId(null));
        }
        granaryService.pageData(page, param);
    }


 igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java

@@ -24,7 +24,7 @@

    public void listBookStore(Page<DepotBookStore> page, Map<String, Object> param) throws Exception {
        StringBuffer hql = new StringBuffer();
        hql.append(" from " + DepotBookStore.class.getName() + " where companyId =:companyId and kqdm =:deptId ");
        hql.append(" from " + DepotBookStore.class.getName() + " where companyId =:companyId and deptId =:deptId ");
        Map<String, Object> args = new HashMap<>();
        args.put("companyId", ContextUtil.getCompanyId());
        args.put("deptId", ContextUtil.subDeptId(null));
@@ -44,12 +44,10 @@
        try {
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
                data.setKqdm(ContextUtil.subDeptId(null));
                data.setDeptId(ContextUtil.subDeptId(null));
                data.setCompanyId(ContextUtil.getCompanyId());
                data.setCzbz("i");
                session.save(data);
            } else {
                data.setCzbz("u");
                session.update(data);
            }
        } catch (Exception e) {

 igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java

@@ -7,7 +7,6 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;

import java.util.HashMap;
import java.util.Map;

@@ -24,27 +23,29 @@
            throws Exception {
        String hql = " from " + Granary.class.getName()
                + " where companyId=:companyId";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", ContextUtil.getCompanyId());

        if (null != param) {

            String str = (String) param.get("depotId");
            if (StringUtils.isNotEmpty(str)) {
                hql += " and cfbh =:depotId";
                args.put("depotId", str);
        if (null == param) {
            param = new HashMap<>();
            }
        String companyId = (String) param.get("companyId");
        if (StringUtils.isEmpty(companyId)) {
            companyId = ContextUtil.getCompanyId();
        }
        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", companyId);

        String str = (String) param.get("deptId");
        if (StringUtils.isNotEmpty(str)) {
            hql += " and deptId =:deptId";
            args.put("deptId", str);
        }

            str = (String) param.get("name");
            if (StringUtils.isNotEmpty(str)) {
                hql += " and ajmc like:name";
                args.put("name", "%" + str + "%");
            }

        }

        String count = "select count(*) " + hql;

        hql += " order by  updateTime desc";

        this.pagingQuery(page, hql, count, args);

 igds-core/src/main/resources/mapper/SecServiceMapper.xml

@@ -8,23 +8,30 @@

    <sql id="DATA_COLUMN">
        ID_ as id,
        SN_ AS sn,
        COMPANY_ID_ as companyId,
        DEPT_ID_ as deptId,
        NAME_ AS name,
        LOGIN_ID_
        AS loginId,
        PWD_ AS pwd,
        BRAND_ AS brand,
        TYPE_ AS type,
        PLAY_TYPE_ AS playType,
        SN_ AS sn,
        SNAP_TYPE_ AS snapType,
        spjklx AS spjklx,
        spdwlx AS spdwlx,
        NAME_ AS name,
        LOGIN_ID_ AS loginId,
        PWD_ AS pwd,
        IP_IN_ AS ipIn,
        PORT_IN_C_ AS portInC,
        PORT_IN_V_ AS portInV,
        CHAN_NUM_ AS chanNum,
        BRAND_ AS brand,
        MEDIA_ADDR_ AS mediaAddr,
        PHONE_ADDR_ AS phoneAddr,
        REMARK_ AS remark,
        POS_X_ AS posX,
        POS_Y_ AS posY
        POS_Y_ AS posY,
        SCREEN_SHOW_ AS screenShow,
        SNAP_TAG_ AS snapTag,
        UPDATE_TIME_ AS updateTime
    </sql>

    <!-- æ›´æ–°è®¾å¤‡ä½ç½® -->

 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java

@@ -197,6 +197,10 @@
                Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
        view.addObject("listFoodVariety", listFoodVariety);

        // ç²®é£Ÿæ€§è´¨ä¸‹æ‹‰æ¡†
        List<DicTrigger> listFoodType = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_TYPE, user.getCompanyId());
        view.addObject("listFoodType", listFoodType);

        // ç²®é£Ÿç­‰çº§ä¸‹æ‹‰æ¡†
        List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
                Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
@@ -696,6 +700,7 @@

    /**
     * æ ¹æ®è´¨æ£€å•å·èŽ·å–出入库信息
     *
     * @param param
     * @return
     */

 igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java

@@ -46,6 +46,8 @@
    private String depotId;
    //粮食品种
    private String foodVariety;
    //粮食品种
    private String foodType;
    //质检单号
    private String checkId;
    //单价

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java

@@ -256,7 +256,9 @@
        }

        if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
            if (StringUtils.isEmpty(data.getCheckUser())) {
            data.setCheckUser(ContextUtil.getLoginUserCName());
            }
            data.setProgress(nextProgress);
            return data;
        }
@@ -397,11 +399,22 @@
        }

        String loginUser = ContextUtil.getLoginUserCName();
        if (StringUtils.isEmpty(data.getRegisterUser())) {
        data.setRegisterUser(loginUser);
        }
        if (StringUtils.isEmpty(data.getFullWeightUser())) {
        data.setFullWeightUser(loginUser);
        }
        if (StringUtils.isEmpty(data.getEmptyWeightUser())) {
        data.setEmptyWeightUser(loginUser);
        }
        if (StringUtils.isEmpty(data.getHandleUser())) {
        data.setHandleUser(loginUser);
        }
        if (StringUtils.isEmpty(data.getCompleteUser())) {
        data.setCompleteUser(loginUser);
        }

        if (null == data.getCompleteTime()) {
            data.setCompleteTime(new Date());
        }
@@ -414,7 +427,7 @@
        if (null == data.getIntelCard()) {
            data.setIntelCard(data.getUserId());
        }
        if (null != data.getCheckItems()) {
        if (null != data.getCheckItems() && StringUtils.isEmpty(data.getCheckUser())) {
            data.setCheckUser(loginUser);
        }

@@ -864,6 +877,7 @@
            curData.setCheckTime(new Date());
            data.setCheckTime(new Date());
        }
        curData.setCheckUser(data.getCheckUser());
        curData.setCheckStatus(data.getCheckStatus());
        curData.setFoodYear(data.getFoodYear());

@@ -887,6 +901,7 @@
        curData.setCheckItems(data.getCheckItems());
        curData.setCheckTime(data.getCheckTime());
        curData.setDepotId(data.getDepotId());
        curData.setFoodType(data.getFoodType());

        if (StringUtils.isEmpty(data.getCheckUser())) {
            curData.setCheckUser(ContextUtil.getLoginUserCName());

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java

@@ -29,6 +29,7 @@
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -551,7 +552,6 @@
                data.setDepotId(item.getDepotId());
            }
            if (data.getDepotId().equals(item.getDepotId())) {

                inoutParam.setId(data.getRecordId());
            } else {
                String newId = data.getRecordId() + temp;
@@ -585,11 +585,15 @@
            map.put(inoutParam.getId(), inoutParam);
        }
        InoutParam par;
        InoutData dat;
        for (String key : map.keySet()) {
            par = map.get(key);
            if (par != null) {
                dat = new InoutData();
                //更新流水数据(包含重量信息以及流程进度信息)
                inoutService.toComplete(par);
                BeanUtils.copyProperties(par, dat);
                inoutService.updateData(dat);

//                //更新仓库库存
//                if (InoutConstant.TYPE_IN.equals(par.getType())) {

 igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java

@@ -6,6 +6,7 @@
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;

import java.util.*;

@Component
@@ -42,10 +43,10 @@
                hql += " and type <> 'LOSS' and type <> 'OVER'";
            }

            str = (String) param.get("customerId");
            str = (String) param.get("noticeId");
            if (StringUtils.isNotEmpty(str)) {
                hql += " and customerId=:customerId ";
                args.put("customerId", str);
                hql += " and noticeId=:noticeId ";
                args.put("noticeId", str);
            }

            str = (String) param.get("progress");

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml

@@ -14,6 +14,7 @@
      </PropertyDef>
      <PropertyDef name="userId">
        <Property name="label">身份证号</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="noticeId">
        <Property name="label">通知单号</Property>
@@ -22,6 +23,15 @@
        <Property name="dataType">Double</Property>
        <Property name="label">粮食定价</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="foodType">
        <Property name="label">粮食性质</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
        </Property>
      </PropertyDef>
      <Reference name="checkItems">
        <Property name="parameter">
@@ -608,6 +618,11 @@
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">foodType</Property>
              <Property name="property">foodType</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">sampleUser</Property>
              <Property name="property">sampleUser</Property>
              <Editor/>

 igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml

@@ -19,7 +19,7 @@
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="customerId">
      <PropertyDef name="noticeId">
        <Property></Property>
        <Property name="label">发货单位</Property>
      </PropertyDef>
@@ -112,12 +112,6 @@
      <Property name="labelWidth">100</Property>
      <Property name="labelAlign">right</Property>
      <AutoFormElement>
        <Property name="name">depotId</Property>
        <Property name="property">depotId</Property>
        <Property name="trigger">autoMappingDropDown2</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">type</Property>
        <Property name="property">type</Property>
        <Editor/>
@@ -125,8 +119,14 @@
      <AutoFormElement>
        <Property name="name">customerName</Property>
        <Property name="property">customerName</Property>
        <Property name="trigger">ddCustomer</Property>
        <Property name="trigger">ddNotice</Property>
        <Property name="editable">false</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">depotId</Property>
        <Property name="property">depotId</Property>
        <Property name="trigger">autoMappingDropDown2</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
@@ -375,5 +375,79 @@
        </DataGrid>
      </Container>
    </CustomDropDown>
    <CustomDropDown id="ddNotice">
      <ClientEvent name="onOpen">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var type = data.get(&quot;type&quot;);&#xD;
if(type){&#xD;
    view.get(&quot;#dsNotice&quot;).set(&quot;parameter&quot;,{type: type}).flushAsync();&#xD;
}else{&#xD;
    $alert(&quot;请先选择出入库类型&quot;)&#xD;
}&#xD;
</ClientEvent>
      <Property name="minHeight">400</Property>
      <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
      <Property name="minWidth">1000</Property>
      <Property name="autoOpen">true</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsNotice">
          <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
          <Property name="dataType">[dtNoticeDto]</Property>
          <Property name="parameter"/>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key3">
            <Property name="blankText"> -- å®¢æˆ·åç§°æˆ–编码 --</Property>
            <Property name="width">200</Property>
          </TextEditor>
          <Button>
            <ClientEvent name="onClick">var key = view.get(&quot;#key3.value&quot;);&#xD;
var type = &quot;${request.getParameter('type')}&quot;;&#xD;
view.get(&quot;#dsNotice&quot;).set(&quot;parameter&quot;,{key: key,type: type}).flushAsync();</ClientEvent>
            <Property name="caption">查询</Property>
            <Property name="iconClass">fa fa-search</Property>
          </Button>
          <Button>
            <ClientEvent name="onClick">var data = view.get(&quot;#dsNotice.data:#&quot;);&#xD;
if(data){&#xD;
    view.get(&quot;#ddNotice&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
            <Property name="iconClass">fa fa-check</Property>
            <Property name="caption">确定</Property>
          </Button>
        </Container>
        <DataGrid>
          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsNotice.data:#&quot;);&#xD;
if(data){&#xD;
    view.get(&quot;#ddNotice&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
          <Property name="dataSet">dsNotice</Property>
          <Property name="readOnly">true</Property>
          <DataColumn name="name">
            <Property name="property">name</Property>
            <Property name="align">center</Property>
            <Property name="width">100</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">customerName</Property>
            <Property name="align">center</Property>
            <Property name="name">customerName</Property>
            <Property name="width">240</Property>
          </DataColumn>
          <DataColumn name="foodVariety">
            <Property name="property">foodVariety</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="year">
            <Property name="property">year</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="contractName">
            <Property name="property">contractName</Property>
            <Property name="align">center</Property>
            <Property name="width">300</Property>
          </DataColumn>
        </DataGrid>
      </Container>
    </CustomDropDown>
  </View>
</ViewConfig>

 igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java

@@ -27,23 +27,18 @@
    public void pageQueryIn(Page<InoutNoticeIn> page, Map<String, Object> param) throws Exception {

        String hql = " from " + InoutNoticeIn.class.getName()
                + " where companyId =:companyId";
                + " where companyId =:companyId and deptId =:deptId";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", ContextUtil.getCompanyId());
        args.put("deptId", ContextUtil.subDeptId(null));

        Object year = param.get("year");
        if (year == null) {
            param.put("year", DateFormatUtils.format(new Date(), "yyyy"));
        }

        String str = (String) param.get("deptId");
        if (StringUtils.isNotEmpty(str)) {
            hql += " and deptId =:deptId";
            args.put("deptId", str);
        }

        str = (String) param.get("id");
        String str = (String) param.get("id");
        if (StringUtils.isNotEmpty(str)) {
            hql += " and id=:id";
            args.put("id", str);
@@ -143,23 +138,18 @@
    public void pageQueryOut(Page<InoutNoticeOut> page, Map<String, Object> param) throws Exception {

        String hql = " from " + InoutNoticeOut.class.getName()
                + " where companyId =:companyId";
                + " where companyId =:companyId and deptId =:deptId";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", ContextUtil.getCompanyId());
        args.put("deptId", ContextUtil.subDeptId(null));

        Object year = param.get("year");
        if (year == null) {
            param.put("year", DateFormatUtils.format(new Date(), "yyyy"));
        }

        String str = (String) param.get("deptId");
        if (StringUtils.isNotEmpty(str)) {
            hql += " and deptId =:deptId";
            args.put("deptId", str);
        }

        str = (String) param.get("id");
        String str = (String) param.get("id");
        if (StringUtils.isNotEmpty(str)) {
            hql += " and id =:id";
            args.put("id", str);

 igds-inout/src/main/java/com/ld/igds/timer/DepotBookStoreScheduled.java

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

import com.bstek.bdf2.core.model.DefaultCompany;
import com.ld.igds.common.CoreCommonService;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.DepotStatus;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.models.DepotStore;
import com.ld.igds.models.InoutLossOver;
import com.ld.igds.models.InoutRecord;
import com.ld.igds.util.ContextUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

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

/**
 * @Desc: è´¦é¢åº“å­˜ - æ¯æœˆåº•è‡ªåŠ¨ç»Ÿè®¡æ¯ä¸ªä»“库的账面库存
 * @author: czt
 * @update-time: 2023/10/30
 */
@Slf4j
@Component(DepotBookStoreScheduled.BEAN_ID)
public class DepotBookStoreScheduled {

    public static final String BEAN_ID = "inout.depotBookStoreScheduled";

    @Resource
    private InoutService inoutService;

    @Resource
    private CoreCommonService commonService;

    /**
     * æ¯æœˆæœ€åŽä¸€å¤©22点25分执行
     */
    @Scheduled(cron = "0 25 22 28-31 * ?")
    public void scheduled() {

        final Calendar c = Calendar.getInstance();
        //如果是最后一天 åˆ™æ‰§è¡Œå®šæ—¶ä»»åŠ¡
        if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)) {

            List<DefaultCompany> listCompany = commonService.getCompanyList();
            if (null == listCompany){
                return;
            }

            for (DefaultCompany company : listCompany) {
                //TODO ç»Ÿè®¡æ¯ä¸ªä»“库账面库存

            }
        }
    }

    /**
     * ç»Ÿè®¡è´¦é¢åº“å­˜
     * @param companyId
     * @param listLossOver
     * @param param
     */
    private void sumDepotBookStore(String companyId, List<InoutLossOver> listLossOver, InoutParam param) {

//        if (null == listLossOver || listLossOver.isEmpty()) {
//            log.info("-----------系统自动同步库存，近期无损益记录，取消同步仓库库存……{}", companyId);
//            return;
//        }
//
//        // èŽ·å–有出入库记录的仓库
//        Map<String, InoutLossOver> map = new HashMap<>();
//        String key;
//        DepotStore lastStore;
//        double sumRecordWeight = 0.0;
//        for (InoutLossOver data : listLossOver) {
//            key = data.getDepotId() + "_" + data.getType();
//            if (null != map.get(key)) {
//                continue;
//            }
//
//            map.put(key, data);
//
//            // æ ¹æ®æœ€åŽä¸€è½¦è¿›è¡Œæ±‡æ€»ç»Ÿè®¡ï¼Œå¼€å§‹æ—¶é—´æ˜¯ä»“库库存最后一个时间截止到当前
//            lastStore = commonService.getLastDepotStore(data.getDepotId());
//            if (null == lastStore) {
//                log.error("--------库存定时任务-----没有获取到仓库最后库存信息，取消自动统计，请核对业务逻辑--仓库-{}",
//                        data.getDepotId());
//                continue;
//            }
//
//            param.setDeptId(data.getDeptId());
//            param.setDepotId(data.getDepotId());
//            param.setCompanyId(data.getCompanyId());
//            param.setType(data.getType());
//
//            //获取出入库的重量信息
//            sumRecordWeight = inoutService.sumLossOverWeight(param);
//
//            //新增一条库存记录
//            lastStore.setRemark("系统定时生成记录");
//            lastStore.setId(ContextUtil.getUUID());
//            lastStore.setUpdateUser("系统管理员");
//            lastStore.setUpdateDate(new Date());
//            lastStore.setCreateDate(new Date());
//            if(Constant.LOSS_OVER_LOSS.equals(data.getType())){
//                lastStore.setStorageReal(lastStore.getStorageReal() + sumRecordWeight);
//
//            }
//            if(Constant.LOSS_OVER_OVER.equals(data.getType())){
//                lastStore.setStorageReal(lastStore.getStorageReal() - sumRecordWeight);
//            }
//
//            lastStore.setStorageSettle(lastStore.getStorageReal());
//            commonService.addDepotStore(lastStore, true);
//        }
    }

}

 igds-inout/src/main/resources/mapper/InoutCheckMapper.xml

@@ -80,6 +80,7 @@
        CHECK_STATUS_ AS checkStatus,
        REMARKS_ AS remarks,
        FOOD_YEAR_ AS foodYear,
        FOOD_TYPE_ AS foodType,
        IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
        from
        D_INOUT_RECORD
@@ -115,6 +116,7 @@
            <if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
            <if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
            <if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
            <if test="data.foodType != null">FOOD_Type_ = #{data.foodType},</if>
            <if test="data.deCheck != null">DE_CHECK_ = #{data.deCheck},</if>
            <if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
            <if test="data.price != null">PRICE_ = #{data.price},</if>

 igds-inout/src/main/resources/mapper/InoutCommonMapper.xml

@@ -293,14 +293,12 @@
    <update id="reSumNoticeInComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
        update D_INOUT_NOTICE_IN t,(
            SELECT
            r.CUSTOMER_ID_,
            r.FOOD_VARIETY_,
            r.NOTICE_ID_,
            sum (r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
            from d_inout_record r
            where r.COMPANY_ID_ = #{param.companyId}
            and r.DEPT_ID_ = #{param.deptId}
            and r.CUSTOMER_ID_ = #{param.customerId}
            and r.FOOD_VARIETY_ = #{param.foodVariety}
            and r.NOTICE_ID_ = #{param.id}
            and r.RECORD_STATUS_ != 'DEL'
@@ -308,8 +306,8 @@
            GROUP BY r.FOOD_VARIETY_
            ) b
        SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
        WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
          AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
        WHERE
          t.FOOD_VARIETY_ = b.FOOD_VARIETY_
          AND t.ID_ = b.NOTICE_ID_
    </update>

@@ -465,7 +463,6 @@
    <update id="reSumNoticeOutComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
        update D_INOUT_NOTICE_OUT t,(
            SELECT
            r.CUSTOMER_ID_,
            r.FOOD_VARIETY_,
            r.DEPOT_ID_,
            r.NOTICE_ID_,
@@ -473,7 +470,6 @@
            from d_inout_record r
            where r.COMPANY_ID_ = #{param.companyId}
            AND r.DEPT_ID_ = #{param.deptId}
            and r.CUSTOMER_ID_ = #{param.customerId}
            and r.DEPOT_ID_ = #{param.depotId}
            and r.FOOD_VARIETY_ = #{param.foodVariety}
            and r.RECORD_STATUS_ != 'DEL'
@@ -481,8 +477,7 @@
            GROUP BY r.DEPOT_ID_
            ) b
        SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
        WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
          AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
        WHERE  t.FOOD_VARIETY_ = b.FOOD_VARIETY_
          AND t.DEPOT_ID_ = b.DEPOT_ID_
          AND t.ID_ = b.NOTICE_ID_
    </update>

 igds-inout/src/main/resources/mapper/InoutRecordMapper.xml

@@ -536,10 +536,10 @@
        <if test="param.foodVariety != null and param.foodVariety != ''">AND FOOD_VARIETY_ = #{param.foodVariety}</if>
        <if test="param.id != null and param.id != ''">AND NOTICE_ID_ = #{param.id}</if>
        <if test="param.start != null">AND
            COMPLETE_TIME_  <![CDATA[ > ]]> #{param.start}
            UPDATE_TIME_  <![CDATA[ > ]]> #{param.start}
        </if>
        <if test="param.end != null">AND
            COMPLETE_TIME_  <![CDATA[ < ]]> #{param.end}
            UPDATE_TIME_  <![CDATA[ < ]]> #{param.end}
        </if>
    </select>


 igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java

@@ -3,7 +3,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -20,29 +19,17 @@

    private static final long serialVersionUID = 1L;
    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "ID")
    private String id;

    @Column(name = "kqdm", length = 40)
    @PropertyDef(label = "库区代码")
    private String kqdm;
    @Column(name = "sbbh", length = 20)
    @PropertyDef(label = "设备编号")
    private String sbbh;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码", description = "")
    private String companyId;

    @Column(name = "dwdm", length = 18)
    @PropertyDef(label = "单位代码")
    private String dwdm;

    @Column(name = "kqmc", length = 256)
    @PropertyDef(label = "库区名称")
    private String kqmc;

    @Column(name = "sbbh", length = 20)
    @PropertyDef(label = "设备编号")
    private String sbbh;
    @Column(name = "DEPT_ID_", length = 40)
    @PropertyDef(label = "所属库区")
    private String deptId;

    @Column(name = "sbyqmc", length = 50)
    @PropertyDef(label = "设备仪器名称")
@@ -75,7 +62,6 @@

    @Column(name = "jdsj")
    @PropertyDef(label = "检定时间")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date jdsj;

    @Column(name = "jddw", length = 256)
@@ -84,7 +70,6 @@

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date updateTime;
    
}

 igds-manager/src/main/java/com/ld/igds/models/OAStaff.java

@@ -25,30 +25,31 @@
@Table(name = "D_OA_STAFF")
public class OAStaff implements Serializable {
    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "ID")
    private String id;
    @Column(name = "sfzhm", length = 18)
    @PropertyDef(label = "身份证号码")
    private String sfzhm;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码", description = "")
    private String companyId;

    @Column(name = "dwdm", length = 18)
    @PropertyDef(label = "单位代码")
    private String dwdm;

    @Column(name = "dwmc", length = 256)
    @PropertyDef(label = "单位名称")
    private String dwmc;
    @Column(name = "DEPT_ID_", length = 20)
    @PropertyDef(label = "库区编码", description = "")
    private String deptId;

    @Column(name = "lsbm", length = 256)
    @PropertyDef(label = "隶属部门", description = "隶属部门名称")
    private String lsbm;

    @Column(name = "xzqhdm", length = 6)
    @PropertyDef(label = "行政区划代码")
    @PropertyDef(label = "所属行政区划")
    private String xzqhdm;

    @Column(name = "xzqhmc", length = 6)
    @PropertyDef(label = "所属行政区划")
    private String xzqhmc;

    @Column(name = "xm", length = 32)
    @PropertyDef(label = "姓名")
@@ -57,10 +58,6 @@
    @Column(name = "xb", length = 1)
    @PropertyDef(label = "性别")
    private String xb;

    @Column(name = "sfzhm", length = 18)
    @PropertyDef(label = "身份证号码")
    private String sfzhm;

    @Column(name = "rzrq")
    @PropertyDef(label = "入职日期")

 igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java

@@ -9,6 +9,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -34,10 +35,11 @@
    //=====================================库区设备=======================================//
    public void pageData(Page<DeptDevice> page, Map<String, Object> param)
            throws Exception {
        String hql = " from " + DeptDevice.class.getName() + " where companyId=:companyId";
        String hql = " from " + DeptDevice.class.getName() + " where companyId =:companyId and deptId =:deptId";

        Map<String, Object> args = new HashMap<>();
        args.put("companyId", ContextUtil.getCompanyId());
        args.put("deptId", ContextUtil.subDeptId(null));

        if (null != param) {
            hql = buildHql(hql, param, args);
@@ -57,14 +59,12 @@
            if (null == data.getCompanyId()) {
                data.setCompanyId(ContextUtil.getCompanyId());
            }
            if (StringUtils.isEmpty(data.getKqdm())) {
                data.setKqdm(ContextUtil.subDeptId(null));
            if (StringUtils.isEmpty(data.getDeptId())) {
                data.setDeptId(ContextUtil.subDeptId(null));
            }
            DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
            data.setKqmc(dept.getName());
            data.setUpdateTime(new Date());
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
            if (null == data.getSbbh()) {
                data.setSbbh(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
            }
            session.saveOrUpdate(data);
        } finally {
@@ -74,6 +74,39 @@
        return null;
    }

    public String getIndex(String companyId) {
        List<DeptDevice> list = getDataByTime(companyId);
        int index = 10000;
        if (list != null && list.size() > 0) {
            String id = list.get(0).getSbbh().substring(8);
            int temp = Integer.valueOf(id) + 1;
            index += temp;
        }else {
            index ++;
        }
        return String.valueOf(index).substring(1);
    }

    private List<DeptDevice> getDataByTime(String companyId) {
        String hql = " from " + DeptDevice.class.getName()
                + " where companyId =:companyId ";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", companyId);

        hql += " and updateTime >:startTime";
        args.put("startTime", DateUtil.getCurZero(new Date()));


        hql += " and updateTime <:endTime";
        args.put("endTime", DateUtil.getNextZero(new Date()));


        hql += " order by id desc";

        return this.query(hql, args);
    }

    public String delData(DeptDevice data) {
        Session session = this.getSessionFactory().openSession();
        try {

 igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java

@@ -68,13 +68,13 @@
    }

    public String saveOrUpdate(OAStaff data) {

        //判断组织编码
        if (StringUtils.isEmpty(data.getCompanyId())) {
            data.setCompanyId(data.getCompanyId());
        }
        Session session = this.getSessionFactory().openSession();
        try {
            data.setCompanyId(ContextUtil.getCompanyId());
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
            }
            session.saveOrUpdate(data);
        } finally {
            session.flush();

 igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml

@@ -5,48 +5,95 @@
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.DeptDevice</Property>
      <PropertyDef name="id">
        <Property name="label">ID</Property>
      <PropertyDef name="sbbh">
        <Property/>
        <Property name="label">设备编号</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      <PropertyDef name="companyId">
        <Property/>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property/>
        <Property name="label">所属库区</Property>
        <Property name="readOnly">false</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="dwdm">
        <Property></Property>
        <Property name="label">单位代码</Property>
      </PropertyDef>
      <PropertyDef name="kqmc">
        <Property></Property>
        <Property name="label">库区名称</Property>
      </PropertyDef>
      <PropertyDef name="sbbh">
        <Property></Property>
        <Property name="label">设备编号</Property>
      </PropertyDef>
      <PropertyDef name="sbyqmc">
        <Property></Property>
        <Property/>
        <Property name="label">设备仪器名称</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sbyqdm">
        <Property></Property>
        <Property/>
        <Property name="label">设备仪器代码</Property>
        <Property name="readOnly">false</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <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>
              <Entity>
                <Property name="key">17</Property>
                <Property name="value">17-碾米机械设备</Property>
              </Entity>
              <Entity>
                <Property name="key">18</Property>
                <Property name="value">18-粮油食品机械设备</Property>
              </Entity>
              <Entity>
                <Property name="key">21</Property>
                <Property name="value">21-饲料加工机械设备</Property>
              </Entity>
              <Entity>
                <Property name="key">22</Property>
                <Property name="value">22-油脂加工机械和设备</Property>
              </Entity>
              <Entity>
                <Property name="key">99</Property>
                <Property name="value">99-其他粮食设备</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="sbggxh">
        <Property></Property>
        <Property/>
        <Property name="label">设备规格型号</Property>
      </PropertyDef>
      <PropertyDef name="sccj">
        <Property></Property>
        <Property/>
        <Property name="label">生产厂家</Property>
      </PropertyDef>
      <PropertyDef name="scrq">
@@ -54,11 +101,11 @@
        <Property name="label">生产日期</Property>
      </PropertyDef>
      <PropertyDef name="sbms">
        <Property></Property>
        <Property/>
        <Property name="label">设备描述</Property>
      </PropertyDef>
      <PropertyDef name="sbzt">
        <Property></Property>
        <Property/>
        <Property name="label">设备状态</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
@@ -67,19 +114,19 @@
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1：完好</Property>
                  <Property name="value">1-完好</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2：报废</Property>
                  <Property name="value">2-报废</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3：待检修</Property>
                  <Property name="value">3-待检修</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">4：其他</Property>
                  <Property name="value">4-其他</Property>
              </Entity>
            </Collection>
          </Property>
@@ -90,13 +137,12 @@
        <Property name="label">检定时间</Property>
      </PropertyDef>
      <PropertyDef name="jddw">
        <Property></Property>
        <Property/>
        <Property name="label">检定单位</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="dataType">DateTime</Property>
        <Property name="label">更新时间</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
@@ -284,65 +330,50 @@
        <RowNumColumn>
          <Property name="caption">序号</Property>
        </RowNumColumn>
        <DataColumn name="dwdm">
          <Property name="property">dwdm</Property>
          <Property name="align">center</Property>
        <DataColumn name="sbbh">
          <Property name="property">sbbh</Property>
          <Property name="readOnly">true</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="kqmc">
          <Property name="property">kqmc</Property>
          <Property name="align">center</Property>
        <DataColumn name="deptId">
          <Property name="property">deptId</Property>
          <Property name="readOnly">true</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sbyqmc">
          <Property name="property">sbyqmc</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="sbyqdm">
          <Property name="property">sbyqdm</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="sbggxh">
          <Property name="property">sbggxh</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="sccj">
          <Property name="property">sccj</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="scrq">
          <Property name="property">scrq</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="sbms">
          <Property name="property">sbms</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
        </DataColumn>
        <DataColumn name="sbzt">
          <Property name="property">sbzt</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jdsj">
          <Property name="property">jdsj</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jddw">
          <Property name="property">jddw</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
          <Property name="readOnly">true</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
    </Container>
@@ -386,13 +417,13 @@
          <Property name="labelSeparator">：</Property>
          <Property name="labelWidth">150</Property>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Property name="name">sbbh</Property>
            <Property name="property">sbbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sbbh</Property>
            <Property name="property">sbbh</Property>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>

 igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml

@@ -5,33 +5,44 @@
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.OAStaff</Property>
      <PropertyDef name="id">
      <PropertyDef name="sfzhm">
        <Property></Property>
        <Property name="label">ID</Property>
        <Property name="label">身份证号码</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="dwdm">
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">单位代码</Property>
      </PropertyDef>
      <PropertyDef name="dwmc">
        <Property></Property>
        <Property name="label">单位名称</Property>
        <Property name="label">所属库区</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="lsbm">
        <Property></Property>
        <Property name="label">隶属部门</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="xzqhdm">
        <Property></Property>
        <Property name="label">行政区划代码</Property>
        <Property name="label">所属行政区划</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="xzqhmc">
        <Property></Property>
        <Property name="label">所属行政区划</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="xm">
        <Property></Property>
        <Property name="label">姓名</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="xb">
        <Property></Property>
@@ -52,32 +63,58 @@
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="sfzhm">
        <Property></Property>
        <Property name="label">身份证号码</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="rzrq">
        <Property name="dataType">Date</Property>
        <Property name="label">入职日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="gwxz">
        <Property></Property>
        <Property name="label">岗位性质</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;GWXZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <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">20</Property>
                <Property name="value">20-其他从业人员</Property>
              </Entity>
            </Collection>
        </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="zgzt">
        <Property></Property>
        <Property name="label">在岗状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;ZGZT&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">01</Property>
                <Property name="value">01-在岗</Property>
              </Entity>
              <Entity>
                <Property name="key">02</Property>
                <Property name="value">02-已离职</Property>
              </Entity>
            </Collection>
        </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="lzrq">
        <Property></Property>
@@ -100,27 +137,382 @@
        <Property></Property>
        <Property name="label">民族</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;MZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">01</Property>
                <Property name="value">01-汉族</Property>
              </Entity>
              <Entity>
                <Property name="key">02</Property>
                <Property name="value">02-蒙古族</Property>
              </Entity>
              <Entity>
                <Property name="key">03</Property>
                <Property name="value">03-回族</Property>
              </Entity>
              <Entity>
                <Property name="key">04</Property>
                <Property name="value">04-藏族</Property>
              </Entity>
              <Entity>
                <Property name="key">05</Property>
                <Property name="value">05-维吾尔族</Property>
              </Entity>
              <Entity>
                <Property name="key">06</Property>
                <Property name="value">06-苗族</Property>
              </Entity>
              <Entity>
                <Property name="key">07</Property>
                <Property name="value">07-彝族</Property>
              </Entity>
              <Entity>
                <Property name="key">08</Property>
                <Property name="value">08-壮族</Property>
              </Entity>
              <Entity>
                <Property name="key">09</Property>
                <Property name="value">09-布依族</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>
              <Entity>
                <Property name="key">17</Property>
                <Property name="value">17-哈萨克族</Property>
              </Entity>
              <Entity>
                <Property name="key">18</Property>
                <Property name="value">18-傣族</Property>
              </Entity>
              <Entity>
                <Property name="key">19</Property>
                <Property name="value">19-黎族</Property>
              </Entity>
              <Entity>
                <Property name="key">20</Property>
                <Property name="value">20-傈僳族</Property>
              </Entity>
              <Entity>
                <Property name="key">21</Property>
                <Property name="value">21-佤族</Property>
              </Entity>
              <Entity>
                <Property name="key">22</Property>
                <Property name="value">22-畲族</Property>
              </Entity>
              <Entity>
                <Property name="key">23</Property>
                <Property name="value">23-高山族</Property>
              </Entity>
              <Entity>
                <Property name="key">24</Property>
                <Property name="value">24-拉祜族</Property>
              </Entity>
              <Entity>
                <Property name="key">25</Property>
                <Property name="value">25-水族</Property>
              </Entity>
              <Entity>
                <Property name="key">26</Property>
                <Property name="value">26-东乡族</Property>
              </Entity>
              <Entity>
                <Property name="key">27</Property>
                <Property name="value">27-纳西族</Property>
              </Entity>
              <Entity>
                <Property name="key">28</Property>
                <Property name="value">28-景颇族</Property>
              </Entity>
              <Entity>
                <Property name="key">29</Property>
                <Property name="value">29-柯尔克孜族</Property>
              </Entity>
              <Entity>
                <Property name="key">30</Property>
                <Property name="value">30-土族</Property>
              </Entity>
              <Entity>
                <Property name="key">31</Property>
                <Property name="value">31-达斡尔族</Property>
              </Entity>
              <Entity>
                <Property name="key">32</Property>
                <Property name="value">32-仫佬族</Property>
              </Entity>
              <Entity>
                <Property name="key">33</Property>
                <Property name="value">33-羌族</Property>
              </Entity>
              <Entity>
                <Property name="key">34</Property>
                <Property name="value">34-布朗族</Property>
              </Entity>
              <Entity>
                <Property name="key">35</Property>
                <Property name="value">35-撒拉族</Property>
              </Entity>
              <Entity>
                <Property name="key">36</Property>
                <Property name="value">36-毛南族</Property>
              </Entity>
              <Entity>
                <Property name="key">37</Property>
                <Property name="value">37-仡佬</Property>
              </Entity>
              <Entity>
                <Property name="key">38</Property>
                <Property name="value">38-锡伯族</Property>
              </Entity>
              <Entity>
                <Property name="key">39</Property>
                <Property name="value">39-阿昌族</Property>
              </Entity>
              <Entity>
                <Property name="key">40</Property>
                <Property name="value">40-普米族</Property>
              </Entity>
              <Entity>
                <Property name="key">41</Property>
                <Property name="value">41-塔吉克族</Property>
              </Entity>
              <Entity>
                <Property name="key">42</Property>
                <Property name="value">42-怒族</Property>
              </Entity>
              <Entity>
                <Property name="key">43</Property>
                <Property name="value">43-乌孜别克族</Property>
              </Entity>
              <Entity>
                <Property name="key">44</Property>
                <Property name="value">44-俄罗斯族</Property>
              </Entity>
              <Entity>
                <Property name="key">45</Property>
                <Property name="value">45-鄂温克族</Property>
              </Entity>
              <Entity>
                <Property name="key">46</Property>
                <Property name="value">46-崩龙族</Property>
              </Entity>
              <Entity>
                <Property name="key">47</Property>
                <Property name="value">47-保安族</Property>
              </Entity>
              <Entity>
                <Property name="key">48</Property>
                <Property name="value">48-裕固族</Property>
              </Entity>
              <Entity>
                <Property name="key">49</Property>
                <Property name="value">49-京族</Property>
              </Entity>
              <Entity>
                <Property name="key">50</Property>
                <Property name="value">50-塔塔尔族</Property>
              </Entity>
              <Entity>
                <Property name="key">51</Property>
                <Property name="value">51-独龙族</Property>
              </Entity>
              <Entity>
                <Property name="key">52</Property>
                <Property name="value">52-鄂伦春族</Property>
              </Entity>
              <Entity>
                <Property name="key">53</Property>
                <Property name="value">53-赫哲族</Property>
              </Entity>
              <Entity>
                <Property name="key">54</Property>
                <Property name="value">54-门巴族</Property>
              </Entity>
              <Entity>
                <Property name="key">55</Property>
                <Property name="value">55-珞巴族</Property>
              </Entity>
              <Entity>
                <Property name="key">56</Property>
                <Property name="value">56-基诺族</Property>
              </Entity>
            </Collection>
        </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="zzmm">
        <Property></Property>
        <Property name="label">政治面貌</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;ZZMM&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">01</Property>
                <Property name="value">01-中国共产党党员</Property>
              </Entity>
              <Entity>
                <Property name="key">02</Property>
                <Property name="value">02-中国共产党预备党员</Property>
              </Entity>
              <Entity>
                <Property name="key">03</Property>
                <Property name="value">03-中国共产主义青年团团员</Property>
              </Entity>
              <Entity>
                <Property name="key">04</Property>
                <Property name="value">04-中国国民党革命委员会会员</Property>
              </Entity>
              <Entity>
                <Property name="key">05</Property>
                <Property name="value">05-中国主同盟盟员</Property>
              </Entity>
              <Entity>
                <Property name="key">06</Property>
                <Property name="value">06-中国民主建国会会员</Property>
              </Entity>
              <Entity>
                <Property name="key">07</Property>
                <Property name="value">07-中国民主促进会会员</Property>
              </Entity>
              <Entity>
                <Property name="key">08</Property>
                <Property name="value">08-中国农工民主党党员</Property>
              </Entity>
              <Entity>
                <Property name="key">09</Property>
                <Property name="value">09-中国致公党党员</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>
            </Collection>
        </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="rylb">
        <Property></Property>
        <Property name="label">人员类别</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;RYLB&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1100</Property>
                <Property name="value">1100-公务员</Property>
              </Entity>
              <Entity>
                <Property name="key">1200</Property>
                <Property name="value">1200-事业单位管理人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1300</Property>
                <Property name="value">1300-企业经营管理人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1400</Property>
                <Property name="value">1400-专业技术人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1410</Property>
                <Property name="value">1410-高级职称</Property>
              </Entity>
              <Entity>
                <Property name="key">1411</Property>
                <Property name="value">1411-正高级职称</Property>
              </Entity>
              <Entity>
                <Property name="key">1420</Property>
                <Property name="value">1420-中级职称</Property>
              </Entity>
              <Entity>
                <Property name="key">1430</Property>
                <Property name="value">1430-初级及以下职称</Property>
              </Entity>
              <Entity>
                <Property name="key">1431</Property>
                <Property name="value">1431-主要专职保管人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1432</Property>
                <Property name="value">1432-主要专职检化验人员</Property>
              </Entity>
              <Entity>
                <Property name="key">1500</Property>
                <Property name="value">1500-工人</Property>
              </Entity>
              <Entity>
                <Property name="key">1510</Property>
                <Property name="value">1510-技术工人</Property>
              </Entity>
              <Entity>
                <Property name="key">1511</Property>
                <Property name="value">1511-高级技师</Property>
              </Entity>
              <Entity>
                <Property name="key">1512</Property>
                <Property name="value">1512-技师</Property>
              </Entity>
              <Entity>
                <Property name="key">1513</Property>
                <Property name="value">1513-高级工</Property>
              </Entity>
              <Entity>
                <Property name="key">1514</Property>
                <Property name="value">1514-中级工</Property>
              </Entity>
              <Entity>
                <Property name="key">1515</Property>
                <Property name="value">1515-初级工</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="zy">
@@ -129,16 +521,40 @@
      </PropertyDef>
      <PropertyDef name="qdzgzchzyzgsj">
        <Property name="dataType">Date</Property>
        <Property name="label">取得最高职称或职业资格时间</Property>
        <Property name="label">职业资格时间</Property>
      </PropertyDef>
      <PropertyDef name="xl">
        <Property></Property>
        <Property name="label">学历</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;XL&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">0</Property>
                <Property name="value">0-研究生</Property>
              </Entity>
              <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>
            </Collection>
        </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="zw">
        <Property></Property>
@@ -158,14 +574,6 @@
      </PropertyDef>
      <PropertyDef name="userId">
        <Property name="label">身份证号</Property>
      </PropertyDef>
      <PropertyDef name="start">
        <Property name="label">入职日期（开始）</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="end">
        <Property name="label">入职日期（结束）</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -251,12 +659,6 @@
            <Property name="exClassName">btn-normal</Property>
            <Property name="iconClass">fa fa-search</Property>
          </Button>
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).flushAsync();</ClientEvent>
            <Property name="caption">重置</Property>
            <Property name="iconClass">fa fa-refresh</Property>
            <Property name="exClassName">btn-default</Property>
          </Button>
        </Container>
      </AutoForm>
      <DataGrid id="dgMain">
@@ -267,12 +669,12 @@
        <RowNumColumn>
          <Property name="caption">序号</Property>
        </RowNumColumn>
        <DataColumn name="lsbm">
          <Property name="property">lsbm</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="xm">
          <Property name="property">xm</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="lsbm">
          <Property name="property">lsbm</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="xb">
@@ -295,22 +697,6 @@
          <Property name="property">mz</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="rylb">
          <Property name="property">rylb</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="zy">
          <Property name="property">zy</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="qdzgzchzyzgsj">
          <Property name="property">qdzgzchzyzgsj</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="xl">
          <Property name="property">xl</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="zw">
          <Property name="property">zw</Property>
          <Property name="align">center</Property>
@@ -330,8 +716,8 @@
    </Container>
    <Dialog id="dialogMain">
      <Property name="closeable">false</Property>
      <Property name="caption">仓库设备信息</Property>
      <Property name="width">80%</Property>
      <Property name="caption">人员信息</Property>
      <Property name="width">70%</Property>
      <Property name="iconClass">fa fa-tasks</Property>
      <Buttons>
        <Button id="btnOk">
@@ -356,23 +742,23 @@
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*</Property>
          <Property name="labelAlign">left</Property>
          <Property name="cols">*,*</Property>
          <Property name="labelAlign">right</Property>
          <Property name="labelSeparator">：</Property>
          <Property name="labelPosition">top</Property>
          <AutoFormElement>
            <Property name="name">lsbm</Property>
            <Property name="property">lsbm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">xzqhdm</Property>
            <Property name="property">xzqhdm</Property>
            <Editor/>
          </AutoFormElement>
          <Property name="labelWidth">120</Property>
          <AutoFormElement>
            <Property name="name">xm</Property>
            <Property name="property">xm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sfzhm</Property>
            <Property name="property">sfzhm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -381,8 +767,14 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sfzhm</Property>
            <Property name="property">sfzhm</Property>
            <Property name="name">lsbm</Property>
            <Property name="property">lsbm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">xzqhmc</Property>
            <Property name="property">xzqhmc</Property>
            <Property name="trigger">ddFoodOrigin</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -476,5 +868,66 @@
      <Property name="service">staffPR#delData</Property>
      <Property name="confirmMessage">确定要执行删除么？</Property>
    </AjaxAction>
    <CustomDropDown id="ddFoodOrigin">
      <Property name="minHeight">500</Property>
      <Property name="assignmentMap">xzqhmc=name,xzqhdm=code</Property>
      <Property name="minWidth">500</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsFoodOrigin">
          <Property name="dataProvider">dicAreaPR#pageList</Property>
          <Property name="dataType">[dtArea]</Property>
          <Property name="parameter"></Property>
          <Property name="pageSize">30</Property>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key2">
            <Property name="blankText"> -- ç¼–码或者名称 --</Property>
            <Property name="width">200</Property>
          </TextEditor>
          <Button>
            <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
              view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();</ClientEvent>
            <Property name="caption">查询</Property>
            <Property name="iconClass">fa fa-search</Property>
          </Button>
          <Button>
            <ClientEvent name="onClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
              if(data){&#xD;
              view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
              }</ClientEvent>
            <Property name="iconClass">fa fa-check</Property>
            <Property name="caption">确定</Property>
          </Button>
        </Container>
        <DataGrid>
          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
            if(data){&#xD;
            view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
            }</ClientEvent>
          <Property name="dataSet">dsFoodOrigin</Property>
          <Property name="readOnly">true</Property>
          <DataColumn name="code">
            <Property name="property">code</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="name">
            <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
              arg.processDefault = true;</ClientEvent>
            <Property name="property">name</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="simple">
            <Property name="property">simple</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
        </DataGrid>
        <DataPilot layoutConstraint="bottom">
          <Property name="dataSet">dsFoodOrigin</Property>
        </DataPilot>
      </Container>
    </CustomDropDown>
  </View>
</ViewConfig>

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java

@@ -26,6 +26,7 @@
    private BhznGrainV1ServerEngine bhznGrainServerEngine1;
    @Autowired
    private BhznVerbServerEngine bhznVerbServerEngine;

    @Override
    public void run(String... strings) throws Exception {

@@ -36,12 +37,12 @@

        if (configData.getActive().indexOf("pro") >= 0) {
            //徐闻服务器使用
            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
//            bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);

            //江西赣州、广东高州使用
//            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
            //江西赣州、广东高州使用、西藏山南、宁夏石嘴山、广东佛山
            bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
            //广东高州使用
           // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
            bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
            return;
        }
        if (configData.getActive().indexOf("dev") >= 0) {

 igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java

@@ -14,6 +14,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -86,14 +87,12 @@
        if (null == data.getDeptId()) {
            data.setDeptId(ContextUtil.subDeptId(null));
        }
        DefaultDept dept = sysDeptService.getDeptById(data.getDeptId());
        data.setDeptName(dept.getName());
        Session session = this.getSessionFactory().openSession();
        data.setUpdateTime(new Date());
        data.setUpdateUser(ContextUtil.getLoginUserCName());
        try {
            if (null == data.getId()) {
                String id = createId(data.getCompanyId(), data.getDeptId());
                String id = createId(data.getCompanyId(), data.getCgrq());
                data.setId(id);
                session.save(data);
            } else {
@@ -184,26 +183,27 @@

    }

    public String createId(String companyId, String deptId) {
    public String createId(String companyId, Date time) {

        String timeKey = DateFormatUtils.format(time, "yyyyMMdd");
        // ä»Žç¼“存中获取已有的组织编码
        String cacheKey = RedisConst.buildKey(companyId, HDrugService.CACHE_DRUG_ID);

        String cacheId = (String) redisUtil.get(cacheKey);

        if (null != cacheId && cacheId.indexOf(deptId) >= 0) {
        if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
            String temp = cacheId.substring(cacheId.length() - 3);
            Integer i = Integer.valueOf(temp);
            cacheId = deptId + String.format("%03d", ++i);
            cacheId = timeKey + String.format("%03d", ++i);
        } else {
            List<Drug> result = listDrug(companyId, null);
            if (null == result || result.size() == 0) {
                cacheId = deptId + "001";
                cacheId = timeKey + "001";
            } else {
                Drug drug = result.get(0);
                String temp = drug.getId().substring(drug.getId().length() - 3);
                Integer i = Integer.valueOf(temp);
                cacheId = deptId + String.format("%03d", ++i);
                cacheId = timeKey + String.format("%03d", ++i);
            }
        }
        // æ›´æ–°ç¼“å­˜

 igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml

@@ -441,6 +441,73 @@
        <Property name="label">熏蒸作业人员</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtPest">
      <Property name="creationType">com.ld.igds.models.Pest</Property>
      <PropertyDef name="batchId">
        <Property/>
        <Property name="label">批次ID</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property/>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property/>
        <Property name="label">仓库ID</Property>
      </PropertyDef>
      <PropertyDef name="pestMax">
        <Property name="dataType">int</Property>
        <Property name="label">最多数量</Property>
      </PropertyDef>
      <PropertyDef name="method">
        <Property/>
        <Property name="label">虫害检测方法</Property>
      </PropertyDef>
      <PropertyDef name="position">
        <Property/>
        <Property name="label">发生部位</Property>
      </PropertyDef>
      <PropertyDef name="pestType">
        <Property/>
        <Property name="label">虫害种类</Property>
      </PropertyDef>
      <PropertyDef name="pestLevel">
        <Property/>
        <Property name="label">虫粮等级判定</Property>
      </PropertyDef>
      <PropertyDef name="pestAnalysis">
        <Property/>
        <Property name="label">害虫抗药性分析</Property>
      </PropertyDef>
      <PropertyDef name="pestStart">
        <Property name="dataType">int</Property>
        <Property name="label">虫害采集点开始</Property>
      </PropertyDef>
      <PropertyDef name="pestEnd">
        <Property name="dataType">int</Property>
        <Property name="label">虫害采集点截至</Property>
      </PropertyDef>
      <PropertyDef name="checkNum">
        <Property name="dataType">int</Property>
        <Property name="label">采集通道个数</Property>
      </PropertyDef>
      <PropertyDef name="receiveDate">
        <Property name="dataType">Date</Property>
        <Property name="label">检测时间</Property>
      </PropertyDef>
      <PropertyDef name="points">
        <Property/>
        <Property name="label">采集点信息</Property>
      </PropertyDef>
      <PropertyDef name="checkUser">
        <Property/>
        <Property name="label">检测人</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property/>
        <Property name="label">备注信息</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:5;regionPadding:5">
    <Property name="packages">font-awesome,css-common</Property>
@@ -622,6 +689,7 @@
          <AutoFormElement>
            <Property name="name">pestBatchId</Property>
            <Property name="property">pestBatchId</Property>
            <Property name="trigger">cddPest</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -951,5 +1019,46 @@
      <Property name="items">片剂,注射剂,乳剂,丸剂,颗粒剂,其他</Property>
      <Property name="autoOpen">true</Property>
    </ListDropDown>
    <CustomDropDown id="cddPest">
      <ClientEvent name="onOpen">var key = view.get(&quot;#dsMain.data:#&quot;).get(&quot;depotId&quot;);&#xD;
console.log(key)&#xD;
view.get(&quot;#dsPest&quot;).set(&quot;parameter&quot;,{depotId:key}).flushAsync();</ClientEvent>
      <Property name="width">500</Property>
      <Property name="assignmentMap">pestBatchId=batchId</Property>
      <Property name="height">500</Property>
      <Property name="maxHeight">500</Property>
      <Property name="minHeight">500</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsPest">
          <Property name="dataType">[dtPest]</Property>
          <Property name="dataProvider">pestDataPR#getDataReport</Property>
          <Property name="pageSize">10</Property>
        </DataSet>
        <Container>
          <Property name="exClassName">bg-color</Property>
          <DataGrid id="dgPest" layoutConstraint="top">
            <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsPest.data:#&quot;);&#xD;
if(data){&#xD;
    view.get(&quot;#cddPest&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
            <Property name="dataSet">dsPest</Property>
            <Property name="readOnly">true</Property>
            <DataColumn name="batchId">
              <Property name="property">batchId</Property>
            </DataColumn>
            <DataColumn name="receiveDate">
              <Property name="property">receiveDate</Property>
            </DataColumn>
          </DataGrid>
        </Container>
        <Container layoutConstraint="bottom">
          <Property name="exClassName">bg-color</Property>
          <DataPilot layoutConstraint="right">
            <Property name="dataSet">dsPest</Property>
            <Property name="itemCodes">pageSize,pages</Property>
          </DataPilot>
        </Container>
      </Container>
    </CustomDropDown>
  </View>
</ViewConfig>

 igds-recir/src/main/java/com/ld/igds/models/Drug.java

@@ -26,15 +26,13 @@

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "药剂编号", description = "库区代码+三位顺序号")
    @PropertyDef(label = "药剂编号", description = "采购日期(yyyyMMdd)+三位顺序号")
    private String id;

    @Id
    @Column(name = "DEPT_ID_", length = 50)
    @PropertyDef(label = "库区代码")
    private String deptId;

    @Id
    @Column(name = "cgrq")
    @PropertyDef(label = "采购日期")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")

 igds-recir/src/main/java/com/ld/igds/models/DrugLog.java

@@ -25,7 +25,7 @@

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "熏蒸作业单号", description = "仓房代码+作业日期 (yyyyMMdd) +3 ä½é¡ºåºå·")
    @PropertyDef(label = "熏蒸作业单号", description = "作业日期 (yyyyMMdd) +3 ä½é¡ºåºå·")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)

 igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml

@@ -141,6 +141,10 @@
        <Property></Property>
        <Property name="label">rtsp地址</Property>
      </PropertyDef>
      <PropertyDef name="phoneAddr">
        <Property></Property>
        <Property name="label">手机地址</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property></Property>
        <Property name="label">备注说明</Property>
@@ -192,70 +196,6 @@
              <Entity>
                <Property name="code">Y</Property>
                <Property name="name">自动抓拍</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="azwzlx">
        <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">01</Property>
                <Property name="value">粮库大门</Property>
              </Entity>
              <Entity>
                <Property name="key">02</Property>
                <Property name="value">扦样机</Property>
              </Entity>
              <Entity>
                <Property name="key">03</Property>
                <Property name="value">化验室</Property>
              </Entity>
              <Entity>
                <Property name="key">04</Property>
                <Property name="value">结算室</Property>
              </Entity>
              <Entity>
                <Property name="key">05</Property>
                <Property name="value">地磅房</Property>
              </Entity>
              <Entity>
                <Property name="key">06</Property>
                <Property name="value">库区主干道</Property>
              </Entity>
              <Entity>
                <Property name="key">07</Property>
                <Property name="value">仓间监控</Property>
              </Entity>
              <Entity>
                <Property name="key">08</Property>
                <Property name="value">仓内</Property>
              </Entity>
              <Entity>
                <Property name="key">09</Property>
                <Property name="value">药品库</Property>
              </Entity>
              <Entity>
                <Property name="key">10</Property>
                <Property name="value">器材库</Property>
              </Entity>
              <Entity>
                <Property name="key">11</Property>
                <Property name="value">制高点</Property>
              </Entity>
              <Entity>
                <Property name="key">12</Property>
                <Property name="value">周界</Property>
              </Entity>
              <Entity>
                <Property name="key">99</Property>
                <Property name="value">其他</Property>
              </Entity>
            </Collection>
          </Property>
@@ -627,11 +567,10 @@
      </DataGrid>
    </Container>
    <Dialog id="dialogMain" layout="padding:5;regionPadding:5">
      <Property name="width">800</Property>
      <Property name="width">75%</Property>
      <Property name="caption">监控设备信息</Property>
      <Property name="iconClass">fa fa-flag-o</Property>
      <Property name="closeable">false</Property>
      <Property name="height">100%</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -661,7 +600,7 @@
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">：</Property>
@@ -696,11 +635,6 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">azwzlx</Property>
                <Property name="property">azwzlx</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">spjklx</Property>
                <Property name="property">spjklx</Property>
                <Editor/>
@@ -719,10 +653,26 @@
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">：</Property>
              <AutoFormElement>
                <Property name="name">screenShow</Property>
                <Property name="property">screenShow</Property>
                <Editor>
                  <RadioGroup>
                    <RadioButton>
                      <Property name="text">默认展示</Property>
                      <Property name="value">Y</Property>
                    </RadioButton>
                    <RadioButton>
                      <Property name="text">选择展示</Property>
                      <Property name="value">N</Property>
                    </RadioButton>
                  </RadioGroup>
                </Editor>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">snapTag</Property>
                <Property name="property">snapTag</Property>
@@ -745,22 +695,6 @@
                  <Property name="color">blue</Property>
                </Property>
              </Label>
              <AutoFormElement>
                <Property name="name">screenShow</Property>
                <Property name="property">screenShow</Property>
                <Editor>
                  <RadioGroup>
                    <RadioButton>
                      <Property name="text">默认展示</Property>
                      <Property name="value">Y</Property>
                    </RadioButton>
                    <RadioButton>
                      <Property name="text">选择展示</Property>
                      <Property name="value">N</Property>
                    </RadioButton>
                  </RadioGroup>
                </Editor>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>
@@ -793,7 +727,7 @@
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">：</Property>
@@ -827,7 +761,7 @@
                <Property name="property">portInC</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
              <AutoFormElement layoutConstraint="colSpan:3">
                <Property name="name">mediaAddr</Property>
                <Property name="property">mediaAddr</Property>
                <Property name="trigger">triggerMedia</Property>
@@ -838,6 +772,11 @@
                </Editor>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:3">
                <Property name="name">phoneAddr</Property>
                <Property name="property">phoneAddr</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:3">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>
                <Property name="editorType">TextArea</Property>

 igds-warn/src/main/java/com/ld/igds/warn/service/HSecureManagerService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,105 @@
package com.ld.igds.warn.service;

import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.SecureManager;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @author czt
 * @date 2023/10/30
 **/
@Component
public class HSecureManagerService extends HibernateDao {


    public void listData(Page<SecureManager> page, Map<String, Object> param) throws Exception {
        StringBuffer hql = new StringBuffer();
        hql.append(" from " + SecureManager.class.getName() + " where companyId =:companyId and deptId =:deptId ");
        Map<String, Object> args = new HashMap<>();
        args.put("companyId", ContextUtil.getCompanyId());
        args.put("deptId", ContextUtil.subDeptId(null));

        String count = "select count(*) " + hql.toString();
        hql.append(" order by updateTime desc");
        this.pagingQuery(page, hql.toString(), count, args);

    }

    public void saveData(SecureManager data) {
        data.setUpdateTime(new Date());
        data.setDeptId(ContextUtil.subDeptId(null));
        data.setCompanyId(ContextUtil.getCompanyId());
        Session session = this.getSessionFactory().openSession();
        try {
            if (null == data.getFxdbm()) {
                data.setFxdbm(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));

                session.save(data);
            } else {
                session.update(data);
            }
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            session.flush();
            session.close();
        }
    }

    public String getIndex(String companyId) {
        List<SecureManager> list = getDataByTime(companyId);
        int index = 10000;
        if (list != null && list.size() > 0) {
            String id = list.get(0).getFxdbm().substring(8);
            int temp = Integer.valueOf(id) + 1;
            index += temp;
        }else {
            index ++;
        }
        return String.valueOf(index).substring(1);
    }

    private List<SecureManager> getDataByTime(String companyId) {
        String hql = " from " + SecureManager.class.getName()
                + " where companyId =:companyId ";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", companyId);

        hql += " and updateTime >:startTime";
        args.put("startTime", DateUtil.getCurZero(new Date()));


        hql += " and updateTime <:endTime";
        args.put("endTime", DateUtil.getNextZero(new Date()));


        hql += " order by id desc";

        return this.query(hql, args);
    }

    public void delData(SecureManager data) {
        Session session = this.getSessionFactory().openSession();
        try {
            if (null != data.getFxdbm()) {
                session.delete(data);
            }
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            session.flush();
            session.close();
        }
    }

}

 igds-warn/src/main/java/com/ld/igds/warn/view/SecureManager.view.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,460 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.SecureManager</Property>
      <PropertyDef name="fxdbm">
        <Property></Property>
        <Property name="label">风险点编码</Property>
        <Property name="readOnly">true</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#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="dd">
        <Property></Property>
        <Property name="label">地点</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sbr">
        <Property></Property>
        <Property name="label">识别人</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="hjbw">
        <Property></Property>
        <Property name="label">环节/部位</Property>
      </PropertyDef>
      <PropertyDef name="fxxx">
        <Property></Property>
        <Property name="label">风险信息</Property>
      </PropertyDef>
      <PropertyDef name="fxlx">
        <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>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="fxfj">
        <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>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="fxglcs">
        <Property></Property>
        <Property name="label">风险管控措施</Property>
      </PropertyDef>
      <PropertyDef name="yhxx">
        <Property></Property>
        <Property name="label">隐患信息</Property>
      </PropertyDef>
      <PropertyDef name="yhpcxx">
        <Property></Property>
        <Property name="label">隐患排查信息</Property>
      </PropertyDef>
      <PropertyDef name="yhzgxx">
        <Property></Property>
        <Property name="label">隐患整改信息</Property>
      </PropertyDef>
      <PropertyDef name="yhysxx">
        <Property></Property>
        <Property name="label">隐患整改验收信息</Property>
      </PropertyDef>
      <PropertyDef name="sgjbxx">
        <Property></Property>
        <Property name="label">事故基本信息</Property>
      </PropertyDef>
      <PropertyDef name="zgsx">
        <Property></Property>
        <Property name="label">整改时限</Property>
      </PropertyDef>
      <PropertyDef name="zrdw">
        <Property></Property>
        <Property name="label">责任单位</Property>
      </PropertyDef>
      <PropertyDef name="zrr">
        <Property></Property>
        <Property name="label">责任人</Property>
      </PropertyDef>
      <PropertyDef name="zgysxx">
        <Property></Property>
        <Property name="label">整改验收信息</Property>
      </PropertyDef>
      <PropertyDef name="fxgzjgzrr">
        <Property name="label">风险跟踪监管责任人</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <PropertyDef name="sbr">
        <Property name="label">识别人</Property>
      </PropertyDef>
      <PropertyDef name="dd">
        <Property name="label">地点</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:5;regionPadding:5">
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">secureManagerPR#pageList</Property>
      <Property name="pageSize">15</Property>
    </DataSet>
    <DataSet id="dsParam">
      <ClientEvent name="onReady">self.insert({})&#xD;
</ClientEvent>
      <Property name="dataType">[dtParam]</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
      <Property name="height">55</Property>
      <Label layoutConstraint="left">
        <Property name="text">菜单栏：</Property>
      </Label>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
        <Property name="exClassName">btn-normal</Property>
        <Property name="iconClass">fa fa-plus</Property>
        <Property name="caption">新增</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var dialog= view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(dialog){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}else{&#xD;
    $alert(&quot;请选中需要修改的数据&quot;)&#xD;
}</ClientEvent>
        <Property name="caption">编辑</Property>
        <Property name="exClassName">btn-warm</Property>
        <Property name="iconClass">fa fa-pencil</Property>
      </Button>
      <Button>
        <ClientEvent name="onClick">var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(!cur) return;&#xD;
view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
        return;&#xD;
    }else{&#xD;
        cur.remove();&#xD;
    }&#xD;
});</ClientEvent>
        <Property name="exClassName">btn-warn</Property>
        <Property name="iconClass">fa fa-pencil</Property>
        <Property name="caption">删除</Property>
      </Button>
    </Container>
    <Container>
      <AutoForm>
        <Property name="dataSet">dsParam</Property>
        <Property name="cols">*,*,*,*</Property>
        <AutoFormElement>
          <Property name="name">sbr</Property>
          <Property name="property">sbr</Property>
          <Editor/>
        </AutoFormElement>
        <AutoFormElement>
          <Property name="name">dd</Property>
          <Property name="property">dd</Property>
          <Editor/>
        </AutoFormElement>
        <Container layout="regionPadding:10">
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data:#&quot;);&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();</ClientEvent>
            <Property name="caption">查询</Property>
            <Property name="exClassName">btn-normal</Property>
            <Property name="iconClass">fa fa-search</Property>
          </Button>
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).insert({})</ClientEvent>
            <Property name="caption">重置</Property>
            <Property name="iconClass">fa fa-refresh</Property>
            <Property name="exClassName">btn-default</Property>
          </Button>
        </Container>
      </AutoForm>
      <DataGrid id="dgMain">
        <ClientEvent name="onDataRowDoubleClick">view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <RowNumColumn/>
        <DataColumn name="fxdbm">
          <Property name="property">fxdbm</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sbr">
          <Property name="property">sbr</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="dd">
          <Property name="property">dd</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="hjbw">
          <Property name="property">hjbw</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="fxxx">
          <Property name="property">fxxx</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="fxlx">
          <Property name="property">fxlx</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
      </DataGrid>
      <ToolBar layoutConstraint="bottom">
        <Fill/>
        <DataPilot>
          <Property name="dataSet">dsMain</Property>
          <Property name="itemCodes">pageSize,pages</Property>
        </DataPilot>
      </ToolBar>
    </Container>
    <Dialog id="dialogMain">
      <Property name="caption">基本信息</Property>
      <Property name="width">80%</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
view.get(&quot;#uaAction&quot;).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
    }else{&#xD;
        self.get(&quot;parent&quot;).hide();&#xD;
    }&#xD;
});</ClientEvent>
          <Property name="caption">保存</Property>
          <Property name="iconClass">fa fa-check</Property>
          <Property name="exClassName">btn-normal</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="iconClass">fa fa-times</Property>
          <Property name="exClassName">btn-warn</Property>
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="readOnly">false</Property>
          <Property name="labelSeparator"> : </Property>
          <Property name="labelAlign">right</Property>
          <Property name="cols">*,*</Property>
          <Property name="labelWidth">160</Property>
          <AutoFormElement>
            <Property name="name">fxdbm</Property>
            <Property name="property">fxdbm</Property>
            <Editor>
              <TextEditor>
                <Property name="blankText">--系统自动生成--</Property>
              </TextEditor>
            </Editor>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dd</Property>
            <Property name="property">dd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sbr</Property>
            <Property name="property">sbr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hjbw</Property>
            <Property name="property">hjbw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fxxx</Property>
            <Property name="property">fxxx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fxlx</Property>
            <Property name="property">fxlx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fxfj</Property>
            <Property name="property">fxfj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fxglcs</Property>
            <Property name="property">fxglcs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">yhxx</Property>
            <Property name="property">yhxx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">yhpcxx</Property>
            <Property name="property">yhpcxx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">yhzgxx</Property>
            <Property name="property">yhzgxx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">yhysxx</Property>
            <Property name="property">yhysxx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sgjbxx</Property>
            <Property name="property">sgjbxx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zgsx</Property>
            <Property name="property">zgsx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zrdw</Property>
            <Property name="property">zrdw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zrr</Property>
            <Property name="property">zrr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zgysxx</Property>
            <Property name="property">zgysxx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fxgzjgzrr</Property>
            <Property name="property">fxgzjgzrr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="uaAction">
      <Property name="successMessage">执行成功!</Property>
      <Property name="dataResolver">secureManagerPR#saveData</Property>
      <UpdateItem>
        <Property name="dataSet">dsMain</Property>
        <Property name="dataPath">[#current]</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="confirmMessage">确定要删除吗？</Property>
      <Property name="service">secureManagerPR#delData</Property>
    </AjaxAction>
    <MonthDropDown id="monthDropDown1">
      <ClientEvent name="onClose">var date = arg.selectedValue+1;&#xD;
if(date&lt;10){&#xD;
    arg.selectedValue=&quot;0&quot;+date&#xD;
}else if(date>=10){&#xD;
    arg.selectedValue=date&#xD;
}&#xD;
</ClientEvent>
    </MonthDropDown>
  </View>
</ViewConfig>

 igds-warn/src/main/java/com/ld/igds/warn/view/SecureManagerPR.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
package com.ld.igds.warn.view;

import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.SecureManager;
import com.ld.igds.warn.service.HSecureManagerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Map;

/**
 * @Author: czt
 **/
@Component
public class SecureManagerPR {
    @Autowired
    private HSecureManagerService secureManagerService;

    /**
     * secureManagerPR#pageList
     *
     * @param page
     * @param param
     * @throws Exception
     */
    @DataProvider
    public void pageList(Page<SecureManager> page, Map<String, Object> param) throws Exception {
        secureManagerService.listData(page, param);
    }

    /**
     * secureManagerPR#saveData
     *
     * @param data
     */
    @DataResolver
    public void saveData(SecureManager data) {
        secureManagerService.saveData(data);
    }

    /**
     * secureManagerPR#delData
     *
     * @param data
     */
    @Expose
    public void delData(SecureManager data) {
        secureManagerService.delData(data);
    }

}

 igds-web/pom.xml

@@ -144,12 +144,12 @@
        </dependency>


        <!-- æŽ¥å£åŒ…，包括上海接口和、气象接口、三维接口
        <!-- æŽ¥å£åŒ…，包括上海接口和、气象接口、三维接口-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-api-inte</artifactId>
            <version>${igds.version}</version>
        </dependency>-->
        </dependency>


        <!--  ç§æœ‰åè®®-风正致远-->
@@ -187,7 +187,7 @@
        </dependency>-->


        <!-- ç§æœ‰åè®®-风正致远IOT、制氮机-->
        <!-- ç§æœ‰åè®®-风正致远IOT、制氮机
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-iot</artifactId>
@@ -202,7 +202,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--  ç§æœ‰åè®®-贝博粮情-->
        <dependency>
@@ -238,7 +238,7 @@
            </exclusions>
        </dependency>

        <!--  ç§æœ‰åè®®-邦海智能-->
        <!--  ç§æœ‰åè®®-邦海智能
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-bhzn</artifactId>
@@ -253,9 +253,9 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--  ç§æœ‰åè®®-正来电子-->
        <!--  ç§æœ‰åè®®-正来电子
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-zldz</artifactId>
@@ -270,9 +270,9 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--  æµ·åº·è½¦ç‰Œè¯†åˆ«-SDK-->
        <!--  æµ·åº·è½¦ç‰Œè¯†åˆ«-SDK
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-sdk</artifactId>
@@ -287,7 +287,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->
    </dependencies>

    <dependencyManagement>

 igds-web/src/main/java/com/ld/igds/web/TestController.java

@@ -1,10 +1,16 @@
package com.ld.igds.web;

import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * æµ‹è¯•ä½¿ç”¨
@@ -15,77 +21,100 @@
 * @data:2019å¹´12月17日
 */
@Controller
@RequestMapping
@RequestMapping("/test")
public class TestController {

//
//    /**
//     * å•ç»„织大屏跳转
//     *
//     * @return
//     */
//    @RequestMapping("/test/grain-detail")
//    public ModelAndView singleScreen() {
//        // ç”¨æˆ·ä¿¡æ¯
//        ModelAndView view = new ModelAndView();
//        view.setViewName("test/grainDetail");
//        return view;
//    }
//
//    @RequestMapping("/test/print")
//    public ModelAndView testPrint() {
//        ModelAndView view = new ModelAndView();
//        view.setViewName("test/demoPrint");
//        return view;
//    }
//
//    @RequestMapping("/test/print-check")
//    public ModelAndView testPrintCheck() {
//        ModelAndView view = new ModelAndView();
//        view.setViewName("test/demoCheckPrint");
//        return view;
//    }
//
//    @RequestMapping("/test/inout/print/2019")
//    public ModelAndView testPrint2019() {
//        ModelAndView view = new ModelAndView();
//        view.setViewName("test/print-out-2019");
//        return view;
//    }
//
//    @RequestMapping("/test/gas-print")
//    public ModelAndView testGasPrint() {
//        ModelAndView view = new ModelAndView();
//        view.setViewName("test/demoGasPrint");
//        return view;
//    }
//
//    @RequestMapping("/test/demp")
//    public ModelAndView testDemo(
//            @RequestParam(name = "t", required = false) String t) {
//        ModelAndView view = new ModelAndView();
//
//        String desc = "……功能调试中……";
//
//        if (StringUtils.isNotEmpty(t)) {
//            if ("security-no".equals(t)) {
//                desc = "……待三维模型图绘制完成后展示……";
//            }
//        }
//        view.addObject("desc", desc);
//
//        view.setViewName("test/demo");
//        return view;
//    }
//
//    @RequestMapping("/test/no-access")
//    public ModelAndView testNoAccess(
//            @RequestParam(name = "t", required = false) String t) {
//        ModelAndView view = new ModelAndView();
//
//        String desc = "……您没有权限，请联系系统管理员……";
//        view.addObject("desc", desc);
//        view.setViewName("test/demo");
//        return view;
//    }

    /**
     * å•ç»„织大屏跳转
     *
     * @return
     */
    @RequestMapping("/test/grain-detail")
    public ModelAndView singleScreen() {
        // ç”¨æˆ·ä¿¡æ¯
        ModelAndView view = new ModelAndView();
        view.setViewName("test/grainDetail");
        return view;
    }

    @RequestMapping("/test/print")
    public ModelAndView testPrint() {
        ModelAndView view = new ModelAndView();
        view.setViewName("test/demoPrint");
        return view;
    }
    @RequestMapping("/IDCARD")
    public  @ResponseBody String testIDCARD(
            @RequestParam(name = "t", required = false) String t , HttpServletRequest request, HttpServletResponse response) {

    @RequestMapping("/test/print-check")
    public ModelAndView testPrintCheck() {
        ModelAndView view = new ModelAndView();
        view.setViewName("test/demoCheckPrint");
        return view;
    }

    @RequestMapping("/test/inout/print/2019")
    public ModelAndView testPrint2019() {
        ModelAndView view = new ModelAndView();
        view.setViewName("test/print-out-2019");
        return view;
    }

    @RequestMapping("/test/gas-print")
    public ModelAndView testGasPrint() {
        ModelAndView view = new ModelAndView();
        view.setViewName("test/demoGasPrint");
        return view;
    }

    @RequestMapping("/test/demp")
    public ModelAndView testDemo(
            @RequestParam(name = "t", required = false) String t) {
        ModelAndView view = new ModelAndView();

        String desc = "……功能调试中……";

        if (StringUtils.isNotEmpty(t)) {
            if ("security-no".equals(t)) {
                desc = "……待三维模型图绘制完成后展示……";
            }
        }
        view.addObject("desc", desc);

        view.setViewName("test/demo");
        return view;
    }

    @RequestMapping("/test/no-access")
    public ModelAndView testNoAccess(
            @RequestParam(name = "t", required = false) String t) {
        ModelAndView view = new ModelAndView();

        String desc = "……您没有权限，请联系系统管理员……";
        view.addObject("desc", desc);
        view.setViewName("test/demo");
        return view;
//        JSONObject content= new JSONObject();
//        JSONObject data = new JSONObject();
        return "{\n" +
                "    \"address\": \"xxxxxxxxxxxxxxxxxx-17\",\n" +
                "    \"birthdate\": \"1996-12-01\",\n" +
                "    \"cnName\": \"许彬\",\n" +
                "    \"effectedDate\": \"2014-04-02\",\n" +
                "    \"expiredDate\": \"2024-04-02\",\n" +
                "    \"folk\": \"汉\",\n" +
                "    \"idNum\": \"510000000000000000\",\n" +
                "    \"issue\": \"安陆市公安局\",\n" +
                "    \"nation\": \"中国\",\n" +
                "    \"sex\": \"男\"\n" +
                "}\n" +
                "\n" +
                "";
    }
}

 igds-web/src/main/resources/application-pro.yml

@@ -1,4 +1,4 @@
##########################   å¹¿ä¸œå¾é—»é¡¹ç›®   ##########################
##########################  è¥¿è—å±±å—粮库项目   ##########################
server:
  port: 8888
  context-path: /
@@ -15,7 +15,7 @@
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
      password: VoN6mGy94W/8BcVVpTsa+J2sjO4oBTDU25XkwdI2tJW4wj7ZOjuOHFonNaFcFoG3KfotN1M5p7mhxim8PkLcnw==
      public-key:
      config-decrypt: true
      initial-size:  5
@@ -51,7 +51,7 @@
    database: 0
    host: 127.0.0.1
    port: 6379
    password: Abc123..
    password: Redispwd..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
@@ -71,10 +71,10 @@
## ç³»ç»ŸæŽ¥å£è·¯ç”±é…ç½® æ³¨æ„æ•°å­—如果以0开头的话，后台会出现转义，请添加""
igds:
  default:
    companyId: 5322
    companyId: 5333
    sys-name: æ™ºæ…§ç²®åº“管理系统
    logo: logo-default.png
    logo-title: logo-title-default.png
    support: æ™ºæ…§ç²®åº“综合管理平台
    support: é£Žæ­£è‡´è¿œä¿¡æ¯æŠ€æœ¯è‚¡ä»½æœ‰é™å…¬å¸
    grian-add-point: N
  file-path: D:/IGDS/FILE/

 igds-web/src/main/resources/application-pro5303.yml

@@ -1,6 +1,7 @@
##########################  ä¸Šæµ·å˜‰å®š   ##########################
server:
  port: 8088
#  port: 8098   #上海4.0版本演示-本地部署
  context-path: /
  connection-timeout: 5000
  tomcat:
@@ -13,7 +14,7 @@
      name: db-base
      type: com.alibaba.druid.pool.DruidDataSource
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
#      url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8
#      url: jdbc:mysql://127.0.0.1:3306/igds_master_4.0?useUnicode=true&characterEncoding=utf-8   #上海4.0版本演示-本地部署
      driver-class-name: com.mysql.jdbc.Driver
      username: igds
      password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==

 igds-web/src/main/resources/application-pro5333.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
##########################  è¥¿è—å±±å—粮库项目   ##########################
server:
  port: 8888
  context-path: /
  connection-timeout: 5000
  tomcat:
    uri-encoding: UTF-8

##########################  datasourcec   ##########################
spring:
  datasource:
    db-base:
      name: db-base
      type: com.alibaba.druid.pool.DruidDataSource
      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
      driver-class-name: com.mysql.jdbc.Driver
      username: root
      password: VoN6mGy94W/8BcVVpTsa+J2sjO4oBTDU25XkwdI2tJW4wj7ZOjuOHFonNaFcFoG3KfotN1M5p7mhxim8PkLcnw==
      public-key:
      config-decrypt: true
      initial-size: 5
      min-idle: 5
      max-active: 50
      max-wait: 60000
      time-between-eviction-runs-millis: 60000
      min-evictable-idle-time-millis: 300000
      validation-query: select 1 from dual
      test-whileIdle: true
      test-on-borrow: false
      test-on-return: false
      pool-prepared-statements: true
      max-pool-prepared-statement-per-connection-size: 20
      filters: stat
      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
      use-global-data-source-stat: true
      removeAbandoned: true
      removeAbandonedTimeout: 90
      logAbandoned: true
      poolPreparedStatements: true
      maxPoolPreparedStatementPerConnectionSize: 20
    db-sqlite:
      name: db-sqlite
      url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
      driver-class-name: org.sqlite.JDBC
      type: com.alibaba.druid.pool.DruidDataSource
      username:
      password:

  # Redis相关配置
  redis:
    database: 0
    host: 127.0.0.1
    port: 6379
    password: Redispwd..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0
      timeout: 6000

license:
  subject: ld_license
  publicAlias: publicCert
  storePass: PUBLICFZZYXXJSGFYXGS888888
  licensePath: D:/IGDS/license/license.lic
  publicKeysStorePath: D:/IGDS/license/publicCerts.keystore

##########################  IGDS   ##########################
## ç³»ç»ŸæŽ¥å£è·¯ç”±é…ç½® æ³¨æ„æ•°å­—如果以0开头的话，后台会出现转义，请添加""
igds:
  default:
    companyId: 5333
    sys-name: æ™ºæ…§ç²®åº“管理系统
    logo: logo-default.png
    logo-title: logo-title-default.png
    support: é£Žæ­£è‡´è¿œä¿¡æ¯æŠ€æœ¯è‚¡ä»½æœ‰é™å…¬å¸
    grian-add-point: N
  file-path: D:/IGDS/FILE/

 igds-web/src/main/resources/static/admin/inout/in-check.js

@@ -362,7 +362,8 @@
            title: '备注说明',
            align: 'center',
            edit: 'text'
        }]]
        }]],
        limit: this.curCheckItems.length //显示的数量
    });

    $("thead tr").css({
@@ -490,6 +491,11 @@

//保存提交
function submit() {
    console.log(curCheckData)
    if (!curCheckData.sampleUser) {
        layer.alert("请先扦样！！");
        return;
    }
    if (curCheckData.checkStatus == "NONE" || curCheckData.checkStatus == "NONE2") {
        layer.alert("请确认化验结果！！");
        return;
@@ -500,6 +506,10 @@
    }
    if (!curCheckData.foodLevel) {
        layer.alert("请确认粮食等级！！");
        return;
    }
    if (!curCheckData.foodType) {
        layer.alert("请确认粮食性质！！");
        return;
    }
    if (!curCheckData.price) {
@@ -617,7 +627,7 @@
        }, {
            field: 'registerTime',
            title: '登记时间',
            width: '15%',
            width: '13%',
            style: 'font-weight: bold'
        }, {
            field: 'sampleStatus',
@@ -642,12 +652,26 @@
        }, {
            field: 'sampleTime',
            title: '扦样时间',
            width: '15%',
            width: '13%',
            style: 'font-weight: bold'
        }, {
            field: 'foodType',
            title: '粮食性质',
            width: '9%',
            templet: function (item) {
                var result = item.foodType;
                $.each(listFoodType, function (index, data) {
                    if (item.foodType == data.code) {
                        result = data.name;
                        return true;
                    }
                });
                return result == null ? "" : result;
            }
        }, {
            field: 'foodVariety',
            title: '粮食品种',
            width: '11%',
            width: '9%',
            templet: function (item) {
                var result = item.foodVariety;
                $.each(listFoodVariety, function (index, data) {
@@ -661,7 +685,7 @@
        }, {
            field: 'depotId',
            title: '装卸仓库',
            width: '11%',
            width: '10%',
            templet: function (item) {
                var result = item.depotId;
                $.each(listDepot, function (index, data) {

 igds-web/src/main/resources/static/admin/inout/in-weight.js

@@ -255,7 +255,8 @@
}

function flushByHand() {
    flushData(null, null);
    var intelCard = $("#intelCard").val();
    flushData(intelCard, null);
}

function flushWeight() {

 igds-web/src/main/resources/templates/admin/inout/in-check.html

@@ -350,6 +350,8 @@
    var companyId = [[${loginUser.companyId}]];
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
    //性质
    var listFoodType = [[${listFoodType}]];
    var startTime = [[${startTime}]];
    var endTime = [[${endTime}]];
    var foodYear = [[${foodYear}]];
@@ -515,25 +517,19 @@
                </div>
            </div>
        </div>
        <!--        <div class="layui-col-xs4">-->
        <!--            <div class="layui-form-item">-->
        <!--                <label class="layui-form-label red">粮食年份</label>-->
        <!--                <div class="layui-input-block">-->
        <!--                    <input type="text" name="foodYear" placeholder="请输入"-->
        <!--                           class="layui-input rkbk-search-input bg-date" id="foodYear">-->

        <!--                </div>-->
        <!--            </div>-->
        <!--        </div>-->
        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label">备注说明</label>
                <label class="layui-form-label red">粮食性质</label>
                <div class="layui-input-block">
                    <input type="text" name="remarks" placeholder="请输入内容"
                           class="layui-input">
                    <select id="foodType" name="foodType" lay-filter="select_foodType">
                        <option value=""></option>
                        <option th:each="dic,dicSet:${listFoodType}"
                                th:value="${dic.code}" th:text="${dic.name}"></option>
                    </select>
                </div>
            </div>
        </div>

        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label red">化验结果</label>
@@ -546,6 +542,15 @@
                </div>
            </div>
        </div>
        <div class="layui-col-xs12">
            <div class="layui-form-item">
                <label class="layui-form-label">备注说明</label>
                <div class="layui-input-block">
                    <input type="text" name="remarks" placeholder="请输入内容"
                           class="layui-input">
                </div>
            </div>
        </div>
        <div class="layui-col-xs12" style="margin-bottom: 10px">
            <div style="padding-left: 50px; color: #2ab5ad;">
                <span style="font-weight: bold; margin-right: 10px;">备注说明：1.结果判定：系统根据各化验项结果判定，最后化验结果需手动选择确认；2.核算定价：根据化验项配置计算相关增扣价，最后单价需手动确认。</span>

 igds-web/src/main/resources/templates/index/index-5303.html

@@ -112,9 +112,9 @@
                        <P>智能气调</P>
                </a>
                </span> <span class="i-menu-item i-menu4 i-navBg4"> <a
                href="javascript:;" onclick="openByTag('hlxz')"> <i><img
                href="javascript:;" onclick="openByTag('warn')"> <i><img
                th:src="@{/static/images/i-icon-hlzx.png}"/></i>
                        <P>环流熏蒸</P>
                        <P>智能预警</P>
                </a>
                </span> <span class="i-menu-item i-menu5 i-navBg5">
                <a href="javascript:;" onclick="openQuantity()"> <i><img

 igds-web/src/main/resources/templates/index/index-5329.html

@@ -111,7 +111,7 @@
                        <P>智能预警</P>
                </a>
                </span> <span class="i-menu-item i-menu5 i-navBg5">
                <a href="javascript:;" onClick="open3d()">
                <a href="javascript:;" onClick="openHelp()">
                    <i><img th:src="@{/static/images/i-icon-help1.png}"/></i>
                    <P>帮助中心</P>
                </a>
@@ -207,14 +207,15 @@
    };

    //打开质量检测
    // function open3d() {
    //     if ("#" == threePath) {
    //         window.open("#", "_self");
    //     } else {
    //         window.open(threePath, "_blank");
    //     }
    // };
    function open3d() {
        if ("#" == threePath) {
            window.open("#", "_self");
        } else {
            window.open(threePath, "_blank");
        }
    };

    function openHelp() {
        window.open("./basic/common/help-center", "_blank");
    };
</script>

 igds-web/src/main/resources/verb-conf.properties

@@ -192,3 +192,6 @@
## 5330_001
verb.mapImg.5330_001.a=default_pfc2_a.png
verb.mapImg.5330_001.b=default_pfc2_b.png
## 5333_001 \u5206\u5E93\u7F16\u7801
verb.mapImg.5333_001.a=default_pfc2_a.png
verb.mapImg.5333_001.b=default_pfc2_b.png