diff --git a/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java b/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java index 07c606e..b7a0394 100644 --- a/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java +++ b/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java @@ -93,4 +93,14 @@ public class SimulationAnalysisController { public ResponseDTO getProcessList(@RequestParam String tableCode){ return ResponseDTO.ok(simulationAnalysisService.getProcessList(tableCode)); } + + /** + * 获取缓存数量时间 + * @param process + * @return + */ + @GetMapping("/get-buffer-num") + public ResponseDTO getBufferNum(@RequestParam String process){ + return ResponseDTO.ok(simulationAnalysisService.getBufferNum(process)); + } } diff --git a/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java b/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java index cbe43f2..a0347a5 100644 --- a/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java +++ b/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java @@ -1,6 +1,7 @@ package com.ipsplm.dao.simulation; import com.ipsplm.entity.simulation.*; +import com.ipsplm.entity.simulation.vo.BufferVO; import com.ipsplm.entity.simulation.vo.PlantEquipmentUtilizationVO; import org.apache.ibatis.annotations.Mapper; @@ -63,4 +64,53 @@ public interface SimulationAnalysisMapper { * @return */ List getProcessList(String tableCode); + + /** + * 获取缓存信息 + * @param process + * @return + */ + List getBufferName(String process); + + /** + * 获取不锈钢缓存数量 + * @param bufferNameList + * @return + */ + List getBufferNumBxg(List bufferNameList); + + /** + * 获取大径线缓存数量 + * @param bufferNameList + * @return + */ + List getBufferNumDj(List bufferNameList); + + /** + * 获取小二线缓存数量 + * @param bufferNameList + * @return + */ + List getBufferNumXe(List bufferNameList); + + /** + * 获取小一线缓存数量 + * @param bufferNameList + * @return + */ + List getBufferNumXy(List bufferNameList); + + /** + * 获取中二线缓存数量 + * @param bufferNameList + * @return + */ + List getBufferNumZe(List bufferNameList); + + /** + * 获取中一线缓存数量 + * @param bufferNameList + * @return + */ + List getBufferNumZy(List bufferNameList); } diff --git a/src/main/java/com/ipsplm/entity/simulation/vo/BufferNumVO.java b/src/main/java/com/ipsplm/entity/simulation/vo/BufferNumVO.java new file mode 100644 index 0000000..66227ec --- /dev/null +++ b/src/main/java/com/ipsplm/entity/simulation/vo/BufferNumVO.java @@ -0,0 +1,14 @@ +package com.ipsplm.entity.simulation.vo; + +import lombok.Data; + +import java.io.Serializable; +@Data +public class BufferNumVO implements Serializable { + //x轴(时间) + private String xTime; + //y轴(Buffer数量) + private String bufferNum; + //缓冲描述 + private String bufferName; +} diff --git a/src/main/java/com/ipsplm/entity/simulation/vo/BufferVO.java b/src/main/java/com/ipsplm/entity/simulation/vo/BufferVO.java new file mode 100644 index 0000000..c8d55cc --- /dev/null +++ b/src/main/java/com/ipsplm/entity/simulation/vo/BufferVO.java @@ -0,0 +1,14 @@ +package com.ipsplm.entity.simulation.vo; + +import lombok.Data; + +import java.io.Serializable; +@Data +public class BufferVO implements Serializable { + //表编号 + private String tableCode; + //缓冲编号 + private String bufferCode; + //缓冲名称 + private String bufferName; +} diff --git a/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java b/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java index eafeeae..6544627 100644 --- a/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java +++ b/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java @@ -61,4 +61,11 @@ public interface ISimulationAnalysisService { * @return */ List getProcessList(String tableCode); + + /** + * 获取缓存数量时间 + * @param process + * @return + */ + Object getBufferNum(String process); } 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 1a3c8cd..d5068d9 100644 --- a/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java +++ b/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java @@ -2,6 +2,8 @@ package com.ipsplm.service.simulation.impl; import com.ipsplm.dao.simulation.SimulationAnalysisMapper; import com.ipsplm.entity.simulation.*; +import com.ipsplm.entity.simulation.vo.BufferNumVO; +import com.ipsplm.entity.simulation.vo.BufferVO; import com.ipsplm.entity.simulation.vo.PlantEquipmentUtilizationVO; import com.ipsplm.service.simulation.ISimulationAnalysisService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,8 +22,10 @@ import java.util.List; public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService { @Autowired private SimulationAnalysisMapper simulationAnalysisMapper; + /** * 获取厂房设备利用率信息 + * * @param flag * @return */ @@ -32,6 +36,7 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService /** * 获取不锈钢OEE + * * @return */ @Override @@ -41,6 +46,7 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService /** * 获取大径线OEE + * * @return */ @Override @@ -50,6 +56,7 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService /** * 获取小二线OEE + * * @return */ @Override @@ -59,6 +66,7 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService /** * 获取小一线OEE + * * @return */ @Override @@ -68,6 +76,7 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService /** * 获取中二线OEE + * * @return */ @Override @@ -77,6 +86,7 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService /** * 获取中一线OEE + * * @return */ @Override @@ -86,6 +96,7 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService /** * 获取工序列表 + * * @param tableCode * @return */ @@ -93,4 +104,44 @@ public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService public List getProcessList(String tableCode) { return simulationAnalysisMapper.getProcessList(tableCode); } + + /** + * 获取缓存数量时间 + * @param process + * @return + */ + @Override + public Object getBufferNum(String process) { + List bufferNameList = simulationAnalysisMapper.getBufferName(process); + String tableCode = bufferNameList.get(0).getTableCode(); + switch (tableCode) { + case "buffernum_bxg": { + List bufferNumBxgList = simulationAnalysisMapper.getBufferNumBxg(bufferNameList); + return bufferNumBxgList; + } + case "buffernum_dj": { + List bufferNumDjList = simulationAnalysisMapper.getBufferNumDj(bufferNameList); + return bufferNumDjList; + } + case "buffernum_xe": { + List bufferNumXeList = simulationAnalysisMapper.getBufferNumXe(bufferNameList); + return bufferNumXeList; + } + case "buffernum_xy": { + List bufferNumXyList = simulationAnalysisMapper.getBufferNumXy(bufferNameList); + return bufferNumXyList; + } + case "buffernum_ze": { + List bufferNumZeList = simulationAnalysisMapper.getBufferNumZe(bufferNameList); + return bufferNumZeList; + } + case "buffernum_zy": { + List bufferNumZyList = simulationAnalysisMapper.getBufferNumZy(bufferNameList); + return bufferNumZyList; + } + default: + break; + } + return null; + } } diff --git a/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml b/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml index 2d8cfc2..6c6b099 100644 --- a/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml +++ b/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml @@ -73,4 +73,56 @@ + + + + + + + + + + + + + + \ No newline at end of file