Merge remote-tracking branch 'origin/master'

YYC

2023-09-07 7243e0b4bd9a267a633d2e481e17646509b6868d

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

@@ -154,10 +154,6 @@
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="ggm">
      <Property></Property>
      <Property name="label">国规码</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDepot">
    <Property name="creationType">com.ld.igds.models.Depot</Property>
@@ -316,6 +312,10 @@
    <PropertyDef name="remark">
      <Property></Property>
      <Property name="label">备注</Property>
    </PropertyDef>
    <PropertyDef name="ggm">
      <Property></Property>
      <Property name="label">国规码</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDepotStore">
@@ -518,14 +518,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 +551,7 @@
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="type">
      <Property></Property>
@@ -603,24 +607,20 @@
      <Property></Property>
      <Property name="label">位置</Property>
    </PropertyDef>
    <PropertyDef name="modbus">
      <Property/>
      <Property name="label">Modbus配置</Property>
    </PropertyDef>
    <PropertyDef name="ext1">
      <Property/>
      <Property></Property>
      <Property name="label">扩展字段1</Property>
    </PropertyDef>
    <PropertyDef name="ext2">
      <Property/>
      <Property></Property>
      <Property name="label">扩展字段2</Property>
    </PropertyDef>
    <PropertyDef name="ext3">
      <Property/>
      <Property></Property>
      <Property name="label">扩展字段3</Property>
    </PropertyDef>
    <PropertyDef name="statusName">
      <Property/>
      <Property></Property>
      <Property name="label">当前状态</Property>
    </PropertyDef>
  </DataType>
@@ -871,24 +871,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 +922,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 +947,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">