类名修改

YYC

2023-10-25 84e6dc37bf0079f14fa4f69e892ece977d8b785f

类名修改

 src/main/java/com/fzzy/async/whhpjl/Fzzy40ToWhjlSyncService11.java

@@ -29,11 +29,11 @@
    @Autowired
    private Fz40ToWhjlSync1105 fz40ToWhjlSync1105;
    @Autowired
    private Fz40ToWhjlSync1106 fz40ToWhjlSync1106;
    @Autowired
    private Fz40ToWhjlSync1107 fz40ToWhjlSync1107;
    @Autowired
    private Fz40ToWhjlSync1111 fz40ToWhjlSync1111;
    private Fz40ToWhjlSync1108 fz40ToWhjlSync1108;
    @Autowired
    private Fz40ToWhjlSync1112 fz40ToWhjlSync1112;

    @Override
    public String getProtocol() {
@@ -59,11 +59,11 @@
        //同步仓房信息
        fz40ToWhjlSync1105.syncData(kqdm, deptId, start, end);
        // åŒæ­¥å»’间信息
        fz40ToWhjlSync1106.syncData(kqdm, deptId, start, end);
        // åŒæ­¥è´§ä½ä¿¡æ¯
        fz40ToWhjlSync1107.syncData(kqdm, deptId, start, end);
        // åŒæ­¥è´§ä½ä¿¡æ¯
        fz40ToWhjlSync1108.syncData(kqdm, deptId, start, end);
        // åŒæ­¥ä»“储设备信息
        fz40ToWhjlSync1111.syncData(kqdm, deptId, start, end);
        fz40ToWhjlSync1112.syncData(kqdm, deptId, start, end);
    }

}

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1106.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java

@@ -7,8 +7,8 @@
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1107;
import lombok.extern.slf4j.Slf4j;
@@ -19,23 +19,22 @@
import java.util.List;

/**
 * è´§ä½ä¿¡æ¯
 * å»’间信息
 *
 * @Author:YAN
 */
@Slf4j
@Component
public class Fz40ToWhjlSync1107 {

    @Autowired
    private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
    private Fz40ToWhjlSync1106Rep fz40ToWhjlSync1106Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * è´§ä½ä¿¡æ¯
     * å»’间信息
     *
     * @param kqdm
     * @param deptId
@@ -43,54 +42,59 @@
     * @param end
     */
    public void syncData(String kqdm, String deptId, Date start, Date end) {
        log.info("-------------1107接口数据开始同步------------------");
        log.info("-------------1106接口数据开始同步------------------");

        //同步数据，只记录失败的信息
        ApiLog apiLog = new ApiLog();
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(Constant.API_CODE_1107);
        apiLog.setInteId(Constant.API_CODE_1106);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());

        try {
            List<Fz40WhjlDefaultDepot> list = fz40ToWhjlSync1107Rep.listApi1107(deptId.substring(0, 4));
            List<Fz40WhjlDefaultGranary> list = fz40ToWhjlSync1106Rep.listApi1106(deptId.substring(0, 4));
            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到单位信息------------------");
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1107 apiData;
            for (Fz40WhjlDefaultDepot sysData : list) {
            for (Fz40WhjlDefaultGranary sysData : list) {
                apiData = new WhjlApi1107();
                apiData.setHwbh(sysData.getId());  //货位编号
                apiData.setAjbh(sysData.getAjdh());  //廒间编号
                apiData.setJlqybh("");  //军粮企业编号
                apiData.setJlqymc("");  //军粮企业名称
                apiData.setJgzdbh("");  //军供站点编号
                apiData.setJlqymc("");  //军供站点名称
                apiData.setSscfbh(sysData.getBuildingId());  //仓房编号
                apiData.setSscfbh(sysData.getCfbh());  //仓房编号
                apiData.setSscfmc("");  //仓房名称
                apiData.setSsajbh(sysData.getGranaryId()); //廒间编号
                apiData.setAjmc("");  //廒间名称
                apiData.setHwmc(sysData.getName());  //货位名称
                apiData.setHwqyrq(sysData.getStoreDate());  //货位启用日期
                apiData.setHwzt(sysData.getDepotStatus());  //货位状态
                apiData.setClfs(sysData.getStoreType());  //储粮方式
                apiData.setHwrl(sysData.getStorageMax());  //货位容量
                apiData.setAjmc(sysData.getAjmc());  //廒间名称
                apiData.setAjcd(sysData.getAjcd());  //廒间长度
                apiData.setAjkd(sysData.getAjkd());  //廒间宽度
                apiData.setAjgd(sysData.getAjgd());  //廒间高度
                apiData.setAjsjcr(sysData.getAjsjcr());  //廒间设计仓容
                apiData.setAjsjcr01(null);  //廒间实际仓容
                apiData.setAjlxdh(sysData.getAjlxdh());  //廒间联系电话
                apiData.setAjjd(null);  //廒间经度
                apiData.setAjwd(null);  //廒间纬度
                apiData.setAjqyrq(sysData.getAjqyrq());  //廒间启用日期
                apiData.setAjzt(sysData.getAjzt());  //廒间状态
                apiData.setAjsyzt("");  //廒间使用状态
                apiData.setSfyx("");  //是否有效

                apiData.setBizId(sysData.getId());
                apiData.setBizId(sysData.getAjdh());
                apiData.setUpdateTime(new Date());

                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setId(sysData.getAjdh());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                infoData.setInteId(WhjlConstant.API_CODE_1107);
                infoData.setInteId(WhjlConstant.API_CODE_1106);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getId());
                infoData.setDataId(sysData.getAjdh());
                infoData.setRemarks("备注信息");

                //设置操作标志
@@ -107,12 +111,12 @@
                apiInfoDataRep.save(infoData);


                log.info("1107---货位-同步数据：{}", apiData.toString());
                log.info("1106---廒间-同步数据：{}", apiData.toString());
            }

        } catch (Exception e) {
            log.error("---1107货位-同步数据执行失败----{}", e.getMessage());
            apiLog.setResult("1107货位信息同步失败：" + e.getMessage());
            log.error("---1106廒间-同步数据执行失败----{}", e.getMessage());
            apiLog.setResult("1106廒间信息同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);
        }
    }

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,119 @@
package com.fzzy.async.whhpjl.impl;

import com.alibaba.fastjson.JSON;
import com.fzzy.api.Constant;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1108;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Date;
import java.util.List;

/**
 * è´§ä½ä¿¡æ¯
 *
 * @Author:YAN
 */
@Slf4j
@Component
public class Fz40ToWhjlSync1108 {

    @Autowired
    private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;

    /**
     * è´§ä½ä¿¡æ¯
     *
     * @param kqdm
     * @param deptId
     * @param start
     * @param end
     */
    public void syncData(String kqdm, String deptId, Date start, Date end) {
        log.info("-------------1107接口数据开始同步------------------");

        //同步数据，只记录失败的信息
        ApiLog apiLog = new ApiLog();
        apiLog.setType(ApiLog.TYPE_SYNC);
        apiLog.setKqdm(deptId);
        apiLog.setUploadTime(new Date());
        apiLog.setInteId(Constant.API_CODE_1107);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());

        try {
            List<Fz40WhjlDefaultDepot> list = fz40ToWhjlSync1107Rep.listApi1107(deptId.substring(0, 4));
            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到单位信息------------------");
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1108 apiData;
            for (Fz40WhjlDefaultDepot sysData : list) {
                apiData = new WhjlApi1108();
                apiData.setHwbh(sysData.getId());  //货位编号
                apiData.setJlqybh("");  //军粮企业编号
                apiData.setJlqymc("");  //军粮企业名称
                apiData.setJgzdbh("");  //军供站点编号
                apiData.setJlqymc("");  //军供站点名称
                apiData.setSscfbh(sysData.getBuildingId());  //仓房编号
                apiData.setSscfmc("");  //仓房名称
                apiData.setSsajbh(sysData.getGranaryId()); //廒间编号
                apiData.setAjmc("");  //廒间名称
                apiData.setHwmc(sysData.getName());  //货位名称
                apiData.setHwqyrq(sysData.getStoreDate());  //货位启用日期
                apiData.setHwzt(sysData.getDepotStatus());  //货位状态
                apiData.setClfs(sysData.getStoreType());  //储粮方式
                apiData.setHwrl(sysData.getStorageMax());  //货位容量
                apiData.setSfyx("");  //是否有效

                apiData.setBizId(sysData.getId());
                apiData.setUpdateTime(new Date());

                //持久化保存，单独存入非国标接口表
                ApiInfoData infoData = new ApiInfoData();
                infoData.setId(sysData.getId());
                infoData.setKqdm(kqdm);
                infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                infoData.setInteId(WhjlConstant.API_CODE_1107);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(sysData.getId());
                infoData.setRemarks("备注信息");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                    infoData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
                    infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
                }

                infoData.setData(JSON.toJSONString(apiData));
                apiInfoDataRep.save(infoData);


                log.info("1107---货位-同步数据：{}", apiData.toString());
            }

        } catch (Exception e) {
            log.error("---1107货位-同步数据执行失败----{}", e.getMessage());
            apiLog.setResult("1107货位信息同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);
        }
    }
}

 src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1112.java

ÎļþÃû´Ó src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1111.java ÐÞ¸Ä
@@ -10,7 +10,7 @@
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDevice;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1111Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1112;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@
 */
@Slf4j
@Component
public class Fz40ToWhjlSync1111 {
public class Fz40ToWhjlSync1112 {

    @Autowired
    private Fz40ToWhjlSync1111Rep fz40ToWhjlSync1111Rep;
@@ -61,9 +61,9 @@
                return;
            }
            List<ApiInfoData> apiInfoDataList;
            WhjlApi1111 apiData;
            WhjlApi1112 apiData;
            for (Fz40WhjlDefaultDevice sysData : list) {
                apiData = new WhjlApi1111();
                apiData = new WhjlApi1112();
                apiData.setSbbh(sysData.getSbyqdm());  //设备编号
                apiData.setJlqybh("");  //军粮企业编号
                apiData.setJlqymc("");  //军粮企业名称

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1107.view.xml

@@ -5,9 +5,9 @@
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1107</Property>
      <PropertyDef name="hwbh">
      <PropertyDef name="ajbh">
        <Property></Property>
        <Property name="label">货位编号</Property>
        <Property name="label">廒间编号</Property>
      </PropertyDef>
      <PropertyDef name="jlqybh">
        <Property></Property>
@@ -33,55 +33,71 @@
        <Property></Property>
        <Property name="label">仓房名称</Property>
      </PropertyDef>
      <PropertyDef name="ssajbh">
        <Property></Property>
        <Property name="label">廒间编号</Property>
      </PropertyDef>
      <PropertyDef name="ajmc">
        <Property></Property>
        <Property name="label">廒间名称</Property>
      </PropertyDef>
      <PropertyDef name="hwmc">
        <Property></Property>
        <Property name="label">货位名称</Property>
      <PropertyDef name="ajcd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间长度</Property>
        <Property name="displayFormat">#0.0ç±³</Property>
      </PropertyDef>
      <PropertyDef name="hwqyrq">
      <PropertyDef name="ajkd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间宽度</Property>
        <Property name="displayFormat">#0.0ç±³</Property>
      </PropertyDef>
      <PropertyDef name="ajgd">
        <Property></Property>
        <Property name="label">廒间高度</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#0.0ç±³</Property>
      </PropertyDef>
      <PropertyDef name="ajsjcr">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间设计仓容</Property>
        <Property name="displayFormat">#0.00吨</Property>
      </PropertyDef>
      <PropertyDef name="ajsjcr01">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间实际仓容</Property>
        <Property name="displayFormat">#0.00吨</Property>
      </PropertyDef>
      <PropertyDef name="ajlxdh">
        <Property></Property>
        <Property name="label">廒间联系电话</Property>
      </PropertyDef>
      <PropertyDef name="ajjd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间经度</Property>
        <Property name="displayFormat">#0.000000度</Property>
      </PropertyDef>
      <PropertyDef name="ajwd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间纬度</Property>
        <Property name="displayFormat">#0.000000度</Property>
      </PropertyDef>
      <PropertyDef name="ajqyrq">
        <Property name="dataType">Date</Property>
        <Property name="label">货位启用日期</Property>
        <Property name="label">廒间启用日期</Property>
      </PropertyDef>
      <PropertyDef name="hwzt">
      <PropertyDef name="ajzt">
        <Property></Property>
        <Property name="label">货位状态</Property>
        <Property name="label">廒间状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CFZT&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="clfs">
      <PropertyDef name="ajsyzt">
        <Property></Property>
        <Property name="label">储粮方式</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>
            </Collection>
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;HWZT&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="hwrl">
        <Property name="dataType">Double</Property>
        <Property name="label">货位容量</Property>
        <Property name="displayFormat">#0.00吨</Property>
      </PropertyDef>
      <PropertyDef name="sfyx">
        <Property></Property>
@@ -118,7 +134,7 @@
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">whjlApi1107PR#listData</Property>
      <Property name="dataProvider">WhjlApi1107PR#listData</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
@@ -205,40 +221,44 @@
        <RowSelectorColumn>
          <Property name="caption">上传</Property>
        </RowSelectorColumn>
        <DataColumn name="hwmc">
          <Property name="property">hwmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jlqymc">
          <Property name="property">jlqymc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jgzdmc">
          <Property name="property">jgzdmc</Property>
        <DataColumn name="ajmc">
          <Property name="property">ajmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sscfmc">
          <Property name="property">sscfmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajmc">
          <Property name="property">ajmc</Property>
        <DataColumn name="ajcd">
          <Property name="property">ajcd</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="hwqyrq">
          <Property name="property">hwqyrq</Property>
        <DataColumn name="ajkd">
          <Property name="property">ajkd</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="hwzt">
          <Property name="property">hwzt</Property>
        <DataColumn name="ajgd">
          <Property name="property">ajgd</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="clfs">
          <Property name="property">clfs</Property>
        <DataColumn name="ajsjcr">
          <Property name="property">ajsjcr</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="hwrl">
          <Property name="property">hwrl</Property>
        <DataColumn name="ajsjcr01">
          <Property name="property">ajsjcr01</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajqyrq">
          <Property name="property">ajqyrq</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajzt">
          <Property name="property">ajzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajsyzt">
          <Property name="property">ajsyzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sfyx">
@@ -251,7 +271,7 @@
      <Property name="width">60%</Property>
      <Property name="closeable">false</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="caption">货位信息</Property>
      <Property name="caption">廒间信息</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
@@ -279,13 +299,8 @@
          <Property name="labelWidth">120</Property>
          <Property name="labelAlign">right</Property>
          <AutoFormElement>
            <Property name="name">hwbh</Property>
            <Property name="property">hwbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwmc</Property>
            <Property name="property">hwmc</Property>
            <Property name="name">ajbh</Property>
            <Property name="property">ajbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -319,33 +334,63 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ssajbh</Property>
            <Property name="property">ssajbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajmc</Property>
            <Property name="property">ajmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwqyrq</Property>
            <Property name="property">hwqyrq</Property>
            <Property name="name">ajcd</Property>
            <Property name="property">ajcd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwzt</Property>
            <Property name="property">hwzt</Property>
            <Property name="name">ajkd</Property>
            <Property name="property">ajkd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">clfs</Property>
            <Property name="property">clfs</Property>
            <Property name="name">ajgd</Property>
            <Property name="property">ajgd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwrl</Property>
            <Property name="property">hwrl</Property>
            <Property name="name">ajsjcr</Property>
            <Property name="property">ajsjcr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajsjcr01</Property>
            <Property name="property">ajsjcr01</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajlxdh</Property>
            <Property name="property">ajlxdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajjd</Property>
            <Property name="property">ajjd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajwd</Property>
            <Property name="property">ajwd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajqyrq</Property>
            <Property name="property">ajqyrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajzt</Property>
            <Property name="property">ajzt</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajsyzt</Property>
            <Property name="property">ajsyzt</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -384,7 +429,7 @@
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">whjlApi1107PR#saveData</Property>
      <Property name="dataResolver">WhjlApi1107PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
@@ -392,10 +437,10 @@
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="confirmMessage">当前数据删除后无法恢复，请确认要删除么？</Property>
      <Property name="service">whjlApi1107PR#delData</Property>
      <Property name="service">WhjlApi1107PR#delData</Property>
    </AjaxAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">whjlApi1107PR#pushData</Property>
      <Property name="service">WhjlApi1107PR#pushData</Property>
    </AjaxAction>
    <Dialog id="dialogLog">
      <Property name="width">90%</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1108.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1106.view.xml ÐÞ¸Ä
@@ -4,10 +4,10 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1106</Property>
      <PropertyDef name="ajbh">
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1108</Property>
      <PropertyDef name="hwbh">
        <Property></Property>
        <Property name="label">廒间编号</Property>
        <Property name="label">货位编号</Property>
      </PropertyDef>
      <PropertyDef name="jlqybh">
        <Property></Property>
@@ -33,71 +33,55 @@
        <Property></Property>
        <Property name="label">仓房名称</Property>
      </PropertyDef>
      <PropertyDef name="ssajbh">
        <Property></Property>
        <Property name="label">廒间编号</Property>
      </PropertyDef>
      <PropertyDef name="ajmc">
        <Property></Property>
        <Property name="label">廒间名称</Property>
      </PropertyDef>
      <PropertyDef name="ajcd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间长度</Property>
        <Property name="displayFormat">#0.0ç±³</Property>
      </PropertyDef>
      <PropertyDef name="ajkd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间宽度</Property>
        <Property name="displayFormat">#0.0ç±³</Property>
      </PropertyDef>
      <PropertyDef name="ajgd">
      <PropertyDef name="hwmc">
        <Property></Property>
        <Property name="label">廒间高度</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#0.0ç±³</Property>
        <Property name="label">货位名称</Property>
      </PropertyDef>
      <PropertyDef name="ajsjcr">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间设计仓容</Property>
        <Property name="displayFormat">#0.00吨</Property>
      </PropertyDef>
      <PropertyDef name="ajsjcr01">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间实际仓容</Property>
        <Property name="displayFormat">#0.00吨</Property>
      </PropertyDef>
      <PropertyDef name="ajlxdh">
        <Property></Property>
        <Property name="label">廒间联系电话</Property>
      </PropertyDef>
      <PropertyDef name="ajjd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间经度</Property>
        <Property name="displayFormat">#0.000000度</Property>
      </PropertyDef>
      <PropertyDef name="ajwd">
        <Property name="dataType">Double</Property>
        <Property name="label">廒间纬度</Property>
        <Property name="displayFormat">#0.000000度</Property>
      </PropertyDef>
      <PropertyDef name="ajqyrq">
      <PropertyDef name="hwqyrq">
        <Property name="dataType">Date</Property>
        <Property name="label">廒间启用日期</Property>
        <Property name="label">货位启用日期</Property>
      </PropertyDef>
      <PropertyDef name="ajzt">
      <PropertyDef name="hwzt">
        <Property></Property>
        <Property name="label">廒间状态</Property>
        <Property name="label">货位状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CFZT&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="ajsyzt">
      <PropertyDef name="clfs">
        <Property></Property>
        <Property name="label">廒间使用状态</Property>
        <Property name="label">储粮方式</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;HWZT&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">1</Property>
                <Property name="value">袋装</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">瓶装</Property>
              </Entity>
            </Collection>
        </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="hwrl">
        <Property name="dataType">Double</Property>
        <Property name="label">货位容量</Property>
        <Property name="displayFormat">#0.00吨</Property>
      </PropertyDef>
      <PropertyDef name="sfyx">
        <Property></Property>
@@ -134,7 +118,7 @@
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">whjlApi1106PR#listData</Property>
      <Property name="dataProvider">WhjlApi1108PR#listData</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
@@ -221,44 +205,40 @@
        <RowSelectorColumn>
          <Property name="caption">上传</Property>
        </RowSelectorColumn>
        <DataColumn name="ajmc">
          <Property name="property">ajmc</Property>
        <DataColumn name="hwmc">
          <Property name="property">hwmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jlqymc">
          <Property name="property">jlqymc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="jgzdmc">
          <Property name="property">jgzdmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sscfmc">
          <Property name="property">sscfmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajcd">
          <Property name="property">ajcd</Property>
        <DataColumn name="ajmc">
          <Property name="property">ajmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajkd">
          <Property name="property">ajkd</Property>
        <DataColumn name="hwqyrq">
          <Property name="property">hwqyrq</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajgd">
          <Property name="property">ajgd</Property>
        <DataColumn name="hwzt">
          <Property name="property">hwzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajsjcr">
          <Property name="property">ajsjcr</Property>
        <DataColumn name="clfs">
          <Property name="property">clfs</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajsjcr01">
          <Property name="property">ajsjcr01</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajqyrq">
          <Property name="property">ajqyrq</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajzt">
          <Property name="property">ajzt</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="ajsyzt">
          <Property name="property">ajsyzt</Property>
        <DataColumn name="hwrl">
          <Property name="property">hwrl</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="sfyx">
@@ -271,7 +251,7 @@
      <Property name="width">60%</Property>
      <Property name="closeable">false</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="caption">廒间信息</Property>
      <Property name="caption">货位信息</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
@@ -299,8 +279,13 @@
          <Property name="labelWidth">120</Property>
          <Property name="labelAlign">right</Property>
          <AutoFormElement>
            <Property name="name">ajbh</Property>
            <Property name="property">ajbh</Property>
            <Property name="name">hwbh</Property>
            <Property name="property">hwbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwmc</Property>
            <Property name="property">hwmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -334,63 +319,33 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ssajbh</Property>
            <Property name="property">ssajbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajmc</Property>
            <Property name="property">ajmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajcd</Property>
            <Property name="property">ajcd</Property>
            <Property name="name">hwqyrq</Property>
            <Property name="property">hwqyrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajkd</Property>
            <Property name="property">ajkd</Property>
            <Property name="name">hwzt</Property>
            <Property name="property">hwzt</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajgd</Property>
            <Property name="property">ajgd</Property>
            <Property name="name">clfs</Property>
            <Property name="property">clfs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajsjcr</Property>
            <Property name="property">ajsjcr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajsjcr01</Property>
            <Property name="property">ajsjcr01</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajlxdh</Property>
            <Property name="property">ajlxdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajjd</Property>
            <Property name="property">ajjd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajwd</Property>
            <Property name="property">ajwd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajqyrq</Property>
            <Property name="property">ajqyrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajzt</Property>
            <Property name="property">ajzt</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajsyzt</Property>
            <Property name="property">ajsyzt</Property>
            <Property name="name">hwrl</Property>
            <Property name="property">hwrl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -429,7 +384,7 @@
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">whjlApi1106PR#saveData</Property>
      <Property name="dataResolver">WhjlApi1108PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
@@ -437,10 +392,10 @@
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="confirmMessage">当前数据删除后无法恢复，请确认要删除么？</Property>
      <Property name="service">whjlApi1106PR#delData</Property>
      <Property name="service">WhjlApi1108PR#delData</Property>
    </AjaxAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">whjlApi1106PR#pushData</Property>
      <Property name="service">WhjlApi1108PR#pushData</Property>
    </AjaxAction>
    <Dialog id="dialogLog">
      <Property name="width">90%</Property>

 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml

ÎļþÃû´Ó src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1111.view.xml ÐÞ¸Ä
@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1111</Property>
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1112</Property>
      <PropertyDef name="sbbh">
        <Property></Property>
        <Property name="label">设备编号</Property>
@@ -190,7 +190,7 @@
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">whjlApi1111PR#listData</Property>
      <Property name="dataProvider">whjlApi1112PR#listData</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
@@ -549,7 +549,7 @@
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">whjlApi1111PR#saveData</Property>
      <Property name="dataResolver">whjlApi1112PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
@@ -557,10 +557,10 @@
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="confirmMessage">当前数据删除后无法恢复，请确认要删除么？</Property>
      <Property name="service">whjlApi1111PR#delData</Property>
      <Property name="service">whjlApi1112PR#delData</Property>
    </AjaxAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">whjlApi1111PR#pushData</Property>
      <Property name="service">whjlApi1112PR#pushData</Property>
    </AjaxAction>
    <Dialog id="dialogLog">
      <Property name="width">90%</Property>

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1106.java

ÎļþÒÑɾ³ý

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1107.java

@@ -8,10 +8,10 @@
import java.util.Date;

/**
 * ä»“储设施设备-货位信息
 * ä»“储设施设备-廒间信息
 *
 * @author czt
 * @date 2023/8/2  17:15
 * @date 2023/8/2  17:00
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,21 +21,26 @@
     */
    private static final long serialVersionUID = 1L;

    private String hwbh;  //货位编号
    private String ajbh;  //廒间编号
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String sscfbh;  //仓房编号
    private String sscfmc;  //仓房名称
    private String ssajbh;  //廒间编号
    private String ajmc;  //廒间名称
    private String hwmc;  //货位名称
    private Double ajcd;  //廒间长度
    private Double ajkd;  //廒间宽度
    private Double ajgd;  //廒间高度
    private Double ajsjcr;  //廒间设计仓容
    private Double ajsjcr01;  //廒间实际仓容
    private String ajlxdh;  //廒间联系电话
    private Double ajjd;  //廒间经度
    private Double ajwd;  //廒间纬度
    @JSONField(format = "yyyy-MM-dd")
    private Date hwqyrq;  //货位启用日期
    private String hwzt;  //货位状态
    private String clfs;  //储粮方式
    private Double hwrl;  //货位容量
    private Date ajqyrq;  //廒间启用日期
    private String ajzt;  //廒间状态
    private String ajsyzt;  //廒间使用状态
    private String sfyx;  //是否有效
    private String bz;  //备注
    

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1108.java

@@ -1,15 +1,17 @@
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.Date;

/**
 * ä»“储设施设备-仓储设施电子档案
 * ä»“储设施设备-货位信息
 *
 * @author czt
 * @date 2023/8/2  17:25
 * @date 2023/8/2  17:15
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -19,19 +21,32 @@
     */
    private static final long serialVersionUID = 1L;

    private String dadm;  //档案代码
    private String hwbh;  //货位编号
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String cfbh;  //仓房编号
    private String sscfbh;  //仓房编号
    private String sscfmc;  //仓房名称
    private String dalx;  //档案类型
    private String damc;  //档案名称
    private String dawj;  //档案文件
    private String ssajbh;  //廒间编号
    private String ajmc;  //廒间名称
    private String hwmc;  //货位名称
    @JSONField(format = "yyyy-MM-dd")
    private Date hwqyrq;  //货位启用日期
    private String hwzt;  //货位状态
    private String clfs;  //储粮方式
    private Double hwrl;  //货位容量
    private String sfyx;  //是否有效
    private String bz;  //备注


    //单独增加，不进行上传
    @JSONField(serialize = false)
    private String bizId;  //业务ID
    @JSONField(serialize = false)
    private Date updateTime;  //最后更新时间
    @JSONField(serialize = false)
    private String czbz;  //操作标志
    @JSONField(serialize = false)
    private String kqdm;  //库区代码

}

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java

@@ -1,17 +1,15 @@
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.Date;

/**
 * ä»“储设施设备-仓储设施维护记录
 * ä»“储设施设备-仓储设施电子档案
 *
 * @author czt
 * @date 2023/8/2  17:35
 * @date 2023/8/2  17:25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,24 +19,17 @@
     */
    private static final long serialVersionUID = 1L;

    private String whjlhb;  //维护记录编号
    private String dadm;  //档案代码
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String cfbh;  //仓房编号
    private String sscfmc;  //仓房名称
    @JSONField(format = "yyyy-MM-dd")
    private Date jcrq;  //检查日期
    private String jclx;  //检查类型
    private String jxlr;  //检修内容
    private String shqk;  //损害情况
    private String wxff;  //维修方法
    private String wxqk;  //维修情况
    private String jxr;  //检修人
    private String ysr;  //验收人
    @JSONField(format = "yyyy-MM-dd")
    private Date wcrq;  //完成日期
    private String dalx;  //档案类型
    private String damc;  //档案名称
    private String dawj;  //档案文件
    private String sfyx;  //是否有效
    private String bz;  //备注



 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1110.java

@@ -8,10 +8,10 @@
import java.util.Date;

/**
 * ä»“储设施设备-仓储设备报废记录
 * ä»“储设施设备-仓储设施维护记录
 *
 * @author czt
 * @date 2023/8/2  17:45
 * @date 2023/8/2  17:35
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,7 +21,7 @@
     */
    private static final long serialVersionUID = 1L;

    private String ssbfjlbh;  //设施报废记录编号
    private String whjlhb;  //维护记录编号
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
@@ -29,13 +29,18 @@
    private String cfbh;  //仓房编号
    private String sscfmc;  //仓房名称
    @JSONField(format = "yyyy-MM-dd")
    private Date sqrq;  //申请日期
    private String bfyy;  //报废原因
    private String sqr;  //申请人
    private String spr;  //审批人
    private Date jcrq;  //检查日期
    private String jclx;  //检查类型
    private String jxlr;  //检修内容
    private String shqk;  //损害情况
    private String wxff;  //维修方法
    private String wxqk;  //维修情况
    private String jxr;  //检修人
    private String ysr;  //验收人
    @JSONField(format = "yyyy-MM-dd")
    private Date sprq;  //审批日期
    private String spyj;  //审批意见
    private Date wcrq;  //完成日期
    private String bz;  //备注



}

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1111.java

@@ -8,10 +8,10 @@
import java.util.Date;

/**
 * ä»“储设施设备-仓储设备信息
 * ä»“储设施设备-仓储设备报废记录
 *
 * @author czt
 * @date 2023/8/2  17:55
 * @date 2023/8/2  17:45
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,52 +21,21 @@
     */
    private static final long serialVersionUID = 1L;

    private String sbbh;  //设备编号
    private String ssbfjlbh;  //设施报废记录编号
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String cfbh;  //仓房编号
    private String sscfmc;  //仓房名称
    private String sblxbh;  //设备类型编号
    private String sbmc;  //设备名称
    private String sbzt;  //设备状态
    private String ggxh;  //规格型号
    private String zzdw;  //制造单位
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date cgsj;  //采购时间
    private String gl;  //功率
    private String cl;  //产量
    private String wxcc;  //外形尺寸
    private String zygn;  //主要功能
    private String bgfzrmc;  //保管负责人
    private String whgzrmc;  //维护负责人
    private String czfzrmc;  //操作负责人
    private String zynhyq;  //主要保管要求
    @JSONField(format = "yyyy-MM-dd")
    private Date xgrq;  //修改日期
    private String tbrmc;  //填表人名称
    private String sfytkk;  //是否云台可控
    private String ipdz;  //IP地址
    private Integer gldk;  //管理端口
    private String sdkdk;  //Sdk端口
    private String zh;  //帐号
    private String mm;  //密码
    private Integer rstpdz;  //Rtsp地址
    private String rtspdk;  //rtsp端口
    private String sbxlh;  //设备序列号
    private String jklx;  //监控类型
    private String sfyx;  //是否有效
    private Date sqrq;  //申请日期
    private String bfyy;  //报废原因
    private String sqr;  //申请人
    private String spr;  //审批人
    @JSONField(format = "yyyy-MM-dd")
    private Date sprq;  //审批日期
    private String spyj;  //审批意见
    private String bz;  //备注

    //单独增加，不进行上传
    @JSONField(serialize = false)
    private String bizId;  //业务ID
    @JSONField(serialize = false)
    private Date updateTime;  //最后更新时间
    @JSONField(serialize = false)
    private String czbz;  //操作标志
    @JSONField(serialize = false)
    private String kqdm;  //库区代码

}

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1112.java

@@ -8,10 +8,10 @@
import java.util.Date;

/**
 * ä»“储设施设备-仓储设备维护记录
 * ä»“储设施设备-仓储设备信息
 *
 * @author czt
 * @date 2023/8/2  18:20
 * @date 2023/8/2  17:55
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,31 +21,52 @@
     */
    private static final long serialVersionUID = 1L;

    private String sbwhjlbh;  //设备维护记录编号
    private String sbbh;  //设备编号
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String sbbh;  //设备编号
    private String cfbh;  //仓房编号
    private String sscfmc;  //仓房名称
    private String sblxbh;  //设备类型编号
    private String sbmc;  //设备名称
    private String sbzt;  //设备状态
    private String ggxh;  //规格型号
    private String zzdw;  //制造单位
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date cgsj;  //采购时间
    private String gl;  //功率
    private String cl;  //产量
    private String wxcc;  //外形尺寸
    private String zygn;  //主要功能
    private String bgfzrmc;  //保管负责人
    private String whgzrmc;  //维护负责人
    private String czfzrmc;  //操作负责人
    private String zynhyq;  //主要保管要求
    @JSONField(format = "yyyy-MM-dd")
    private Date wbrq;  //维保日期
    private String wbdw;  //维保单位
    private String wbr;  //维保人
    private String lxdh;  //联系电话
    private String whlr;  //维护内容
    private String whjl;  //维护记录
    private String fxwt;  //发现问题
    private String jjcs;  //解决措施
    @JSONField(format = "yyyy-MM-dd")
    private Date xcwbrq;  //下次维保日期
    private String ysr;  //验收人
    private String whjy;  //维护建议
    private String whjlzp;  //维护记录照片
    private Date xgrq;  //修改日期
    private String tbrmc;  //填表人名称
    private String sfytkk;  //是否云台可控
    private String ipdz;  //IP地址
    private Integer gldk;  //管理端口
    private String sdkdk;  //Sdk端口
    private String zh;  //帐号
    private String mm;  //密码
    private Integer rstpdz;  //Rtsp地址
    private String rtspdk;  //rtsp端口
    private String sbxlh;  //设备序列号
    private String jklx;  //监控类型
    private String sfyx;  //是否有效
    private String bz;  //备注
    private String zpid;  //照片id
    private String zpmc;  //照片名称
    private String zplj;  //照片路径
    private String zpdx;  //照片大小

    //单独增加，不进行上传
    @JSONField(serialize = false)
    private String bizId;  //业务ID
    @JSONField(serialize = false)
    private Date updateTime;  //最后更新时间
    @JSONField(serialize = false)
    private String czbz;  //操作标志
    @JSONField(serialize = false)
    private String kqdm;  //库区代码

}

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1113.java

@@ -5,12 +5,13 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.Date;

/**
 * ä»“储设施设备-仓储设备维修记录
 * ä»“储设施设备-仓储设备维护记录
 *
 * @author czt
 * @date 2023/8/2  18:40
 * @date 2023/8/2  18:20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -20,33 +21,31 @@
     */
    private static final long serialVersionUID = 1L;

    private String sbwxjlbh;  //设备维修记录编号
    private String sbwhjlbh;  //设备维护记录编号
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String sbbh;  //设备编号
    private String sbmc;  //设备名称
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private String wxkssj;  //开始维修时间
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private String wxjssj;  //结束维修时间
    private String wxdw;  //维修单位
    private String lxr;  //联系人
    @JSONField(format = "yyyy-MM-dd")
    private Date wbrq;  //维保日期
    private String wbdw;  //维保单位
    private String wbr;  //维保人
    private String lxdh;  //联系电话
    private String gzxx;  //故障现象
    private String gzyy;  //故障原因
    private String wxff;  //维修方法
    private String gxpjxx;  //更新配件信息
    private String wxhyxzt;  //维修后运行状态
    private int sysj;  //试用时间
    private String wxfy;  //维修费用
    private String whlr;  //维护内容
    private String whjl;  //维护记录
    private String fxwt;  //发现问题
    private String jjcs;  //解决措施
    @JSONField(format = "yyyy-MM-dd")
    private Date xcwbrq;  //下次维保日期
    private String ysr;  //验收人
    private String jl;  //结论
    private String wxjlzp;  //维护记录照片
    private String whjy;  //维护建议
    private String whjlzp;  //维护记录照片
    private String bz;  //备注
    private String zpid;  //照片id
    private String zpmc;  //照片名称
    private String zplj;  //照片路径
    private int zpdx;  //照片大小
    private String zpdx;  //照片大小

}

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java

@@ -5,13 +5,12 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.Date;

/**
 * ä»“储设施设备-仓储设备报废记录
 * ä»“储设施设备-仓储设备维修记录
 *
 * @author czt
 * @date 2023/8/2  18:50
 * @date 2023/8/2  18:40
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,22 +20,33 @@
     */
    private static final long serialVersionUID = 1L;

    private String sbbfjlbh;  //设备报废记录编号
    private String sbwxjlbh;  //设备维修记录编号
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String sbbh;  //设备编号
    private String sbmc;  //设备名称
    @JSONField(format = "yyyy-MM-dd")
    private Date bfsqsj;  //报废申请日期
    private String sqr;  //申请人
    private String ysynx;  //已使用年限
    private String bfyy;  //报废原因
    private String pzr;  //批准人
    @JSONField(format = "yyyy-MM-dd")
    private Date pzrq;  //批准日期
    private String sm;  //说明
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private String wxkssj;  //开始维修时间
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private String wxjssj;  //结束维修时间
    private String wxdw;  //维修单位
    private String lxr;  //联系人
    private String lxdh;  //联系电话
    private String gzxx;  //故障现象
    private String gzyy;  //故障原因
    private String wxff;  //维修方法
    private String gxpjxx;  //更新配件信息
    private String wxhyxzt;  //维修后运行状态
    private int sysj;  //试用时间
    private String wxfy;  //维修费用
    private String ysr;  //验收人
    private String jl;  //结论
    private String wxjlzp;  //维护记录照片
    private String bz;  //备注

    private String zpid;  //照片id
    private String zpmc;  //照片名称
    private String zplj;  //照片路径
    private int zpdx;  //照片大小
}

 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.fzzy.otherview.whhpjl.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.Date;

/**
 * ä»“储设施设备-仓储设备报废记录
 *
 * @author czt
 * @date 2023/8/2  18:50
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class WhjlApi1115 implements Serializable {
    /**
     *
     */
    private static final long serialVersionUID = 1L;

    private String sbbfjlbh;  //设备报废记录编号
    private String jlqybh;  //军粮企业编号
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String sbbh;  //设备编号
    private String sbmc;  //设备名称
    @JSONField(format = "yyyy-MM-dd")
    private Date bfsqsj;  //报废申请日期
    private String sqr;  //申请人
    private String ysynx;  //已使用年限
    private String bfyy;  //报废原因
    private String pzr;  //批准人
    @JSONField(format = "yyyy-MM-dd")
    private Date pzrq;  //批准日期
    private String sm;  //说明
    private String bz;  //备注

}

 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1107PR.java

@@ -24,13 +24,12 @@
import java.util.List;

/**
 * è´§ä½ä¿¡æ¯
 * å»’间信息
 *
 * @Author:YAN
 */
@Component
public class WhjlApi1107PR {


    @Autowired
    private ApiCommonService apiCommonService;
@@ -41,32 +40,32 @@

    /**
     * èŽ·å–列表信息
     * whjlApi1107PR#listData
     * whjlApi1106PR#listData
     *
     * @return
     */
    @DataProvider
    public List<WhjlApi1107> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1107> list = new ArrayList<>();
        WhjlApi1107 whjlApi1107;
        WhjlApi1107 whjlApi1106;
        for (ApiInfoData infoData : result) {
            whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
            whjlApi1107.setKqdm(infoData.getKqdm());
            whjlApi1107.setCzbz(infoData.getCzbz());
            whjlApi1107.setUpdateTime(infoData.getUpdateTime());
            whjlApi1107.setBizId(infoData.getDataId());
            list.add(whjlApi1107);
            whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
            whjlApi1106.setKqdm(infoData.getKqdm());
            whjlApi1106.setCzbz(infoData.getCzbz());
            whjlApi1106.setUpdateTime(infoData.getUpdateTime());
            whjlApi1106.setBizId(infoData.getDataId());
            list.add(whjlApi1106);
        }
        return list;
    }

    /**
     * æ›´æ–°æˆ–修改
     * whjlApi1107PR#saveData
     * whjlApi1106PR#saveData
     *
     * @param data
     * @return
@@ -77,7 +76,7 @@
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1107);
        infoData.setInteId(WhjlConstant.API_CODE_1106);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
@@ -89,7 +88,7 @@

    /**
     * åˆ é™¤
     * whjlApi1107PR#delData
     * whjlApi1106PR#delData
     *
     * @param data
     * @return
@@ -102,7 +101,7 @@

    /**
     * ä¸Šä¼ 
     * whjlApi1107PR#pushData
     * whjlApi1106PR#pushData
     *
     * @param items
     * @return
@@ -120,7 +119,7 @@
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1106);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -128,12 +127,8 @@
            return "系统没有当前推送协议配置，执行失败";
        }

        //推送，数据为集合形式


        //推送成功，更新数据上传状态
        ApiInfoData infoData;
        ResponseDto responseDto;
        ApiInfoData infoData;
        for (WhjlApi1107 data : items) {
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
@@ -143,7 +138,7 @@
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1107);
                    infoData.setInteId(WhjlConstant.API_CODE_1106);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1108PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java ÐÞ¸Ä
@@ -15,7 +15,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1106;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1108;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -24,12 +24,13 @@
import java.util.List;

/**
 * å»’间信息
 * è´§ä½ä¿¡æ¯
 *
 * @Author:YAN
 */
@Component
public class WhjlApi1106PR {
public class WhjlApi1108PR {


    @Autowired
    private ApiCommonService apiCommonService;
@@ -40,43 +41,43 @@

    /**
     * èŽ·å–列表信息
     * whjlApi1106PR#listData
     * whjlApi1107PR#listData
     *
     * @return
     */
    @DataProvider
    public List<WhjlApi1106> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1106);
    public List<WhjlApi1108> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1107);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1106> list = new ArrayList<>();
        WhjlApi1106 whjlApi1106;
        List<WhjlApi1108> list = new ArrayList<>();
        WhjlApi1108 whjlApi1107;
        for (ApiInfoData infoData : result) {
            whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1106.class);
            whjlApi1106.setKqdm(infoData.getKqdm());
            whjlApi1106.setCzbz(infoData.getCzbz());
            whjlApi1106.setUpdateTime(infoData.getUpdateTime());
            whjlApi1106.setBizId(infoData.getDataId());
            list.add(whjlApi1106);
            whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1108.class);
            whjlApi1107.setKqdm(infoData.getKqdm());
            whjlApi1107.setCzbz(infoData.getCzbz());
            whjlApi1107.setUpdateTime(infoData.getUpdateTime());
            whjlApi1107.setBizId(infoData.getDataId());
            list.add(whjlApi1107);
        }
        return list;
    }

    /**
     * æ›´æ–°æˆ–修改
     * whjlApi1106PR#saveData
     * whjlApi1107PR#saveData
     *
     * @param data
     * @return
     */
    @DataResolver
    public void saveData(WhjlApi1106 data) {
    public void saveData(WhjlApi1108 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1106);
        infoData.setInteId(WhjlConstant.API_CODE_1107);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
@@ -88,26 +89,26 @@

    /**
     * åˆ é™¤
     * whjlApi1106PR#delData
     * whjlApi1107PR#delData
     *
     * @param data
     * @return
     */
    @Expose
    public String delData(WhjlApi1106 data) {
    public String delData(WhjlApi1108 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }

    /**
     * ä¸Šä¼ 
     * whjlApi1106PR#pushData
     * whjlApi1107PR#pushData
     *
     * @param items
     * @return
     */
    @Expose
    public String pushData(List<WhjlApi1106> items) {
    public String pushData(List<WhjlApi1108> items) {

        String result = "";

@@ -119,7 +120,7 @@
        }

        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1106);
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1107);

        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -127,9 +128,13 @@
            return "系统没有当前推送协议配置，执行失败";
        }

        ResponseDto responseDto;
        //推送，数据为集合形式


        //推送成功，更新数据上传状态
        ApiInfoData infoData;
        for (WhjlApi1106 data : items) {
        ResponseDto responseDto;
        for (WhjlApi1108 data : items) {
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
@@ -138,7 +143,7 @@
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1106);
                    infoData.setInteId(WhjlConstant.API_CODE_1107);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());


 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1112PR.java

ÎļþÃû´Ó src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1111PR.java ÐÞ¸Ä
@@ -15,7 +15,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1111;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1112;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -29,7 +29,7 @@
 * @Author:YAN
 */
@Component
public class WhjlApi1111PR {
public class WhjlApi1112PR {


    @Autowired
@@ -46,15 +46,15 @@
     * @return
     */
    @DataProvider
    public List<WhjlApi1111> listData() {
    public List<WhjlApi1112> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1111);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1111> list = new ArrayList<>();
        WhjlApi1111 whjlApi1111;
        List<WhjlApi1112> list = new ArrayList<>();
        WhjlApi1112 whjlApi1111;
        for (ApiInfoData infoData : result) {
            whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1111.class);
            whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1112.class);
            whjlApi1111.setKqdm(infoData.getKqdm());
            whjlApi1111.setCzbz(infoData.getCzbz());
            whjlApi1111.setUpdateTime(infoData.getUpdateTime());
@@ -72,7 +72,7 @@
     * @return
     */
    @DataResolver
    public void saveData(WhjlApi1111 data) {
    public void saveData(WhjlApi1112 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
@@ -95,7 +95,7 @@
     * @return
     */
    @Expose
    public String delData(WhjlApi1111 data) {
    public String delData(WhjlApi1112 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }
@@ -108,7 +108,7 @@
     * @return
     */
    @Expose
    public String pushData(List<WhjlApi1111> items) {
    public String pushData(List<WhjlApi1112> items) {

        String result = "";

@@ -130,7 +130,7 @@

        ApiInfoData infoData;
        ResponseDto responseDto;
        for (WhjlApi1111 data : items) {
        for (WhjlApi1112 data : items) {
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {

 src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java

@@ -225,10 +225,10 @@
        }
        param.setInteCategory(WhjlConstant.API_CATEGORY_11);
        param.setInteId(WhjlConstant.API_CODE_1106);
        List<WhjlApi1106> list = new ArrayList<>();
        WhjlApi1106 whjlApi1106;
        List<WhjlApi1107> list = new ArrayList<>();
        WhjlApi1107 whjlApi1106;
        for (ApiInfoData infoData : items) {
            whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1106.class);
            whjlApi1106 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
            whjlApi1106.setKqdm(infoData.getKqdm());
            whjlApi1106.setCzbz(infoData.getCzbz());
            whjlApi1106.setUpdateTime(infoData.getUpdateTime());
@@ -263,10 +263,10 @@
        }
        param.setInteCategory(WhjlConstant.API_CATEGORY_11);
        param.setInteId(WhjlConstant.API_CODE_1107);
        List<WhjlApi1107> list = new ArrayList<>();
        WhjlApi1107 whjlApi1107;
        List<WhjlApi1108> list = new ArrayList<>();
        WhjlApi1108 whjlApi1107;
        for (ApiInfoData infoData : items) {
            whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1107.class);
            whjlApi1107 = JSONObject.parseObject(infoData.getData(), WhjlApi1108.class);
            whjlApi1107.setKqdm(infoData.getKqdm());
            whjlApi1107.setCzbz(infoData.getCzbz());
            whjlApi1107.setUpdateTime(infoData.getUpdateTime());
@@ -301,10 +301,10 @@
        }
        param.setInteCategory(WhjlConstant.API_CATEGORY_11);
        param.setInteId(WhjlConstant.API_CODE_1111);
        List<WhjlApi1111> list = new ArrayList<>();
        WhjlApi1111 whjlApi1111;
        List<WhjlApi1112> list = new ArrayList<>();
        WhjlApi1112 whjlApi1111;
        for (ApiInfoData infoData : items) {
            whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1111.class);
            whjlApi1111 = JSONObject.parseObject(infoData.getData(), WhjlApi1112.class);
            whjlApi1111.setKqdm(infoData.getKqdm());
            whjlApi1111.setCzbz(infoData.getCzbz());
            whjlApi1111.setUpdateTime(infoData.getUpdateTime());