From 57fd91871001c5cb49b13485d0b932e69c3a42a4 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 九月 2024 11:17:01 +0800
Subject: [PATCH] 原片仓储代码功能编写：基础功能已完成，任务编写逻辑已写完，待实现。
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java | 8 --
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java | 27 ++++++--
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java | 11 +--
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 36 +++--------
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java | 4
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 15 ----
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java | 11 +++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java | 15 +++-
8 files changed, 60 insertions(+), 67 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
index 7eb1bdc..869686d 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
@@ -1,18 +1,18 @@
package com.mes.rawglassdetails.controller;
-
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+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;
/**
- * <p>
* 鍓嶇鎺у埗鍣�
- * </p>
*
* @author wf
* @since 2024-09-10
@@ -21,27 +21,13 @@
@RequestMapping("/rawGlassStorageDetails")
public class RawGlassStorageDetailsController {
- @Autowired
- private RawGlassStorageDetailsService rawGlassStorageDetailsService;
- @ApiOperation("宸ヤ綅鐘舵��")
- @PostMapping("/updateEnableState")
- @ResponseBody
- public Result<Boolean> updateStatus(@RequestBody Integer enableState) {
- boolean result = rawGlassStorageDetailsService.updateRawGlassStorageDetails(String.valueOf(enableState));
- if (enableState == 1) {
- return Result.build(1, "鍚敤", result);
- } else {
- return Result.build(0, "绂佺敤", result);
- }
- }
+ @Autowired private RawGlassStorageDetailsService rawGlassStorageDetailsService;
- @ApiOperation("鍘熺墖鍏ュ簱")
- @PostMapping("/patternWarehousing")
- public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
+ @ApiOperation("鍘熺墖鍏ュ簱")
+ @PostMapping("/patternWarehousing")
+ public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
- return Result.build(200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
-
- }
-
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
+ }
}
-
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
index 57237c0..c84cc4a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
@@ -14,13 +14,6 @@
List<RawGlassStorageDetails> selectDetails();
- /**
- * 瑕佸ぇ鍐欒繖涓�
- *
- * @param films_id
- * @return
- */
- boolean updateRawGlassStorageDetails(String films_id);
/**
* 鍒犻櫎琛� 鍏堝湪杩欓噷鍒� 鐒跺悗鐐归偅涓浉鍏抽棶棰�
@@ -44,4 +37,5 @@
* @return
*/
String patternWarehousing(RawGlassRequest request);
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
index a71cc7f..13bab9a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -1,7 +1,6 @@
package com.mes.rawglassdetails.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.Const;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
@@ -21,18 +20,8 @@
@Service
@Slf4j
public class RawGlassStorageDetailsServiceImpl extends ServiceImpl<RawGlassStorageDetailsMapper, RawGlassStorageDetails> implements RawGlassStorageDetailsService {
-
- @Override
- public boolean updateRawGlassStorageDetails(String films_id) {
- UpdateWrapper<RawGlassStorageDetails> wrapper = new UpdateWrapper<>(); //杩欎釜绫诲瀷瀹氫箟閿欎簡锛屼笉搴旇鏄痶asking
- wrapper.set("films_id", "1005")
- .eq("films_id", films_id);
-
- return update(wrapper);//杩欎釜鏂规硶榛樿杩斿洖鐨勫氨鏄痓ool绫诲瀷 鎵�鏈夊彲浠ョ洿鎺eturn杩欎釜鏂规硶锛宱k浜嗭紝浣犳甯稿垱寤烘柟娉曞幓涓婁竴灞傚垱
- }
-
- @Override
- public boolean deleteRawGlassStorageDetails(String device_id) {
+ @Override
+ public boolean deleteRawGlassStorageDetails(String device_id) {
QueryWrapper<RawGlassStorageDetails> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("device_id", device_id);
return remove(queryWrapper);//remove鎵嶆槸鍒犻櫎锛宒elete寰楃敤鍙﹀鐨勪緷璧栵紝榛樿鏂规硶鏄痳emove杩斿洖bool
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
index 1b6dc42..9c60f56 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
@@ -1,21 +1,34 @@
package com.mes.rawglassstation.controller;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
+ * 鍓嶇鎺у埗鍣�
*
* @author wf
* @since 2024-09-10
*/
@RestController
-@RequestMapping("/raw-glass-storage-station")
+@RequestMapping("/rawGlassStorageStation")
public class RawGlassStorageStationController {
+ @Resource RawGlassStorageStationService rawGlassStorageStationService;
+
+ @ApiOperation("宸ヤ綅鐘舵��")
+ @PostMapping("/updateSlotState")
+ @ResponseBody
+ public Result<Boolean> updateSlotState(@RequestBody Integer enableState, Integer slot) {
+ boolean result = rawGlassStorageStationService.updateSlotState(slot, enableState);
+ if (enableState == 1) {
+ return Result.build(1, "鍚敤", result);
+ } else {
+ return Result.build(0, "绂佺敤", result);
+ }
+ }
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
index ba221fc..8f1db02 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
@@ -2,15 +2,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
- * <p>
- *
- * </p>
- *
* @author wf
* @since 2024-09-10
*/
@@ -20,8 +17,8 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* 璁惧id
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
index 86c0b45..7195a73 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
@@ -1,8 +1,8 @@
package com.mes.rawglassstation.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
import java.util.List;
@@ -16,5 +16,5 @@
*/
public interface RawGlassStorageStationMapper extends BaseMapper<RawGlassStorageStation> {
- List<RawGlassStorageTask> listRawGlassDetails();
+ List<RawGlassStorageDetails> listRawGlassDetails();
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
index ed790f1..91c2bf7 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
@@ -1,8 +1,8 @@
package com.mes.rawglassstation.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
import java.util.List;
@@ -19,5 +19,12 @@
boolean insertRawGlassStorageStation(RawGlassStorageStation rw);
- List<RawGlassStorageTask> listRawGlassDetails();
+ /**
+ * 鑾峰彇宸ヤ綅鍙婂搴旂殑鍘熺墖淇℃伅
+ *
+ * @return
+ */
+ List<RawGlassStorageDetails> listRawGlassDetails();
+
+ boolean updateSlotState(Integer slot, Integer enableState);
}
\ No newline at end of file
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 b976035..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,12 +1,13 @@
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.mes.rawglasstask.entity.RawGlassStorageTask;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -43,10 +44,16 @@
return this.save(rw);
}
- @Override
- public List<RawGlassStorageTask> listRawGlassDetails() {
+ @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