更新MODBUS-TCP协议 4

jiazx0107@163.com

2023-08-24 2884bf1f32b51129a83125ecfc2cf8526f71154f

更新MODBUS-TCP协议 4

 igds-core/src/main/java/com/ld/igds/models/DepotConf.java

@@ -47,6 +47,14 @@
    @PropertyDef(label = "气体分机")
    private String gasSer;

    @Column(name = "PEST_SER_", length = 40)
    @PropertyDef(label = "气体分机")
    private String pestSer;

    @Column(name = "VERB_SER_", length = 40)
    @PropertyDef(label = "通风分机")
    private String verbSer;

    @Column(name = "GRAIN_FREQ_", length = 4)
    @PropertyDef(label = "粮情保存频率", description = "默认一天多次")
    private String grainFreq = GrainFrequence.FREQ_01.getCode();
@@ -126,7 +134,6 @@
    @Column(name = "PEST_MAX_")
    @PropertyDef(label = "虫害上限")
    private Double pestMax;


    // 仓库名称
    @Transient

 igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml

@@ -155,7 +155,7 @@
          </Children>
        </FieldSet>
        <FieldSet>
          <Property name="caption">粮情检测配置</Property>
          <Property name="caption">粮温检测配置</Property>
          <Buttons/>
          <Children>
            <AutoForm layoutConstraint="padding:5">
@@ -205,17 +205,7 @@
              <AutoFormElement>
                <Property name="name">tempMax</Property>
                <Property name="property">tempMax</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">thSer</Property>
                <Property name="property">thSer</Property>
                <Property name="trigger">autoMappingDropDown2</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">thConf</Property>
                <Property name="property">thConf</Property>
                <Property name="label">粮温上限</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -249,6 +239,17 @@
              <AutoFormElement>
                <Property name="name">grainFreq</Property>
                <Property name="property">grainFreq</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">thSer</Property>
                <Property name="property">thSer</Property>
                <Property name="trigger">autoMappingDropDown2</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">thConf</Property>
                <Property name="property">thConf</Property>
                <Editor/>
              </AutoFormElement>
              <Button>
@@ -326,6 +327,11 @@
              <Property name="labelSeparator">：</Property>
              <Property name="labelWidth">100</Property>
              <AutoFormElement>
                <Property name="name">pestSer</Property>
                <Property name="property">pestSer</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">pestStart</Property>
                <Property name="property">pestStart</Property>
                <Editor/>
@@ -353,6 +359,11 @@
              <Property name="labelSeparator">：</Property>
              <Property name="labelWidth">100</Property>
              <AutoFormElement>
                <Property name="name">verbSer</Property>
                <Property name="property">verbSer</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">esSer</Property>
                <Property name="property">esSer</Property>
                <Editor/>

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

@@ -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>
@@ -957,6 +939,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">

 igds-core/src/main/resources/mapper/CommonMapper.xml

@@ -212,6 +212,8 @@
            <if test="data.gasEnd != null ">GAS_END_ = #{data.gasEnd},</if>
            <if test="data.pestStart != null ">PEST_START_ = #{data.pestStart},</if>
            <if test="data.pestEnd != null ">PEST_END_ = #{data.pestEnd},</if>
            <if test="data.pestSer != null ">PEST_SER_ = #{pestSer},</if>
            <if test="data.verbSer != null ">VERB_SER_ = #{verbSer},</if>
        </set>
        where COMPANY_ID_ = #{data.companyId} AND DEPOT_ID_ = #{data.depotId}
    </update>

 igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml

 igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java

 igds-protocol-modbus/src/main/java/com/ld/igds/modbus/ModbusConstant.java

 igds-protocol-modbus/src/main/java/com/ld/igds/modbus/service/HDeviceModbusService.java

 igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java