hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
@@ -1,32 +1,14 @@ package com.mes.job; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.kangaroohy.milo.runner.subscription.SubscriptionCallback; import com.kangaroohy.milo.service.MiloService; import com.mes.common.config.Const; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; import com.mes.edgstoragecage.service.EdgStorageCageService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.service.GlassInfoService; import com.mes.opctask.entity.EdgStorageDeviceTask; import com.mes.opctask.entity.EdgStorageDeviceTaskHistory; import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService; import com.mes.opctask.service.EdgStorageDeviceTaskService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; import java.util.Arrays; /** * @Author : zhoush @@ -39,319 +21,22 @@ @Autowired(required = false) MiloService miloService; @Resource EdgStorageDeviceTaskService edgStorageDeviceTaskService; @Resource GlassInfoService glassInfoService; @Resource EdgStorageCageDetailsService edgStorageCageDetailsService; @Resource EdgStorageCageService edgStorageCageService; @Resource EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService; @Value("${mes.glassGap}") private int glassGap; @Value("${mes.cellLength}") private int cellLength; @Resource(name = "cacheGlassStartCallback") SubscriptionCallback cacheGlassStartCallback; @Value("${mes.threshold}") private int threshold; // @Autowired // MPJBaseService edgStorageDeviceTaskService; // // @Autowired // SubscriptionCallback cacheGlassSubscriptionCallback; // // @Scheduled(fixedDelay = Long.MAX_VALUE) // public void startOpcTask() throws Exception { // miloService.subscriptionFromOpcUa(Arrays.asList("my.device.x1", "my.device.x2"), cacheGlassSubscriptionCallback); // } @Resource(name = "cacheGlassFinishCallback") SubscriptionCallback cacheGlassFinishCallback; @Scheduled(fixedDelay = 1000) @Scheduled(fixedDelay = Long.MAX_VALUE) public void startOpcTask() throws Exception { int request = 1; // 获取笼内玻璃信息 taskByDevice(); miloService.subscriptionFromOpcUa(Arrays.asList("my.device01.x1", "my.device02.x1"), cacheGlassStartCallback); log.info("--------------------s---------------------------"); } @Scheduled(fixedDelay = 1000) @Scheduled(fixedDelay = Long.MAX_VALUE) public void finishOpcTask() throws Exception { EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage("edg_storage_device_one_task"); if (task == null) { log.info("任务表基础数据录入失败，请检查数据是否录入成功"); return; } if (task.getTaskState() <= 3) { log.info("不存在未完成的任务"); return; } Integer cell = task.getStartCell(); Integer state = task.getTaskState(); task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY); task.setTaskState(Const.GLASS_CACHE_TYPE_EMPTY); task.setStartCell(-1); edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task); edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>() .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW) .set(EdgStorageDeviceTaskHistory::getTaskState, Const.GLASS_CACHE_TYPE_RUNNING.equals(state) ? Const.RAW_GLASS_TASK_SUCCESS : Const.RAW_GLASS_TASK_FAILURE) ); updateCellRemainWidth(cell); miloService.subscriptionFromOpcUa(Arrays.asList("my.device01.x2", "my.device02.x2"), cacheGlassFinishCallback); log.info("--------------------s---------------------------"); } private void taskByDevice() throws Exception { EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage("edg_storage_device_one_task"); if (task == null) { log.info("任务表基础数据录入失败，请检查数据是否录入成功"); return; } int request = task.getTaskState(); if (request == 0) { log.info("未收到任务请求，结束本次任务"); } else if (request == 1) { //进片任务 intoTask(task); } else if (request == 2) { //出片任务 outTask(task); } else if (request == 3) { //todo:直通任务 } else { log.info("异常数据，结束本次任务"); } } private boolean intoTask(EdgStorageDeviceTask task) { //获取玻璃的基本信息 GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn())); if (null == glassInfo) { log.info("进片玻璃信息不存在，玻璃id:{}", task.getGlassIdIn()); return Boolean.FALSE; } //获取当前进片玻璃id和进片格子 相同尺寸可以放下的格子 // select * from edg_storage_cage t left join edg_storage_cage_details t1 on t.slot = t1.slot // where t.device_id =1 and t1.state = 100 and t.remain_width >= 827 and t1.width = 827 and t1.height = 1124 order by abs(t.slot - 10) EdgStorageCage edgStorageCage = edgStorageCageService.getEdgStorageCageBySize(1, glassInfo.getWidth(), glassInfo.getHeight(), task.getCurrentCell()); if (edgStorageCage == null) { log.info("相同尺寸可以放下的格子未找到，格子id:{}", task.getCurrentCell()); // SELECT * from edg_storage_cage where device_id = 1 and remain_width > 1000 order by abs(slot - 10) List<EdgStorageCage> storageCageList = edgStorageCageService.list(new LambdaQueryWrapper<EdgStorageCage>().eq(EdgStorageCage::getDeviceId, 1) .eq(EdgStorageCage::getEnableState, Const.SLOT_ON) .ge(EdgStorageCage::getRemainWidth, glassInfo.getWidth()).last("order by abs(slot - " + task.getCurrentCell() + ")")); // //直通任务 // if (flag && CollectionUtil.isNotEmpty(emptyList)) { // return emptyList.get(0); // } if (CollectionUtil.isEmpty(storageCageList) || storageCageList.size() == 1) { log.info("没有多余的空格子"); return Boolean.FALSE; } edgStorageCage = storageCageList.get(0); } log.info("4、将玻璃信息插入卧式理片笼,当前玻璃信息:{}", glassInfo); EdgStorageCageDetails details = new EdgStorageCageDetails(); BeanUtils.copyProperties(glassInfo, details); details.setState(Const.GLASS_STATE_IN); details.setSlot(edgStorageCage.getSlot()); details.setDeviceId(edgStorageCage.getDeviceId()); edgStorageCageDetailsService.save(details); //更新任务信息 task.setStartCell(edgStorageCage.getSlot()); task.setTaskRunning(task.getTaskState()); edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task); saveHistoryTask(task); return Boolean.TRUE; } private boolean outTask(EdgStorageDeviceTask task) { EdgStorageCageDetails edgStorageCageDetails = null; //笼内是版图相差是否超过阈值 boolean flag = queryMaxMinDiff(threshold); if (flag) { EdgStorageCageDetails minEdgDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .inSql(EdgStorageCageDetails::getSlot, "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON) .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN) .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId) .orderBy(Boolean.TRUE, Boolean.TRUE, EdgStorageCageDetails::getTemperingFeedSequence) .last("limit 1")); // select * from edg_storage_cage_details where width = 551 and height = 1151 and id in (select min(id ) from edg_storage_cage_details where state = 100 group by slot ) edgStorageCageDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getWidth, minEdgDetails.getWidth()) .eq(EdgStorageCageDetails::getHeight, minEdgDetails.getHeight()) .inSql(EdgStorageCageDetails::getId, "select min(id ) from edg_storage_cage_details where state = 100 group by slot ") .last("order by abs(t.slot - " + task.getCurrentCell() + ") asc limit 1") ); if (null == edgStorageCageDetails) { edgStorageCageDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN) .eq(EdgStorageCageDetails::getSlot, minEdgDetails.getSlot()) .orderByAsc(EdgStorageCageDetails::getId) .last("limit 1") ); } } if (null == edgStorageCageDetails) { // 获取上次任务 // 获取历史表中上次任务最后一片尺寸 EdgStorageDeviceTaskHistory edgeData = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>() .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_SUCCESS). orderByDesc(EdgStorageDeviceTaskHistory::getId).last("limit 1")); GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, edgeData.getGlassIdOut())); //笼内的玻璃的尺寸是否和上一次任务一致 edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(one.getWidth(), one.getHeight()); } if (null == edgStorageCageDetails) { edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(0, 0); } if (edgStorageCageDetails == null) { //和上次任务不存在相同尺寸 log.info("笼内没有玻璃了"); return Boolean.FALSE; } //玻璃信息替换 String glassIdChange = queryAndChangeGlass(edgStorageCageDetails.getGlassId()); //处理在卧理内的玻璃信息：笼内的数据处理 queryEdgAndChangeGlass(edgStorageCageDetails.getGlassId(), glassIdChange); //生成出片任务 task.setGlassIdOut(edgStorageCageDetails.getGlassId()); task.setCurrentCell(edgStorageCageDetails.getSlot()); task.setTaskRunning(Const.GLASS_CACHE_TYPE_OUT); edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task); saveHistoryTask(task); //更新详情表任务出片中 edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>() .set(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT) .eq(EdgStorageCageDetails::getGlassId, edgStorageCageDetails.getGlassId())); return Boolean.TRUE; } private boolean updateCellRemainWidth(int slot) { List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, slot) .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)); if (CollectionUtil.isEmpty(list)) { log.info("格子{}内无玻璃，无法更新", slot); return Boolean.FALSE; } int widthTotal = (int) list.stream().map(e -> e.getWidth() + glassGap).mapToDouble(Double::intValue).sum(); int remainWidth = cellLength - widthTotal >= 0 ? cellLength - widthTotal : 0; edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>(). set(EdgStorageCage::getRemainWidth, remainWidth).eq(EdgStorageCage::getSlot, slot)); return Boolean.FALSE; } /** * 查询玻璃并进行交换 * * @param glassId * @return */ public String queryAndChangeGlass(String glassId) { GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId)); // .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1")); Assert.isFalse(null == glassInfo, "玻璃信息不存在"); //按照玻璃尺寸 LambdaQueryWrapper<GlassInfo> queryWrapper = new LambdaQueryWrapper<GlassInfo>() .eq(GlassInfo::getWidth, glassInfo.getWidth()) .eq(GlassInfo::getHeight, glassInfo.getHeight()) .eq(GlassInfo::getThickness, glassInfo.getThickness()) .eq(GlassInfo::getFilmsid, glassInfo.getFilmsid()) .eq(GlassInfo::getFlowCardId, glassInfo.getFlowCardId()) .eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer()) .eq(GlassInfo::getLayer, glassInfo.getLayer()) .eq(GlassInfo::getEngineerId, glassInfo.getEngineerId()) .notInSql(GlassInfo::getGlassId, "select distinct glass_id from edg_storage_cage_details " + "where engineer_id = '" + glassInfo.getEngineerId() + "' and width = " + glassInfo.getWidth() + " and height = " + glassInfo.getHeight() + " and state != 100") .orderByAsc(GlassInfo::getTemperingLayoutId) .orderBy(Boolean.TRUE, Boolean.TRUE, GlassInfo::getTemperingFeedSequence) .last("Limit 1"); GlassInfo swapGlassInfo = glassInfoService.getOne(queryWrapper); if (swapGlassInfo != null && !glassInfo.getGlassId().equals(swapGlassInfo.getGlassId())) { String swapGlassId = swapGlassInfo.getGlassId(); log.info("将玻璃{}和玻璃{}，信息互换,进玻璃 {}", glassInfo, swapGlassInfo, swapGlassInfo); swapGlassInfo.setGlassId(glassId); glassInfo.setGlassId(swapGlassId); glassInfoService.updateById(swapGlassInfo); glassInfoService.updateById(glassInfo); return swapGlassId; } return ""; } /** * 查询卧式理片玻璃并进行交换 * * @param glassId * @return */ public void queryEdgAndChangeGlass(String glassId, String swapGlassId) { if (StringUtils.isBlank(swapGlassId)) { log.info("当前出笼玻璃不存在需要替换的玻璃"); return; } //获取待出笼的玻璃 EdgStorageCageDetails glassInfo = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getGlassId, glassId).eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)); // 获取待出笼的玻璃需要替换的玻璃信息 EdgStorageCageDetails swapGlassDetailInfo = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getGlassId, swapGlassId).eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)); // 玻璃小片表中玻璃已经替换，更新卧理笼内现有的准备出笼的玻璃信息， if (null == swapGlassDetailInfo) { GlassInfo glassInfoBase = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>() .eq(GlassInfo::getGlassId, glassId)); //需要替换的玻璃为存进卧理，仅需更新当前需要出笼的玻璃信息即可 edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getGlassId, glassId) .set(EdgStorageCageDetails::getTemperingLayoutId, glassInfoBase.getTemperingLayoutId()) .set(EdgStorageCageDetails::getTemperingFeedSequence, glassInfoBase.getTemperingFeedSequence())); } else { //需要替换的玻璃都在卧理内，按照玻璃id对调玻璃信息：对调玻璃id即可 edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getId, glassInfo.getId()) .set(EdgStorageCageDetails::getTemperingLayoutId, swapGlassDetailInfo.getTemperingLayoutId()) .set(EdgStorageCageDetails::getTemperingFeedSequence, swapGlassDetailInfo.getTemperingFeedSequence()) ); edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getId, swapGlassDetailInfo.getId()) .set(EdgStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId()) .set(EdgStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence()) ); } } /** * 获取详情表内最大最小版图id的差值，判断是否出最小版图玻璃 * * @return */ public boolean queryMaxMinDiff(int threshold) { //获取笼子内最大版图id和最小版图id插值，判断是否大于阈值，大于阈值直接出最小版图玻璃 QueryWrapper<EdgStorageCageDetails> queryWrapper = new QueryWrapper<>(); queryWrapper.select("max(tempering_layout_id)-min(tempering_layout_id) as diff") .eq("state", Const.GLASS_STATE_IN) .inSql("slot", "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON); List<Object> list = edgStorageCageDetailsService.listObjs(queryWrapper); //获取笼内玻璃版图差值是否大于阈值 if (CollectionUtil.isNotEmpty(list)) { Long diff = (Long) list.get(0); return diff > threshold; } else { return Boolean.FALSE; } } public boolean saveHistoryTask(EdgStorageDeviceTask task) { EdgStorageDeviceTaskHistory taskHistory = new EdgStorageDeviceTaskHistory(); BeanUtils.copyProperties(task, taskHistory); task.setTaskType(task.getTaskRunning()); task.setTaskState(Const.RAW_GLASS_TASK_NEW); edgStorageDeviceTaskHistoryService.save(taskHistory); return Boolean.TRUE; } } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/opccallback/CacheGlassFinishCallback.java
New file @@ -0,0 +1,89 @@ package com.mes.job.opccallback; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.kangaroohy.milo.runner.subscription.SubscriptionCallback; import com.mes.common.config.Const; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; import com.mes.edgstoragecage.service.EdgStorageCageService; import com.mes.opctask.entity.EdgStorageDeviceTask; import com.mes.opctask.entity.EdgStorageDeviceTaskHistory; import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService; import com.mes.opctask.service.EdgStorageDeviceTaskService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /** * @Author : zhoush * @Date: 2024/10/10 14:13 * @Description: */ @Service @Slf4j public class CacheGlassFinishCallback implements SubscriptionCallback { private static final String EDG_STORAGE_DEVICE_ONE_TASK = "edg_storage_device_one_task"; private static final String EDG_STORAGE_DEVICE_TWO_TASK = "edg_storage_device_two_task"; @Value("${mes.glassGap}") private int glassGap; @Value("${mes.cellLength}") private int cellLength; @Resource EdgStorageDeviceTaskService edgStorageDeviceTaskService; @Resource EdgStorageCageDetailsService edgStorageCageDetailsService; @Resource EdgStorageCageService edgStorageCageService; @Resource EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService; @Override public void onSubscribe(String identifier, Object value) { String tableName = identifier.contains("01") ? EDG_STORAGE_DEVICE_ONE_TASK : EDG_STORAGE_DEVICE_TWO_TASK; EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName); if (task == null) { log.info("任务表基础数据录入失败，请检查数据是否录入成功"); return; } if (task.getTaskState() <= 4) { log.info("不存在未完成的任务"); return; } Integer cell = task.getStartCell(); Integer state = task.getTaskState(); task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY); task.setTaskState(Const.GLASS_CACHE_TYPE_EMPTY); task.setStartCell(0); edgStorageDeviceTaskService.updateTaskMessage(tableName, task); edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>() .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW) .set(EdgStorageDeviceTaskHistory::getTaskState, Const.GLASS_CACHE_TYPE_FINISH.equals(state) ? Const.RAW_GLASS_TASK_SUCCESS : Const.RAW_GLASS_TASK_FAILURE) ); updateCellRemainWidth(cell); } private boolean updateCellRemainWidth(int slot) { List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, slot) .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)); if (CollectionUtil.isEmpty(list)) { log.info("格子{}内无玻璃，无法更新", slot); return Boolean.FALSE; } int widthTotal = (int) list.stream().map(e -> e.getWidth() + glassGap).mapToDouble(Double::intValue).sum(); int remainWidth = cellLength - widthTotal >= 0 ? cellLength - widthTotal : 0; edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>(). set(EdgStorageCage::getRemainWidth, remainWidth).eq(EdgStorageCage::getSlot, slot)); return Boolean.FALSE; } } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/opccallback/CacheGlassStartCallback.java
New file @@ -0,0 +1,303 @@ package com.mes.job.opccallback; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.kangaroohy.milo.runner.subscription.SubscriptionCallback; import com.mes.common.config.Const; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; import com.mes.edgstoragecage.service.EdgStorageCageService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.service.GlassInfoService; import com.mes.opctask.entity.EdgStorageDeviceTask; import com.mes.opctask.entity.EdgStorageDeviceTaskHistory; import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService; import com.mes.opctask.service.EdgStorageDeviceTaskService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /** * @Author : zhoush * @Date: 2024/10/10 14:13 * @Description: */ @Service @Slf4j public class CacheGlassStartCallback implements SubscriptionCallback { private static final String EDG_STORAGE_DEVICE_ONE_TASK = "edg_storage_device_one_task"; private static final String EDG_STORAGE_DEVICE_TWO_TASK = "edg_storage_device_two_task"; @Resource EdgStorageDeviceTaskService edgStorageDeviceTaskService; @Resource GlassInfoService glassInfoService; @Resource EdgStorageCageDetailsService edgStorageCageDetailsService; @Resource EdgStorageCageService edgStorageCageService; @Resource EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService; @Value("${mes.threshold}") private int threshold; @Override public void onSubscribe(String identifier, Object value) { String tableName = identifier.contains("01") ? EDG_STORAGE_DEVICE_ONE_TASK : EDG_STORAGE_DEVICE_TWO_TASK; EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName); if (task == null) { log.info("任务表基础数据录入失败，请检查数据是否录入成功"); return; } if (task.getTaskRunning() != 0) { log.info("有正在执行的任务，结束"); return; } int request = task.getTaskState(); if (request == 0) { log.info("未收到任务请求，结束本次任务"); } else if (request == 1) { //进片任务 intoTask(task); } else if (request == 2) { //出片任务 outTask(task); } else if (request == 3) { //todo:直通任务 } else { log.info("异常数据，结束本次任务"); } } private boolean intoTask(EdgStorageDeviceTask task) { //获取玻璃的基本信息 GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn())); if (null == glassInfo) { log.info("进片玻璃信息不存在，玻璃id:{}", task.getGlassIdIn()); return Boolean.FALSE; } //获取当前进片玻璃id和进片格子 相同尺寸可以放下的格子 // select * from edg_storage_cage t left join edg_storage_cage_details t1 on t.slot = t1.slot // where t.device_id =1 and t1.state = 100 and t.remain_width >= 827 and t1.width = 827 and t1.height = 1124 order by abs(t.slot - 10) EdgStorageCage edgStorageCage = edgStorageCageService.getEdgStorageCageBySize(1, glassInfo.getWidth(), glassInfo.getHeight(), task.getCurrentCell()); if (edgStorageCage == null) { log.info("相同尺寸可以放下的格子未找到，格子id:{}", task.getCurrentCell()); // SELECT * from edg_storage_cage where device_id = 1 and remain_width > 1000 order by abs(slot - 10) List<EdgStorageCage> storageCageList = edgStorageCageService.list(new LambdaQueryWrapper<EdgStorageCage>().eq(EdgStorageCage::getDeviceId, 1) .eq(EdgStorageCage::getEnableState, Const.SLOT_ON) .ge(EdgStorageCage::getRemainWidth, glassInfo.getWidth()).last("order by abs(slot - " + task.getCurrentCell() + ")")); // //直通任务 // if (flag && CollectionUtil.isNotEmpty(emptyList)) { // return emptyList.get(0); // } if (CollectionUtil.isEmpty(storageCageList) || storageCageList.size() == 1) { log.info("没有多余的空格子"); return Boolean.FALSE; } edgStorageCage = storageCageList.get(0); } log.info("4、将玻璃信息插入卧式理片笼,当前玻璃信息:{}", glassInfo); EdgStorageCageDetails details = new EdgStorageCageDetails(); BeanUtils.copyProperties(glassInfo, details); details.setState(Const.GLASS_STATE_IN); details.setSlot(edgStorageCage.getSlot()); details.setDeviceId(edgStorageCage.getDeviceId()); edgStorageCageDetailsService.save(details); //更新任务信息 task.setStartCell(edgStorageCage.getSlot()); task.setTaskRunning(task.getTaskState()); edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task); saveHistoryTask(task); return Boolean.TRUE; } private boolean outTask(EdgStorageDeviceTask task) { EdgStorageCageDetails edgStorageCageDetails = null; //笼内是版图相差是否超过阈值 boolean flag = queryMaxMinDiff(threshold); if (flag) { EdgStorageCageDetails minEdgDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .inSql(EdgStorageCageDetails::getSlot, "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON) .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN) .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId) .orderBy(Boolean.TRUE, Boolean.TRUE, EdgStorageCageDetails::getTemperingFeedSequence) .last("limit 1")); // select * from edg_storage_cage_details where width = 551 and height = 1151 and id in (select min(id ) from edg_storage_cage_details where state = 100 group by slot ) edgStorageCageDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getWidth, minEdgDetails.getWidth()) .eq(EdgStorageCageDetails::getHeight, minEdgDetails.getHeight()) .inSql(EdgStorageCageDetails::getId, "select min(id) from edg_storage_cage_details where state = 100 group by slot ") .last("order by abs(slot - " + task.getCurrentCell() + ") asc limit 1") ); if (null == edgStorageCageDetails) { edgStorageCageDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN) .eq(EdgStorageCageDetails::getSlot, minEdgDetails.getSlot()) .orderByAsc(EdgStorageCageDetails::getId) .last("limit 1") ); } } if (null == edgStorageCageDetails) { // 获取上次任务 // 获取历史表中上次任务最后一片尺寸 EdgStorageDeviceTaskHistory edgeData = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>() .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_SUCCESS). orderByDesc(EdgStorageDeviceTaskHistory::getId).last("limit 1")); GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, edgeData.getGlassIdOut())); //笼内的玻璃的尺寸是否和上一次任务一致 edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(one.getWidth(), one.getHeight()); } if (null == edgStorageCageDetails) { edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(0, 0); } if (edgStorageCageDetails == null) { //和上次任务不存在相同尺寸 log.info("笼内没有玻璃了"); return Boolean.FALSE; } //玻璃信息替换 String glassIdChange = queryAndChangeGlass(edgStorageCageDetails.getGlassId()); //处理在卧理内的玻璃信息：笼内的数据处理 queryEdgAndChangeGlass(edgStorageCageDetails.getGlassId(), glassIdChange); //生成出片任务 task.setGlassIdOut(edgStorageCageDetails.getGlassId()); task.setStartCell(edgStorageCageDetails.getSlot()); task.setTaskRunning(Const.GLASS_CACHE_TYPE_OUT); edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task); saveHistoryTask(task); //更新详情表任务出片中 edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>() .set(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT) .eq(EdgStorageCageDetails::getGlassId, edgStorageCageDetails.getGlassId())); return Boolean.TRUE; } /** * 查询玻璃并进行交换 * * @param glassId * @return */ public String queryAndChangeGlass(String glassId) { GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId)); // .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1")); Assert.isFalse(null == glassInfo, "玻璃信息不存在"); //按照玻璃尺寸 LambdaQueryWrapper<GlassInfo> queryWrapper = new LambdaQueryWrapper<GlassInfo>() .eq(GlassInfo::getWidth, glassInfo.getWidth()) .eq(GlassInfo::getHeight, glassInfo.getHeight()) .eq(GlassInfo::getThickness, glassInfo.getThickness()) .eq(GlassInfo::getFilmsid, glassInfo.getFilmsid()) .eq(GlassInfo::getFlowCardId, glassInfo.getFlowCardId()) .eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer()) .eq(GlassInfo::getLayer, glassInfo.getLayer()) .eq(GlassInfo::getEngineerId, glassInfo.getEngineerId()) .notInSql(GlassInfo::getGlassId, "select distinct glass_id from edg_storage_cage_details " + "where engineer_id = '" + glassInfo.getEngineerId() + "' and width = " + glassInfo.getWidth() + " and height = " + glassInfo.getHeight() + " and state != 100") .orderByAsc(GlassInfo::getTemperingLayoutId) .orderBy(Boolean.TRUE, Boolean.TRUE, GlassInfo::getTemperingFeedSequence) .last("Limit 1"); GlassInfo swapGlassInfo = glassInfoService.getOne(queryWrapper); if (swapGlassInfo != null && !glassInfo.getGlassId().equals(swapGlassInfo.getGlassId())) { String swapGlassId = swapGlassInfo.getGlassId(); log.info("将玻璃{}和玻璃{}，信息互换,进玻璃 {}", glassInfo, swapGlassInfo, swapGlassInfo); swapGlassInfo.setGlassId(glassId); glassInfo.setGlassId(swapGlassId); glassInfoService.updateById(swapGlassInfo); glassInfoService.updateById(glassInfo); return swapGlassId; } return ""; } /** * 查询卧式理片玻璃并进行交换 * * @param glassId * @return */ public void queryEdgAndChangeGlass(String glassId, String swapGlassId) { if (StringUtils.isBlank(swapGlassId)) { log.info("当前出笼玻璃不存在需要替换的玻璃"); return; } //获取待出笼的玻璃 EdgStorageCageDetails glassInfo = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getGlassId, glassId).eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)); // 获取待出笼的玻璃需要替换的玻璃信息 EdgStorageCageDetails swapGlassDetailInfo = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getGlassId, swapGlassId).eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)); // 玻璃小片表中玻璃已经替换，更新卧理笼内现有的准备出笼的玻璃信息， if (null == swapGlassDetailInfo) { GlassInfo glassInfoBase = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>() .eq(GlassInfo::getGlassId, glassId)); //需要替换的玻璃为存进卧理，仅需更新当前需要出笼的玻璃信息即可 edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getGlassId, glassId) .set(EdgStorageCageDetails::getTemperingLayoutId, glassInfoBase.getTemperingLayoutId()) .set(EdgStorageCageDetails::getTemperingFeedSequence, glassInfoBase.getTemperingFeedSequence())); } else { //需要替换的玻璃都在卧理内，按照玻璃id对调玻璃信息：对调玻璃id即可 edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getId, glassInfo.getId()) .set(EdgStorageCageDetails::getTemperingLayoutId, swapGlassDetailInfo.getTemperingLayoutId()) .set(EdgStorageCageDetails::getTemperingFeedSequence, swapGlassDetailInfo.getTemperingFeedSequence()) ); edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>() .eq(EdgStorageCageDetails::getId, swapGlassDetailInfo.getId()) .set(EdgStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId()) .set(EdgStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence()) ); } } /** * 获取详情表内最大最小版图id的差值，判断是否出最小版图玻璃 * * @return */ public boolean queryMaxMinDiff(int threshold) { //获取笼子内最大版图id和最小版图id插值，判断是否大于阈值，大于阈值直接出最小版图玻璃 QueryWrapper<EdgStorageCageDetails> queryWrapper = new QueryWrapper<>(); queryWrapper.select("max(tempering_layout_id)-min(tempering_layout_id) as diff") .eq("state", Const.GLASS_STATE_IN) .inSql("slot", "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON); List<Object> list = edgStorageCageDetailsService.listObjs(queryWrapper); //获取笼内玻璃版图差值是否大于阈值 if (CollectionUtil.isNotEmpty(list)) { Long diff = (Long) list.get(0); return diff > threshold; } else { return Boolean.FALSE; } } public boolean saveHistoryTask(EdgStorageDeviceTask task) { EdgStorageDeviceTaskHistory taskHistory = new EdgStorageDeviceTaskHistory(); BeanUtils.copyProperties(task, taskHistory); task.setTaskType(task.getTaskRunning()); task.setTaskState(Const.RAW_GLASS_TASK_NEW); edgStorageDeviceTaskHistoryService.save(taskHistory); return Boolean.TRUE; } } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opccallback/CacheGlassSubscriptionCallback.java
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceOneTask.java
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceTwoTask.java
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskMapper.java
@@ -1,6 +1,7 @@ package com.mes.opctask.mapper; import com.mes.opctask.entity.EdgStorageDeviceTask; import org.apache.ibatis.annotations.Param; /** * @Author : zhoush @@ -11,5 +12,5 @@ EdgStorageDeviceTask queryTaskMessage(String tableName); boolean updateTaskMessage(String tableName, EdgStorageDeviceTask edgStorageDeviceTask); boolean updateTaskMessage(@Param("tableName") String tableName, @Param("task") EdgStorageDeviceTask edgStorageDeviceTask); } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
@@ -3,6 +3,7 @@ import com.mes.opctask.entity.EdgStorageDeviceTask; import com.mes.opctask.mapper.EdgStorageDeviceTaskMapper; import com.mes.opctask.service.EdgStorageDeviceTaskService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -11,6 +12,7 @@ * @Date: 2024/10/24 15:36 * @Description: */ @Service public class EdgStorageDeviceTaskServiceImpl implements EdgStorageDeviceTaskService { // @Override // public void updateTaskMessage(Integer slot, Integer taskRunning, String glassIdOut) { @@ -21,8 +23,7 @@ @Override public EdgStorageDeviceTask queryTaskMessage(String tableName) { edgStorageDeviceTaskMapper.queryTaskMessage(tableName); return null; return edgStorageDeviceTaskMapper.queryTaskMessage(tableName); } @Override hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -8,6 +8,11 @@ name: cacheGlass liquibase: enabled: false task: scheduling: pool: size: 10 thread-name-prefix: task-cache mybatis-plus: mapper-locations: classpath*:mapper/*.xml # configuration: @@ -28,8 +33,8 @@ two: #第二条磨边线的最小尺寸信息 firstLength: 400 secondLength: 400 glassGap: 300 cellLength: 2700 glassGap: 300 cellLength: 2700 sequence: order: false kangaroohy: @@ -38,7 +43,8 @@ primary: default config: default: endpoint: opc.tcp://zidonghua:49320 endpoint: opc.tcp://192.168.10.241:49320 security-policy: basic256sha256 username: zsh username: liu password: 1qaz2wsx3edc4rfv
@@ -44,10 +44,10 @@ inner join size_max_temp t2 on t.width = t2.width and t.height = t2.height <where> <if test="width != 0"> t.width = #{width} and t.width = #{width} </if> <if test="height != 0"> t.height = #{height} and t.height = #{height} </if> </where> order by total_count desc, glass_count, abs(t.slot - 10) hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
@@ -16,19 +16,19 @@ <select id="queryTaskMessage" resultMap="baseMap"> select * from #{tableName} from ${tableName} limit 1 </select> <update id="updateTaskMessage"> UPDATE #{tableName} SET task_running = #{taskRunning}, glass_id_out = #{glassIdOut}, current_cell = #{currentCell}, start_cell = #{startCell}, enc_cell = #{endCell}, <if test="taskState == 0"> task_state = #{taskState}, UPDATE ${tableName} SET task_running = #{task.taskRunning}, glass_id_out = #{task.glassIdOut}, current_cell = #{task.currentCell}, start_cell = #{task.startCell}, end_cell = #{task.endCell} <if test="task.taskState == 0"> ,task_state = #{task.taskState} </if> </update> </mapper>
