更改配置及筒仓偏移量

CZT

2023-10-11 564295458c720206db9b5194b90481b711f4b010

 igds-core/src/main/java/models/igds.model.xml

@@ -97,13 +97,18 @@
      <Property name="displayFormat">0.00 米</Property>
    </PropertyDef>
    <PropertyDef name="diameter">
      <Property name="label">筒仓直径</Property>
      <Property name="displayFormat">0.00 米</Property>
      <Property name="label">筒仓/油罐直径</Property>
      <Property name="displayFormat">0.000 米</Property>
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="volume">
      <Property name="label">筒仓体积</Property>
      <Property name="displayFormat">0.00 立方米</Property>
      <Property name="displayFormat">0.000 立方米</Property>
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="deVolume">
      <Property name="label">扣除体积</Property>
      <Property name="displayFormat">0.000 立方米</Property>
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="doorNum">
@@ -518,14 +523,17 @@
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property></Property>
      <Property name="label">名称</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="passCode">
      <Property name="dataType">int</Property>
      <Property name="label">设备编号</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="link">
      <Property></Property>
@@ -548,6 +556,7 @@
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="type">
      <Property></Property>
@@ -602,14 +611,6 @@
    <PropertyDef name="locationName">
      <Property></Property>
      <Property name="label">位置</Property>
    </PropertyDef>
    <PropertyDef name="modbus">
      <Property></Property>
      <Property name="label">Modbus配置</Property>
    </PropertyDef>
    <PropertyDef name="linkModbus">
      <Property/>
      <Property name="label">关联设备Modbus</Property>
    </PropertyDef>
    <PropertyDef name="ext1">
      <Property></Property>
@@ -875,24 +876,6 @@
      <Property name="dataType">Double</Property>
      <Property name="label">虫害上限</Property>
    </PropertyDef>
    <PropertyDef name="videoIn">
      <Property></Property>
      <Property name="label">内部视频</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;securityPR#listCamera&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="quantitySer">
      <Property></Property>
      <Property name="label">数量检测分机</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR2#getSerCacheByType&quot;).getResult(&quot;99&quot;)}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="thSer">
      <Property></Property>
      <Property name="label">温湿度分机</Property>
@@ -944,6 +927,14 @@
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStartPoint&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="startConvert">
      <Property name="label">层行转换</Property>
      <Property name="mapping">
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStartConvert&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="depotName">
      <Property></Property>
    </PropertyDef>
@@ -961,6 +952,29 @@
    <PropertyDef name="gasSer">
      <Property></Property>
      <Property name="label">气体分机</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="pestSer">
      <Property/>
      <Property name="label">气体分机</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="verbSer">
      <Property/>
      <Property name="label">通风分机</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deviceSerPR#getAllSerCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDicSlogan">