hangzhoumesParent/common/servicebase/src/main/java/com/mes/alarm/controller/ProductAlarmInfoController.java
New file @@ -0,0 +1,37 @@ package com.mes.alarm.controller; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.mes.alarm.entity.ProductAlarmInfo; import com.mes.alarm.entity.request.ProductAlarmInfoRequest; import com.mes.alarm.service.ProductAlarmInfoService; import com.mes.common.config.Const; import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * @author Administrator */ @RestController @RequestMapping("productAlarmInfo") public class ProductAlarmInfoController { /** * 服务对象 */ @Resource private ProductAlarmInfoService productAlarmInfoService; @ApiOperation("报警数据确认") @PostMapping("/updateAlarmInfo") public Result<Boolean> updateAlarmInfo(@RequestBody ProductAlarmInfoRequest request) { return Result.build(200, "查询成功", productAlarmInfoService.update(new LambdaUpdateWrapper<ProductAlarmInfo>() .eq(ProductAlarmInfo::getId, request.getId()).set(ProductAlarmInfo::getState, Const.RAW_GLASS_TASK_SUCCESS))); } }
New file @@ -0,0 +1,56 @@ package com.mes.alarm.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.Date; /** * 生产报警表(ProductAlarmInfo)表实体类 * * @author makejava * @since 2025-09-19 16:00:31 */ @Data public class ProductAlarmInfo { /** * 报警ID */ @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 报警模块 */ private String alarmModule; /** * 报警类型 */ private String alarmType; /** * 报警编码 */ private String alarmCode; /** * 报警级别(ERROR/WARN/INFO) */ private String alarmLevel; /** * 报警详细信息 */ private String alarmMessage; /** * 任务状态 */ private Integer state; /** * 创建时间 */ private Date createTime; /** * 更新时间 */ private Date updateTime; }
New file @@ -0,0 +1,48 @@ package com.mes.alarm.entity.request; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @Author : zhoush * @Date: 2025/9/19 16:24 * @Description: */ @ApiModel(description = "生产预警请求") @Data public class ProductAlarmInfoRequest { /** * 报警ID */ @ApiModelProperty(value = "报警ID", position = 1) private Long id; /** * 报警模块 */ @ApiModelProperty(value = "报警模块", position = 2) private String alarmModule; /** * 报警类型 */ @ApiModelProperty(value = "报警类型", position = 3) private String alarmType; /** * 报警编码 */ @ApiModelProperty(value = "报警编码", position = 4) private String alarmCode; /** * 报警级别(ERROR/WARN/INFO) */ @ApiModelProperty(value = "报警级别(ERROR/WARN/INFO)", position = 5) private String alarmLevel; /** * 任务状态 */ @ApiModelProperty(value = "报警状态", position = 6) private Integer state; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/alarm/mapper/ProductAlarmInfoMapper.java
New file @@ -0,0 +1,15 @@ package com.mes.alarm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.alarm.entity.ProductAlarmInfo; /** * 生产报警表(ProductAlarmInfo)表数据库访问层 * * @author makejava * @since 2025-09-19 16:00:31 */ public interface ProductAlarmInfoMapper extends BaseMapper<ProductAlarmInfo> { }
New file @@ -0,0 +1,15 @@ package com.mes.alarm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mes.alarm.entity.ProductAlarmInfo; /** * 生产报警表(ProductAlarmInfo)表服务接口 * * @author makejava * @since 2025-09-19 16:00:31 */ public interface ProductAlarmInfoService extends IService<ProductAlarmInfo> { }
New file @@ -0,0 +1,19 @@ package com.mes.alarm.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.alarm.mapper.ProductAlarmInfoMapper; import com.mes.alarm.entity.ProductAlarmInfo; import com.mes.alarm.service.ProductAlarmInfoService; import org.springframework.stereotype.Service; /** * 生产报警表(ProductAlarmInfo)表服务实现类 * * @author makejava * @since 2025-09-19 16:00:31 */ @Service public class ProductAlarmInfoServiceImpl extends ServiceImpl<ProductAlarmInfoMapper, ProductAlarmInfo> implements ProductAlarmInfoService { }
@@ -10,6 +10,8 @@ import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer; import com.kangaroohy.milo.model.ReadWriteEntity; import com.kangaroohy.milo.service.MiloService; import com.mes.alarm.entity.ProductAlarmInfo; import com.mes.alarm.service.ProductAlarmInfoService; import com.mes.base.entity.HollowBigStorageCageBaseInfo; import com.mes.bigstoragecagetask.entity.BigStorageCageTask; import com.mes.bigstoragecagetask.service.BigStorageCageTaskService; @@ -101,11 +103,19 @@ @Qualifier("CMJ1ModbusTcp") ModbusTcp CMJ1ModbusTcp; @Resource private ProductAlarmInfoService productAlarmInfoService; private static final String BIG_STORAGE_CAGE_IN_TWO_TASK = "big_storage_cage_in_two_task"; private static final String BIG_STORAGE_CAGE_OUT_TWO_TASK = "big_storage_cage_out_two_task"; private static final List<Integer> ONE_LINE_FIRST = Arrays.asList(930, 931, 932); private static final List<Integer> TWO_LINE_FIRST = Arrays.asList(931, 930, 932); private static final String ALARM_MODULE = "中空"; private static final String ALARM_TYPE = "中空大理片"; private static final String ALARM_CODE = "sizeSame"; /** * 直通格子 @@ -118,6 +128,15 @@ @Scheduled(fixedDelay = 1000) public void inBigStorageTask() { List<ProductAlarmInfo> alarmInfos = productAlarmInfoService.list(new LambdaQueryWrapper<ProductAlarmInfo>() .eq(ProductAlarmInfo::getState, Const.LOAD_RAW_GLASS_NEW) .eq(ProductAlarmInfo::getAlarmModule, ALARM_MODULE) .eq(ProductAlarmInfo::getAlarmType, ALARM_TYPE) .eq(ProductAlarmInfo::getAlarmCode, ALARM_CODE)); if (CollectionUtil.isNotEmpty(alarmInfos)) { log.info("界面报警，等待人工干预处理"); return; } S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class); log.info("进片任务读取s7DataZKDLPOne:{}", s7DataZKDLPOne); Boolean inkageEntity = s7DataZKDLPOne.getMesControl(); @@ -240,13 +259,43 @@ List<HollowBigStorageCageHistoryTask> historyTasks = new ArrayList<>(); Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP); try { log.info("开始计算目标格子,玻璃id有：{}", inTaskList); if (slotMaxHeight > Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) && glassInfoList.get(0).getThickness() < slotMaxthickness) { for (BigStorageCageTask task : inTaskList) { GlassInfo info = glassListMap.get(task.getGlassId()).get(0); HollowBigStorageDTO bigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(info.getFlowCardId(), info.getGlassType(), HollowBigStorageDTO bigStorageDTO = null; try { bigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(info.getFlowCardId(), info.getGlassType(), info.getWidth(), info.getHeight(), info.getTotalLayer(), info.getLayer()); } catch (Exception exception) { log.info("进片任务执行中发生异常：{}", exception); //保存故障信息 ProductAlarmInfo alarmInfo = new ProductAlarmInfo(); alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW); alarmInfo.setAlarmModule(ALARM_MODULE); alarmInfo.setAlarmType(ALARM_TYPE); alarmInfo.setAlarmCode(ALARM_CODE); alarmInfo.setAlarmMessage(info.getGlassId()); productAlarmInfoService.save(alarmInfo); //重置详情表数据 hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>() .set(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_TAKE) .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_NEW)); //重置中空关系表数据 hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>() .set(HollowGlassRelationInfo::getGlassId, null) .set(HollowGlassRelationInfo::getTemperingLayoutId, null) .set(HollowGlassRelationInfo::getTemperingFeedSequence, null) .set(HollowGlassRelationInfo::getEngineerId, null) .set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW) .eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY) ); //将格子尺寸恢复 hollowBigStorageCageService.resetCage(); return; } // 临时更新格子的剩余尺寸：防止相邻玻璃进同一格子造成剩余尺寸不足，玻璃越界的情况，任务完成后再次更新大理片笼表剩余宽度（按照笼内玻璃数量更新大理片笼剩余尺寸） hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>() .set(HollowBigStorageCage::getRemainWidth, bigStorageDTO.getRemainWidth() - Math.max(info.getWidth(), info.getHeight()) - glassGap) @@ -305,24 +354,7 @@ cageDetails.setId(null); hollowBigStorageCageDetailsService.save(cageDetails); } } catch (Exception exception) { log.info("进片任务执行中发生异常：{}", exception); hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>() .set(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_TAKE) .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_NEW)); hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>() .set(HollowGlassRelationInfo::getGlassId, null) .set(HollowGlassRelationInfo::getTemperingLayoutId, null) .set(HollowGlassRelationInfo::getTemperingFeedSequence, null) .set(HollowGlassRelationInfo::getEngineerId, null) .set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW) .eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY) ); //将格子尺寸恢复 hollowBigStorageCageService.resetCage(); return; } //历史数据入库 hollowBigStorageCageHistoryTaskService.saveBatch(historyTasks); //向opc发送启动信号 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -5,6 +5,8 @@ import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp; import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer; import com.kangaroohy.milo.service.MiloService; import com.mes.alarm.entity.ProductAlarmInfo; import com.mes.alarm.service.ProductAlarmInfoService; import com.mes.bigstoragecagetask.entity.BigStorageCageTask; import com.mes.bigstoragecagetask.entity.BigStorageTaskVO; import com.mes.bigstoragecagetask.service.BigStorageCageTaskService; @@ -67,6 +69,8 @@ @Autowired(required = false) MiloService miloService; @Resource ProductAlarmInfoService productAlarmInfoService; @Autowired @Qualifier("s7SerializerZKDLPOne") @@ -94,6 +98,10 @@ @Resource RedisUtil redisUtil; private static final String ALARM_MODULE = "中空"; private static final String ALARM_TYPE = "中空大理片"; private static final String ALARM_CODE = "sizeSame"; @Scheduled(fixedDelay = 5000) public void hollowGlassTaskOne() { @@ -330,6 +338,12 @@ //缺片详情 List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard(); jsonObject.append("lackDetailsList", lackDetailsList); jsonObject.append("alarmInfo", productAlarmInfoService.list(new LambdaQueryWrapper<ProductAlarmInfo>() .eq(ProductAlarmInfo::getState, Const.LOAD_RAW_GLASS_NEW) .eq(ProductAlarmInfo::getAlarmModule, ALARM_MODULE) .eq(ProductAlarmInfo::getAlarmType, ALARM_TYPE) .eq(ProductAlarmInfo::getAlarmCode, ALARM_CODE))); } @Scheduled(fixedDelay = 1000)
