Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-06 786b5b76fee42107cef33892cbf7e3e8fab4f0e4

 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">
@@ -499,6 +504,10 @@
    <PropertyDef name="createDate">
      <Property name="dataType">Date</Property>
    </PropertyDef>
    <PropertyDef name="lqgsdwdm">
      <Property/>
      <Property name="label">粮权单位代码</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDevice">
    <Property name="creationType">com.ld.igds.models.Device</Property>
@@ -871,24 +880,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>
@@ -940,6 +931,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>
@@ -957,6 +956,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>
      <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>
      <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">