粮情协议优化

vince

2024-04-26 b1c572949997a5d82d9b609163ff280a1c49627d

 src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml

@@ -25,7 +25,7 @@
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">所属仓库编码</Property>
        <Property name="label">仓库编码</Property>
      </PropertyDef>
      <PropertyDef name="type">
        <Property></Property>
@@ -78,7 +78,7 @@
      </PropertyDef>
      <PropertyDef name="httpUrl">
        <Property></Property>
        <Property name="label">HTTP地址</Property>
        <Property name="label">API路径</Property>
      </PropertyDef>
      <PropertyDef name="deviceSn">
        <Property></Property>
@@ -98,11 +98,11 @@
      </PropertyDef>
      <PropertyDef name="depotIdSys">
        <Property></Property>
        <Property name="label">自定义仓库编码</Property>
        <Property name="label">系统仓库编码</Property>
      </PropertyDef>
      <PropertyDef name="productId">
        <Property></Property>
        <Property name="label">设备类型KEY</Property>
        <Property name="label">设备KEY</Property>
      </PropertyDef>
      <PropertyDef name="cableRule">
        <Property></Property>
@@ -117,12 +117,50 @@
        <Property name="label">位置</Property>
      </PropertyDef>
      <PropertyDef name="status">
        <Property/>
        <Property></Property>
        <Property name="label">在线状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#triggerOnline&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="onlineTime">
        <Property name="dataType">DateTime</Property>
        <Property name="label">最后上线时间</Property>
      </PropertyDef>
      <PropertyDef name="cableStart">
        <Property></Property>
        <Property name="label">电缆开始</Property>
      </PropertyDef>
      <PropertyDef name="cableEnd">
        <Property></Property>
        <Property name="label">电缆截至</Property>
      </PropertyDef>
      <PropertyDef name="thAddr">
        <Property></Property>
        <Property name="label">温湿度地址</Property>
      </PropertyDef>
      <PropertyDef name="cableFormat">
        <Property></Property>
        <Property name="label">电缆制式</Property>
      </PropertyDef>
      <PropertyDef name="cableType">
        <Property></Property>
        <Property name="label">电缆类型</Property>
      </PropertyDef>
      <PropertyDef name="depotType">
        <Property></Property>
        <Property name="label">仓库类型</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerPR#listDepotType&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="bhId">
        <Property></Property>
        <Property name="label">分机内部仓库编码</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam" parent="Map">
@@ -148,6 +186,9 @@
        <Property></Property>
        <Property name="label">设备ID</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="bizType">
        <Property name="label">动作事件</Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -224,12 +265,15 @@
        <Property name="exClassName">toolbar-button-push</Property>
      </ToolBarButton>
      <ToolBarButton>
        <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
var param = {&#xD;
   deviceId:data.get(&quot;deviceId&quot;),&#xD;
   bizType:&quot;testGrain&quot;&#xD;
}&#xD;
testDevice(param);</ClientEvent>
        <ClientEvent name="onClick">$confirm(&quot;确认测试粮情？&quot;,function(){&#xD;
   var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
   var param = {&#xD;
      deviceId:data.get(&quot;deviceId&quot;),&#xD;
      bizType:&quot;testGrain&quot;&#xD;
   }&#xD;
testDevice(param);&#xD;
});&#xD;
</ClientEvent>
        <Property name="caption">粮情调试</Property>
        <Property name="iconClass">fa fa-wrench</Property>
        <Property name="exClassName">toolbar-button-push</Property>
@@ -259,6 +303,60 @@
        <Property name="iconClass">fa fa-wrench</Property>
        <Property name="exClassName">toolbar-button-push</Property>
      </ToolBarButton>
      <Separator/>
      <MenuButton>
        <Property name="caption">下行分机调试</Property>
        <Property name="exClassName">toolbar-button-push</Property>
        <Property name="iconClass">fa fa-wrench</Property>
        <MenuItem>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
var param = {&#xD;
   deviceId:data.get(&quot;deviceId&quot;),&#xD;
   bizType:&quot;syncConf&quot;&#xD;
}&#xD;
testIde(param);</ClientEvent>
          <Property name="caption">远程获取配置</Property>
        </MenuItem>
        <MenuItem>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
var param = {&#xD;
   deviceId:data.get(&quot;deviceId&quot;),&#xD;
   bizType:&quot;writeConf&quot;&#xD;
}&#xD;
testIde(param);</ClientEvent>
          <Property name="caption">写入参数</Property>
        </MenuItem>
        <MenuItem>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
var param = {&#xD;
   deviceId:data.get(&quot;deviceId&quot;),&#xD;
   bizType:&quot;initParam&quot;&#xD;
}&#xD;
&#xD;
testIde(param);</ClientEvent>
          <Property name="caption">初始化分机参数</Property>
        </MenuItem>
        <MenuItem>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
var param = {&#xD;
   deviceId:data.get(&quot;deviceId&quot;),&#xD;
   bizType:&quot;disconnect&quot;&#xD;
}&#xD;
&#xD;
testIde(param);</ClientEvent>
          <Property name="caption">主动断开连接</Property>
        </MenuItem>
        <MenuItem>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
var param = {&#xD;
   deviceId:data.get(&quot;deviceId&quot;),&#xD;
   bizType:&quot;transparent&quot;&#xD;
}&#xD;
&#xD;
testIde(param);</ClientEvent>
          <Property name="caption">信息透传调试</Property>
        </MenuItem>
      </MenuButton>
    </ToolBar>
    <DataGrid id="dgMain">
      <Property name="dataSet">dsMain</Property>
@@ -317,121 +415,188 @@
      </Buttons>
      <Children>
        <Container layout="regionPadding:10;padding:10">
          <AutoForm>
            <Property name="dataSet">dsMain</Property>
            <Property name="cols">*,*,*</Property>
            <Property name="labelWidth">125</Property>
            <Property name="labelAlign">right</Property>
            <Property name="labelSeparator">：</Property>
            <Property name="labelPosition">left</Property>
            <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>
              <Property name="name">deviceName</Property>
              <Property name="property">deviceName</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">type</Property>
              <Property name="property">type</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">productId</Property>
              <Property name="property">productId</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">orgId</Property>
              <Property name="property">orgId</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">depotId</Property>
              <Property name="property">depotId</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">depotIdSys</Property>
              <Property name="property">depotIdSys</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">ip</Property>
              <Property name="property">ip</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">port</Property>
              <Property name="property">port</Property>
              <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">pushProtocol</Property>
              <Property name="property">pushProtocol</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">syncProtocol</Property>
              <Property name="property">syncProtocol</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">serPort</Property>
              <Property name="property">serPort</Property>
              <Property name="labelWidth">150</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:2">
              <Property name="name">rtsp</Property>
              <Property name="property">rtsp</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:2">
              <Property name="name">httpUrl</Property>
              <Property name="property">httpUrl</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">position</Property>
              <Property name="property">position</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement layoutConstraint="colSpan:3">
              <Property name="name">remark</Property>
              <Property name="property">remark</Property>
              <Property name="editorType">TextArea</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">cableRule</Property>
              <Property name="property">cableRule</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">cableCir</Property>
              <Property name="property">cableCir</Property>
              <Editor/>
            </AutoFormElement>
          </AutoForm>
          <FieldSet layout="padding:5">
            <Property name="caption">网关设备配置</Property>
            <Buttons/>
            <Children>
              <AutoForm>
                <Property name="dataSet">dsMain</Property>
                <Property name="cols">*,*,*</Property>
                <Property name="labelAlign">right</Property>
                <Property name="labelSeparator">：</Property>
                <Property name="labelPosition">left</Property>
                <Property name="labelWidth">100</Property>
                <AutoFormElement layoutConstraint="colSpan:2">
                  <Property name="name">deviceId</Property>
                  <Property name="property">deviceId</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">deviceName</Property>
                  <Property name="property">deviceName</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">type</Property>
                  <Property name="property">type</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">productId</Property>
                  <Property name="property">productId</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">depotId</Property>
                  <Property name="property">depotId</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">position</Property>
                  <Property name="property">position</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">bhId</Property>
                  <Property name="property">bhId</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement layoutConstraint="colSpan:1">
                  <Property name="name">remark</Property>
                  <Property name="property">remark</Property>
                  <Editor/>
                </AutoFormElement>
              </AutoForm>
            </Children>
          </FieldSet>
          <FieldSet layout="padding:5">
            <Property name="caption">下行通讯设备配置</Property>
            <Buttons/>
            <Children>
              <AutoForm>
                <Property name="dataSet">dsMain</Property>
                <Property name="cols">*,*,*</Property>
                <Property name="labelWidth">120</Property>
                <Property name="labelAlign">right</Property>
                <Property name="labelSeparator">：</Property>
                <Property name="labelPosition">left</Property>
                <AutoFormElement layoutConstraint="colSpan:2">
                  <Property name="name">deviceSn</Property>
                  <Property name="property">deviceSn</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">orgId</Property>
                  <Property name="property">orgId</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">ip</Property>
                  <Property name="property">ip</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">port</Property>
                  <Property name="property">port</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">syncProtocol</Property>
                  <Property name="property">syncProtocol</Property>
                  <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">pushProtocol</Property>
                  <Property name="property">pushProtocol</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement layoutConstraint="colSpan:2">
                  <Property name="name">rtsp</Property>
                  <Property name="property">rtsp</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">status</Property>
                  <Property name="property">status</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement layoutConstraint="colSpan:2">
                  <Property name="name">httpUrl</Property>
                  <Property name="property">httpUrl</Property>
                  <Editor/>
                </AutoFormElement>
              </AutoForm>
            </Children>
          </FieldSet>
          <FieldSet layout="padding:5">
            <Property name="caption">粮情检测参数配置</Property>
            <Buttons/>
            <Children>
              <AutoForm>
                <Property name="dataSet">dsMain</Property>
                <Property name="cols">*,*,*</Property>
                <Property name="labelWidth">120</Property>
                <Property name="labelAlign">right</Property>
                <Property name="labelSeparator">：</Property>
                <Property name="labelPosition">left</Property>
                <AutoFormElement>
                  <Property name="name">depotIdSys</Property>
                  <Property name="property">depotIdSys</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">depotType</Property>
                  <Property name="property">depotType</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">cableRule</Property>
                  <Property name="property">cableRule</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">cableCir</Property>
                  <Property name="property">cableCir</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">cableStart</Property>
                  <Property name="property">cableStart</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">cableEnd</Property>
                  <Property name="property">cableEnd</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">thAddr</Property>
                  <Property name="property">thAddr</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">cableFormat</Property>
                  <Property name="property">cableFormat</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">cableType</Property>
                  <Property name="property">cableType</Property>
                  <Editor/>
                </AutoFormElement>
              </AutoForm>
            </Children>
          </FieldSet>
        </Container>
      </Children>
      <Tools/>
@@ -551,5 +716,9 @@
      </Children>
      <Tools/>
    </Dialog>
    <AjaxAction id="ajaxTestIDE">
      <Property name="confirmMessage">确定要执行么？</Property>
      <Property name="service">gatewayDeviceTestPR#testIde</Property>
    </AjaxAction>
  </View>
</ViewConfig>