diff --git a/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java b/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java index 5ba06c0..b016ee9 100644 --- a/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java +++ b/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java @@ -29,4 +29,58 @@ public class SimulationAnalysisController { public ResponseDTO getPlantEquipmentUtilization(@RequestParam(required = false) Long flag) { return ResponseDTO.ok(simulationAnalysisService.getPlantEquipmentUtilization(flag)); } + + /** + * 获取不锈钢OEE + * @return + */ + @GetMapping("/get-oee-bxg") + public ResponseDTO getOeeBxg(){ + return ResponseDTO.ok(simulationAnalysisService.getOeeBxg()); + } + + /** + * 获取大径线OEE + * @return + */ + @GetMapping("/get-oee-dj") + public ResponseDTO getOeeDj(){ + return ResponseDTO.ok(simulationAnalysisService.getOeeDj()); + } + + /** + * 获取小二线OEE + * @return + */ + @GetMapping("/get-oee-xe") + public ResponseDTO getOeeXe(){ + return ResponseDTO.ok(simulationAnalysisService.getOeeXe()); + } + + /** + * 获取小一线OEE + * @return + */ + @GetMapping("/get-oee-xy") + public ResponseDTO getOeeXy(){ + return ResponseDTO.ok(simulationAnalysisService.getOeeXy()); + } + + /** + * 获取中二线OEE + * @return + */ + @GetMapping("/get-oee-ze") + public ResponseDTO getOeeZe(){ + return ResponseDTO.ok(simulationAnalysisService.getOeeZe()); + } + + /** + * 获取中一线OEE + * @return + */ + @GetMapping("/get-oee-zy") + public ResponseDTO getOeeZy(){ + return ResponseDTO.ok(simulationAnalysisService.getOeeZy()); + } } diff --git a/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java b/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java index 7fcbaf5..2c4f0f8 100644 --- a/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java +++ b/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java @@ -1,7 +1,11 @@ package com.ipsplm.dao.simulation; +import com.ipsplm.entity.simulation.*; import com.ipsplm.entity.simulation.vo.PlantEquipmentUtilizationVO; import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + /** * @Description 仿真分析Mapper层 * @Author lulicheng @@ -16,4 +20,40 @@ public interface SimulationAnalysisMapper { * @return */ PlantEquipmentUtilizationVO getPlantEquipmentUtilization(Long flag); + + /** + * 获取不锈钢OEE + * @return + */ + List getOeeBxg(); + + /** + * 获取大径线OEE + * @return + */ + List getOeeDj(); + + /** + * 获取小二线OEE + * @return + */ + List getOeeXe(); + + /** + * 获取小一线OEE + * @return + */ + List getOeeXy(); + + /** + * 获取中二线OEE + * @return + */ + List getOeeZe(); + + /** + * 获取中一线OEE + * @return + */ + List getOeeZy(); } diff --git a/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java b/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java index 334fd19..fc99281 100644 --- a/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java +++ b/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java @@ -1,7 +1,10 @@ package com.ipsplm.service.simulation; +import com.ipsplm.entity.simulation.*; import com.ipsplm.entity.simulation.vo.PlantEquipmentUtilizationVO; +import java.util.List; + /** * @Description 仿真分析接口层 * @Author lulicheng @@ -15,4 +18,40 @@ public interface ISimulationAnalysisService { * @return */ PlantEquipmentUtilizationVO getPlantEquipmentUtilization(Long flag); + + /** + * 获取不锈钢OEE + * @return + */ + List getOeeBxg(); + + /** + * 获取大径线OEE + * @return + */ + List getOeeDj(); + + /** + * 获取小二线OEE + * @return + */ + List getOeeXe(); + + /** + * 获取小一线OEE + * @return + */ + List getOeeXy(); + + /** + * 获取中二线OEE + * @return + */ + List getOeeZe(); + + /** + * 获取中一线OEE + * @return + */ + List getOeeZy(); } diff --git a/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java b/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java index f2618aa..fbd782f 100644 --- a/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java +++ b/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java @@ -1,11 +1,15 @@ package com.ipsplm.service.simulation.impl; import com.ipsplm.dao.simulation.SimulationAnalysisMapper; +import com.ipsplm.entity.simulation.*; import com.ipsplm.entity.simulation.vo.PlantEquipmentUtilizationVO; import com.ipsplm.service.simulation.ISimulationAnalysisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + /** * @Description 仿真分析实现类 * @Author lulicheng @@ -25,4 +29,58 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService public PlantEquipmentUtilizationVO getPlantEquipmentUtilization(Long flag) { return simulationAnalysisMapper.getPlantEquipmentUtilization(flag); } + + /** + * 获取不锈钢OEE + * @return + */ + @Override + public List getOeeBxg() { + return simulationAnalysisMapper.getOeeBxg(); + } + + /** + * 获取大径线OEE + * @return + */ + @Override + public List getOeeDj() { + return simulationAnalysisMapper.getOeeDj(); + } + + /** + * 获取小二线OEE + * @return + */ + @Override + public List getOeeXe() { + return simulationAnalysisMapper.getOeeXe(); + } + + /** + * 获取小一线OEE + * @return + */ + @Override + public List getOeeXy() { + return simulationAnalysisMapper.getOeeXy(); + } + + /** + * 获取中二线OEE + * @return + */ + @Override + public List getOeeZe() { + return simulationAnalysisMapper.getOeeZe(); + } + + /** + * 获取中一线OEE + * @return + */ + @Override + public List getOeeZy() { + return simulationAnalysisMapper.getOeeZy(); + } } diff --git a/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml b/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml index 3db9cfa..1af5143 100644 --- a/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml +++ b/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml @@ -3,7 +3,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + + + + + + + + + + + + \ No newline at end of file