From f7d3ebdc86f50be05170263ea8cc755154650d50 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 15 一月 2024 11:03:42 +0800
Subject: [PATCH] 扭矩配置添加进给参数
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 16 ++++++++--------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml | 5 ++---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 2 +-
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
index 7232b35..873c326 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
@@ -62,18 +62,18 @@
private Date torqueDate;
/**
- * 鍙傛暟绫诲瀷
+ * 鎵煩鍊�
*/
- @Excel(name = "鍙傛暟绫诲瀷", width = 15)
- @ApiModelProperty("鍙傛暟绫诲瀷")
- private String argumentType;
+ @Excel(name = "鎵煩鍊�", width = 15)
+ @ApiModelProperty("鎵煩鍊�")
+ private float torqueValue;
/**
- * 鍙傛暟鍊�
+ * 杩涚粰鍙傛暟
*/
- @Excel(name = "鍙傛暟鍊�", width = 15)
- @ApiModelProperty("鍙傛暟鍊�")
- private float torqueValue;
+ @Excel(name = "杩涚粰鍙傛暟", width = 15)
+ @ApiModelProperty("杩涚粰鍙傛暟")
+ private String feedParameter;
/**
* 澶囨敞
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
index e835fe9..ef4f0c3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper">
<!--鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�-->
<select id="findSpindleRunningCurve" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig">
- select mtc.* from mdc_torque_config mtc where mtc.torque_value=#{torqueValue} and mtc.equipment_id=#{equipmentId} AND mtc.argument_type = '鎵煩'
+ select mtc.* from mdc_torque_config mtc where mtc.torque_value=#{torqueValue} and mtc.equipment_id=#{equipmentId}
</select>
<!--鏍规嵁杞﹂棿灞傜骇鏌ヨ鎵煩閰嶇疆鍒楄〃-->
@@ -25,7 +25,6 @@
#{ id }
</foreach>
</if>
- AND argument_type = '鎵煩'
ORDER BY torque_date ASC
</where>
</select>
@@ -36,7 +35,7 @@
FROM
mdc_torque_config
WHERE
- equipment_id = #{ equipmentId } AND argument_type = '鎵煩'
+ equipment_id = #{ equipmentId }
ORDER BY
torque_date DESC
</select>
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
index dc3c963..71682cb 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
@@ -49,7 +49,7 @@
MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
MdcTorqueConfig torqueConfig = new MdcTorqueConfig();
torqueConfig.setEquipmentId(equipmentId);
- torqueConfig.setArgumentType(mdcTorqueConfig.getArgumentType());
+ torqueConfig.setFeedParameter(mdcTorqueConfig.getFeedParameter());
torqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
torqueConfig.setTorqueDate(mdcTorqueConfig.getTorqueDate());
torqueConfig.setTorqueValue(mdcTorqueConfig.getTorqueValue());
--
Gitblit v1.9.3