Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-08-22 deee597fa30e9a40792a4eb094b6ce45a35bc13f

Merge remote-tracking branch 'origin/master'

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

@@ -68,6 +68,7 @@
        try {
            if (StringUtils.isEmpty(data.getId())) {
                data.setId(ContextUtil.getUUID());
                data.setCreateDate(new Date());
                session.save(data);
            } else {
                session.update(data);

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

@@ -7,8 +7,10 @@
import com.ld.igds.models.*;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -66,24 +68,35 @@
        Session session = this.getSessionFactory().openSession();
        data.setUpdateTime(new Date());
        try {
            if (null == data.getId()) {
            if (null == data.getXzbm()) {
                String id = createId(data.getCompanyId());
                data.setId(id);
                session.save(data);
            } else {
                session.update(data);
                data.setXzbm(id);
            }
            if (StringUtils.isEmpty(data.getDtlId())){
                data.setDtlId(ContextUtil.getUUID());
            }
            if (StringUtils.isEmpty(data.getWayId())){
                data.setWayId(ContextUtil.getUUID());
            }
            //添加粮情子表
            saveDtl(data);
            //添加备案方式子表
            saveWay(data);
            //添加主表
            session.saveOrUpdate(data);

            if (!CollectionUtils.isEmpty(data.getDrugLogPeople())) {
                for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
                    if (null == drugLogPeople.getId()) {
                        drugLogPeople.setId(ContextUtil.getUUID());
                        drugLogPeople.setDrugLogId(data.getId());
                        drugLogPeople.setCompanyId(data.getCompanyId());
                    if (null == drugLogPeople.getPropleId()) {
                        String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
                        drugLogPeople.setPropleId(ContextUtil.getUUID());
                        drugLogPeople.setId(data.getXzbm() + data.getDeptId() + tbrq);
                        drugLogPeople.setTbrq(data.getTbrq());
                        drugLogPeople.setDrugLogId(data.getXzbm());
                        drugLogPeople.setDeptId(data.getDeptId());
                        session.save(drugLogPeople);
                    } else {
                        session.update(drugLogPeople);
                    }
                    session.saveOrUpdate(drugLogPeople);
                    session.flush();
                }
            }
        } catch (Exception e) {
@@ -95,6 +108,45 @@
        return null;
    }

    private void saveWay(DrugLogApply data) {
        Session session = this.getSessionFactory().openSession();

        try {
            DrugLogWay way = new DrugLogWay();
            BeanUtils.copyProperties(data, way);
            way.setWayId(ContextUtil.getUUID());
            String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
            way.setId(data.getXzbm() + data.getDeptId() + tbrq);
            session.saveOrUpdate(way);
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            session.flush();
            session.close();
        }
    }

    /**
     * æ ¹æ®ä¸»è¡¨ä¿¡æ¯æ·»åŠ ç²®æƒ…字表
     *
     * @param data
     */
    private void saveDtl(DrugLogApply data) {
        Session session = this.getSessionFactory().openSession();
        try {
            DrugLogDtl dtl = new DrugLogDtl();
            BeanUtils.copyProperties(data, dtl);
            String tbrq = DateFormatUtils.format(data.getTbrq(), "yyyyMMdd");
            dtl.setId(data.getXzbm() + data.getDeptId() + tbrq);
            session.saveOrUpdate(dtl);
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            session.flush();
            session.close();
        }
    }

    /**
     * åˆ é™¤ç†è’¸å¤‡æ¡ˆä¸»è¡¨ä¿¡æ¯
     *
@@ -104,7 +156,7 @@
    public String delDrugLogApply(DrugLogApply data) {
        Session session = this.getSessionFactory().openSession();
        try {
            if (null != data.getId()) {
            if (null != data.getXzbm()) {
                session.delete(data);
                for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
                    session.delete(drugLogPeople);
@@ -146,8 +198,6 @@
    public List<DrugLogDtl> drugLogDtlList(Map<String, Object> param) throws Exception {
        StringBuffer hql = new StringBuffer();
        Map<String, Object> args = new HashMap<>();
        hql.append(" from " + DrugLogDtl.class.getName() + " where companyId=:companyId");
        args.put("companyId", ContextUtil.getCompanyId());
        if (null != param) {
            buildHql(hql, param, args);
        }
@@ -161,9 +211,6 @@
     * @return
     */
    public String saveDrugLogDtl(DrugLogDtl data) {
        if (null == data.getCompanyId()) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        if (null == data.getDeptId()) {
            data.setDeptId(ContextUtil.subDeptId(null));
        }
@@ -216,9 +263,15 @@
    public List<DrugLogPeople> drugLogPeopleList(Map<String, Object> param) throws Exception {
        StringBuffer hql = new StringBuffer();
        Map<String, Object> args = new HashMap<>();
        hql.append(" from " + DrugLogPeople.class.getName() + " where companyId=:companyId");
        args.put("companyId", ContextUtil.getCompanyId());

        if (null != param) {

            String xzbm = (String) param.get("xzbm");
            String deptId = (String) param.get("deptId");
            String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
            String id = xzbm + deptId + tbrq;
            hql.append(" from " + DrugLogPeople.class.getName() + " where id=:id");
            args.put("id", id);
            buildHql(hql, param, args);
        }
        return this.query(String.valueOf(hql), args);
@@ -231,9 +284,6 @@
     * @return
     */
    public String saveDrugLogPeople(DrugLogPeople data) {
        if (null == data.getCompanyId()) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        if (null == data.getDeptId()) {
            data.setDeptId(ContextUtil.subDeptId(null));
        }
@@ -285,9 +335,14 @@
    public List<DrugLogWay> drugLogWayList(Map<String, Object> param) throws Exception {
        StringBuffer hql = new StringBuffer();
        Map<String, Object> args = new HashMap<>();
        hql.append(" from " + DrugLogWay.class.getName() + " where companyId=:companyId");
        args.put("companyId", ContextUtil.getCompanyId());
        if (null != param) {

            String xzbm = (String) param.get("xzbm");
            String deptId = (String) param.get("deptId");
            String tbrq = DateFormatUtils.format((Date) param.get("tbsj"), "yyMMdd");
            String id = xzbm + deptId + tbrq;
            hql.append(" from " + DrugLogWay.class.getName() + " where id=:id");
            args.put("id", id);
            buildHql(hql, param, args);
        }
        return this.query(String.valueOf(hql), args);
@@ -301,9 +356,6 @@
     * @return
     */
    public String saveDrugLogWay(DrugLogWay data) {
        if (null == data.getCompanyId()) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
        if (null == data.getDeptId()) {
            data.setDeptId(ContextUtil.subDeptId(null));
        }
@@ -391,7 +443,7 @@
                cacheId = "0001";
            } else {

                String temp = drugLogApplies.get(0).getId();
                String temp = drugLogApplies.get(0).getXzbm();
                Integer i = Integer.valueOf(temp);
                cacheId = String.format("%04d", ++i);
            }

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

@@ -5,396 +5,248 @@
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
      <PropertyDef name="id">
      <PropertyDef name="xzbm">
        <Property/>
        <Property name="label">熏蒸备案编号</Property>
        <Property name="readOnly">true</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property/>
        <Property name="label">库区代码</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property/>
        <Property name="label">组织编码</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="tbrq">
        <Property name="dataType">Date</Property>
        <Property name="label">填报日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="dwdm">
        <Property/>
        <Property name="label">单位代码</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="sqxzrq">
        <Property name="dataType">Date</Property>
        <Property name="label">申请熏蒸日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="fzr">
        <Property/>
        <Property name="label">负责人</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="fzrdh">
        <Property/>
        <Property name="label">负责人电话</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="xcfzr">
        <Property/>
        <Property name="label">现场负责人</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="fzrzw">
      <PropertyDef name="xcfzrzw">
        <Property/>
        <Property name="label">负责人职务</Property>
        <Property name="required">true</Property>
        <Property name="label">现场负责人职务</Property>
      </PropertyDef>
      <PropertyDef name="xcfzrdh">
        <Property/>
        <Property name="label">现场负责人</Property>
        <Property name="required">false</Property>
        <Property name="label">现场负责人电话</Property>
      </PropertyDef>
      <PropertyDef name="tbr">
        <Property/>
        <Property name="label">填表人</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="tbrdh">
        <Property/>
        <Property name="label">填表人电话</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="sfszjjxd">
        <Property/>
        <Property name="label">是否设置警戒线(东)</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sfszjjxx">
        <Property/>
        <Property name="label">是否设置警戒线(西)</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sfszjjxn">
        <Property/>
        <Property name="label">是否设置警戒线(南)</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sfszjjxb">
        <Property/>
        <Property name="label">是否设置警戒线(北)</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="ssxzzystqybqk">
        <Property/>
        <Property name="label">实施熏蒸作业时天气预报情况</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="xzssgcap">
        <Property/>
        <Property name="label">熏蒸安排及实施过程</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="aqfhjyjcccs">
        <Property/>
        <Property name="label">安全防护及应急处置措施</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="xzzysx">
        <Property/>
        <Property name="label">熏蒸注意事项</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="fileStorageId">
        <Property/>
        <Property name="label">文件存储ID</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="drugName">
        <Property/>
        <Property name="label">药剂名称</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="drugType">
        <Property/>
        <Property name="label">药剂类型/型号</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="yjyxqz">
        <Property name="dataType">Date</Property>
        <Property name="label">药剂有效期至</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="lqsl">
        <Property name="dataType">Double</Property>
        <Property name="label">领取数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000公斤</Property>
      </PropertyDef>
      <PropertyDef name="sysbjfs">
        <Property/>
        <Property name="label">施药设备及方式</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="zcdd">
        <Property/>
        <Property name="label">暂存地点</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="lqr">
        <Property/>
        <Property name="label">领取人</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="lqsj">
        <Property name="dataType">Date</Property>
        <Property name="label">领取时间时间</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
        <Property name="required">false</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <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>
        <Property name="label">仓房/油罐代码</Property>
      </PropertyDef>
      <PropertyDef name="foodVariety">
        <Property/>
        <Property name="label">粮食品种</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="foodType">
        <Property/>
        <Property name="label">粮食性质</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="foodLevel">
        <Property/>
        <Property name="label">粮食等级</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="number">
        <Property name="dataType">Double</Property>
        <Property name="label">粮食数量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000吨</Property>
      </PropertyDef>
      <PropertyDef name="perWet">
        <Property name="dataType">Double</Property>
        <Property name="label">水分</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000%</Property>
      </PropertyDef>
      <PropertyDef name="perImpurity">
        <Property name="dataType">Double</Property>
        <Property name="label">杂质</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000%</Property>
      </PropertyDef>
      <PropertyDef name="lw">
        <Property name="dataType">Double</Property>
        <Property name="label">粮温</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000℃</Property>
      </PropertyDef>
      <PropertyDef name="cnsd">
        <Property name="dataType">Double</Property>
        <Property name="label">仓内湿度</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000%RH</Property>
      </PropertyDef>
      <PropertyDef name="clfs">
        <Property/>
        <Property name="label">存粮方式</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">散装储粮</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">包装</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">围包散存</Property>
              </Entity>
              <Entity>
                <Property name="key">9</Property>
                <Property name="value">其他</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="rkrq">
        <Property name="dataType">Date</Property>
        <Property name="label">入库日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="hc">
        <Property/>
        <Property name="label">害虫</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="cldjpd">
        <Property/>
        <Property name="label">虫粮等级判定</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">531</Property>
                <Property name="value">基本无虫粮</Property>
              </Entity>
              <Entity>
                <Property name="key">532</Property>
                <Property name="value">一般虫粮</Property>
              </Entity>
              <Entity>
                <Property name="key">533</Property>
                <Property name="value">严重虫粮</Property>
              </Entity>
              <Entity>
                <Property name="key">534</Property>
                <Property name="value">危险虫粮</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="ldtj">
        <Property name="dataType">Double</Property>
        <Property name="label">粮堆体积</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000m³</Property>
      </PropertyDef>
      <PropertyDef name="kjtj">
        <Property name="dataType">Double</Property>
        <Property name="label">空间体积</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000m³</Property>
      </PropertyDef>
      <PropertyDef name="lddwyyl">
        <Property name="dataType">Double</Property>
        <Property name="label">粮堆单位用药量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000g/m³</Property>
      </PropertyDef>
      <PropertyDef name="kjdwyyl">
        <Property name="dataType">Double</Property>
        <Property name="label">空间单位用药量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000g/m³</Property>
      </PropertyDef>
      <PropertyDef name="zyyl">
        <Property name="dataType">Double</Property>
        <Property name="label">总用药量</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000kg</Property>
      </PropertyDef>
      <PropertyDef name="qmx">
        <Property/>
        <Property name="label">气密性</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">Ⅰ级;t≥300s</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">Ⅱ级;120s≤t&lt;300s</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">Ⅲ级;40s≤t&lt;120s (平房仓) ,60s≤ t&lt;120s (立筒仓、浅圆仓)</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">Ⅳ级;t&lt;40s (平房仓) ,t&lt;60s (立筒仓、浅圆仓)</Property>
              </Entity>
            </Collection>
          </Property>
          <Property name="valueProperty">value</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="jhxzksrq">
        <Property name="dataType">Date</Property>
        <Property name="label">计划熏蒸开始日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="jhxzjsrq">
        <Property name="dataType">Date</Property>
        <Property name="label">计划熏蒸结束日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="xznd">
        <Property name="dataType">Double</Property>
        <Property name="label">设定熏蒸浓度</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000ml/m³</Property>
      </PropertyDef>
      <PropertyDef name="mbsj">
        <Property name="dataType">Integer</Property>
        <Property name="label">密闭时间</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0天</Property>
      </PropertyDef>
      <PropertyDef name="xzfs">
        <Property/>
        <Property name="label">熏蒸方式</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sqfs">
        <Property/>
        <Property name="label">散气方式</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <Reference name="drugLogPeople">
        <Property name="parameter">$${this.id}</Property>
        <Property name="dataType">[dtPeople]</Property>
        <Property name="dataProvider">drugLogApplyPR#peopleList</Property>
        <Property name="parameter">
          <Entity>
            <Property name="xzbm">$${this.xzbm}</Property>
            <Property name="deptId">$${this.deptId}</Property>
            <Property name="tbrq">$${this.tbrq}</Property>
          </Entity>
        </Property>
      </Reference>
    </DataType>
    <DataType name="dtPeople">
      <Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
      <PropertyDef name="propleId">
        <Property/>
        <Property name="label">propleId</Property>
      </PropertyDef>
      <PropertyDef name="id">
        <Property/>
        <Property name="label">id</Property>
@@ -407,44 +259,38 @@
        <Property/>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property/>
        <Property name="label">组织编码</Property>
      <PropertyDef name="tbrq">
        <Property name="dataType">Date</Property>
        <Property name="label">填报日期</Property>
      </PropertyDef>
      <PropertyDef name="mx">
        <Property/>
        <Property name="label">姓名</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="zw">
        <Property/>
        <Property name="label">职务</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="zyzg">
        <Property/>
        <Property name="label">职业资格</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="stzk">
        <Property/>
        <Property name="label">身体状况</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="xzrwfg">
        <Property/>
        <Property name="label">熏蒸任务分工</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="sfwb">
        <Property/>
        <Property name="label">是否外包</Property>
        <Property name="required">true</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <PropertyDef name="depotId">
        <Property/>
        <Property></Property>
        <Property name="label">仓房名称</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
@@ -461,11 +307,158 @@
        <Property name="label">备案结束时间</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtDtl">
      <Property name="creationType">com.ld.igds.models.DrugLogDtl</Property>
      <PropertyDef name="id">
        <Property/>
        <Property name="label">id</Property>
      </PropertyDef>
      <PropertyDef name="drugLogId">
        <Property/>
        <Property name="label">熏蒸备案编号</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property/>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="tbrq">
        <Property name="dataType">Date</Property>
        <Property name="label">填报日期</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property/>
        <Property name="label">仓房/油罐代码</Property>
      </PropertyDef>
      <PropertyDef name="foodVariety">
        <Property/>
        <Property name="label">粮食品种</Property>
      </PropertyDef>
      <PropertyDef name="foodType">
        <Property/>
        <Property name="label">粮食性质</Property>
      </PropertyDef>
      <PropertyDef name="foodLevel">
        <Property/>
        <Property name="label">粮食等级</Property>
      </PropertyDef>
      <PropertyDef name="number">
        <Property name="dataType">Double</Property>
        <Property name="label">粮食数量</Property>
      </PropertyDef>
      <PropertyDef name="perWet">
        <Property name="dataType">Double</Property>
        <Property name="label">水分</Property>
      </PropertyDef>
      <PropertyDef name="perImpurity">
        <Property name="dataType">Double</Property>
        <Property name="label">杂质</Property>
      </PropertyDef>
      <PropertyDef name="lw">
        <Property name="dataType">Double</Property>
        <Property name="label">粮温</Property>
      </PropertyDef>
      <PropertyDef name="cw">
        <Property name="dataType">Double</Property>
        <Property name="label">仓温</Property>
      </PropertyDef>
      <PropertyDef name="cnsd">
        <Property name="dataType">Double</Property>
        <Property name="label">仓内湿度</Property>
      </PropertyDef>
      <PropertyDef name="clfs">
        <Property/>
        <Property name="label">存粮方式</Property>
      </PropertyDef>
      <PropertyDef name="rkrq">
        <Property name="dataType">Date</Property>
        <Property name="label">入库日期</Property>
      </PropertyDef>
      <PropertyDef name="hc">
        <Property/>
        <Property name="label">害虫</Property>
      </PropertyDef>
      <PropertyDef name="cldjpd">
        <Property/>
        <Property name="label">虫粮等级判定</Property>
      </PropertyDef>
      <PropertyDef name="ldtj">
        <Property name="dataType">Double</Property>
        <Property name="label">粮堆体积</Property>
      </PropertyDef>
      <PropertyDef name="kjtj">
        <Property name="dataType">Double</Property>
        <Property name="label">空间体积</Property>
      </PropertyDef>
      <PropertyDef name="lddwyyl">
        <Property name="dataType">Double</Property>
        <Property name="label">粮堆单位用药量</Property>
      </PropertyDef>
      <PropertyDef name="kjdwyyl">
        <Property name="dataType">Double</Property>
        <Property name="label">空间单位用药量</Property>
      </PropertyDef>
      <PropertyDef name="zyyl">
        <Property name="dataType">Double</Property>
        <Property name="label">总用药量</Property>
      </PropertyDef>
      <PropertyDef name="qmx">
        <Property/>
        <Property name="label">气密性</Property>
      </PropertyDef>
      <PropertyDef name="jhxzksrq">
        <Property name="dataType">Date</Property>
        <Property name="label">计划熏蒸开始日期</Property>
      </PropertyDef>
      <PropertyDef name="jhxzjsrq">
        <Property name="dataType">Date</Property>
        <Property name="label">计划熏蒸结束日期</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtWay">
      <Property name="creationType">com.ld.igds.models.DrugLogWay</Property>
      <PropertyDef name="id">
        <Property/>
        <Property name="label">id</Property>
      </PropertyDef>
      <PropertyDef name="drugLogId">
        <Property/>
        <Property name="label">熏蒸备案编号</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property/>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="tbrq">
        <Property name="dataType">Date</Property>
        <Property name="label">填报日期</Property>
      </PropertyDef>
      <PropertyDef name="xznd">
        <Property name="dataType">Double</Property>
        <Property name="label">设定熏蒸浓度</Property>
      </PropertyDef>
      <PropertyDef name="mbsj">
        <Property name="dataType">Integer</Property>
        <Property name="label">密闭时间</Property>
      </PropertyDef>
      <PropertyDef name="xzfs">
        <Property/>
        <Property name="label">熏蒸方式</Property>
      </PropertyDef>
      <PropertyDef name="sqfs">
        <Property/>
        <Property name="label">散气方式</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:5;regionPadding:5">
    <ClientEvent name="onReady">view.get(&quot;#dsParam&quot;).insert({});</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataProvider">drugLogApplyPR#pageData</Property>
      <Property name="dataType">[dtMain]</Property>
      <Property name="pageSize">15</Property>
    </DataSet>
    <DataSet id="dsDtl">
      <Property name="dataProvider">drugLogApplyPR#pageData</Property>
      <Property name="dataType">[dtMain]</Property>
      <Property name="pageSize">15</Property>
@@ -563,9 +556,11 @@
        <RowNumColumn>
          <Property name="caption">序号</Property>
        </RowNumColumn>
        <DataColumn name="id">
          <Property name="property">id</Property>
        <DataColumn>
          <Property name="property">xzbm</Property>
          <Property name="align">center</Property>
          <Property name="name">xzbm</Property>
          <Property name="visible">false</Property>
        </DataColumn>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
@@ -587,9 +582,10 @@
          <Property name="property">xcfzr</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="fzrzw">
          <Property name="property">fzrzw</Property>
        <DataColumn>
          <Property name="property">xcfzrzw</Property>
          <Property name="align">center</Property>
          <Property name="name">xcfzrzw</Property>
        </DataColumn>
        <DataColumn name="drugName">
          <Property name="property">drugName</Property>
@@ -649,8 +645,8 @@
              <Property name="labelPosition">top</Property>
              <Property name="labelSeparator">:</Property>
              <AutoFormElement>
                <Property name="name">id</Property>
                <Property name="property">id</Property>
                <Property name="name">xzbm</Property>
                <Property name="property">xzbm</Property>
                <Editor>
                  <TextEditor>
                    <Property name="blankText">---系统自动生成---</Property>
@@ -683,8 +679,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">fzrzw</Property>
                <Property name="property">fzrzw</Property>
                <Property name="name">xcfzrzw</Property>
                <Property name="property">xcfzrzw</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>

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

@@ -6,6 +6,7 @@
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.drug.service.HDrugLogApplyService;
import com.ld.igds.models.DrugLogApply;
import com.ld.igds.models.DrugLogDtl;
import com.ld.igds.models.DrugLogPeople;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,14 +38,12 @@
    /**
     * drugLogApplyPR#peopleList
     *
     * @param id
     * @param
     * @return
     * @throws Exception
     */
    @DataProvider
    public List<DrugLogPeople> peopleList(String id) throws Exception {
        Map<String, Object> param = new HashMap<>();
        param.put("drugLogId", id);
    public List<DrugLogPeople> peopleList(Map<String, Object> param) throws Exception {
        return drugLogApplyService.drugLogPeopleList(param);
    }

@@ -80,4 +79,16 @@
        return drugLogApplyService.delDrugLogPeople(data);
    }

    /**
     * drugLogApplyPR#peopleList
     *
     * @param
     * @return
     * @throws Exception
     */
    @DataProvider
    public List<DrugLogDtl> dtlList(Map<String, Object> param) throws Exception {
        return drugLogApplyService.drugLogDtlList(param);
    }

}

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

@@ -20,9 +20,9 @@
public class DrugLogApply implements Serializable {

    @Id
    @Column(name = "ID_", length = 4)
    @Column(name = "xzbm", length = 4)
    @PropertyDef(label = "熏蒸备案编号", description = "4位顺序号")
    private String id;
    private String xzbm;

    @Id
    @Column(name = "DEPT_ID_", length = 21)
@@ -33,6 +33,7 @@
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Id
    @Column(name = "tbrq")
    @PropertyDef(label = "填报日期")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -60,11 +61,11 @@
    private String xcfzr;

    @Column(name = "fzrzw", length = 10)
    @PropertyDef(label = "负责人职务")
    private String fzrzw;
    @PropertyDef(label = "现场负责人职务")
    private String xcfzrzw;

    @Column(name = "xcfzrdh", length = 11)
    @PropertyDef(label = "现场负责人")
    @PropertyDef(label = "现场负责人电话")
    private String xcfzrdh;

    @Column(name = "tbr", length = 20)
@@ -139,15 +140,26 @@
    @PropertyDef(label = "领取人")
    private String lqr;

    @Column(name = "lqsj")
    @PropertyDef(label = "领取时间")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date lqsj;

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


    /**
     * å‚¨ç²®ç²®æƒ…明细表
     *
     */
//    @Transient
//    private List<DrugLogDtl> drugLogDtls;
    @Transient
    private List<DrugLogDtl> drugLogDtls;

    @Column(name = "DTL_ID_", length = 40)
    @PropertyDef(label = "dtlId")
    private String dtlId;

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "仓房/油罐代码")
@@ -245,8 +257,13 @@
    /**
     * ç†è’¸å¤‡æ¡ˆæ–¹å¼
     */
//    @Transient
//    private List<DrugLogWay> drugLogWays;
    @Transient
    private List<DrugLogWay> drugLogWays;

    @Column(name = "Way_ID_", length = 40)
    @PropertyDef(label = "wayId")
    private String wayId;

    @Column(name = "xznd", precision = 20, scale = 3)
    @PropertyDef(label = "设定熏蒸浓度", description = "单位：ml/m³")
    private Double xznd;

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

@@ -22,8 +22,12 @@
public class DrugLogDtl implements Serializable {

    @Id
    @Column(name = "DTL_ID_", length = 40)
    @PropertyDef(label = "dtlId")
    private String dtlId;

    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "id")
    @PropertyDef(label = "id", description = "熏蒸编号+库区代码+填报日期")
    private String id;

    @Column(name = "DRUG_LOG_ID_", length = 4)
@@ -34,9 +38,10 @@
    @PropertyDef(label = "库区代码")
    private String deptId;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;
    @Column(name = "tbrq")
    @PropertyDef(label = "填报日期")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date tbrq;

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "仓房/油罐代码")
@@ -70,6 +75,10 @@
    @PropertyDef(label = "粮温")
    private Double lw;

    @Column(name = "cw", precision = 20, scale = 3)
    @PropertyDef(label = "仓温")
    private Double cw;

    @Column(name = "cnsd", precision = 20, scale = 3)
    @PropertyDef(label = "仓内湿度")
    private Double cnsd;

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

@@ -1,6 +1,7 @@
package com.ld.igds.models;

import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import javax.persistence.Column;
@@ -8,6 +9,7 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

/**
 * ç†è’¸ä½œä¸šäººå‘˜ä¿¡æ¯è¡¨
@@ -20,6 +22,10 @@
public class DrugLogPeople implements Serializable {

    @Id
    @Column(name = "PEOPLE_ID_", length = 40)
    @PropertyDef(label = "propleId")
    private String propleId;

    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "id")
    private String id;
@@ -32,9 +38,10 @@
    @PropertyDef(label = "库区代码")
    private String deptId;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;
    @Column(name = "tbrq")
    @PropertyDef(label = "填报日期")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date tbrq;

    @Column(name = "mx", length = 20)
    @PropertyDef(label = "姓名")

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

@@ -1,6 +1,8 @@
package com.ld.igds.models;

import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import javax.persistence.Column;
@@ -8,6 +10,7 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

/**
 * ç†è’¸å¤‡æ¡ˆæ–¹å¼è¡¨
@@ -20,8 +23,12 @@
public class DrugLogWay implements Serializable {

    @Id
    @Column(name = "WAY_ID_", length = 40)
    @PropertyDef(label = "wayId")
    private String wayId;

    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "id")
    @PropertyDef(label = "id",description = "与备案信息关联ID   ç†è’¸ç¼–码+库区代码+填报日期")
    private String id;

    @Column(name = "DRUG_LOG_ID_", length = 4)
@@ -30,11 +37,13 @@

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

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;
    @Column(name = "tbrq")
    @PropertyDef(label = "填报日期")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date tbrq;

    @Column(name = "xznd", precision = 20, scale = 3)
    @PropertyDef(label = "设定熏蒸浓度", description = "单位：ml/m³")

 igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java

@@ -114,6 +114,8 @@
                listResult.add(item);
            if (item.getType().equals(DeviceType.TYPE_0C.getCode()))
                listResult.add(item);
            if (item.getType().equals(DeviceType.TYPE_04.getCode()))
                listResult.add(item);

            //浅圆仓加上其他设备
            if (DepotType.TYPE_02.getCode().equals(param.getDepotType())) {

 igds-web/src/main/resources/application-pro5329.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: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
      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: Abc123..
    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰
    pool:
      max-active: 200
      max-wait: -1
      max-idle: 10
      min-idle: 0
      timeout: 6000

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

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

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

@@ -109,3 +109,7 @@
n2.mapImg.5000_0137.b=default_qyc_b.png
n2.mapImg.5000_0138.a=default_qyc_a.png
n2.mapImg.5000_0138.b=default_qyc_b.png

## 5329_001
n2.mapImg.5329_001.a=default_qyc_a.png
n2.mapImg.5329_001.b=default_qyc_b.png

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

@@ -179,3 +179,11 @@
## 5325_001
verb.mapImg.5325_001.a=default_pfc_a.png
verb.mapImg.5325_001.b=default_pfc_b.png

## 5328_001
verb.mapImg.5328_001.a=default_pfc_a.png
verb.mapImg.5328_001.b=default_pfc_b.png

## 5329_001
verb.mapImg.5329_001.a=default_qyc_a.png
verb.mapImg.5329_001.b=default_qyc_b.png