hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -1,14 +1,11 @@ package com.mes.bigstorage.controller; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -25,8 +22,8 @@ @RequestMapping("/bigStorageCage") public class BigStorageCageController { @Autowired private BigStorageCageService bigStorageCageService; private BigStorageCageDetailsService bigStorageCageDetailsService; //todo: 实例代码 待删除 @ApiOperation("测试") @@ -36,21 +33,10 @@ } @ApiOperation("理片笼信息") @GetMapping("/BigStorageCage") public List<BigStorageCage> BigStorageCage() { return bigStorageCageService.list(); } @ApiOperation("理片笼详情") @GetMapping("/BigStorageCageDetails") public List<BigStorageCageDetails> BigStorageCageDetails() { return bigStorageCageDetailsService.list(); } @ApiOperation("小车实时位置") @GetMapping("/CarPosition") public List<Integer> CarPosition() { return bigStorageCageDetailsService.getCarposition(); @GetMapping("/bigStorageCage") public List<BigStorageCage> querybigStorageCageDetail() { // return bigStorageCageService.list(); return bigStorageCageService.querybigStorageCageDetail(); } @ApiOperation("手动完成任务") hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -1,9 +1,16 @@ package com.mes.bigstorage.controller; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.service.BigStorageCageDetailsService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * <p> @@ -13,9 +20,25 @@ * @author zhoush * @since 2024-03-27 */ @ApiModel(description = "理片笼详情") @RestController @RequestMapping("/bigStorageCageDetails") public class BigStorageCageDetailsController { @Autowired private BigStorageCageDetailsService bigStorageCageDetailsService; @ApiOperation("理片笼详情") @GetMapping("/BigStorageCageDetails") public List<BigStorageCageDetails> BigStorageCageDetails() { return bigStorageCageDetailsService.list(); } @ApiOperation("小车实时位置") @GetMapping("/CarPosition") public List<Integer> CarPosition() { return bigStorageCageDetailsService.getCarposition(); } }
@@ -1,10 +1,13 @@ package com.mes.bigstorage.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.List; /** * <p> @@ -46,5 +49,8 @@ */ private Integer remainWidth; @TableField(exist = false) private List<BigStorageCageDetails> bigStorageCageDetails; } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
@@ -3,13 +3,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper; import com.mes.bigstorage.mapper.BigStorageCageMapper; import com.mes.uppattenusage.entity.GlassInfo; import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; import java.util.Collections; import java.util.List; /** @@ -21,6 +16,10 @@ * @since 2024-03-27 */ public interface BigStorageCageService extends IService<BigStorageCage> { public void updateRemainWidth(int Slot); public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); void updateRemainWidth(int Slot); BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails); List<BigStorageCage> querybigStorageCageDetail(); } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -7,12 +7,14 @@ import com.mes.bigstorage.mapper.BigStorageCageMapper; import com.mes.bigstorage.service.BigStorageCageService; import com.mes.uppattenusage.entity.GlassInfo; import org.springframework.beans.factory.annotation.Autowired; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; import javax.annotation.Resource; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** * <p> @@ -23,11 +25,15 @@ * @since 2024-03-27 */ @Service @Slf4j public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService { @Autowired @Resource private BigStorageCageMapper bigStorageCageMapper; @Autowired @Resource private BigStorageCageDetailsMapper bigStorageCageDetailsMapper; @Override public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) { @@ -58,6 +64,23 @@ return bigStorageCageDetails; } @Override public List<BigStorageCage> querybigStorageCageDetail() { //1、获取大理片笼信息 // List<BigStorageCage> bigStorageCages = bigStorageCageMapper.querybigStorageCageDetail(null); List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(null); log.info("1、获取大理片笼信息完成，获取到的数据{}", bigStorageCages.size()); //2获取理片笼所有信息 List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(null); Map<Integer, List<BigStorageCageDetails>> listMap = bigStorageCageDetailsList.stream().collect(Collectors.groupingBy(BigStorageCageDetails::getSlot)); for (BigStorageCage bigStorageCage : bigStorageCages) { List<BigStorageCageDetails> bigStorageCageDetails = listMap.get(bigStorageCage.getSlot()); bigStorageCage.setBigStorageCageDetails(bigStorageCageDetails); } return bigStorageCages; } //修改格子剩余宽度 @Override public void updateRemainWidth(int Slot){
