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 | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 457ef85..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,27 +1,27 @@
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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author wf
- * @since 2024-09-10
+ * @author system
+ * @since 2024-07-09 14:51:27
*/
@Service
-public abstract class RawGlassStorageStationServiceImpl extends ServiceImpl<RawGlassStorageStationMapper, RawGlassStorageStation> implements RawGlassStorageStationService {
- public List<RawGlassStorageStation> selectDetails() {
+@Slf4j
+public class RawGlassStorageStationServiceImpl extends ServiceImpl<RawGlassStorageStationMapper, RawGlassStorageStation> implements RawGlassStorageStationService {
+ @Override
+ public List<RawGlassStorageStation> selectStations() {
return list();
}
@Override
@@ -36,11 +36,24 @@
public boolean deleteRawGlassStorageStation(String device_id) {
QueryWrapper<RawGlassStorageStation> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("device_id", device_id);
- return remove(queryWrapper);
+ return remove(queryWrapper);
}
@Override
public boolean insertRawGlassStorageStation(RawGlassStorageStation rw) {
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