YYC
2023-10-30 03b873ebffb7dc1818a460d3aa5339f3a6fd1ef8
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -16,20 +16,25 @@
      </PropertyDef>
      <PropertyDef name="deviceName">
        <Property></Property>
        <Property name="label">名称</Property>
        <Property name="label">设备名称</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="depotName">
        <Property></Property>
        <Property name="label">仓库名称</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">所属仓库编码</Property>
      </PropertyDef>
      <PropertyDef name="type">
        <Property></Property>
        <Property name="label">设备类型</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">所属仓库</Property>
      </PropertyDef>
      <PropertyDef name="depotName">
        <Property></Property>
        <Property name="label">所属仓库</Property>
        <Property name="mapping">
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerGatewayDeviceType&quot;).getResult()}</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="ip">
        <Property></Property>
@@ -43,9 +48,19 @@
        <Property></Property>
        <Property name="label">视频RTSP</Property>
      </PropertyDef>
      <PropertyDef name="provinceProtocol">
        <Property></Property>
        <Property name="label">省平台协议</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerPushProtocol&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="pushProtocol">
        <Property></Property>
        <Property name="label">系统网关通讯协议</Property>
        <Property name="label">与系统通讯协议</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerGatewayProtocol&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
@@ -55,7 +70,7 @@
      </PropertyDef>
      <PropertyDef name="syncProtocol">
        <Property></Property>
        <Property name="label">网关与设备通讯协议</Property>
        <Property name="label">与设备通讯协议</Property>
        <Property name="mapping">
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
@@ -76,8 +91,24 @@
        <Property name="label">HTTP地址</Property>
      </PropertyDef>
      <PropertyDef name="deviceSn">
        <Property/>
        <Property></Property>
        <Property name="label">设备序列号</Property>
      </PropertyDef>
      <PropertyDef name="serPort">
        <Property name="dataType">int</Property>
        <Property name="label">TCP服务端口</Property>
      </PropertyDef>
      <PropertyDef name="userName">
        <Property></Property>
        <Property name="label">设备用户名</Property>
      </PropertyDef>
      <PropertyDef name="password">
        <Property></Property>
        <Property name="label">设备密码</Property>
      </PropertyDef>
      <PropertyDef name="depotIdSys">
        <Property/>
        <Property name="label">库区系统仓库编码</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -149,18 +180,20 @@
      </DataColumn>
      <DataColumn name="type">
        <Property name="property">type</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="depotName">
        <Property name="property">depotName</Property>
      <DataColumn name="deviceId">
        <Property name="property">deviceId</Property>
        <Property name="align">center</Property>
        <Property name="width">550</Property>
      </DataColumn>
      <DataColumn name="syncProtocol">
        <Property name="property">syncProtocol</Property>
        <Property name="align">center</Property>
      </DataColumn>
      <DataColumn name="pushProtocol">
        <Property name="property">pushProtocol</Property>
      </DataColumn>
      <DataColumn name="remark">
        <Property name="property">remark</Property>
        <Property name="align">center</Property>
      </DataColumn>
    </DataGrid>
    <Dialog id="dialogMain">
@@ -192,13 +225,18 @@
          <AutoForm>
            <Property name="dataSet">dsMain</Property>
            <Property name="cols">*,*,*</Property>
            <Property name="labelWidth">100</Property>
            <Property name="labelWidth">125</Property>
            <Property name="labelAlign">right</Property>
            <Property name="labelSeparator">:</Property>
            <Property name="labelPosition">left</Property>
            <AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:2">
              <Property name="name">deviceId</Property>
              <Property name="property">deviceId</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">deviceSn</Property>
              <Property name="property">deviceSn</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
@@ -209,6 +247,11 @@
            <AutoFormElement>
              <Property name="name">type</Property>
              <Property name="property">type</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">orgId</Property>
              <Property name="property">orgId</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
@@ -227,6 +270,21 @@
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">userName</Property>
              <Property name="property">userName</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">password</Property>
              <Property name="property">password</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">provinceProtocol</Property>
              <Property name="property">provinceProtocol</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">pushProtocol</Property>
              <Property name="property">pushProtocol</Property>
              <Editor/>
@@ -237,8 +295,9 @@
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">orgId</Property>
              <Property name="property">orgId</Property>
              <Property name="name">serPort</Property>
              <Property name="property">serPort</Property>
              <Property name="labelWidth">150</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:2">
@@ -251,6 +310,11 @@
              <Property name="property">httpUrl</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">depotIdSys</Property>
              <Property name="property">depotIdSys</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:3">
              <Property name="name">remark</Property>
              <Property name="property">remark</Property>