调整基础配置信息查询方式，取消jpa

czt

2025-12-01 096296cd7485c5583c8194d88cca700e3c4d84a0

 fzzy-igdss-view/src/main/java/models/core.model.xml

@@ -3,14 +3,14 @@
  <DataType name="dtBank">
    <Property name="matchType">com.fzzy.igds.domain.Bank</Property>
    <PropertyDef name="id">
      <Property/>
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property/>
      <Property></Property>
      <Property name="label">银行名称</Property>
    </PropertyDef>
    <PropertyDef name="status">
      <Property/>
      <Property></Property>
      <Property name="label">是否启用</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerYN&quot;).getResult(&quot;DEVICE_STATUS&quot;)}</Property>
@@ -19,15 +19,15 @@
      </Property>
    </PropertyDef>
    <PropertyDef name="remark">
      <Property/>
      <Property></Property>
      <Property name="label">备注说明</Property>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property/>
      <Property></Property>
      <Property name="label">所属组织</Property>
    </PropertyDef>
    <PropertyDef name="createBy">
      <Property/>
      <Property></Property>
      <Property name="label">创建人</Property>
    </PropertyDef>
    <PropertyDef name="createTime">
@@ -35,7 +35,7 @@
      <Property name="label">创建时间</Property>
    </PropertyDef>
    <PropertyDef name="updateBy">
      <Property/>
      <Property></Property>
      <Property name="label">更新人</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
@@ -46,14 +46,14 @@
  <DataType name="dtBaseParam">
    <Property name="matchType">com.fzzy.igds.data.IgdsBaseParam</Property>
    <PropertyDef name="id">
      <Property/>
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property/>
      <Property></Property>
      <Property name="label">名称</Property>
    </PropertyDef>
    <PropertyDef name="key">
      <Property/>
      <Property></Property>
      <Property name="label">关键字</Property>
    </PropertyDef>
    <PropertyDef name="start">
@@ -163,9 +163,9 @@
      <Property></Property>
      <Property name="label">所属分库</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getData&quot;).getResult()}</Property>
        <Property name="keyProperty">deptId</Property>
        <Property name="valueProperty">deptName</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">kqmc</Property>
      </Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
@@ -405,7 +405,7 @@
    <PropertyDef name="storageReal">
      <Property name="dataType">Double</Property>
      <Property name="label">实际储量</Property>
      <Property name="displayFormat">#,##0 KG</Property>
      <Property name="displayFormat">#0.0 KG</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="remark">
@@ -433,4 +433,569 @@
      <Property name="readOnly">true</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDeviceSer">
    <Property name="creationType">com.fzzy.igds.domain.DeviceSer</Property>
    <PropertyDef name="id">
      <Property></Property>
      <Property name="label">分机编码</Property>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">所属库区</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">kqmc</Property>
      </Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property></Property>
      <Property name="label">组织编码</Property>
    </PropertyDef>
    <PropertyDef name="sn">
      <Property></Property>
      <Property name="label">序列号</Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property></Property>
      <Property name="label">分机名称</Property>
    </PropertyDef>
    <PropertyDef name="ip">
      <Property></Property>
      <Property name="label">分机IP</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="port">
      <Property name="dataType">Integer</Property>
      <Property name="label">分机端口</Property>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="type">
      <Property></Property>
      <Property name="label">分机类型</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;SER_TYPE&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="status">
      <Property></Property>
      <Property name="label">是否在线</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;sys_yes_no&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="controlModel">
      <Property></Property>
      <Property name="label">操作模式</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#controlModel&quot;).getResult()}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="networkType">
      <Property></Property>
      <Property name="label">网络模式</Property>
      <Property name="mapping">
        <Property name="mapValues">
          <Collection>
            <Entity>
              <Property name="code">01</Property>
              <Property name="name">有线模式</Property>
            </Entity>
            <Entity>
              <Property name="code">02</Property>
              <Property name="name">无线模式</Property>
            </Entity>
          </Collection>
        </Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
      <Property name="required">false</Property>
    </PropertyDef>
    <PropertyDef name="protocol">
      <Property></Property>
      <Property name="label">分机协议</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;PROTOCOL&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="isMoreDepot">
      <Property></Property>
      <Property name="label">多仓并发</Property>
      <Property name="mapping">
        <Property name="mapValues">
          <Collection>
            <Entity>
              <Property name="code">Y</Property>
              <Property name="name">是</Property>
            </Entity>
            <Entity>
              <Property name="code">N</Property>
              <Property name="name">否</Property>
            </Entity>
          </Collection>
        </Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="producer">
      <Property></Property>
      <Property name="label">厂商名称</Property>
    </PropertyDef>
    <PropertyDef name="remark">
      <Property></Property>
      <Property name="label">备注</Property>
    </PropertyDef>
    <PropertyDef name="orderNum">
      <Property name="dataType">Integer</Property>
      <Property name="label">顺序号</Property>
    </PropertyDef>
    <PropertyDef name="contactPhone">
      <Property></Property>
      <Property name="label">联系电话</Property>
    </PropertyDef>
    <PropertyDef name="powerModel">
      <Property></Property>
      <Property name="label">供电模式</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;POWER_TYPE&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="cableStart">
      <Property name="dataType">int</Property>
      <Property name="label">开始列</Property>
    </PropertyDef>
    <PropertyDef name="cableZ">
      <Property name="dataType">int</Property>
      <Property name="label">层配置</Property>
    </PropertyDef>
    <PropertyDef name="cableY">
      <Property name="dataType">int</Property>
      <Property name="label">行配置</Property>
    </PropertyDef>
    <PropertyDef name="cableX">
      <Property name="dataType">int</Property>
      <Property name="label">列配置</Property>
    </PropertyDef>
    <PropertyDef name="cableType">
      <Property></Property>
      <Property name="label">电缆类型</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;CABLE_TYPE&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="cableFormat">
      <Property></Property>
      <Property name="label">电缆制式</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;CABLE_FORMAT&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="orgId">
      <Property></Property>
      <Property name="label">组织号</Property>
    </PropertyDef>
    <PropertyDef name="createTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">创建时间</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="createBy">
      <Property></Property>
      <Property name="label">创建人</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">更新时间</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="updateBy">
      <Property></Property>
      <Property name="label">更新人</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDeviceIot">
    <Property name="creationType">com.fzzy.igds.domain.DeviceIot</Property>
    <PropertyDef name="id">
      <Property></Property>
      <Property name="label">设备编码</Property>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">所属库区</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">kqmc</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property></Property>
      <Property name="label">组织编码</Property>
    </PropertyDef>
    <PropertyDef name="depotId">
      <Property></Property>
      <Property name="label">所属仓库</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="name">
      <Property></Property>
      <Property name="label">名称</Property>
    </PropertyDef>
    <PropertyDef name="passCode">
      <Property name="dataType">int</Property>
      <Property name="label">设备编号</Property>
    </PropertyDef>
    <PropertyDef name="serId">
      <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="type">
      <Property></Property>
      <Property name="label">设备类型</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;DEVICE_IOT_TYPE&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="remark">
      <Property></Property>
      <Property name="label">备注</Property>
    </PropertyDef>
    <PropertyDef name="posX">
      <Property name="dataType">Double</Property>
      <Property name="label">X坐标</Property>
    </PropertyDef>
    <PropertyDef name="posY">
      <Property name="dataType">Double</Property>
      <Property name="label">Y坐标</Property>
    </PropertyDef>
    <PropertyDef name="createTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">创建时间</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="createBy">
      <Property></Property>
      <Property name="label">创建人</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">更新时间</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="updateBy">
      <Property></Property>
      <Property name="label">更新人</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtDepotConf">
    <Property name="creationType">com.fzzy.igds.domain.DepotConf</Property>
    <PropertyDef name="depotId">
      <Property></Property>
      <Property name="label">所属仓库</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property></Property>
      <Property name="label">所属库区</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">kqmc</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property></Property>
      <Property name="label">组织编码</Property>
    </PropertyDef>
    <PropertyDef name="grainSer">
      <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>
      <Property name="required">true</Property>
    </PropertyDef>
    <PropertyDef name="thSer">
      <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="grainFreq">
      <Property></Property>
      <Property name="label">保存频率</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;GRAIN_FREQ&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="thConf">
      <Property></Property>
      <Property name="label">温湿度通道</Property>
    </PropertyDef>
    <PropertyDef name="cableRule">
      <Property></Property>
      <Property name="label">布线规则</Property>
    </PropertyDef>
    <PropertyDef name="cableCir">
      <Property></Property>
      <Property name="label">筒仓层规则</Property>
    </PropertyDef>
    <PropertyDef name="cableCone">
      <Property name="label">筒仓锥形</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerCableCone&quot;).getResult()}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="cableStart">
      <Property name="dataType">int</Property>
      <Property name="label">电缆开始列</Property>
    </PropertyDef>
    <PropertyDef name="cableEnd">
      <Property name="dataType">int</Property>
      <Property name="label">电缆截至列</Property>
    </PropertyDef>
    <PropertyDef name="startOrientation">
      <Property></Property>
      <Property name="label">电缆起始方位</Property>
      <Property name="mapping">
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerStartOrientation&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="startDirection">
      <Property name="label">电缆布线方向</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerStartDirection&quot;).getResult()}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="startPoint">
      <Property name="label">电缆起始点位</Property>
      <Property name="mapping">
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerStartPoint&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="startConvert">
      <Property name="label">层行转换</Property>
      <Property name="mapping">
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerStartConvert&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="tempMax">
      <Property name="dataType">Double</Property>
      <Property name="label">温度上限</Property>
    </PropertyDef>
    <PropertyDef name="temperature">
      <Property name="dataType">Double</Property>
      <Property name="label">温差阈值</Property>
    </PropertyDef>
    <PropertyDef name="startRow">
      <Property name="dataType">Integer</Property>
      <Property name="label">起始根号</Property>
    </PropertyDef>
    <PropertyDef name="grainAuto">
      <Property></Property>
      <Property name="label">粮情优化</Property>
      <Property name="mapping">
        <Property name="mapValues">
          <Collection>
            <Entity>
              <Property name="code">Y</Property>
              <Property name="name">是</Property>
            </Entity>
            <Entity>
              <Property name="code">N</Property>
              <Property name="name">否</Property>
            </Entity>
          </Collection>
        </Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="depotName">
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="depotType">
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="isOnlyTH">
      <Property></Property>
      <Property name="label">粮情类型</Property>
      <Property name="mapping">
        <Property name="mapValues">
          <Collection>
            <Entity>
              <Property name="code">Y</Property>
              <Property name="name">温湿度设备</Property>
            </Entity>
            <Entity>
              <Property name="code">N</Property>
              <Property name="name">粮情电缆</Property>
            </Entity>
          </Collection>
        </Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="createTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">创建时间</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="createBy">
      <Property></Property>
      <Property name="label">创建人</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="updateTime">
      <Property name="dataType">DateTime</Property>
      <Property name="label">更新时间</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
    <PropertyDef name="updateBy">
      <Property></Property>
      <Property name="label">更新人</Property>
      <Property name="readOnly">true</Property>
    </PropertyDef>
  </DataType>
  <DataType name="dtNoticeParam">
    <Property name="matchType">com.fzzy.igds.data.NoticeParam</Property>
    <PropertyDef name="id">
      <Property/>
    </PropertyDef>
    <PropertyDef name="companyId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="deptId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="depotId">
      <Property/>
      <Property name="label">装卸仓库</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
        <Property name="keyProperty">id</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="customerName">
      <Property/>
      <Property name="label">客户名称</Property>
    </PropertyDef>
    <PropertyDef name="foodVariety">
      <Property/>
      <Property name="label">粮食品种</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#sysDictData&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
        <Property name="keyProperty">dictValue</Property>
        <Property name="valueProperty">dictLabel</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="contractId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="planId">
      <Property/>
    </PropertyDef>
    <PropertyDef name="foodType">
      <Property/>
    </PropertyDef>
    <PropertyDef name="year">
      <Property/>
    </PropertyDef>
    <PropertyDef name="type">
      <Property/>
    </PropertyDef>
    <PropertyDef name="weight">
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="taskNum">
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="completeStatus">
      <Property/>
      <Property name="label">完成状态</Property>
      <Property name="mapping">
        <Property name="mapValues">
          <Collection>
            <Entity>
              <Property name="name">未完成</Property>
              <Property name="code">NONE</Property>
            </Entity>
            <Entity>
              <Property name="name">已完成</Property>
              <Property name="code">COMPLETE</Property>
            </Entity>
          </Collection>
        </Property>
        <Property name="keyProperty">code</Property>
        <Property name="valueProperty">name</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="storageReal">
      <Property name="dataType">Double</Property>
    </PropertyDef>
    <PropertyDef name="start">
      <Property name="dataType">Date</Property>
    </PropertyDef>
    <PropertyDef name="end">
      <Property name="dataType">Date</Property>
    </PropertyDef>
    <PropertyDef name="createUser">
      <Property/>
    </PropertyDef>
  </DataType>
</Model>