From f2274691ec9ff2bf3c5b7ee7aa87e3b0aacb2d78 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 15 一月 2024 10:42:13 +0800
Subject: [PATCH] 扭矩配置修改为参数配置
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 14 ++++++++++----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java | 1 -
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 | 1 +
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
index 7981de8..49a6baf 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -1,6 +1,5 @@
package org.jeecg.modules.mdc.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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 bdea1c6..7232b35 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
@@ -7,7 +7,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -63,10 +62,17 @@
private Date torqueDate;
/**
- * 鎵煩鍊�
+ * 鍙傛暟绫诲瀷
*/
- @Excel(name = "鎵煩鍊�", width = 15)
- @ApiModelProperty("鎵煩鍊�")
+ @Excel(name = "鍙傛暟绫诲瀷", width = 15)
+ @ApiModelProperty("鍙傛暟绫诲瀷")
+ private String argumentType;
+
+ /**
+ * 鍙傛暟鍊�
+ */
+ @Excel(name = "鍙傛暟鍊�", width = 15)
+ @ApiModelProperty("鍙傛暟鍊�")
private float torqueValue;
/**
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 ef4f0c3..e835fe9 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}
+ select mtc.* from mdc_torque_config mtc where mtc.torque_value=#{torqueValue} and mtc.equipment_id=#{equipmentId} AND mtc.argument_type = '鎵煩'
</select>
<!--鏍规嵁杞﹂棿灞傜骇鏌ヨ鎵煩閰嶇疆鍒楄〃-->
@@ -25,6 +25,7 @@
#{ id }
</foreach>
</if>
+ AND argument_type = '鎵煩'
ORDER BY torque_date ASC
</where>
</select>
@@ -35,7 +36,7 @@
FROM
mdc_torque_config
WHERE
- equipment_id = #{ equipmentId }
+ equipment_id = #{ equipmentId } AND argument_type = '鎵煩'
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 30e9b51..dc3c963 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,6 +49,7 @@
MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
MdcTorqueConfig torqueConfig = new MdcTorqueConfig();
torqueConfig.setEquipmentId(equipmentId);
+ torqueConfig.setArgumentType(mdcTorqueConfig.getArgumentType());
torqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
torqueConfig.setTorqueDate(mdcTorqueConfig.getTorqueDate());
torqueConfig.setTorqueValue(mdcTorqueConfig.getTorqueValue());
--
Gitblit v1.9.3