From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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