YYC
2023-09-01 b21c9160a376b76258f59c18dac65496ce037d70
上海新增页面--粮情设备配置
已删除4个文件
已修改9个文件
已添加1个文件
1244 ■■■■ 文件已修改
src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml 100 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/ShApi2103.view.xml 596 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi1311.java 133 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2101.java 114 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2102.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2103.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java 207 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/repository/ShApi1311Rep.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/repository/ShApi2101Rep.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/sh2023/ShApi2102.view.xml
@@ -6,25 +6,25 @@
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2102</Property>
      <PropertyDef name="drdh">
        <Property/>
        <Property></Property>
        <Property name="label">倒入单号</Property>
      </PropertyDef>
      <PropertyDef name="drdw">
        <Property/>
        <Property></Property>
        <Property name="label">倒入单位</Property>
      </PropertyDef>
      <PropertyDef name="drhwsl">
        <Property/>
        <Property></Property>
        <Property name="label">倒入数量</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">#0.000000</Property>
      </PropertyDef>
      <PropertyDef name="drhwdm">
        <Property/>
        <Property></Property>
        <Property name="label">倒入货位代码</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property></Property>
        <Property name="label">操作标志</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
@@ -41,28 +41,100 @@
        <Property name="label">倒入日期</Property>
      </PropertyDef>
      <PropertyDef name="kddh">
        <Property/>
        <Property></Property>
        <Property name="label">库调单号</Property>
      </PropertyDef>
      <PropertyDef name="bjw">
        <Property/>
        <Property name="label">标记位</Property>
      </PropertyDef>
      <PropertyDef name="pch">
        <Property/>
        <Property></Property>
        <Property name="label">批次号</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property/>
        <Property></Property>
        <Property name="label">业务id</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property/>
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="syncTime">
        <Property name="dataType">Date</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>
    </DataType>
    <DataType name="dtParam">
@@ -393,7 +465,7 @@
      <Property name="confirmMessage">当前数据删除后无法恢复,请确认要删除么?</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDelUpdate">
      <Property name="service">sHApi2103PR#delUpdate</Property>
      <Property name="service">sHApi2102PR#delUpdate</Property>
      <Property name="confirmMessage">确定要将数据标记为删除么?</Property>
    </AjaxAction>
  </View>
src/main/java/com/fzzy/otherview/sh2023/ShApi2103.view.xml
@@ -3,9 +3,601 @@
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2103</Property>
      <PropertyDef name="bizId">
        <Property></Property>
        <Property name="label">业务id</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property></Property>
        <Property name="label">库区代码</Property>
      </PropertyDef>
      <PropertyDef name="syncTime">
        <Property name="dataType">Date</Property>
        <Property name="label">同步时间</Property>
      </PropertyDef>
      <PropertyDef name="hwdm">
        <Property></Property>
        <Property name="label">货位代码</Property>
      </PropertyDef>
      <PropertyDef name="dlhs">
        <Property></Property>
        <Property name="label">电缆行数</Property>
      </PropertyDef>
      <PropertyDef name="dlls">
        <Property></Property>
        <Property name="label">电缆列数</Property>
      </PropertyDef>
      <PropertyDef name="dlcs">
        <Property></Property>
        <Property name="label">电缆层数</Property>
      </PropertyDef>
      <PropertyDef name="dlqs">
        <Property></Property>
        <Property name="label">电缆圈数</Property>
      </PropertyDef>
      <PropertyDef name="dlqplxq">
        <Property></Property>
        <Property name="label">电缆圈排列详情</Property>
      </PropertyDef>
      <PropertyDef name="scqd">
        <Property></Property>
        <Property name="label">上层起点</Property>
      </PropertyDef>
      <PropertyDef name="sczd">
        <Property></Property>
        <Property name="label">上层终点</Property>
      </PropertyDef>
      <PropertyDef name="zcqd">
        <Property></Property>
        <Property name="label">中层起点</Property>
      </PropertyDef>
      <PropertyDef name="zczd">
        <Property></Property>
        <Property name="label">中层终点</Property>
      </PropertyDef>
      <PropertyDef name="xcqd">
        <Property></Property>
        <Property name="label">下层起点</Property>
      </PropertyDef>
      <PropertyDef name="xczd">
        <Property></Property>
        <Property name="label">下层终点</Property>
      </PropertyDef>
      <PropertyDef name="yxfwqsc">
        <Property></Property>
        <Property name="label">有效范围起始层</Property>
      </PropertyDef>
      <PropertyDef name="yxfwjsc">
        <Property></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="zhgxsj">
        <Property name="dataType">Date</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <Reference name="sh2023Api2103Items">
        <Property name="dataType">[dtItem]</Property>
        <Property name="dataProvider">sHApi2103PR#itemList</Property>
        <Property name="parameter">$${this.dlqplxq}</Property>
      </Reference>
    </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>
    <DataType name="dtItem">
      <Property name="creationType">com.fzzy.push.sh2023.dto.SH2023Api2103Item</Property>
      <PropertyDef name="qh">
        <Property/>
        <Property name="label">圈号</Property>
      </PropertyDef>
      <PropertyDef name="qsdlbh">
        <Property/>
        <Property name="label">起始电缆编号</Property>
      </PropertyDef>
      <PropertyDef name="jsdlbh">
        <Property/>
        <Property name="label">结束电缆编号</Property>
      </PropertyDef>
      <PropertyDef name="cs">
        <Property/>
        <Property name="label">各圈总层数</Property>
      </PropertyDef>
      <PropertyDef name="ybj">
        <Property/>
        <Property name="label">圈半径</Property>
      </PropertyDef>
      <PropertyDef name="rowId">
        <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">sHApi2103PR#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="hwdm">
        <Property name="property">hwdm</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="scqd">
        <Property name="property">scqd</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="sczd">
        <Property name="property">sczd</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="zcqd">
        <Property name="property">zcqd</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="zczd">
        <Property name="property">zczd</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="xcqd">
        <Property name="property">xcqd</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="xczd">
        <Property name="property">xczd</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="yxfwqsc">
        <Property name="property">yxfwqsc</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="yxfwjsc">
        <Property name="property">yxfwjsc</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="bjw">
        <Property name="property">bjw</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" layout="regionPadding:5">
      <Property name="width">80%</Property>
      <Property name="caption">粮情设备配置信息</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="closeable">false</Property>
      <Property name="height">80%</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>
        <FieldSet layout="regionPadding:5">
          <Property name="caption">基本信息</Property>
          <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">hwdm</Property>
                <Property name="property">hwdm</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlhs</Property>
                <Property name="property">dlhs</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlls</Property>
                <Property name="property">dlls</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlcs</Property>
                <Property name="property">dlcs</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">dlqs</Property>
                <Property name="property">dlqs</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">scqd</Property>
                <Property name="property">scqd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">sczd</Property>
                <Property name="property">sczd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zcqd</Property>
                <Property name="property">zcqd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zczd</Property>
                <Property name="property">zczd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">xcqd</Property>
                <Property name="property">xcqd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">xczd</Property>
                <Property name="property">xczd</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">yxfwqsc</Property>
                <Property name="property">yxfwqsc</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">yxfwjsc</Property>
                <Property name="property">yxfwjsc</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">bjw</Property>
                <Property name="property">bjw</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">zhgxsj</Property>
                <Property name="property">zhgxsj</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
        <Panel layout="regionPadding:5">
          <Property name="caption">电缆圈排列详情</Property>
          <Property name="height">400</Property>
          <Buttons/>
          <Children>
            <Container layout="regionPadding:10">
              <Property name="exClassName">bg-color</Property>
              <Property name="contentOverflow">hidden</Property>
              <Property name="height">55</Property>
              <Label layoutConstraint="left">
                <Property name="text">菜单栏:</Property>
              </Label>
              <Button layoutConstraint="left">
                <ClientEvent name="onClick">var list = view.get(&quot;#dsMain.data:#&quot;).get(&quot;sh2023Api2103Items&quot;);&#xD;
list.insert({});</ClientEvent>
                <Property name="caption">新增</Property>
                <Property name="exClassName">btn-default</Property>
                <Property name="iconClass">fa fa-plus</Property>
              </Button>
              <Button layoutConstraint="left">
                <ClientEvent name="onClick">var data = view.get(&quot;#dataItem.currentEntity&quot;);&#xD;
if(!data){&#xD;
 return;&#xD;
}&#xD;
data.remove();</ClientEvent>
                <Property name="caption">删除</Property>
                <Property name="iconClass">fa fa-minus</Property>
                <Property name="exClassName">btn-warn</Property>
              </Button>
            </Container>
            <DataGrid id="dataItem">
              <Property name="dataPath">#.sh2023Api2103Items</Property>
              <Property name="dataSet">dsMain</Property>
              <DataColumn name="qh">
                <Property name="property">qh</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="qsdlbh">
                <Property name="property">qsdlbh</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="jsdlbh">
                <Property name="property">jsdlbh</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="cs">
                <Property name="property">cs</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="ybj">
                <Property name="property">ybj</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="rowId">
                <Property name="property">rowId</Property>
                <Property name="align">center</Property>
              </DataColumn>
            </DataGrid>
          </Children>
          <Tools/>
        </Panel>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">sHApi2103PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">sHApi2103PR#pushData</Property>
      <Property name="confirmMessage">确定要上报么?</Property>
    </AjaxAction>
    <AjaxAction id="ajaxDel">
      <Property name="service">sHApi2103PR#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/dto/ShApi1311.java
ÎļþÒÑɾ³ý
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2101.java
ÎļþÒÑɾ³ý
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2102.java
ÎļþÒÑɾ³ý
src/main/java/com/fzzy/otherview/sh2023/dto/ShApi2103.java
ÎļþÒÑɾ³ý
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2101PR.java
@@ -160,7 +160,9 @@
        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);
        if (null == apiConf) return "系统没有获取到当前库区配置信息,执行失败";
        if (null == apiConf) {
            return "系统没有获取到当前库区配置信息,执行失败";
        }
        //封装参数
        ApiParam param = new ApiParam(apiConf, "21", SH2023Constant.SH_2023_API_CODE_2101);
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2102PR.java
@@ -36,7 +36,7 @@
import java.util.List;
/**
 * ä¸Šæµ·å¸‚接口-2102 æ£€æ–¤å•
 * ä¸Šæµ·å¸‚接口-2102 å€’仓倒入
 *
 * @author czt
 * @date 2023/8/17
@@ -154,10 +154,12 @@
        ResponseDto responseDto;
        String result = "";
        String kqdm = items.get(0).getKqdm();
        String kqdm = items.get(0).getDrhwdm().substring(0, 21);
        ApiConfs apiConf = apiCommonService.getConf(kqdm);
        if (null == apiConf) return "系统没有获取到当前库区配置信息,执行失败";
        if (null == apiConf) {
            return "系统没有获取到当前库区配置信息,执行失败";
        }
        //封装参数
        ApiParam param = new ApiParam(apiConf, "21", SH2023Constant.SH_2023_API_CODE_2102);
@@ -179,7 +181,7 @@
                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setKqdm(data.getDrhwdm().substring(0, 21));
                    infoData.setInteType("21");
                    infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2102);
                    infoData.setUpdateTime(new Date());
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi2103PR.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,207 @@
package com.fzzy.otherview.sh2023.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
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.SH2023Api2103;
import com.fzzy.push.sh2023.dto.SH2023Api2103Item;
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.*;
/**
 * ä¸Šæµ·å¸‚接口-2103 ç²®æƒ…设备配置
 *
 * @author czt
 * @date 2023/8/17
 */
@Component(value = "sHApi2103PR")
public class SHApi2103PR {
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    /**
     * èŽ·å–ä¿¡æ¯
     * sHApi2103PR#listData
     *
     * @return
     */
    @DataProvider
    public void listData(Page<SH2023Api2103> 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_2103);
                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<SH2023Api2103> list = new ArrayList<>();
        SH2023Api2103 sh2023Api2103;
        for (ApiInfoData infoData : japPage.getContent()) {
            sh2023Api2103 = JSONObject.parseObject(infoData.getData(), SH2023Api2103.class);
            list.add(sh2023Api2103);
        }
        page.setEntities(list);
    }
    /**
     * sHApi2103PR#itemList
     */
    @DataProvider
    public List<SH2023Api2103Item> itemList(String code) {
        return JSON.parseArray(code, SH2023Api2103Item.class);
    }
    /**
     * sHApi2103PR#saveData
     */
    @DataResolver
    public void saveData(SH2023Api2103 data) {
        data.setDlqplxq(JSON.toJSONString(data.getSh2023Api2103Items()));
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getHwdm());
        infoData.setKqdm(data.getHwdm().substring(0, 21));
        infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getHwdm());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(Constant.CZBZ_I);
        infoData.setRemarks("备注信息");
        apiInfoDataRep.save(infoData);
    }
    /**
     * sHApi2103PR#delData
     */
    @Expose
    public void delData(SH2023Api2103 data) {
        apiInfoDataRep.deleteById(data.getHwdm());
    }
    /**
     * sHApi2103PR#delUpdate
     */
    @Expose
    public String delUpdate(SH2023Api2103 entity) {
        if (null == entity) {
            return "无数据执行";
        }
        apiInfoDataRep.updateStatus(entity.getHwdm(), JSON.toJSONString(entity), Constant.CZBZ_D);
        return null;
    }
    @Expose
    public String pushData(List<SH2023Api2103> items) {
        ResponseDto responseDto;
        String result = "";
        String kqdm = items.get(0).getHwdm().substring(0, 21);
        ApiConfs apiConf = apiCommonService.getConf(kqdm);
        if (null == apiConf) {
            return "系统没有获取到当前库区配置信息,执行失败";
        }
        //封装参数
        ApiParam param = new ApiParam(apiConf, "21", SH2023Constant.SH_2023_API_CODE_2103);
        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        if (null == apiService) {
            return "系统没有当前推送协议配置,执行失败";
        }
        //推送,数据为集合形式
        responseDto = apiService.pushData(param, apiConf, items);
        if (responseDto.getSuccess() == 0) {
            //推送成功,更新数据上传状态
            ApiInfoData infoData;
            for (SH2023Api2103 data : items) {
                infoData = new ApiInfoData();
                infoData.setId(data.getBizId());
                infoData.setKqdm(data.getKqdm());
                infoData.setInteType("21");
                infoData.setInteId(SH2023Constant.SH_2023_API_CODE_2103);
                infoData.setUpdateTime(new Date());
                infoData.setDataId(data.getBizId());
                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/repository/ShApi1311Rep.java
@@ -1,15 +1,5 @@
package com.fzzy.otherview.sh2023.repository;
import com.fzzy.otherview.sh2023.dto.ShApi1311;
import com.fzzy.otherview.sh2023.dto.ShApi2101;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.Date;
import java.util.List;
/**
 * è§†é¢‘监控
 *
src/main/java/com/fzzy/otherview/sh2023/repository/ShApi2101Rep.java
@@ -1,15 +1,5 @@
package com.fzzy.otherview.sh2023.repository;
import com.fzzy.api.entity.Api1310;
import com.fzzy.otherview.sh2023.dto.ShApi2101;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.Date;
import java.util.List;
/**
 * æ£€æ–¤å•
 *
src/main/java/com/fzzy/push/sh2023/SH2023PushService12.java
@@ -9,8 +9,6 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
import com.fzzy.otherview.sh2023.dto.ShApi2101;
import com.fzzy.push.sh2023.dto.SH2023Api1401;
import com.fzzy.push.sh2023.dto.SH2023Api2101;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
src/main/java/com/fzzy/push/sh2023/SH2023PushService13.java
@@ -9,14 +9,9 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
import com.fzzy.otherview.sh2023.dto.ShApi1311;
import com.fzzy.otherview.sh2023.dto.ShApi2103;
import com.fzzy.otherview.sh2023.repository.ShApi1311Rep;
import com.fzzy.push.impl.ComPushService11;
import com.fzzy.push.sh2023.dto.SH2023Api1311;
import com.fzzy.push.sh2023.dto.SH2023Api2103;
import lombok.extern.slf4j.Slf4j;
import org.codehaus.jackson.JsonParser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
@@ -4,14 +4,16 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
 * ç²®æƒ…设备配置
 *
 * @author czt
 *
 * @date 2023-08-21
 */
@Data
@@ -68,4 +70,7 @@
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date zhgxsj;
    @Transient
    private List<SH2023Api2103Item> sh2023Api2103Items;
}