ws
2023-12-11 a3a62a367e0654ac81c2f996e9e8fb33d4f257ac
修改武汉接口
已修改13个文件
已添加3个文件
615 ■■■■■ 文件已修改
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1414.view.xml 319 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1414.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1414PR.java 157 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/templates/home/home-whjl.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
@@ -38,17 +38,16 @@
        <Property name="label">档案类型</Property>
      </PropertyDef>
      <PropertyDef name="damc">
          <Property></Property>
        <Property></Property>
        <Property name="label">档案名称</Property>
      </PropertyDef>
      <PropertyDef name="dawj">
          <Property name="dataType">byte</Property>
          <Property></Property>
        <Property name="dataType">Byte</Property>
        <Property name="label">档案文件</Property>
      </PropertyDef>
      <PropertyDef name="sfyx">
      <PropertyDef name="ccssdzdaid">
        <Property></Property>
        <Property name="label">是否有效</Property>
        <Property name="label">仓储设施电子档案</Property>
      </PropertyDef>
      <PropertyDef name="bz">
        <Property></Property>
@@ -227,10 +226,10 @@
        <DataColumn name="dawj">
          <Property name="property">dawj</Property>
        </DataColumn>
        <DataColumn name="sfyx">
          <Property name="property">sfyx</Property>
        <DataColumn name="ccssdzdaid">
          <Property name="property">ccssdzdaid</Property>
        </DataColumn>
        <DataColumn name="sfyx">
        <DataColumn name="ccssdzdaid">
          <Property name="property">czbz</Property>
        </DataColumn>
      </DataGrid>
@@ -273,6 +272,11 @@
          <Property name="labelSeparator">:</Property>
          <Property name="labelWidth">120</Property>
          <Property name="labelAlign">right</Property>
          <AutoFormElement>
            <Property name="name">ccssdzdaid</Property>
            <Property name="property">ccssdzdaid</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dadm</Property>
            <Property name="property">dadm</Property>
@@ -322,12 +326,6 @@
          <AutoFormElement>
            <Property name="name">dawj</Property>
            <Property name="property">dawj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sfyx</Property>
            <Property name="property">sfyx</Property>
            <Property name="trigger">listDropYN</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
@@ -152,7 +152,7 @@
        <Property></Property>
        <Property name="label">付款凭证号</Property>
      </PropertyDef>
      <PropertyDef name="sl">
      <PropertyDef name="zl">
        <Property name="dataType">Double</Property>
        <Property name="label">数量</Property>
      </PropertyDef>
@@ -522,8 +522,8 @@
              <DataColumn name="fkpzh">
                <Property name="property">fkpzh</Property>
              </DataColumn>
              <DataColumn name="sl">
                <Property name="property">sl</Property>
              <DataColumn name="zl">
                <Property name="property">zl</Property>
              </DataColumn>
              <DataColumn name="dj">
                <Property name="property">dj</Property>
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml
@@ -13,7 +13,7 @@
        <Property></Property>
        <Property name="label">军粮企业编号</Property>
      </PropertyDef>
      <PropertyDef name="ssqymc">
      <PropertyDef name="jlqymc">
        <Property></Property>
        <Property name="label">军粮企业名称</Property>
      </PropertyDef>
@@ -28,6 +28,10 @@
      <PropertyDef name="ajbh">
        <Property></Property>
        <Property name="label">廒间编号</Property>
      </PropertyDef>
      <PropertyDef name="jllx">
          <Property></Property>
          <Property name="label">记录类型</Property>
      </PropertyDef>
      <PropertyDef name="sbbh">
        <Property></Property>
@@ -175,8 +179,8 @@
        <DataColumn name="jlqybh">
          <Property name="property">jlqybh</Property>
        </DataColumn>
        <DataColumn name="ssqymc">
          <Property name="property">ssqymc</Property>
        <DataColumn name="jlqymc">
          <Property name="property">jlqymc</Property>
        </DataColumn>
        <DataColumn name="jgzdbh">
          <Property name="property">jgzdbh</Property>
@@ -186,6 +190,9 @@
        </DataColumn>
        <DataColumn name="ajbh">
          <Property name="property">ajbh</Property>
        </DataColumn>
        <DataColumn name="jllx">
            <Property name="property">jllx</Property>
        </DataColumn>
        <DataColumn name="sbbh">
          <Property name="property">sbbh</Property>
@@ -263,8 +270,8 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ssqymc</Property>
            <Property name="property">ssqymc</Property>
            <Property name="name">jlqymc</Property>
            <Property name="property">jlqymc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -283,6 +290,11 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
              <Property name="name">jllx</Property>
              <Property name="property">jllx</Property>
              <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sbbh</Property>
            <Property name="property">sbbh</Property>
            <Editor/>
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
@@ -9,6 +9,10 @@
        <Property></Property>
        <Property name="label">动员协议id</Property>
      </PropertyDef>
      <PropertyDef name="dyspid">
        <Property></Property>
        <Property name="label">动员商品ID</Property>
      </PropertyDef>
      <PropertyDef name="dyqynm">
        <Property></Property>
        <Property name="label">动员企业内码</Property>
@@ -268,6 +272,9 @@
        <DataColumn name="dyqynm">
          <Property name="property">dyqynm</Property>
        </DataColumn>
        <DataColumn name="dyspid">
          <Property name="property">dyspid</Property>
        </DataColumn>
        <DataColumn name="htkhbh">
          <Property name="property">htkhbh</Property>
        </DataColumn>
@@ -344,6 +351,11 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dyspid</Property>
            <Property name="property">dyspid</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">htkhbh</Property>
            <Property name="property">htkhbh</Property>
            <Editor/>
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml
@@ -9,6 +9,10 @@
        <Property></Property>
        <Property name="label">动员企业编号</Property>
      </PropertyDef>
      <PropertyDef name="dynlid">
          <Property></Property>
          <Property name="label">动员能力id</Property>
      </PropertyDef>
      <PropertyDef name="pzflbm">
        <Property></Property>
        <Property name="label">品种分类编码</Property>
@@ -219,6 +223,9 @@
        <DataColumn name="dyqynm">
          <Property name="property">dyqynm</Property>
        </DataColumn>
       <DataColumn name="dynlid">
           <Property name="property">dynlid</Property>
       </DataColumn>
        <DataColumn name="pzflbm">
          <Property name="property">pzflbm</Property>
        </DataColumn>
@@ -293,6 +300,11 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
              <Property name="name">dynlid</Property>
              <Property name="property">dynlid</Property>
              <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">pzflbm</Property>
            <Property name="property">pzflbm</Property>
            <Editor/>
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1414.view.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,319 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1414</Property>
      <PropertyDef name="jlqybh">
        <Property/>
        <Property name="label">军粮企业编号</Property>
      </PropertyDef>
      <PropertyDef name="jlqymc">
        <Property/>
        <Property name="label">军粮企业名称</Property>
      </PropertyDef>
      <PropertyDef name="jgzdbh">
        <Property/>
        <Property name="label">军供站点编号</Property>
      </PropertyDef>
      <PropertyDef name="jgzdmc">
        <Property/>
        <Property name="label">军供站点名称</Property>
      </PropertyDef>
      <PropertyDef name="bdkh">
        <Property/>
        <Property name="label">北斗卡号</Property>
      </PropertyDef>
      <PropertyDef name="sjkh">
        <Property/>
        <Property name="label">4G卡号</Property>
      </PropertyDef>
      <PropertyDef name="sblx">
        <Property/>
        <Property name="label">设备类型</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务ID</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property></Property>
        <Property name="label">操作标志</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</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">whjlApi1414PR#listData</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
      <Property name="height">55</Property>
      <Property name="contentOverflow">hidden</Property>
      <Label layoutConstraint="left">
        <Property name="text">菜单栏:</Property>
      </Label>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
        <Property name="iconClass">fa fa-plus</Property>
        <Property name="caption">新增</Property>
        <Property name="exClassName">btn-default</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
if(cur){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}else{&#xD;
    $alert(&quot;请勾选需要修改的数据!&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">编辑</Property>
        <Property name="iconClass">fa fa-pencil</Property>
        <Property name="exClassName">btn-warm</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
if(cur){&#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;
}else{&#xD;
    $alert(&quot;请勾选需要删除的数据!&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">删除</Property>
        <Property name="iconClass">fa fa-minus</Property>
        <Property name="exClassName">btn-warn</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync();</ClientEvent>
        <Property name="caption">刷新</Property>
        <Property name="iconClass">fa fa-search</Property>
        <Property name="exClassName">btn-flush</Property>
      </Button>
      <Button layoutConstraint="left">
        <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;
}</ClientEvent>
        <Property name="caption">手动上传</Property>
        <Property name="iconClass">fa fa-hand-o-up</Property>
        <Property name="exClassName">btn-default</Property>
      </Button>
      <Button layoutConstraint="right">
        <ClientEvent name="onClick">//显示记录&#xD;
view.get(&quot;#iFrame&quot;).reload();&#xD;
view.get(&quot;#dialogLog&quot;).show();</ClientEvent>
        <Property name="caption">上传记录</Property>
        <Property name="iconClass">fa fa-bars</Property>
        <Property name="exClassName">btn-flush</Property>
      </Button>
    </Container>
    <Container layoutConstraint="center">
      <Property name="exClassName">bg-color</Property>
      <DataGrid id="dgMain">
        <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(data){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}</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="jlqybh">
          <Property name="property">jlqybh</Property>
        </DataColumn>
        <DataColumn name="jlqymc">
          <Property name="property">jlqymc</Property>
        </DataColumn>
        <DataColumn name="jgzdbh">
          <Property name="property">jgzdbh</Property>
        </DataColumn>
        <DataColumn name="jgzdmc">
          <Property name="property">jgzdmc</Property>
        </DataColumn>
        <DataColumn name="bdkh">
          <Property name="property">bdkh</Property>
        </DataColumn>
        <DataColumn name="sjkh">
          <Property name="property">sjkh</Property>
        </DataColumn>
        <DataColumn name="sblx">
          <Property name="property">sblx</Property>
        </DataColumn>
        <DataColumn name="bizId">
          <Property name="property">bizId</Property>
        </DataColumn>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
        </DataColumn>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
        </DataColumn>
        <DataColumn name="kqdm">
          <Property name="property">kqdm</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Dialog id="dialogMain">
      <Property name="width">85%</Property>
      <Property name="closeable">false</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="caption">车辆运输环境</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;
    view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
});</ClientEvent>
          <Property name="caption">确定</Property>
          <Property name="iconClass">fa fa-check</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>
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*,*</Property>
          <Property name="labelPosition">top</Property>
          <Property name="labelSeparator">:</Property>
          <Property name="labelAlign">left</Property>
          <AutoFormElement>
            <Property name="name">jlqybh</Property>
            <Property name="property">jlqybh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jlqymc</Property>
            <Property name="property">jlqymc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jgzdbh</Property>
            <Property name="property">jgzdbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jgzdmc</Property>
            <Property name="property">jgzdmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bdkh</Property>
            <Property name="property">bdkh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sjkh</Property>
            <Property name="property">sjkh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sblx</Property>
            <Property name="property">sblx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">whjlApi1414PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="confirmMessage">当前数据删除后无法恢复,请确认要删除么?</Property>
      <Property name="service">whjlApi1414PR#delData</Property>
    </AjaxAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">whjlApi1414PR#pushData</Property>
    </AjaxAction>
    <Dialog id="dialogLog">
      <Property name="width">90%</Property>
      <Property name="height">90%</Property>
      <Property name="caption">上传记录</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">关闭</Property>
          <Property name="iconClass">fa fa-times</Property>
        </Button>
      </Buttons>
      <Children>
        <Container>
          <IFrame id="iFrame">
            <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
            <Property name="userData">
              <Entity>
                <Property name="deptId">deptId</Property>
              </Entity>
            </Property>
          </IFrame>
        </Container>
      </Children>
      <Tools/>
    </Dialog>
    <ListDropDown id="listDropYN">
      <Property name="items">是,否</Property>
    </ListDropDown>
    <ListDropDown id="listDropType">
      <Property name="items">日常出库,日常入库,应急出库,应急入库</Property>
    </ListDropDown>
    <ListDropDown id="listDropInOut">
      <Property name="items">入库,出库</Property>
    </ListDropDown>
  </View>
</ViewConfig>
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -259,7 +259,10 @@
     * æŽ¥å£ç¼–码-1413 è¿è¾“路线数据接口
     */
    public static String API_CODE_1413 = "1413";
    /**
     * æŽ¥å£ç¼–码-1414 åŒ—斗终端设备
     */
    public static String API_CODE_1414 = "1414";
    /*----------接口路径----------*/
    //接口编码-1101 å†›ç²®ä¼ä¸šä¿¡æ¯ --路径(JLQYXX)
@@ -380,6 +383,8 @@
    public static String API_CODE_CLYSHJ = "CLYSHJ";
    //接口编码-1413 è¿è¾“路线 --路径(YSLX)
    public static String API_CODE_YSLX = "YSLX";
    //接口编码-1414 åŒ—斗终端设备 --路径(YSLX)
    public static String API_CODE_BDZDSB = "BDZDSB";
    //接口编码- åº”急调度 --路径(YJDD)
    public static String API_CODE_YJDD = "YJDD";
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
@@ -30,8 +30,8 @@
    private String sscfmc;  //仓房名称
    private String dalx;  //档案类型
    private String damc;  //档案名称
    private String ccssdzdaid;  //仓储设施电子档案
    private byte dawj;  //档案文件
    private String sfyx;  //是否有效
    private String bz;  //备注
    //单独增加,不进行上传
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
@@ -23,10 +23,11 @@
    private String chjlid;  //能耗记录id
    private String jlqybh;  //军粮企业编号
    private String ssqymc;  //军粮企业名称
    private String jlqymc;  //军粮企业名称
    private String jgzdbh;  //军供站点编号
    private String jgzdmc;  //军供站点名称
    private String ajbh;  //廒间编号
    private String jllx;  //记录类型
    private String sbbh;  //设备编号
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date cjsj;  //采集时间
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
@@ -22,6 +22,7 @@
    private String dyxyid; //动员协议id
    private String dyqynm; //动员企业内码
    private String dyspid; //动员协议id
    private String htkhbh; //合同客户编号
    private String htkhmc; //合同客户名称
    private String htbh; //合同编号
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java
@@ -20,6 +20,7 @@
    private static final long serialVersionUID = 1L;
    private String dyqynm; //动员企业编号
    private String dynlid; //动员能力id
    private String pzflbm; //品种分类编码
    private String jldwflbm; //计量单位分类编码
    private String dylb; //类别
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1414.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
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;
import java.util.List;
/**
 * åŒ—斗终端设备
 *
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class WhjlApi1414 implements Serializable {
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private String jlqybh; //军粮企业编号
    private String jlqymc; //军粮企业名称
    private String jgzdbh; //军供站点编号
    private String jgzdmc; //军供站点名称
    private String bdkh; //北斗卡号
    private String sjkh; //4G卡号
    private String sblx; //设备类型
    //单独增加,不进行上传
    @JSONField(serialize = false)
    private String bizId;  //业务ID
    @JSONField(serialize = false)
    private Date updateTime;  //最后更新时间
    private String czbz;  //操作标志
    @JSONField(serialize = false)
    private String kqdm;  //库区代码
}
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java
@@ -22,7 +22,7 @@
    private String rkfkjlmxid; //结算记录明细ID
    private String crkmxid;//出入库明细ID
    private String fkpzh; //付款凭证号
    private Double sl; //数量
    private Double zl; //数量
    private Double dj; //单价
    private Double je; //金额
}
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1414PR.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,157 @@
package com.fzzy.otherview.whhpjl.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.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.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1414;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * è½¦è¾†è¿è¾“环境
 *
 * @Author:YAN
 */
@Component
public class WhjlApi1414PR {
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;
    /**
     * èŽ·å–åˆ—è¡¨ä¿¡æ¯
     * whjlApi1414PR#listData
     *
     * @return
     */
    @DataProvider
    public List<WhjlApi1414> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1414);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1414> list = new ArrayList<>();
        WhjlApi1414 whjlApi1414;
        for (ApiInfoData infoData : result) {
            whjlApi1414 = JSONObject.parseObject(infoData.getData(), WhjlApi1414.class);
            whjlApi1414.setKqdm(infoData.getKqdm());
            whjlApi1414.setCzbz(infoData.getCzbz());
            whjlApi1414.setUpdateTime(infoData.getUpdateTime());
            whjlApi1414.setBizId(infoData.getDataId());
            list.add(whjlApi1414);
        }
        return list;
    }
    /**
     * æ›´æ–°æˆ–修改
     * whjlApi1414PR#saveData
     *
     * @param data
     * @return
     */
    @DataResolver
    public void saveData(WhjlApi1414 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_14);
        infoData.setInteId(WhjlConstant.API_CODE_1414);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");
        apiInfoDataRep.save(infoData);
    }
    /**
     * åˆ é™¤
     * whjlApi1414PR#delData
     *
     * @param data
     * @return
     */
    @Expose
    public String delData(WhjlApi1414 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }
    /**
     * ä¸Šä¼ 
     * whjlApi1414PR#pushData
     *
     * @param items
     * @return
     */
    @Expose
    public String pushData(List<WhjlApi1414> items) {
        String result = "";
        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);
        if (null == apiConf) {
            return "系统没有获取到当前库区配置信息,执行失败";
        }
        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1414);
        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        if (null == apiService) {
            return "系统没有当前推送协议配置,执行失败";
        }
        ApiInfoData infoData;
        ResponseDto responseDto;
        for (WhjlApi1414 data : items) {
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_14);
                    infoData.setInteId(WhjlConstant.API_CODE_1414);
                    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/whhpjl/WhjlApiRemoteService.java
@@ -277,6 +277,8 @@
                return WhjlConstant.API_CODE_CLYSHJ;
            case "1413":
                return WhjlConstant.API_CODE_YSLX;
            case "1414":
                return WhjlConstant.API_CODE_BDZDSB;
            default:
                return inteId;
        }
src/main/resources/templates/home/home-whjl.html
@@ -332,6 +332,9 @@
                            <dd>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1413.d">运输路线</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1414.d">北斗终端设备</a>
                            </dd>
                        </dl>
                    </li>
                </ul>