hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -1,6 +1,7 @@ package com.mes.bigstorage.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.utils.Result; @@ -50,5 +51,14 @@ return Result.build(200,"删除成功",1); } @ApiOperation("理片笼任务查询") @PostMapping("/selectBigStorageCageDetails") public Result selectBigStorageCageDetails(int state) { LambdaQueryWrapper<BigStorageCageDetails> selectWrapper = new LambdaQueryWrapper<>(); selectWrapper.eq(BigStorageCageDetails::getState,state); return Result.build(200,"查询成功",bigStorageCageDetailsService.list(selectWrapper)); } }
@@ -10,6 +10,7 @@ import com.mes.bigstorage.mapper.BigStorageCageMapper; import com.mes.bigstorage.service.BigStorageCageService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.service.GlassInfoService; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.service.TemperingGlassInfoService; import lombok.extern.slf4j.Slf4j; @@ -18,6 +19,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -44,23 +46,26 @@ @Resource private TemperingGlassInfoService temperingGlassInfoService; @Resource private GlassInfoService glassInfoService; @Override public BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) { log.info("1、查询理片笼内片序+1等于当前玻璃片序的玻璃"); log.info("1、查询理片笼内片序-1等于当前玻璃片序的玻璃"); LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId()) .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1); .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() - 1); BigStorageCageDetails layoutSlotInfo; layoutSlotInfo= bigStorageCageDetailsMapper.selectOne(wrapper); BeanUtils.copyProperties(glassInfo, bigStorageCageDetails); log.info("2、查询理片笼内片序+1等于当前玻璃片序的玻璃的结果不为空时"); log.info("2、查询理片笼内片序-1等于当前玻璃片序的玻璃的结果不为空时"); if (layoutSlotInfo.getSlot() != null) { bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot()); } else { log.info("3、查询理片笼内片序+1等于当前玻璃片序的玻璃的结果为空时获取当前玻璃版图id是否存在理片笼内"); log.info("3、查询理片笼内片序-1等于当前玻璃片序的玻璃的结果为空时获取当前玻璃版图id是否存在理片笼内"); LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>(); bigStorageCageDetailslambdaQueryWrapper .select(BigStorageCageDetails::getTemperingLayoutId); @@ -119,7 +124,6 @@ public boolean outGlass() { List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(); log.info("1、查询钢化小片任务表是否有待出玻璃"+temperingGlassInfoList.size()); if(temperingGlassInfoList!=null){ temperingGlassInfoService.addOutTask(temperingGlassInfoList); log.info("2、添加任务到任务表"); @@ -137,6 +141,16 @@ String layoutNum = entry.getKey().substring(entry.getKey().indexOf('-') + 1); if (layoutNum.equals(entry.getValue())) { //4、添加此钢化版图id所有小片小片到钢化小片表 LambdaQueryWrapper<GlassInfo> glassInfoWrapper=new LambdaQueryWrapper<>(); glassInfoWrapper.select(GlassInfo::getTemperingLayoutId) .orderByDesc(GlassInfo::getTemperingFeedSequence); List<GlassInfo> glassInfoList= glassInfoService.list(glassInfoWrapper); for (GlassInfo glassInfo:glassInfoList ) { TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo(); BeanUtils.copyProperties(glassInfo, temperingGlassInfo); temperingGlassInfoService.save(temperingGlassInfo); } return false; } } @@ -162,8 +176,6 @@ bigStorageCageWrapper.eq("remain_width", width); bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper); } @Override hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageFeedTaskMapper.java
@@ -1,5 +1,6 @@ package com.mes.bigstoragetask.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.mes.bigstoragetask.entity.BigStorageCageFeedTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ * @author zhoush * @since 2024-04-16 */ @DS("salve_hangzhoumes") public interface BigStorageCageFeedTaskMapper extends BaseMapper<BigStorageCageFeedTask> { } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/mapper/BigStorageCageOutTaskMapper.java
@@ -1,5 +1,6 @@ package com.mes.bigstoragetask.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.mes.bigstoragetask.entity.BigStorageCageOutTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ * @author zhoush * @since 2024-04-16 */ @DS("salve_hangzhoumes") public interface BigStorageCageOutTaskMapper extends BaseMapper<BigStorageCageOutTask> { } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/controller/TaskCacheController.java
@@ -1,4 +1,4 @@ package com.mes.userinfo.controller; package com.mes.edgstoragetask.controller; import org.springframework.web.bind.annotation.RequestMapping; hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/mapper/TaskCacheMapper.java
@@ -1,5 +1,6 @@ package com.mes.edgstoragetask.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.mes.edgstoragetask.entity.TaskCache; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +12,7 @@ * @author zhoush * @since 2024-04-16 */ @DS("salve_hangzhoumes") public interface TaskCacheMapper extends BaseMapper<TaskCache> { } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -49,7 +49,7 @@ * fixedRate : 上一个调用开始后再次调用的延时（不用等待上一次调用完成） * fixedDelay : 上一个调用结束后再次调用的延时 */ @Scheduled(fixedDelay = 300) @Scheduled(fixedDelay = 30000) public void plcStorageCageTask() throws InterruptedException { JSONObject jsonObject = new JSONObject(); try { @@ -109,6 +109,8 @@ //报警信息 jsonObject.append("bigStorageCageFullAlarm", bigStorageCageFullAlarm); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) {
