From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
index 3634546..974d918 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.dto.EquipmentMachingDto;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
-import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo;
+import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
import java.util.List;
/**
@@ -31,7 +33,7 @@
* @param torqueVo
* @return
*/
- Boolean addTorque(MdcTorqueConfigVo torqueVo);
+ Boolean addTorque(MdcTorqueConfig torqueVo);
/**
* 缂栬緫鎵煩閰嶇疆
@@ -58,15 +60,6 @@
Boolean deleteBatchTorque(String ids);
/**
- * 鐢熸垚涓昏酱杩愯鏇茬嚎
- *
- * @param torqueValue
- * @return
- */
- List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue, String equipmentId);
-
-
- /**
* 鍒嗛〉鏌ヨ
*
* @param userId
@@ -76,4 +69,23 @@
* @return
*/
IPage<MdcTorqueConfig> pageList(String userId, Page page, HttpServletRequest req, MdcTorqueConfig mdcTorqueConfig);
+
+ /**
+ * 瀵煎嚭
+ *
+ * @param userId
+ * @param mdcTorqueConfig
+ * @return
+ */
+ ModelAndView exportXls(String userId, MdcTorqueConfig mdcTorqueConfig);
+
+ /**
+ * 鑾峰彇宸ヤ綔鏇茬嚎
+ * @param equipmentId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<EquipmentMachingDto> getWorkLineList(String equipmentId, Date startTime, Date endTime);
+
}
--
Gitblit v1.9.3