From 6abae920ad543ebdc3ee2e386828dd65e4c5ec35 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 06 十一月 2024 23:21:53 +0800 Subject: [PATCH] 1、opc订阅服务同时订阅一个节点两次,仅一个订阅任务生效,将进出片任务/完成任务放在一起 2、移除原片仓储中的下发字段 --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java index 353f1b8..9d2b255 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java @@ -1,15 +1,16 @@ package com.mes.rawglassstation.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mes.rawglassdetails.entity.RawGlassStorageDetails; import com.mes.rawglassstation.entity.RawGlassStorageStation; import com.mes.rawglassstation.mapper.RawGlassStorageStationMapper; import com.mes.rawglassstation.service.RawGlassStorageStationService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** @@ -35,7 +36,7 @@ public boolean deleteRawGlassStorageStation(String device_id) { QueryWrapper<RawGlassStorageStation> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("device_id", device_id); - return remove(queryWrapper); + return remove(queryWrapper); } @Override @@ -43,6 +44,16 @@ return this.save(rw); } + @Override + public List<RawGlassStorageDetails> listRawGlassDetails() { + return baseMapper.listRawGlassDetails(); + } - + @Override + public boolean updateSlotState(Integer slot, Integer enableState) { + return update( + new LambdaUpdateWrapper<RawGlassStorageStation>() + .set(RawGlassStorageStation::getEnableState, enableState) + .eq(RawGlassStorageStation::getSlot, slot)); + } } \ No newline at end of file -- Gitblit v1.8.0