hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -41,14 +41,14 @@ @PostMapping("/insertBigStorageCageDetails") public Result insertBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) { bigStorageCageDetailsService.insertBigStorageCageDetails(bigStorageCageDetails); return Result.build(200,"添加成功",bigStorageCageService.querybigStorageCageDetail(0)); return Result.build(200,"添加成功",bigStorageCageService.querybigStorageCageDetail()); } @ApiOperation("理片笼详情删除") @PostMapping("/deleteBigStorageCageDetails") public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails) { bigStorageCageDetailsService.deleteBigStorageCageDetails(bigStorageCageDetails); return Result.build(200,"删除成功",bigStorageCageService.querybigStorageCageDetail(0)); return Result.build(200,"删除成功",bigStorageCageService.querybigStorageCageDetail()); } @ApiOperation("理片笼任务破损0/拿走1") hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageService.java
@@ -24,7 +24,7 @@ boolean outGlass(); List<BigStorageCage> querybigStorageCageDetail(int deviceId); List<BigStorageCage> querybigStorageCageDetailAll(); Map<Integer, List<BigStorageCage>> querybigStorageCageDetail();
@@ -27,6 +27,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -67,43 +68,55 @@ */ @Override public List<BigStorageCageDetails> selectTask(int taskType) { return null; // if (taskType == 1) { // //进片任务数据 // LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>(); // feedWrapper.eq(BigStorageCageDetails::getState, Const.BIG_STORAGE_IN); // List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper); // // LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>(); // feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT); // List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper); // // Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream() // .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task)); // // for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) { // BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId()); // bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask); // } // return bigStorageCageDetailsList; // } else { // //出片任务数据 // LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>(); // outWrapper.eq(BigStorageCageDetails::getState, Const.BIG_STORAGE_OUT); // List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper); // // LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>(); // outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS); // List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper); // // Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream() // .collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task)); // for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) { // BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId()); // bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask); // } // return bigStorageCageDetailsList; // } if (taskType == 1) { //进片任务数据 LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>(); feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN); List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper); LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>(); feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT); List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper); Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream() .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task)); Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator(); while (iterator.hasNext()) { BigStorageCageDetails bigStorageCageDetails = iterator.next(); BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId()); bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask); if (bigStorageCageDetails.getBigStorageCageFeedTask() == null) { iterator.remove(); } } return bigStorageCageDetailsList; } else { //出片任务数据 LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>(); outWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN); List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper); LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>(); outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS); List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper); Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream() .collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task)); for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) { BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId()); bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask); } Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator(); while (iterator.hasNext()) { BigStorageCageDetails bigStorageCageDetails = iterator.next(); BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId()); bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask); if (bigStorageCageDetails.getBigStorageCageOutTask() == null) { iterator.remove(); } } return bigStorageCageDetailsList; } } /** hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -237,29 +237,12 @@ //查询大理片信息，前端展示用 @Override public List<BigStorageCage> querybigStorageCageDetail(int deviceId) { LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>(); bigStorageCageDetailsWrapper .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN) .or() .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL); if (deviceId != 0) { bigStorageCageWrapper.eq(BigStorageCage::getDeviceId, deviceId); bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getDeviceId, deviceId); } List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(bigStorageCageWrapper); log.info("1、获取大理片笼信息完成，获取到的数据{}", bigStorageCages.size()); List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper); 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; public List<BigStorageCage> querybigStorageCageDetailAll() { MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails) .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot) .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL)); return bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper); } //查询大理片信息，前端展示用 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -34,15 +34,12 @@ private JSONObject jsonObject = new JSONObject(); public void hangzhoumes() throws InterruptedException { List<Double> carPostion=new ArrayList<>(); carPostion.add(0.25); carPostion.add(0.5); jsonObject.append("carPostion",carPostion); //界面展示笼子信息 jsonObject.append("bigStorageCageInfo1", bigStorageCageService.querybigStorageCageDetail(1)); jsonObject.append("bigStorageCageInfo2", bigStorageCageService.querybigStorageCageDetail(2)); jsonObject.append("bigStorageCageInfo3", bigStorageCageService.querybigStorageCageDetail(3)); jsonObject.append("bigStorageCageInfo4", bigStorageCageService.querybigStorageCageDetail(4)); jsonObject.append("bigStorageCageInfo5", bigStorageCageService.querybigStorageCageDetail(5)); jsonObject.append("bigStorageCageInfo6", bigStorageCageService.querybigStorageCageDetail(6)); jsonObject.append("bigStorageCageInfo7", bigStorageCageService.querybigStorageCageDetail(7)); jsonObject.append("bigStorageCageInfo8", bigStorageCageService.querybigStorageCageDetail(8)); jsonObject.append("bigStorageCageInfos", bigStorageCageService.querybigStorageCageDetail()); //进片任务数据 List<BigStorageCageDetails> bigStorageCageDetailsFeedTask=bigStorageCageDetailsService.selectTask(1); @@ -57,10 +54,10 @@ jsonObject.append("bigStorageCageUsage", bigStorageCageUsage); //理片笼表格信息 jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetail(0)); jsonObject.append("bigStorageCageInfo", bigStorageCageService.querybigStorageCageDetailAll()); } public void salve_hangzhoumes_1() throws InterruptedException { //出片队列 List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list();
