From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 5c752ac..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,12 +7,12 @@
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;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
-import org.jeecg.modules.quartz.entity.QuartzJob;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -47,6 +47,7 @@
MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
MdcTorqueConfig torqueConfig = new MdcTorqueConfig();
torqueConfig.setEquipmentId(equipmentId);
+ torqueConfig.setFeedParameter(mdcTorqueConfig.getFeedParameter());
torqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
torqueConfig.setTorqueDate(mdcTorqueConfig.getTorqueDate());
torqueConfig.setTorqueValue(mdcTorqueConfig.getTorqueValue());
@@ -72,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
@@ -170,9 +166,14 @@
//鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
//update-begin---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鎵煩閰嶇疆鍒楄〃鏁版嵁", "瀵煎嚭浜�:"+user.getRealname(), "瀵煎嚭淇℃伅"));
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鎵煩閰嶇疆鍒楄〃鏁版嵁", "瀵煎嚭浜�:"+user.getRealname(), "鎵煩閰嶇疆"));
//update-end---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
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