From 4a1ef7f62d8fc364bef0e0caa02b1792bd052513 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 15 一月 2024 17:45:34 +0800
Subject: [PATCH] 扭矩工作曲线展示
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
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 71682cb..3d5754d 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
@@ -7,6 +7,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.dto.EquipmentMachingDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
import org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper;
@@ -20,10 +21,7 @@
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
/**
* @Description: 鎵煩閰嶇疆绠＄悊
@@ -75,11 +73,6 @@
@Override
public Boolean deleteBatchTorque(String ids) {
return this.removeBatchByIds(Arrays.asList(ids.split(",")));
- }
-
- @Override
- public List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue, String equipmentId) {
- return this.baseMapper.findSpindleRunningCurve(torqueValue, equipmentId);
}
@Override
@@ -178,4 +171,9 @@
mv.addObject(NormalExcelConstants.DATA_LIST, mdcTorqueConfigs);
return mv;
}
+
+ @Override
+ public List<EquipmentMachingDto> getWorkLineList(String equipmentId, Date startTime, Date endTime) {
+ return this.baseMapper.getWorkLineList(equipmentId, startTime, endTime);
+ }
}
--
Gitblit v1.9.3