diff --git a/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java b/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java new file mode 100644 index 0000000..0668b8f --- /dev/null +++ b/src/main/java/com/ipsplm/controller/simulation/SimulationAnalysisController.java @@ -0,0 +1,35 @@ +package com.ipsplm.controller.simulation; + + +import com.ipsplm.entity.dto.ResponseDTO; +import com.ipsplm.service.simulation.ISimulationAnalysisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.math.BigInteger; + +/** + * @Description 仿真分析Controller层 + * @Author lulicheng + * @Date 2024-07-31 10:11 + * @Version 1.0 + */ +@RestController +@RequestMapping("/simulation") +public class SimulationAnalysisController { + @Autowired + private ISimulationAnalysisService simulationAnalysisService; + + /** + * 获取工厂设备利用率信息 + * @param flag + * @return + */ + @GetMapping("/get-plant-equipment-utilization/{flag}") + public ResponseDTO getPlantEquipmentUtilization(@PathVariable(required = false) Long flag) { + return ResponseDTO.ok(simulationAnalysisService.getPlantEquipmentUtilization(flag)); + } +} diff --git a/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java b/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java new file mode 100644 index 0000000..7fcbaf5 --- /dev/null +++ b/src/main/java/com/ipsplm/dao/simulation/SimulationAnalysisMapper.java @@ -0,0 +1,19 @@ +package com.ipsplm.dao.simulation; + +import com.ipsplm.entity.simulation.vo.PlantEquipmentUtilizationVO; +import org.apache.ibatis.annotations.Mapper; +/** + * @Description 仿真分析Mapper层 + * @Author lulicheng + * @Date 2024-07-31 10:22 + * @Version 1.0 + */ +@Mapper +public interface SimulationAnalysisMapper { + /** + * 获取厂房设备利用率信息 + * @param flag + * @return + */ + PlantEquipmentUtilizationVO getPlantEquipmentUtilization(Long flag); +} diff --git a/src/main/java/com/ipsplm/entity/BufferNumBxg.java b/src/main/java/com/ipsplm/entity/simulation/BufferNumBxg.java similarity index 98% rename from src/main/java/com/ipsplm/entity/BufferNumBxg.java rename to src/main/java/com/ipsplm/entity/simulation/BufferNumBxg.java index 9a8425a..0794046 100644 --- a/src/main/java/com/ipsplm/entity/BufferNumBxg.java +++ b/src/main/java/com/ipsplm/entity/simulation/BufferNumBxg.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 不锈钢线缓存数量表 diff --git a/src/main/java/com/ipsplm/entity/BufferNumDj.java b/src/main/java/com/ipsplm/entity/simulation/BufferNumDj.java similarity index 98% rename from src/main/java/com/ipsplm/entity/BufferNumDj.java rename to src/main/java/com/ipsplm/entity/simulation/BufferNumDj.java index c12b6eb..23a6757 100644 --- a/src/main/java/com/ipsplm/entity/BufferNumDj.java +++ b/src/main/java/com/ipsplm/entity/simulation/BufferNumDj.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 大径线缓存数量表 diff --git a/src/main/java/com/ipsplm/entity/BufferNumXe.java b/src/main/java/com/ipsplm/entity/simulation/BufferNumXe.java similarity index 98% rename from src/main/java/com/ipsplm/entity/BufferNumXe.java rename to src/main/java/com/ipsplm/entity/simulation/BufferNumXe.java index 3254353..996c97a 100644 --- a/src/main/java/com/ipsplm/entity/BufferNumXe.java +++ b/src/main/java/com/ipsplm/entity/simulation/BufferNumXe.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 小二线缓存数量表 diff --git a/src/main/java/com/ipsplm/entity/BufferNumXy.java b/src/main/java/com/ipsplm/entity/simulation/BufferNumXy.java similarity index 98% rename from src/main/java/com/ipsplm/entity/BufferNumXy.java rename to src/main/java/com/ipsplm/entity/simulation/BufferNumXy.java index 5ef3a73..cb593f6 100644 --- a/src/main/java/com/ipsplm/entity/BufferNumXy.java +++ b/src/main/java/com/ipsplm/entity/simulation/BufferNumXy.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 小一线缓存数量表 diff --git a/src/main/java/com/ipsplm/entity/BufferNumZe.java b/src/main/java/com/ipsplm/entity/simulation/BufferNumZe.java similarity index 98% rename from src/main/java/com/ipsplm/entity/BufferNumZe.java rename to src/main/java/com/ipsplm/entity/simulation/BufferNumZe.java index 4209fb3..a60ec49 100644 --- a/src/main/java/com/ipsplm/entity/BufferNumZe.java +++ b/src/main/java/com/ipsplm/entity/simulation/BufferNumZe.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 中二线缓存数量表 diff --git a/src/main/java/com/ipsplm/entity/BufferNumZy.java b/src/main/java/com/ipsplm/entity/simulation/BufferNumZy.java similarity index 99% rename from src/main/java/com/ipsplm/entity/BufferNumZy.java rename to src/main/java/com/ipsplm/entity/simulation/BufferNumZy.java index 081d6f1..8819dba 100644 --- a/src/main/java/com/ipsplm/entity/BufferNumZy.java +++ b/src/main/java/com/ipsplm/entity/simulation/BufferNumZy.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 中一线缓存数量表 diff --git a/src/main/java/com/ipsplm/entity/OeeBxg.java b/src/main/java/com/ipsplm/entity/simulation/OeeBxg.java similarity index 97% rename from src/main/java/com/ipsplm/entity/OeeBxg.java rename to src/main/java/com/ipsplm/entity/simulation/OeeBxg.java index deb76c8..7254326 100644 --- a/src/main/java/com/ipsplm/entity/OeeBxg.java +++ b/src/main/java/com/ipsplm/entity/simulation/OeeBxg.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 不锈钢线OEE信息表 diff --git a/src/main/java/com/ipsplm/entity/OeeDj.java b/src/main/java/com/ipsplm/entity/simulation/OeeDj.java similarity index 98% rename from src/main/java/com/ipsplm/entity/OeeDj.java rename to src/main/java/com/ipsplm/entity/simulation/OeeDj.java index c49b6e1..33d631a 100644 --- a/src/main/java/com/ipsplm/entity/OeeDj.java +++ b/src/main/java/com/ipsplm/entity/simulation/OeeDj.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 大径线OEE信息表 diff --git a/src/main/java/com/ipsplm/entity/OeeXe.java b/src/main/java/com/ipsplm/entity/simulation/OeeXe.java similarity index 98% rename from src/main/java/com/ipsplm/entity/OeeXe.java rename to src/main/java/com/ipsplm/entity/simulation/OeeXe.java index 6b46493..e13b901 100644 --- a/src/main/java/com/ipsplm/entity/OeeXe.java +++ b/src/main/java/com/ipsplm/entity/simulation/OeeXe.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 小二线OEE信息表 diff --git a/src/main/java/com/ipsplm/entity/OeeXy.java b/src/main/java/com/ipsplm/entity/simulation/OeeXy.java similarity index 97% rename from src/main/java/com/ipsplm/entity/OeeXy.java rename to src/main/java/com/ipsplm/entity/simulation/OeeXy.java index fb0e071..3e1bcef 100644 --- a/src/main/java/com/ipsplm/entity/OeeXy.java +++ b/src/main/java/com/ipsplm/entity/simulation/OeeXy.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 小一线OEE信息表 diff --git a/src/main/java/com/ipsplm/entity/OeeZe.java b/src/main/java/com/ipsplm/entity/simulation/OeeZe.java similarity index 98% rename from src/main/java/com/ipsplm/entity/OeeZe.java rename to src/main/java/com/ipsplm/entity/simulation/OeeZe.java index 8a7f67c..1f6cc92 100644 --- a/src/main/java/com/ipsplm/entity/OeeZe.java +++ b/src/main/java/com/ipsplm/entity/simulation/OeeZe.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 中二线OEE信息表 diff --git a/src/main/java/com/ipsplm/entity/OeeZy.java b/src/main/java/com/ipsplm/entity/simulation/OeeZy.java similarity index 98% rename from src/main/java/com/ipsplm/entity/OeeZy.java rename to src/main/java/com/ipsplm/entity/simulation/OeeZy.java index 4e826c4..83b12a5 100644 --- a/src/main/java/com/ipsplm/entity/OeeZy.java +++ b/src/main/java/com/ipsplm/entity/simulation/OeeZy.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 中一线OEE信息表 diff --git a/src/main/java/com/ipsplm/entity/PstMessage.java b/src/main/java/com/ipsplm/entity/simulation/PstMessage.java similarity index 94% rename from src/main/java/com/ipsplm/entity/PstMessage.java rename to src/main/java/com/ipsplm/entity/simulation/PstMessage.java index 353defa..62e0c84 100644 --- a/src/main/java/com/ipsplm/entity/PstMessage.java +++ b/src/main/java/com/ipsplm/entity/simulation/PstMessage.java @@ -1,10 +1,12 @@ -package com.ipsplm.entity; -import com.baomidou.mybatisplus.annotation.TableName; +package com.ipsplm.entity.simulation; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; /** *

* 控制信息表 diff --git a/src/main/java/com/ipsplm/entity/simulation/vo/PlantEquipmentUtilizationVO.java b/src/main/java/com/ipsplm/entity/simulation/vo/PlantEquipmentUtilizationVO.java new file mode 100644 index 0000000..e1fd1c3 --- /dev/null +++ b/src/main/java/com/ipsplm/entity/simulation/vo/PlantEquipmentUtilizationVO.java @@ -0,0 +1,95 @@ +package com.ipsplm.entity.simulation.vo; + +import lombok.Data; + +import java.io.Serializable; +/** + * @Description 工厂设备利用率实体类 + * @Author lulicheng + * @Date 2024-07-31 10:25 + * @Version 1.0 + */ +@Data +public class PlantEquipmentUtilizationVO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 不锈钢流水线装配 + */ + private String bxgZpL; + + /** + * 不锈钢流水线焊接 + */ + private String bxgHjL; + + /** + * 小一线流水线装配1 + */ + private String xyZp1L; + + /** + * 小一线流水线焊接1 + */ + private String xyHj1L; + + /** + * 小一线流水线焊接2 + */ + private String xyHj2L; + + /** + * 小二线流水线装配 + */ + private String xeZpL; + + /** + * 小二线流水线焊接 + */ + private String xeHjL; + + /** + * 中一线流水线装配 + */ + private String zyZpL; + + /** + * 中一线流水线焊接 + */ + private String zyHjL; + + /** + * 中一线流水线短管焊接 + */ + private String zyDghjL; + + /** + * 中二线流水线装配 + */ + private String zeZpL; + + /** + * 中二线流水线焊接 + */ + private String zeHjL; + + /** + * 中二线流水线短管焊接 + */ + private String zeDghjL; + + /** + * 大径线流水线装配 + */ + private String djZpL; + + /** + * 大径线流水线焊接 + */ + private String djHjL; + + /** + * 大径线流水线短管焊接 + */ + private String djDghjL; +} diff --git a/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java b/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java new file mode 100644 index 0000000..334fd19 --- /dev/null +++ b/src/main/java/com/ipsplm/service/simulation/ISimulationAnalysisService.java @@ -0,0 +1,18 @@ +package com.ipsplm.service.simulation; + +import com.ipsplm.entity.simulation.vo.PlantEquipmentUtilizationVO; + +/** + * @Description 仿真分析接口层 + * @Author lulicheng + * @Date 2024-07-31 10:20 + * @Version 1.0 + */ +public interface ISimulationAnalysisService { + /** + * 获取厂房设备利用率信息 + * @param flag + * @return + */ + PlantEquipmentUtilizationVO getPlantEquipmentUtilization(Long flag); +} diff --git a/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java b/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java new file mode 100644 index 0000000..f2618aa --- /dev/null +++ b/src/main/java/com/ipsplm/service/simulation/impl/SimulationAnalysisServiceImpl.java @@ -0,0 +1,28 @@ +package com.ipsplm.service.simulation.impl; + +import com.ipsplm.dao.simulation.SimulationAnalysisMapper; +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; + +/** + * @Description 仿真分析实现类 + * @Author lulicheng + * @Date 2024-07-31 10:20 + * @Version 1.0 + */ +@Service +public class SimulationAnalysisServiceImpl implements ISimulationAnalysisService { + @Autowired + private SimulationAnalysisMapper simulationAnalysisMapper; + /** + * 获取厂房设备利用率信息 + * @param flag + * @return + */ + @Override + public PlantEquipmentUtilizationVO getPlantEquipmentUtilization(Long flag) { + return simulationAnalysisMapper.getPlantEquipmentUtilization(flag); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7d3de12..427643e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: + port: 8188 servlet: context-path: /cosco-shipping-heavy spring: diff --git a/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml b/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml new file mode 100644 index 0000000..3db9cfa --- /dev/null +++ b/src/main/resources/mapper/simulation/SimulationAnalysisMapper.xml @@ -0,0 +1,36 @@ + + + + + + + \ No newline at end of file