~czt/igds-api.git

YYC

2024-01-24 961d92663926cb8aaff3126c04a1c6af9f1d88c1

熏蒸备案调整

已修改4个文件

	src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java	135 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java	70 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java

@@ -4,6 +4,7 @@
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;
@@ -165,4 +166,138 @@
    @Transient
    private List<Fz40DrugLogPeople> drugLogPeople;

    /**
     * 储粮粮情明细表
     */

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

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "仓房/油罐代码")
    private String depotId;

    @Column(name = "FOOD_VARIETY_", length = 20)
    @PropertyDef(label = "粮食品种")
    private String foodVariety;

    @Column(name = "FOOD_TYPE_", length = 20)
    @PropertyDef(label = "粮食性质")
    private String foodType;

    @Column(name = "FOOD_LEVEL_", length = 10)
    @PropertyDef(label = "粮食等级")
    private String foodLevel;

    @Column(name = "NUMBER_", precision = 20, scale = 3)
    @PropertyDef(label = "粮食数量", description = "单位：吨")
    private Double number = 0.0;

    @Column(name = "PER_WET_", precision = 20, scale = 3)
    @PropertyDef(label = "水分", description = "单位：%")
    private Double perWet;

    @Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
    @PropertyDef(label = "杂质", description = "单位：%")
    private Double perImpurity;

    @Column(name = "lw", precision = 20, scale = 3)
    @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;

    @Column(name = "clfs", length = 1)
    @PropertyDef(label = "存粮方式", description = "1：散装储粮;2：包装;3：围包散存;9：其他")
    private String clfs;

    @Column(name = "rkrq")
    @PropertyDef(label = "入库日期")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date rkrq;

    @Column(name = "hc", length = 30)
    @PropertyDef(label = "害虫")
    private String hc;

    @Column(name = "cldjpd", length = 3)
    @PropertyDef(label = "虫粮等级判定")
    private String cldjpd;

    @Column(name = "ldtj", precision = 20, scale = 3)
    @PropertyDef(label = "粮堆体积", description = "m³")
    private Double ldtj;

    @Column(name = "kjtj", precision = 20, scale = 3)
    @PropertyDef(label = "空间体积", description = "m³")
    private Double kjtj;

    @Column(name = "lddwyyl", precision = 20, scale = 3)
    @PropertyDef(label = "粮堆单位用药量")
    private Double lddwyyl;

    @Column(name = "kjdwyyl", precision = 20, scale = 3)
    @PropertyDef(label = "空间单位用药量")
    private Double kjdwyyl;

    @Column(name = "zyyl", precision = 20, scale = 3)
    @PropertyDef(label = "总用药量")
    private Double zyyl;
    /**
     * 仓房气密性以 500 Pa 的压力半衰 期 t 分为四个等级。
     * 1：   Ⅰ级，t≥300s。
     * 2：   Ⅱ级，120s≤t<300s。
     * 3：Ⅲ级，40s≤t<120s (平房仓) ， 60s≤ t<120s (立筒仓、浅圆仓) 。
     * 4：Ⅳ级，t<40s (平房仓) ，t<60s (立筒仓、浅圆仓) 。
     */
    @Column(name = "qmx", length = 1)
    @PropertyDef(label = "气密性")
    private String qmx;

    @Column(name = "jhxzksrq")
    @PropertyDef(label = "计划熏蒸开始日期")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date jhxzksrq;

    @Column(name = "jhxzjsrq")
    @PropertyDef(label = "计划熏蒸结束日期")
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date jhxzjsrq;

    /**
     * 熏蒸备案方式
     */

    @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;

    @Column(name = "mbsj")
    @PropertyDef(label = "密闭时间", description = "单位：天")
    private Integer mbsj;

    @Column(name = "xzfs", length = 30)
    @PropertyDef(label = "熏蒸方式")
    private String xzfs;

    @Column(name = "sqfs", length = 30)
    @PropertyDef(label = "散气方式")
    private String sqfs;

    /**
     * 熏蒸作业人员
     */


}

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java

@@ -112,33 +112,51 @@

                //储粮粮情明细表
                List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
                if (null != dtls && dtls.size() > 0) {
                    dtlList = new ArrayList<>();
                    for (Fz40DrugLogDtl dtl : dtls) {
                        gdApi1023Dtl = new GdApi1023Dtl();
                        BeanUtils.copyProperties(dtl, gdApi1023Dtl);
                        gdApi1023Dtl.setCfdm(dtl.getDepotId());
                        gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
                        gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
                        gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
                        gdApi1023Dtl.setLssl(dtl.getNumber());
                        gdApi1023Dtl.setSf(dtl.getPerWet());
                        gdApi1023Dtl.setZz(dtl.getPerImpurity());
                        dtlList.add(gdApi1023Dtl);
                    }
                    gdApi1023.setDtls(dtlList);
                }
                gdApi1023Dtl = new GdApi1023Dtl();
                BeanUtils.copyProperties(data, gdApi1023Dtl);
                gdApi1023Dtl.setCfdm(data.getDepotId());
                gdApi1023Dtl.setLspzdm(data.getFoodVariety());
                gdApi1023Dtl.setLsxzdm(data.getFoodType());
                gdApi1023Dtl.setLsdjdm(data.getFoodLevel());
                gdApi1023Dtl.setLssl(data.getNumber());
                gdApi1023Dtl.setSf(data.getPerWet());
                gdApi1023Dtl.setZz(data.getPerImpurity());
                dtlList = new ArrayList<>();
                dtlList.add(gdApi1023Dtl);
                gdApi1023.setDtls(dtlList);
//                if (null != dtls && dtls.size() > 0) {
//                    dtlList = new ArrayList<>();
//                    for (Fz40DrugLogDtl dtl : dtls) {
//                        gdApi1023Dtl = new GdApi1023Dtl();
//                        BeanUtils.copyProperties(dtl, gdApi1023Dtl);
//                        gdApi1023Dtl.setCfdm(dtl.getDepotId());
//                        gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
//                        gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
//                        gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
//                        gdApi1023Dtl.setLssl(dtl.getNumber());
//                        gdApi1023Dtl.setSf(dtl.getPerWet());
//                        gdApi1023Dtl.setZz(dtl.getPerImpurity());
//                        dtlList.add(gdApi1023Dtl);
//                    }
//                    gdApi1023.setDtls(dtlList);
//                }

                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
                if (null != ways && ways.size() > 0) {
                    wayList = new ArrayList<>();
                    for (Fz40DrugLogWay way : ways) {
                        gdApi1023Way = new GdApi1023Way();
                        BeanUtils.copyProperties(way, gdApi1023Way);
                        wayList.add(gdApi1023Way);
                    }
                    gdApi1023.setWays(wayList);
                }

                gdApi1023Way = new GdApi1023Way();
                BeanUtils.copyProperties(data, gdApi1023Way);
                wayList = new ArrayList<>();
                wayList.add(gdApi1023Way);
                gdApi1023.setWays(wayList);
//                List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
//                if (null != ways && ways.size() > 0) {
//                    wayList = new ArrayList<>();
//                    for (Fz40DrugLogWay way : ways) {
//                        gdApi1023Way = new GdApi1023Way();
//                        BeanUtils.copyProperties(way, gdApi1023Way);
//                        wayList.add(gdApi1023Way);
//                    }
//                    gdApi1023.setWays(wayList);
//                }

                List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
                if (null != peoples && peoples.size() > 0) {

 src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml

@@ -305,6 +305,10 @@
        <Property name="dataType">Date</Property>
        <Property name="label">计划熏蒸结束日期</Property>
      </PropertyDef>
      <PropertyDef name="cfmc">
        <Property/>
        <Property name="label">仓房名称</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -1128,6 +1132,11 @@
            <Property name="property">jhxzjsrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">cfmc</Property>
            <Property name="property">cfmc</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>

 src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java

@@ -27,6 +27,7 @@
    private Double cw;    //仓温
    private Double cnsd;    //仓内湿度
    private String clfs;    //储粮方式
    private String cfmc;    //仓房名称

    @JSONField(format = "yyyy-MM-dd")
    private Date rkrq;    //入库日期

			@@ -4,6 +4,7 @@
			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;
			@@ -165,4 +166,138 @@
			@Transient
			private List<Fz40DrugLogPeople> drugLogPeople;

			/**
			* 储粮粮情明细表
			*/

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

			@Column(name = "DEPOT_ID_", length = 50)
			@PropertyDef(label = "仓房/油罐代码")
			private String depotId;

			@Column(name = "FOOD_VARIETY_", length = 20)
			@PropertyDef(label = "粮食品种")
			private String foodVariety;

			@Column(name = "FOOD_TYPE_", length = 20)
			@PropertyDef(label = "粮食性质")
			private String foodType;

			@Column(name = "FOOD_LEVEL_", length = 10)
			@PropertyDef(label = "粮食等级")
			private String foodLevel;

			@Column(name = "NUMBER_", precision = 20, scale = 3)
			@PropertyDef(label = "粮食数量", description = "单位：吨")
			private Double number = 0.0;

			@Column(name = "PER_WET_", precision = 20, scale = 3)
			@PropertyDef(label = "水分", description = "单位：%")
			private Double perWet;

			@Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
			@PropertyDef(label = "杂质", description = "单位：%")
			private Double perImpurity;

			@Column(name = "lw", precision = 20, scale = 3)
			@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;

			@Column(name = "clfs", length = 1)
			@PropertyDef(label = "存粮方式", description = "1：散装储粮;2：包装;3：围包散存;9：其他")
			private String clfs;

			@Column(name = "rkrq")
			@PropertyDef(label = "入库日期")
			@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
			private Date rkrq;

			@Column(name = "hc", length = 30)
			@PropertyDef(label = "害虫")
			private String hc;

			@Column(name = "cldjpd", length = 3)
			@PropertyDef(label = "虫粮等级判定")
			private String cldjpd;

			@Column(name = "ldtj", precision = 20, scale = 3)
			@PropertyDef(label = "粮堆体积", description = "m³")
			private Double ldtj;

			@Column(name = "kjtj", precision = 20, scale = 3)
			@PropertyDef(label = "空间体积", description = "m³")
			private Double kjtj;

			@Column(name = "lddwyyl", precision = 20, scale = 3)
			@PropertyDef(label = "粮堆单位用药量")
			private Double lddwyyl;

			@Column(name = "kjdwyyl", precision = 20, scale = 3)
			@PropertyDef(label = "空间单位用药量")
			private Double kjdwyyl;

			@Column(name = "zyyl", precision = 20, scale = 3)
			@PropertyDef(label = "总用药量")
			private Double zyyl;
			/**
			* 仓房气密性以 500 Pa 的压力半衰期 t 分为四个等级。
			* 1： Ⅰ级，t≥300s。
			* 2： Ⅱ级，120s≤t<300s。
			* 3：Ⅲ级，40s≤t<120s (平房仓) ， 60s≤ t<120s (立筒仓、浅圆仓) 。
			* 4：Ⅳ级，t<40s (平房仓) ，t<60s (立筒仓、浅圆仓) 。
			*/
			@Column(name = "qmx", length = 1)
			@PropertyDef(label = "气密性")
			private String qmx;

			@Column(name = "jhxzksrq")
			@PropertyDef(label = "计划熏蒸开始日期")
			@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
			private Date jhxzksrq;

			@Column(name = "jhxzjsrq")
			@PropertyDef(label = "计划熏蒸结束日期")
			@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
			private Date jhxzjsrq;

			/**
			* 熏蒸备案方式
			*/

			@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;

			@Column(name = "mbsj")
			@PropertyDef(label = "密闭时间", description = "单位：天")
			private Integer mbsj;

			@Column(name = "xzfs", length = 30)
			@PropertyDef(label = "熏蒸方式")
			private String xzfs;

			@Column(name = "sqfs", length = 30)
			@PropertyDef(label = "散气方式")
			private String sqfs;

			/**
			* 熏蒸作业人员
			*/


			}

			@@ -112,33 +112,51 @@

			//储粮粮情明细表
			List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
			if (null != dtls && dtls.size() > 0) {
			dtlList = new ArrayList<>();
			for (Fz40DrugLogDtl dtl : dtls) {
			gdApi1023Dtl = new GdApi1023Dtl();
			BeanUtils.copyProperties(dtl, gdApi1023Dtl);
			gdApi1023Dtl.setCfdm(dtl.getDepotId());
			gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
			gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
			gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
			gdApi1023Dtl.setLssl(dtl.getNumber());
			gdApi1023Dtl.setSf(dtl.getPerWet());
			gdApi1023Dtl.setZz(dtl.getPerImpurity());
			dtlList.add(gdApi1023Dtl);
			}
			gdApi1023.setDtls(dtlList);
			}
			gdApi1023Dtl = new GdApi1023Dtl();
			BeanUtils.copyProperties(data, gdApi1023Dtl);
			gdApi1023Dtl.setCfdm(data.getDepotId());
			gdApi1023Dtl.setLspzdm(data.getFoodVariety());
			gdApi1023Dtl.setLsxzdm(data.getFoodType());
			gdApi1023Dtl.setLsdjdm(data.getFoodLevel());
			gdApi1023Dtl.setLssl(data.getNumber());
			gdApi1023Dtl.setSf(data.getPerWet());
			gdApi1023Dtl.setZz(data.getPerImpurity());
			dtlList = new ArrayList<>();
			dtlList.add(gdApi1023Dtl);
			gdApi1023.setDtls(dtlList);
			// if (null != dtls && dtls.size() > 0) {
			// dtlList = new ArrayList<>();
			// for (Fz40DrugLogDtl dtl : dtls) {
			// gdApi1023Dtl = new GdApi1023Dtl();
			// BeanUtils.copyProperties(dtl, gdApi1023Dtl);
			// gdApi1023Dtl.setCfdm(dtl.getDepotId());
			// gdApi1023Dtl.setLspzdm(dtl.getFoodVariety());
			// gdApi1023Dtl.setLsxzdm(dtl.getFoodType());
			// gdApi1023Dtl.setLsdjdm(dtl.getFoodLevel());
			// gdApi1023Dtl.setLssl(dtl.getNumber());
			// gdApi1023Dtl.setSf(dtl.getPerWet());
			// gdApi1023Dtl.setZz(dtl.getPerImpurity());
			// dtlList.add(gdApi1023Dtl);
			// }
			// gdApi1023.setDtls(dtlList);
			// }

			List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
			if (null != ways && ways.size() > 0) {
			wayList = new ArrayList<>();
			for (Fz40DrugLogWay way : ways) {
			gdApi1023Way = new GdApi1023Way();
			BeanUtils.copyProperties(way, gdApi1023Way);
			wayList.add(gdApi1023Way);
			}
			gdApi1023.setWays(wayList);
			}

			gdApi1023Way = new GdApi1023Way();
			BeanUtils.copyProperties(data, gdApi1023Way);
			wayList = new ArrayList<>();
			wayList.add(gdApi1023Way);
			gdApi1023.setWays(wayList);
			// List<Fz40DrugLogWay> ways = drugLogWayRep.listDrugLogWay(data.getXzbm());
			// if (null != ways && ways.size() > 0) {
			// wayList = new ArrayList<>();
			// for (Fz40DrugLogWay way : ways) {
			// gdApi1023Way = new GdApi1023Way();
			// BeanUtils.copyProperties(way, gdApi1023Way);
			// wayList.add(gdApi1023Way);
			// }
			// gdApi1023.setWays(wayList);
			// }

			List<Fz40DrugLogPeople> peoples = drugLogPeopleRep.listDrugLogPeople(data.getXzbm());
			if (null != peoples && peoples.size() > 0) {

			@@ -305,6 +305,10 @@
			<Property name="dataType">Date</Property>
			<Property name="label">计划熏蒸结束日期</Property>
			</PropertyDef>
			<PropertyDef name="cfmc">
			<Property/>
			<Property name="label">仓房名称</Property>
			</PropertyDef>
			</DataType>
			<DataType name="dtParam">
			<Property name="creationType">com.fzzy.api.data.ApiParam</Property>
			@@ -1128,6 +1132,11 @@
			<Property name="property">jhxzjsrq</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">cfmc</Property>
			<Property name="property">cfmc</Property>
			<Editor/>
			</AutoFormElement>
			</AutoForm>
			</Children>
			<Tools/>

			@@ -27,6 +27,7 @@
			private Double cw; //仓温
			private Double cnsd; //仓内湿度
			private String clfs; //储粮方式
			private String cfmc; //仓房名称

			@JSONField(format = "yyyy-MM-dd")
			private Date rkrq; //入库日期