From 2884bf1f32b51129a83125ecfc2cf8526f71154f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 24 八月 2023 15:34:43 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 4
---
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/ModbusConstant.java | 0
igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java | 0
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/service/HDeviceModbusService.java | 0
igds-core/src/main/java/com/ld/igds/models/DepotConf.java | 9 ++++
igds-core/src/main/resources/mapper/CommonMapper.xml | 2 +
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java | 0
igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml | 35 +++++++++++------
igds-core/src/main/java/models/igds.model.xml | 41 +++++++++++---------
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml | 0
9 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotConf.java b/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
index ef59d56..aee0f85 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotConf.java
+++ b/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
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml
index 0f9aaac..a3b6099 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotConf.view.xml
+++ b/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/>
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 933f79a..861700c 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/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("securityPR#listCamera").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("deviceSerPR2#getSerCacheByType").getResult("99")}</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("deviceSerPR#getAllSerCache").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("deviceSerPR#getAllSerCache").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("deviceSerPR#getAllSerCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
</DataType>
<DataType name="dtDicSlogan">
diff --git a/igds-core/src/main/resources/mapper/CommonMapper.xml b/igds-core/src/main/resources/mapper/CommonMapper.xml
index 11d7a80..a31668c 100644
--- a/igds-core/src/main/resources/mapper/CommonMapper.xml
+++ b/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>
diff --git a/igds-core/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
similarity index 100%
rename from igds-core/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
rename to igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
diff --git a/igds-core/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
similarity index 100%
rename from igds-core/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
rename to igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbusPR.java
diff --git a/igds-core/src/main/java/com/ld/igds/modbus/ModbusConstant.java b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/ModbusConstant.java
similarity index 100%
rename from igds-core/src/main/java/com/ld/igds/modbus/ModbusConstant.java
rename to igds-protocol-modbus/src/main/java/com/ld/igds/modbus/ModbusConstant.java
diff --git a/igds-core/src/main/java/com/ld/igds/modbus/service/HDeviceModbusService.java b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/service/HDeviceModbusService.java
similarity index 100%
rename from igds-core/src/main/java/com/ld/igds/modbus/service/HDeviceModbusService.java
rename to igds-protocol-modbus/src/main/java/com/ld/igds/modbus/service/HDeviceModbusService.java
diff --git a/igds-core/src/main/java/com/ld/igds/models/DeviceModbus.java b/igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java
similarity index 100%
rename from igds-core/src/main/java/com/ld/igds/models/DeviceModbus.java
rename to igds-protocol-modbus/src/main/java/com/ld/igds/models/DeviceModbus.java
--
Gitblit v1.9.3