430/mdc_430.git

			@@ -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: 扭矩配置管理
			@@ -49,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());
			@@ -74,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
			@@ -177,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);
			}
			}