430/mdc_430.git

			@@ -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);

			}