YYC
2023-08-28 ba9562289ab7e67c9eeca4d518ddbb3e68ed5dc2
上海新增页面--检斤单,倒仓倒入
已修改6个文件
已添加1个文件
1485 ■■■■■ 文件已修改
src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/ShApi2101.view.xml 667 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml 393 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java 190 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java 200 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/ApiInfoDataRep.java
@@ -3,8 +3,11 @@
import com.fzzy.api.entity.ApiInfoData;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
public interface ApiInfoDataRep extends JpaRepository<ApiInfoData, String>, JpaSpecificationExecutor<ApiInfoData> {
@@ -12,6 +15,7 @@
    /**
     * æ ¹æ®æ•°æ®å†…容ID查询数据
     *
     * @param dataId
     * @return
     */
@@ -20,10 +24,23 @@
    /**
     * æ ¹æ®æŽ¥å£ç¼–码查询数据
     *
     * @param inteId
     * @return
     */
    @Query("from ApiInfoData where inteId=:inteId ")
    List<ApiInfoData> getDataByInteId(@Param("inteId") String inteId);
    /**
     * æ ¹æ®è¡¨å•主键更新操作标志状态
     *
     * @param id   ä¸»é”®ID
     * @param czbz æ“ä½œæ ‡å¿—
     * @return
     */
    @Transactional
    @Modifying
    @Query(value = "update ApiInfoData set czbz=:czbz ,data=:data where id=:id ")
    int updateStatus(@Param("id") String id, @Param("data") String data, @Param("czbz") String czbz);
}
src/main/java/com/fzzy/otherview/sh2023/ShApi2101.view.xml
@@ -3,9 +3,672 @@
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2101</Property>
      <PropertyDef name="jjdh">
        <Property></Property>
        <Property name="label">检斤单号</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="jjrq">
        <Property name="dataType">Date</Property>
        <Property name="label">检斤日期</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="inbillno">
        <Property></Property>
        <Property name="label">驳运单号/库际调拨单号</Property>
      </PropertyDef>
      <PropertyDef name="jzrq">
        <Property name="dataType">Date</Property>
        <Property name="label">记账日期</Property>
      </PropertyDef>
      <PropertyDef name="zydh">
        <Property></Property>
        <Property name="label">作业单号</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="zylx">
        <Property></Property>
        <Property name="label">作业类型</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="value">1:入库作业</Property>
                <Property name="key">1</Property>
              </Entity>
              <Entity>
                <Property name="value">2:中转调出</Property>
                <Property name="key">2</Property>
              </Entity>
              <Entity>
                <Property name="value">3:中转进仓</Property>
                <Property name="key">3</Property>
              </Entity>
              <Entity>
                <Property name="value">4:出库作业</Property>
                <Property name="key">4</Property>
              </Entity>
              <Entity>
                <Property name="value">5:库存调出</Property>
                <Property name="key">5</Property>
              </Entity>
              <Entity>
                <Property name="value">6:库存调入</Property>
                <Property name="key">6</Property>
              </Entity>
              <Entity>
                <Property name="value">7:移仓桩</Property>
                <Property name="key">7</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="khmc">
        <Property></Property>
        <Property name="label">客户编号</Property>
      </PropertyDef>
      <PropertyDef name="psplan">
        <Property></Property>
        <Property name="label">来粮预报号/提货单号</Property>
      </PropertyDef>
      <PropertyDef name="hth">
        <Property></Property>
        <Property name="label">合同号</Property>
      </PropertyDef>
      <PropertyDef name="cch">
        <Property></Property>
        <Property name="label">车船号</Property>
      </PropertyDef>
      <PropertyDef name="zzchh">
        <Property></Property>
        <Property name="label">中转车船号</Property>
      </PropertyDef>
      <PropertyDef name="lspzdmdl">
        <Property></Property>
        <Property name="label">品种大类</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSPZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="lsxzdm">
        <Property></Property>
        <Property name="label">粮食性质代码</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;LSXZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="lldm">
        <Property></Property>
        <Property name="label">来粮代码</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="ajdm">
        <Property></Property>
        <Property name="label">廒间代码</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="hwdm">
        <Property></Property>
        <Property name="label">货位代码</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="yrajdh">
        <Property></Property>
        <Property name="label">移入廒间代码</Property>
      </PropertyDef>
      <PropertyDef name="yrhwdm">
        <Property></Property>
        <Property name="label">移入货位代码</Property>
      </PropertyDef>
      <PropertyDef name="zxb">
        <Property></Property>
        <Property name="label">装卸班</Property>
      </PropertyDef>
      <PropertyDef name="bzwzkl">
        <Property name="dataType">double</Property>
        <Property name="label">包装物增扣量(公斤)</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000000</Property>
      </PropertyDef>
      <PropertyDef name="mz">
        <Property name="dataType">double</Property>
        <Property name="label">毛重(公斤)</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000000</Property>
      </PropertyDef>
      <PropertyDef name="jz">
        <Property name="dataType">double</Property>
        <Property name="label">净重(公斤)</Property>
        <Property name="required">true</Property>
        <Property name="displayFormat">#0.000000</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">数据状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="zhgxsj">
        <Property name="dataType">DateTime</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="bjw">
        <Property></Property>
        <Property name="label">标记位</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="value">黄浦区</Property>
                <Property name="key">huangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">徐汇区</Property>
                <Property name="key">xuhui</Property>
              </Entity>
              <Entity>
                <Property name="value">长宁区</Property>
                <Property name="key">changning</Property>
              </Entity>
              <Entity>
                <Property name="value">静安区</Property>
                <Property name="key">jingan</Property>
              </Entity>
              <Entity>
                <Property name="value">普陀区</Property>
                <Property name="key">putuo</Property>
              </Entity>
              <Entity>
                <Property name="value">虹口区</Property>
                <Property name="key">hongkou</Property>
              </Entity>
              <Entity>
                <Property name="value">杨浦区</Property>
                <Property name="key">yangpu</Property>
              </Entity>
              <Entity>
                <Property name="value">闵行区</Property>
                <Property name="key">minhang</Property>
              </Entity>
              <Entity>
                <Property name="value">宝山区</Property>
                <Property name="key">baoshan</Property>
              </Entity>
              <Entity>
                <Property name="value">嘉定区</Property>
                <Property name="key">jiading</Property>
              </Entity>
              <Entity>
                <Property name="value">浦东新区</Property>
                <Property name="key">pudong</Property>
              </Entity>
              <Entity>
                <Property name="value">金山区</Property>
                <Property name="key">jinshan</Property>
              </Entity>
              <Entity>
                <Property name="value">松江区</Property>
                <Property name="key">songjiang</Property>
              </Entity>
              <Entity>
                <Property name="value">青浦区</Property>
                <Property name="key">qingpu</Property>
              </Entity>
              <Entity>
                <Property name="value">奉贤区</Property>
                <Property name="key">fengxian</Property>
              </Entity>
              <Entity>
                <Property name="value">崇明区</Property>
                <Property name="key">chongming</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="pch">
        <Property></Property>
        <Property name="label">批次号</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务id</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="syncTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">同步时间</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">所属库区</Property>
      </PropertyDef>
      <PropertyDef name="start">
        <Property name="dataType">Date</Property>
        <Property name="label">开始时间</Property>
      </PropertyDef>
      <PropertyDef name="end">
        <Property name="dataType">Date</Property>
        <Property name="label">截止时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="regionPadding:10">
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">sHApi2101PR#listData</Property>
      <Property name="pageSize">15</Property>
    </DataSet>
    <DataSet id="dsQuery">
      <ClientEvent name="onReady">self.insert();</ClientEvent>
      <Property name="dataType">dtParam</Property>
    </DataSet>
    <ToolBar>
      <ToolBarLabel>
        <Property name="text">工具栏:</Property>
        <Property name="style">
          <Property name="font-weight">bold</Property>
        </Property>
      </ToolBarLabel>
      <ToolBarButton>
        <ClientEvent name="onClick">var query = view.get(&quot;#dsQuery&quot;).getData();&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,query).flushAsync();</ClientEvent>
        <Property name="caption">查询</Property>
        <Property name="iconClass">fa fa-search</Property>
        <Property name="width">100</Property>
        <Property name="exClassName">toolbar-button-push</Property>
      </ToolBarButton>
      <ToolBarButton id="btnAdd">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
        <Property name="caption">新增</Property>
        <Property name="iconClass">fa fa-plus</Property>
        <Property name="width">100</Property>
        <Property name="exClassName">toolbar-button</Property>
        <Property name="hideMode">display</Property>
      </ToolBarButton>
      <ToolBarButton id="btnUpdate">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
if(cur){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}</ClientEvent>
        <Property name="caption">修改</Property>
        <Property name="iconClass">fa fa-pencil</Property>
        <Property name="width">100</Property>
        <Property name="exClassName">toolbar-button-warm</Property>
        <Property name="hideMode">display</Property>
      </ToolBarButton>
      <ToolBarButton>
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
view.get(&quot;#ajaxDelUpdate&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
    } else{&#xD;
        cur.set(&quot;czbz&quot;,&quot;d&quot;)&#xD;
    }&#xD;
});&#xD;
</ClientEvent>
        <Property name="caption">标记删除</Property>
        <Property name="iconClass">fa fa-minus</Property>
        <Property name="exClassName">toolbar-button-warn</Property>
        <Property name="width">100</Property>
      </ToolBarButton>
      <ToolBarButton id="btnDel">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
    } else{&#xD;
        cur.remove();&#xD;
    }&#xD;
});&#xD;
</ClientEvent>
        <Property name="caption">直接删除</Property>
        <Property name="iconClass">fa fa-minus</Property>
        <Property name="exClassName">toolbar-button-warn</Property>
        <Property name="width">100</Property>
        <Property name="hideMode">display</Property>
      </ToolBarButton>
      <ToolBarButton>
        <ClientEvent name="onClick">var select = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
if(select &amp;&amp; select.length > 0){&#xD;
    view.get(&quot;#ajaxPush&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
        view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
          $notify(result);&#xD;
    });&#xD;
}else{&#xD;
    $alert(&quot;请勾选上报数据!&quot;);&#xD;
}&#xD;
</ClientEvent>
        <Property name="caption">手动上传</Property>
        <Property name="iconClass">fa fa-hand-o-up</Property>
        <Property name="exClassName">toolbar-button-push</Property>
        <Property name="width">100</Property>
      </ToolBarButton>
      <Fill/>
      <ToolBarButton>
        <Property name="caption">上传记录</Property>
        <Property name="iconClass">fa fa-bars</Property>
        <Property name="exClassName">toolbar-button</Property>
        <Property name="width">100</Property>
      </ToolBarButton>
    </ToolBar>
    <AutoForm>
      <Property name="dataSet">dsQuery</Property>
      <Property name="cols">*,*,*,*</Property>
      <Property name="labelAlign">right</Property>
      <Property name="labelSeparator">:</Property>
      <Property name="labelWidth">90</Property>
      <AutoFormElement>
        <Property name="name">kqdm</Property>
        <Property name="property">kqdm</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">start</Property>
        <Property name="property">start</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">end</Property>
        <Property name="property">end</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">czbz</Property>
        <Property name="property">czbz</Property>
        <Property name="trigger">autoMappingDropDown2</Property>
        <Editor/>
      </AutoFormElement>
    </AutoForm>
    <DataGrid id="dgMain">
      <ClientEvent name="onDataRowDoubleClick">view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
      <Property name="dataSet">dsMain</Property>
      <Property name="selectionMode">multiRows</Property>
      <Property name="readOnly">true</Property>
      <RowNumColumn/>
      <RowSelectorColumn>
        <Property name="caption">上传</Property>
      </RowSelectorColumn>
      <DataColumn name="jjdh">
        <Property name="property">jjdh</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="jjrq">
        <Property name="property">jjrq</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="zydh">
        <Property name="property">zydh</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="zylx">
        <Property name="property">zylx</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="khmc">
        <Property name="property">khmc</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="mz">
        <Property name="property">mz</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="jz">
        <Property name="property">jz</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="czbz">
        <Property name="property">czbz</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="zhgxsj">
        <Property name="property">zhgxsj</Property>
        <Property name="align">center</Property>
      </DataColumn>
    </DataGrid>
    <ToolBar layoutConstraint="bottom">
      <Fill/>
      <DataPilot>
        <Property name="itemCodes">pageSize,pages</Property>
        <Property name="dataSet">dsMain</Property>
      </DataPilot>
    </ToolBar>
    <Dialog id="dialogMain">
      <Property name="width">80%</Property>
      <Property name="caption">到仓信息</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
view.get(&quot;#updateSave&quot;).execute(function(){&#xD;
    self.get(&quot;parent&quot;).hide();&#xD;
});</ClientEvent>
          <Property name="caption">保存修改</Property>
          <Property name="iconClass">fa fa-check</Property>
          <Property name="exClassName">toolbar-button</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
self.get(&quot;parent&quot;).hide();&#xD;
if(cur) cur.cancel();</ClientEvent>
          <Property name="caption">取消修改</Property>
          <Property name="iconClass">fa fa-times</Property>
          <Property name="exClassName">toolbar-button-warn</Property>
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*,*</Property>
          <Property name="labelWidth">100</Property>
          <Property name="labelAlign">left</Property>
          <Property name="labelSeparator">:</Property>
          <Property name="labelPosition">top</Property>
          <AutoFormElement>
            <Property name="name">jjdh</Property>
            <Property name="property">jjdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jjrq</Property>
            <Property name="property">jjrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">inbillno</Property>
            <Property name="property">inbillno</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jzrq</Property>
            <Property name="property">jzrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zydh</Property>
            <Property name="property">zydh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zylx</Property>
            <Property name="property">zylx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">khmc</Property>
            <Property name="property">khmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">psplan</Property>
            <Property name="property">psplan</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hth</Property>
            <Property name="property">hth</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">cch</Property>
            <Property name="property">cch</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zzchh</Property>
            <Property name="property">zzchh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lspzdmdl</Property>
            <Property name="property">lspzdmdl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lsxzdm</Property>
            <Property name="property">lsxzdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lldm</Property>
            <Property name="property">lldm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ajdm</Property>
            <Property name="property">ajdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">hwdm</Property>
            <Property name="property">hwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">yrajdh</Property>
            <Property name="property">yrajdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">yrhwdm</Property>
            <Property name="property">yrhwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zxb</Property>
            <Property name="property">zxb</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bzwzkl</Property>
            <Property name="property">bzwzkl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">mz</Property>
            <Property name="property">mz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jz</Property>
            <Property name="property">jz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">pch</Property>
            <Property name="property">pch</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bjw</Property>
            <Property name="property">bjw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">syncTime</Property>
            <Property name="property">syncTime</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">sHApi2101PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">sHApi2101PR#pushData</Property>
      <Property name="confirmMessage">确定要上报么?</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDel">
      <Property name="service">sHApi2101PR#delData</Property>
      <Property name="confirmMessage">当前数据删除后无法恢复,请确认要删除么?</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDelUpdate">
      <Property name="service">sHApi2101PR#delUpdate</Property>
      <Property name="confirmMessage">确定要将数据标记为删除么?</Property>
    </AjaxAction>
  </View>
</ViewConfig>
src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml
@@ -3,9 +3,398 @@
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2102</Property>
      <PropertyDef name="drdh">
        <Property/>
        <Property name="label">倒入单号</Property>
      </PropertyDef>
      <PropertyDef name="drdw">
        <Property/>
        <Property name="label">倒入单位</Property>
      </PropertyDef>
      <PropertyDef name="drhwsl">
        <Property/>
        <Property name="label">倒入数量</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#0.000000</Property>
      </PropertyDef>
      <PropertyDef name="drhwdm">
        <Property/>
        <Property name="label">倒入货位代码</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="zhgxsj">
        <Property name="dataType">Date</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="dcrq">
        <Property name="dataType">Date</Property>
        <Property name="label">倒入日期</Property>
      </PropertyDef>
      <PropertyDef name="kddh">
        <Property/>
        <Property name="label">库调单号</Property>
      </PropertyDef>
      <PropertyDef name="bjw">
        <Property/>
        <Property name="label">标记位</Property>
      </PropertyDef>
      <PropertyDef name="pch">
        <Property/>
        <Property name="label">批次号</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property/>
        <Property name="label">业务id</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property/>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="syncTime">
        <Property name="dataType">Date</Property>
        <Property name="label">同步时间</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
      <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">所属库区</Property>
      </PropertyDef>
      <PropertyDef name="start">
        <Property name="dataType">Date</Property>
        <Property name="label">开始时间</Property>
      </PropertyDef>
      <PropertyDef name="end">
        <Property name="dataType">Date</Property>
        <Property name="label">截止时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="regionPadding:10">
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">sHApi2102PR#listData</Property>
      <Property name="pageSize">15</Property>
    </DataSet>
    <DataSet id="dsQuery">
      <ClientEvent name="onReady">self.insert();</ClientEvent>
      <Property name="dataType">dtParam</Property>
    </DataSet>
    <ToolBar>
      <ToolBarLabel>
        <Property name="text">工具栏:</Property>
        <Property name="style">
          <Property name="font-weight">bold</Property>
        </Property>
      </ToolBarLabel>
      <ToolBarButton>
        <ClientEvent name="onClick">var query = view.get(&quot;#dsQuery&quot;).getData();&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,query).flushAsync();</ClientEvent>
        <Property name="caption">查询</Property>
        <Property name="iconClass">fa fa-search</Property>
        <Property name="width">100</Property>
        <Property name="exClassName">toolbar-button-push</Property>
      </ToolBarButton>
      <ToolBarButton id="btnAdd">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
        <Property name="caption">新增</Property>
        <Property name="iconClass">fa fa-plus</Property>
        <Property name="width">100</Property>
        <Property name="exClassName">toolbar-button</Property>
        <Property name="hideMode">display</Property>
      </ToolBarButton>
      <ToolBarButton id="btnUpdate">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
if(cur){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}</ClientEvent>
        <Property name="caption">修改</Property>
        <Property name="iconClass">fa fa-pencil</Property>
        <Property name="width">100</Property>
        <Property name="exClassName">toolbar-button-warm</Property>
        <Property name="hideMode">display</Property>
      </ToolBarButton>
      <ToolBarButton>
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
view.get(&quot;#ajaxDelUpdate&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
    } else{&#xD;
        cur.set(&quot;czbz&quot;,&quot;d&quot;)&#xD;
    }&#xD;
});&#xD;
</ClientEvent>
        <Property name="caption">标记删除</Property>
        <Property name="iconClass">fa fa-minus</Property>
        <Property name="exClassName">toolbar-button-warn</Property>
        <Property name="width">100</Property>
      </ToolBarButton>
      <ToolBarButton id="btnDel">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
    } else{&#xD;
        cur.remove();&#xD;
    }&#xD;
});&#xD;
</ClientEvent>
        <Property name="caption">直接删除</Property>
        <Property name="iconClass">fa fa-minus</Property>
        <Property name="exClassName">toolbar-button-warn</Property>
        <Property name="width">100</Property>
        <Property name="hideMode">display</Property>
      </ToolBarButton>
      <ToolBarButton>
        <ClientEvent name="onClick">var select = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
if(select &amp;&amp; select.length > 0){&#xD;
    view.get(&quot;#ajaxPush&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
        view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
          $notify(result);&#xD;
    });&#xD;
}else{&#xD;
    $alert(&quot;请勾选上报数据!&quot;);&#xD;
}&#xD;
</ClientEvent>
        <Property name="caption">手动上传</Property>
        <Property name="iconClass">fa fa-hand-o-up</Property>
        <Property name="exClassName">toolbar-button-push</Property>
        <Property name="width">100</Property>
      </ToolBarButton>
      <Fill/>
      <ToolBarButton>
        <Property name="caption">上传记录</Property>
        <Property name="iconClass">fa fa-bars</Property>
        <Property name="exClassName">toolbar-button</Property>
        <Property name="width">100</Property>
      </ToolBarButton>
    </ToolBar>
    <AutoForm>
      <Property name="dataSet">dsQuery</Property>
      <Property name="cols">*,*,*,*</Property>
      <Property name="labelAlign">right</Property>
      <Property name="labelSeparator">:</Property>
      <Property name="labelWidth">90</Property>
      <AutoFormElement>
        <Property name="name">kqdm</Property>
        <Property name="property">kqdm</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">start</Property>
        <Property name="property">start</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">end</Property>
        <Property name="property">end</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">czbz</Property>
        <Property name="property">czbz</Property>
        <Property name="trigger">autoMappingDropDown2</Property>
        <Editor/>
      </AutoFormElement>
    </AutoForm>
    <DataGrid id="dgMain">
      <ClientEvent name="onDataRowDoubleClick">view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
      <Property name="dataSet">dsMain</Property>
      <Property name="selectionMode">multiRows</Property>
      <Property name="readOnly">true</Property>
      <RowNumColumn/>
      <RowSelectorColumn>
        <Property name="caption">上传</Property>
      </RowSelectorColumn>
      <DataColumn name="drdh">
        <Property name="property">drdh</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="drdw">
        <Property name="property">drdw</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="drhwsl">
        <Property name="property">drhwsl</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="drhwdm">
        <Property name="property">drhwdm</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="czbz">
        <Property name="property">czbz</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="zhgxsj">
        <Property name="property">zhgxsj</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="dcrq">
        <Property name="property">dcrq</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="kddh">
        <Property name="property">kddh</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="bjw">
        <Property name="property">bjw</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="pch">
        <Property name="property">pch</Property>
        <Property name="align">center</Property>
      </DataColumn>
    </DataGrid>
    <ToolBar layoutConstraint="bottom">
      <Fill/>
      <DataPilot>
        <Property name="itemCodes">pageSize,pages</Property>
        <Property name="dataSet">dsMain</Property>
      </DataPilot>
    </ToolBar>
    <Dialog id="dialogMain">
      <Property name="width">80%</Property>
      <Property name="caption">到仓信息</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
view.get(&quot;#updateSave&quot;).execute(function(){&#xD;
    self.get(&quot;parent&quot;).hide();&#xD;
});</ClientEvent>
          <Property name="caption">保存修改</Property>
          <Property name="iconClass">fa fa-check</Property>
          <Property name="exClassName">toolbar-button</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
self.get(&quot;parent&quot;).hide();&#xD;
if(cur) cur.cancel();</ClientEvent>
          <Property name="caption">取消修改</Property>
          <Property name="iconClass">fa fa-times</Property>
          <Property name="exClassName">toolbar-button-warn</Property>
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*</Property>
          <Property name="labelWidth">150</Property>
          <Property name="labelAlign">left</Property>
          <Property name="labelSeparator">:</Property>
          <Property name="labelPosition">left</Property>
          <AutoFormElement>
            <Property name="name">drdh</Property>
            <Property name="property">drdh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">drdw</Property>
            <Property name="property">drdw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">drhwsl</Property>
            <Property name="property">drhwsl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">drhwdm</Property>
            <Property name="property">drhwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zhgxsj</Property>
            <Property name="property">zhgxsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dcrq</Property>
            <Property name="property">dcrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kddh</Property>
            <Property name="property">kddh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bjw</Property>
            <Property name="property">bjw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">pch</Property>
            <Property name="property">pch</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">syncTime</Property>
            <Property name="property">syncTime</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">sHApi2102PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">sHApi2102PR#pushData</Property>
      <Property name="confirmMessage">确定要上报么?</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDel">
      <Property name="service">sHApi2102PR#delData</Property>
      <Property name="confirmMessage">当前数据删除后无法恢复,请确认要删除么?</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDelUpdate">
      <Property name="service">sHApi2103PR#delUpdate</Property>
      <Property name="confirmMessage">确定要将数据标记为删除么?</Property>
    </AjaxAction>
  </View>
</ViewConfig>
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
@@ -1,6 +1,44 @@
package com.fzzy.otherview.sh2023.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1204;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * ä¸Šæµ·å¸‚接口-2101 æ£€æ–¤å•
@@ -8,8 +46,158 @@
 * @author czt
 * @date 2023/8/17
 */
@Component
@Component(value = "sHApi2101PR")
public class SHApi2101PR {
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    /**
     * èŽ·å–ä¿¡æ¯
     * sHApi2101PR#listData
     *
     * @return
     */
    @DataProvider
    public void listData(Page<SH2023Api2101> page, ApiParam param) {
        Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
        Specification specification = new Specification<ApiInfoData>() {
            private static final long serialVersionUID = 1L;
            @Override
            public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
                List<Predicate> predicates = new ArrayList<>(); //所有的断言
                Predicate predicate = criteriaBuilder.equal(root.get("inteId"), SH2023Constant.SH_2023_API_CODE_2101);
                predicates.add(predicate);
                if (null != param) {
                    if (StringUtils.isNotBlank(param.getKqdm())) {
                        Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
                        predicates.add(predicate1);
                    }
                    if (StringUtils.isNotBlank(param.getCzbz())) {
                        Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
                        predicates.add(predicate2);
                    }
                    if (null != param.getStart()) {
                        Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
                        predicates.add(predicate3);
                    }
                    if (null != param.getEnd()) {
                        Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
                        predicates.add(predicate4);
                    }
                }
                return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
        page.setEntityCount((int) japPage.getTotalElements());
        List<SH2023Api2101> list = new ArrayList<>();
        SH2023Api2101 sh2023Api2101;
        for (ApiInfoData infoData : japPage.getContent()) {
            sh2023Api2101 = JSONObject.parseObject(infoData.getData(), SH2023Api2101.class);
            list.add(sh2023Api2101);
        }
        page.setEntities(list);
    }
    /**
     * sHApi2101PR#saveData
     */
    @DataResolver
    public void saveData(SH2023Api2101 data) {
        if (null == data.getPch() || data.getPch() == "") {
            data.setPch(data.getHwdm() + DateFormatUtils.format(data.getJjrq(), "yyyy"));
        }
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getJjdh());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getJjdh());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");
        apiInfoDataRep.save(infoData);
    }
    /**
     * sHApi2101PR#delData
     */
    @Expose
    public void delData(SH2023Api2101 data) {
        apiInfoDataRep.deleteById(data.getJjdh());
    }
    /**
     * sHApi2101PR#delUpdate
     */
    @Expose
    public String delUpdate(SH2023Api2101 entity) {
        if (null == entity) {
            return "无数据执行";
        }
        entity.setCzbz(Constant.CZBZ_D);
        apiInfoDataRep.updateStatus(entity.getJjdh(), JSON.toJSONString(entity), Constant.CZBZ_D);
        return null;
    }
    @Expose
    public String pushData(List<SH2023Api2101> items) {
        ResponseDto responseDto;
        String result = "";
        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);
        if (null == apiConf) return "系统没有获取到当前库区配置信息,执行失败";
        //封装参数
        ApiParam param = new ApiParam(apiConf, "21", SH2023Constant.SH_2023_API_CODE_2101);
        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        if (null == apiService) {
            return "系统没有当前推送协议配置,执行失败";
        }
        //推送,数据为集合形式
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功,更新数据上传状态
            ApiInfoData infoData;
            for (SH2023Api2101 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType("21");
                    infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2101);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());
                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));
                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();
        }
        return result;
    }
}
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,200 @@
package com.fzzy.otherview.sh2023.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.push.sh2023.SH2023Constant;
import com.fzzy.push.sh2023.dto.SH2023Api2102;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * ä¸Šæµ·å¸‚接口-2102 æ£€æ–¤å•
 *
 * @author czt
 * @date 2023/8/17
 */
@Component(value = "sHApi2102PR")
public class SHApi2102PR {
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    /**
     * èŽ·å–ä¿¡æ¯
     * sHApi2102PR#listData
     *
     * @return
     */
    @DataProvider
    public void listData(Page<SH2023Api2102> page, ApiParam param) {
        Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
        Specification specification = new Specification<ApiInfoData>() {
            private static final long serialVersionUID = 1L;
            @Override
            public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
                List<Predicate> predicates = new ArrayList<>(); //所有的断言
                Predicate predicate = criteriaBuilder.equal(root.get("inteId"), SH2023Constant.SH_2023_API_CODE_2102);
                predicates.add(predicate);
                if (null != param) {
                    if (StringUtils.isNotBlank(param.getKqdm())) {
                        Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
                        predicates.add(predicate1);
                    }
                    if (StringUtils.isNotBlank(param.getCzbz())) {
                        Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
                        predicates.add(predicate2);
                    }
                    if (null != param.getStart()) {
                        Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
                        predicates.add(predicate3);
                    }
                    if (null != param.getEnd()) {
                        Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
                        predicates.add(predicate4);
                    }
                }
                return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
            }
        };
        org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
        page.setEntityCount((int) japPage.getTotalElements());
        List<SH2023Api2102> list = new ArrayList<>();
        SH2023Api2102 sh2023Api2102;
        for (ApiInfoData infoData : japPage.getContent()) {
            sh2023Api2102 = JSONObject.parseObject(infoData.getData(), SH2023Api2102.class);
            list.add(sh2023Api2102);
        }
        page.setEntities(list);
    }
    /**
     * sHApi2102PR#saveData
     */
    @DataResolver
    public void saveData(SH2023Api2102 data) {
        if (null == data.getPch() || data.getPch() == "") {
            data.setPch(data.getDrhwdm() + DateFormatUtils.format(data.getDcrq(), "yyyy"));
        }
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getDrdh());
        infoData.setKqdm(data.getDrhwdm().substring(0, 21));
        infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2102);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getDrdh());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");
        apiInfoDataRep.save(infoData);
    }
    /**
     * sHApi2102PR#delData
     */
    @Expose
    public void delData(SH2023Api2102 data) {
        apiInfoDataRep.deleteById(data.getDrdh());
    }
    /**
     * sHApi2102PR#delUpdate
     */
    @Expose
    public String delUpdate(SH2023Api2102 entity) {
        if (null == entity) {
            return "无数据执行";
        }
        entity.setCzbz(Constant.CZBZ_D);
        apiInfoDataRep.updateStatus(entity.getDrdh(), JSON.toJSONString(entity), Constant.CZBZ_D);
        return null;
    }
    @Expose
    public String pushData(List<SH2023Api2102> items) {
        ResponseDto responseDto;
        String result = "";
        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);
        if (null == apiConf) return "系统没有获取到当前库区配置信息,执行失败";
        //封装参数
        ApiParam param = new ApiParam(apiConf, "21", SH2023Constant.SH_2023_API_CODE_2102);
        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        if (null == apiService) {
            return "系统没有当前推送协议配置,执行失败";
        }
        //推送,数据为集合形式
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功,更新数据上传状态
            ApiInfoData infoData;
            for (SH2023Api2102 data : items) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType("21");
                    infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2102);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());
                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));
                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();
        }
        return result;
    }
}
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java
@@ -6,6 +6,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -17,7 +18,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class SH2023Api2101 extends ApiParent implements Serializable {
public class SH2023Api2101 implements Serializable {
    /**
     *
     */
@@ -111,4 +112,14 @@
    @PropertyDef(label = "标记位")
    private String bjw;
    @JSONField(serialize = false)
    @PropertyDef(label = "业务id")
    @Column(name = "bizId", length = 40)
    private String bizId;
    @JSONField(serialize = false)
    @PropertyDef(label = "同步时间", description = "从粮库系统同步到接口管理中心的时间")
    @Column(name = "syncTime")
    private Date syncTime;
}
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,7 +14,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class SH2023Api2102 implements Serializable {
public class SH2023Api2102 extends ApiParent implements Serializable {
    /**
     *
     */
@@ -26,7 +27,7 @@
    private String drdw;
    @PropertyDef(label = "倒入数量")
    private String drhwsl;
    private Double drhwsl;
    @PropertyDef(label = "倒入货位代码")
    private String drhwdm;