From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期四, 25 七月 2024 10:11:52 +0800 Subject: [PATCH] 调整sql --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 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 46e50c7..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,9 +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.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.List; /** @@ -17,20 +20,24 @@ /** * 鏍规嵁id鏌ヨ + * * @param id * @return */ MdcTorqueConfig queryById(String id); + /** - * 鏂板鎵煩閰嶇疆 - * @param mdcTorqueConfig + * 娣诲姞鎵煩閰嶇疆 + * + * @param torqueVo * @return */ - Boolean addTorque(MdcTorqueConfig mdcTorqueConfig); + Boolean addTorque(MdcTorqueConfig torqueVo); /** * 缂栬緫鎵煩閰嶇疆 + * * @param mdcTorqueConfig * @return */ @@ -38,6 +45,7 @@ /** * 鏍规嵁id鍒犻櫎 + * * @param id * @return */ @@ -45,26 +53,39 @@ /** * 鎵归噺鍒犻櫎 + * * @param ids * @return */ Boolean deleteBatchTorque(String ids); /** - * 鐢熸垚涓昏酱杩愯鏇茬嚎 - * @param torqueValue - * @return - */ - List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue,String equipmentId); - - - /** * 鍒嗛〉鏌ヨ + * * @param userId * @param page * @param req * @param mdcTorqueConfig * @return */ - IPage<MdcTorqueConfig> pageList(String userId,Page page,HttpServletRequest req,MdcTorqueConfig mdcTorqueConfig); + 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