通风问题修改

YYC

2023-10-20 d927426741a4fa32a7f250f645d916d778161e37

通风问题修改

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

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

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;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;

/**
 * @Author: YYC
 * @Description:账面库存
 * @DateTime: 2023/10/20 14:07
 **/
@Data
@Entity
@Table(name = "D_DEPOT_BOOK_STORE")
public class DepotBookStore implements Serializable {
    /**
     *
     */
    private static final long serialVersionUID = -5548540780391804729L;

    @Id
    @Column(name = "ID_", length = 40)
    private String id;

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

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

    @Column(name = "lspzdm", length = 7)
    @PropertyDef(label = "粮食品种代码")
    private String lspzdm;

    @Column(name = "nd", length = 4)
    @PropertyDef(label = "年度")
    private String nd;

    @Column(name = "yf", length = 2)
    @PropertyDef(label = "月份")
    private String yf;

    @Column(name = "qcsl", precision = 20, scale = 3)
    @PropertyDef(label = "期初数量", description = "单位：公斤")
    private Double qcsl = 0.0;

    @Column(name = "bqsrsl", precision = 20, scale = 3)
    @PropertyDef(label = "本期收入数量", description = "单位：公斤")
    private Double bqsrsl = 0.0;

    @Column(name = "bqzcsl", precision = 20, scale = 3)
    @PropertyDef(label = "本期支出数量", description = "单位：公斤")
    private Double bqzcsl = 0.0;

    @Column(name = "qmye", precision = 20, scale = 3)
    @PropertyDef(label = "期末数量", description = "单位：公斤")
    private Double qmye = 0.0;

    @Column(name = "yjbz")
    @PropertyDef(label = "月结标志", description = "0：月结；1 æœªæœˆç»“")
    private Integer yjbz;

    @Column(name = "ywrq")
    @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")
    @PropertyDef(label = "最后更新时间")
    private Date zhgxsj;

}

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

@@ -408,7 +408,8 @@
                cacheId = timeKey + "0001";
            } else {
                String temp = drugLogApplies.get(0).getXzbm();
                Integer i = Integer.valueOf(temp);
                String tempNum = temp.substring(temp.length() - 4);
                Integer i = Integer.valueOf(tempNum);
                cacheId = timeKey + String.format("%04d", ++i);
            }
        }

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

@@ -97,7 +97,7 @@
        data.setUpdateUser(ContextUtil.getLoginUserCName());
        try {
            if (null == data.getId()) {
                data.setId(data.getDepotId() + DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
                data.setId(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
                session.save(data);
            } else {
                session.update(data);

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

@@ -1,11 +1,13 @@
package com.ld.igds.drug.view;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.ld.igds.inout.InoutConstant;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.util.ContextUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -64,10 +66,10 @@
     *
     * @throws Exception
     */
//    @DataProvider
//    public List<Drug> listDrug(String name) throws Exception {
//        return drugService.listDrug(name);
//    }
    @DataProvider
    public List<Drug> listDrug() throws Exception {
        return drugService.listDrug(ContextUtil.getCompanyId(), null);
    }

    /**
     * ${dorado.getDataProvider("drugPR#pageDrug").getResult()}

 igds-verb/src/main/java/com/ld/igds/verb/service/HMAreationDataService.java

@@ -2,18 +2,29 @@

import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.models.MAreationData;
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;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Service
public class HMAreationDataService extends HibernateDao {

    @Autowired
    private RedisUtil redisUtil;

    public static final String CACHE_AREATION_ID = "AREATION_ID";

    public void pageData(Page<MAreationData> page, Map<String, Object> param)
            throws Exception {
        String hql = " from " + MAreationData.class.getName()
@@ -49,7 +60,8 @@
        data.setUpdateUser(ContextUtil.getLoginUserCName());
        try {
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
                String id = createId(data.getCompanyId(), data.getStartTime());
                data.setId(id);
                session.save(data);
            } else {
                session.update(data);
@@ -61,6 +73,7 @@
            session.close();
        }
    }

    public String delData(MAreationData data) {
        Session session = this.getSessionFactory().openSession();
        try {
@@ -75,4 +88,50 @@
        }
        return null;
    }

    public List<MAreationData> areationList(Map<String, Object> param) {
        StringBuffer hql = new StringBuffer();
        Map<String, Object> args = new HashMap<>();
        hql.append(" from " + MAreationData.class.getName() + " where companyId=:companyId");
        args.put("companyId", ContextUtil.getCompanyId());
        if (null != param) {
            String str = (String) param.get("id");
            if (StringUtils.isNotEmpty(str)) {
                hql.append(" and id like:id");
                args.put("id", str + "%");
            }
        }
        hql.append(" order by id desc");
        return this.query(String.valueOf(hql), args);
    }

    public String createId(String companyId, Date time) {

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

        String cacheId = (String) redisUtil.get(cacheKey);
        if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
            String temp = cacheId.substring(cacheId.length() - 3);
            Integer i = Integer.valueOf(temp);
            cacheId = timeKey + String.format("%03d", ++i);
        } else {
            Map<String, Object> param = new HashMap<>();
            param.put("id", timeKey);
            List<MAreationData> areationList = this.areationList(param);
            if (null == areationList || areationList.size() == 0) {
                cacheId = timeKey + "001";
            } else {
                String temp = areationList.get(0).getId();
                String tempNum = temp.substring(temp.length() - 3);
                Integer i = Integer.valueOf(tempNum);
                cacheId = timeKey + String.format("%03d", ++i);
            }
        }
        // æ›´æ–°ç¼“å­˜
        redisUtil.set(cacheKey, cacheId);

        return cacheId;
    }
}

 igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml

@@ -147,22 +147,29 @@
      <PropertyDef name="totalEs">
        <Property name="dataType">Double</Property>
        <Property name="label">总耗电量</Property>
        <Property name="displayFormat">#0.000千瓦</Property>
      </PropertyDef>
      <PropertyDef name="beforeTempAvg">
        <Property name="dataType">Double</Property>
        <Property name="label">作业前平均粮温</Property>
        <Property name="displayFormat">#0.000℃</Property>
      </PropertyDef>
      <PropertyDef name="afterTempAvg">
        <Property name="dataType">Double</Property>
        <Property name="label">作业后平均粮温</Property>
        <Property name="displayFormat">#0.000℃</Property>
      </PropertyDef>
      <PropertyDef name="beforPerWetAvg">
        <Property name="dataType">Double</Property>
        <Property name="label">作业前平均水分</Property>
        <Property name="displayFormat">#0.000%</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="afterPerWetAvg">
        <Property name="dataType">Double</Property>
        <Property name="label">作业后平均水分</Property>
        <Property name="displayFormat">#0.000%</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="chargeUser">
        <Property></Property>
@@ -192,6 +199,179 @@
      <PropertyDef name="remark">
        <Property></Property>
        <Property name="label">备注信息</Property>
      </PropertyDef>
      <PropertyDef name="ldkxd">
        <Property name="dataType">Double</Property>
        <Property name="label">粮堆孔隙度</Property>
        <Property name="displayFormat">#0.000%</Property>
      </PropertyDef>
      <PropertyDef name="fdxs">
        <Property/>
        <Property name="label">风网设置方式</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1：一字型</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2：土字型</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">3：圭字行</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">4：U å­—åž‹</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">9</Property>
                <Property name="value">9：其他</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="zfdjmj">
        <Property name="dataType">Double</Property>
        <Property name="label">主风道截面积</Property>
      </PropertyDef>
      <PropertyDef name="zhfdjmj">
        <Property name="dataType">Double</Property>
        <Property name="label">支风道截面积</Property>
      </PropertyDef>
      <PropertyDef name="zfdzcd">
        <Property name="dataType">Double</Property>
        <Property name="label">支风道总长度</Property>
      </PropertyDef>
      <PropertyDef name="fwkkl">
        <Property name="dataType">Double</Property>
        <Property name="label">风网开孔率</Property>
      </PropertyDef>
      <PropertyDef name="kqtjb">
        <Property name="dataType">Double</Property>
        <Property name="label">空气途径比</Property>
      </PropertyDef>
      <PropertyDef name="tfkszgs">
        <Property name="dataType">Integer</Property>
        <Property name="label">通风口设置个数</Property>
      </PropertyDef>
      <PropertyDef name="tfjxh">
        <Property/>
        <Property name="label">通风机型号</Property>
      </PropertyDef>
      <PropertyDef name="tfjts">
        <Property name="dataType">Integer</Property>
        <Property name="label">通风机台数</Property>
      </PropertyDef>
      <PropertyDef name="dtfjedqy">
        <Property name="dataType">Double</Property>
        <Property name="label">单台风机额定全压</Property>
      </PropertyDef>
      <PropertyDef name="dtfjedfl">
        <Property name="dataType">Double</Property>
        <Property name="label">单台风机额定风量</Property>
      </PropertyDef>
      <PropertyDef name="dtfjedgl">
        <Property name="dataType">Double</Property>
        <Property name="label">单台风机额定功率</Property>
      </PropertyDef>
      <PropertyDef name="dtfjscfl">
        <Property name="dataType">Double</Property>
        <Property name="label">单台风机实测风量</Property>
      </PropertyDef>
      <PropertyDef name="dtfjzgl">
        <Property name="dataType">Double</Property>
        <Property name="label">单台风机轴功率</Property>
      </PropertyDef>
      <PropertyDef name="zfl">
        <Property name="dataType">Double</Property>
        <Property name="label">总风量</Property>
      </PropertyDef>
      <PropertyDef name="dwtfl">
        <Property name="dataType">Double</Property>
        <Property name="label">单位通风量</Property>
      </PropertyDef>
      <PropertyDef name="scxtzl">
        <Property name="dataType">Double</Property>
        <Property name="label">实测系统阻力</Property>
      </PropertyDef>
      <PropertyDef name="zysqw">
        <Property name="dataType">double</Property>
        <Property name="label">作业时气温</Property>
      </PropertyDef>
      <PropertyDef name="zysqs">
        <Property name="dataType">double</Property>
        <Property name="label">作业时气湿</Property>
      </PropertyDef>
      <PropertyDef name="jwfd">
        <Property name="dataType">double</Property>
        <Property name="label">降温幅度</Property>
      </PropertyDef>
      <PropertyDef name="dljwnh">
        <Property name="dataType">double</Property>
        <Property name="label">吨粮降温能耗</Property>
      </PropertyDef>
      <PropertyDef name="ssl">
        <Property name="dataType">double</Property>
        <Property name="label">失水率</Property>
      </PropertyDef>
      <PropertyDef name="bsxgpjjg">
        <Property/>
        <Property name="label">保水效果评价结果</Property>
      </PropertyDef>
      <PropertyDef name="tfjwjyxpjzc">
        <Property/>
        <Property name="label">通风降温均匀性评价_整仓</Property>
      </PropertyDef>
      <PropertyDef name="tfjwjyxpjsc">
        <Property/>
        <Property name="label">通风降温均匀性评价_上层</Property>
      </PropertyDef>
      <PropertyDef name="tfjwjyxpjzjc">
        <Property/>
        <Property name="label">通风降温均匀性评价_中(间)层</Property>
      </PropertyDef>
      <PropertyDef name="tfjwjyxpjxc">
        <Property/>
        <Property name="label">通风降温均匀性评价_下层</Property>
      </PropertyDef>
      <PropertyDef name="jsfd">
        <Property name="dataType">Double</Property>
        <Property name="label">降水幅度</Property>
      </PropertyDef>
      <PropertyDef name="dljsnh">
        <Property name="dataType">Double</Property>
        <Property name="label">吨粮降水能耗</Property>
      </PropertyDef>
      <PropertyDef name="tfjsjyxfxzc">
        <Property/>
        <Property name="label">通风降水均匀性分析_整仓</Property>
      </PropertyDef>
      <PropertyDef name="tfjsjyxfxsc">
        <Property/>
        <Property name="label">通风降水均匀性分析_上层</Property>
      </PropertyDef>
      <PropertyDef name="tfjsjyxfxzjc">
        <Property/>
        <Property name="label">通风降水均匀性分析_中(间)层</Property>
      </PropertyDef>
      <PropertyDef name="tfjsjyxfxxc">
        <Property/>
        <Property name="label">通风降水均匀性分析_下层</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
@@ -388,10 +568,11 @@
      </DataPilot>
    </Container>
    <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
      <Property name="width">60%</Property>
      <Property name="width">80%</Property>
      <Property name="caption">详细信息</Property>
      <Property name="iconClass">fa fa-flag-o</Property>
      <Property name="closeable">false</Property>
      <Property name="height">80%</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -417,10 +598,10 @@
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*</Property>
          <Property name="cols">*,*,*,*</Property>
          <Property name="labelWidth">140</Property>
          <Property name="labelAlign">right</Property>
          <Property name="labelSeparator">：</Property>
          <Property name="labelPosition">top</Property>
          <AutoFormElement>
            <Property name="name">depotId</Property>
            <Property name="property">depotId</Property>
@@ -491,7 +672,187 @@
            <Property name="property">operators</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:3">
          <AutoFormElement>
            <Property name="name">ldkxd</Property>
            <Property name="property">ldkxd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zfdjmj</Property>
            <Property name="property">zfdjmj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhfdjmj</Property>
            <Property name="property">zhfdjmj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zfdzcd</Property>
            <Property name="property">zfdzcd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fwkkl</Property>
            <Property name="property">fwkkl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqtjb</Property>
            <Property name="property">kqtjb</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfkszgs</Property>
            <Property name="property">tfkszgs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjxh</Property>
            <Property name="property">tfjxh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjts</Property>
            <Property name="property">tfjts</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dtfjedqy</Property>
            <Property name="property">dtfjedqy</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dtfjedfl</Property>
            <Property name="property">dtfjedfl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dtfjedgl</Property>
            <Property name="property">dtfjedgl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dtfjscfl</Property>
            <Property name="property">dtfjscfl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dtfjzgl</Property>
            <Property name="property">dtfjzgl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zfl</Property>
            <Property name="property">zfl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dwtfl</Property>
            <Property name="property">dwtfl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">scxtzl</Property>
            <Property name="property">scxtzl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zysqw</Property>
            <Property name="property">zysqw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zysqs</Property>
            <Property name="property">zysqs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jwfd</Property>
            <Property name="property">jwfd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dljwnh</Property>
            <Property name="property">dljwnh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ssl</Property>
            <Property name="property">ssl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bsxgpjjg</Property>
            <Property name="property">bsxgpjjg</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fdxs</Property>
            <Property name="property">fdxs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjwjyxpjzc</Property>
            <Property name="property">tfjwjyxpjzc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjwjyxpjsc</Property>
            <Property name="property">tfjwjyxpjsc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjwjyxpjzjc</Property>
            <Property name="property">tfjwjyxpjzjc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjwjyxpjxc</Property>
            <Property name="property">tfjwjyxpjxc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jsfd</Property>
            <Property name="property">jsfd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dljsnh</Property>
            <Property name="property">dljsnh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjsjyxfxzc</Property>
            <Property name="property">tfjsjyxfxzc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjsjyxfxsc</Property>
            <Property name="property">tfjsjyxfxsc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjsjyxfxzjc</Property>
            <Property name="property">tfjsjyxfxzjc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tfjsjyxfxxc</Property>
            <Property name="property">tfjsjyxfxxc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateUser</Property>
            <Property name="property">updateUser</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement layoutConstraint="colSpan:4">
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Property name="editorType">TextArea</Property>