From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
index 16574db..88b1494 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
@@ -1,5 +1,6 @@
package com.mes.storagetask.controller;
+import com.mes.utils.Result;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import io.swagger.annotations.ApiOperation;
@@ -38,9 +39,9 @@
@ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
@ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
@PostMapping("/findList")
- public ResponseEntity<List<StorageTask>> findList(@RequestBody StorageTask params) {
+ public Result findList(@RequestBody StorageTask params) {
List<StorageTask> result = storageTaskService.findList(params);
- return ResponseEntity.ok(result);
+ return Result.success(result);
}
/**
@@ -52,9 +53,9 @@
@ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
@ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
@GetMapping("/{id}")
- public ResponseEntity<StorageTask> findById(@PathVariable("id") Long id) {
- StorageTask storageTask = storageTaskService.findById(id);
- return ResponseEntity.ok(storageTask);
+ public Result findById(@PathVariable("id") Long id) {
+ StorageTask storageTask = storageTaskService.getBaseMapper().selectById(id);
+ return Result.success(storageTask);
}
/**
@@ -66,9 +67,9 @@
@ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
@ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
@PostMapping
- public ResponseEntity<Boolean> insert( @RequestBody StorageTask storageTask) {
- boolean result = storageTaskService.insert(storageTask);
- return ResponseEntity.ok(result);
+ public Result insert( @RequestBody StorageTask storageTask) {
+ boolean result = storageTaskService.save(storageTask);
+ return Result.success(result);
}
/**
@@ -80,9 +81,9 @@
@ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
@ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
@PutMapping
- public ResponseEntity<Boolean> update( @RequestBody StorageTask storageTask) {
- boolean result = storageTaskService.update(storageTask);
- return ResponseEntity.ok(result);
+ public Result update( @RequestBody StorageTask storageTask) {
+ boolean result = storageTaskService.updateById(storageTask);
+ return Result.success(result);
}
/**
@@ -93,9 +94,9 @@
*/
@ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
@DeleteMapping("/{id}")
- public ResponseEntity<Integer> delete(@PathVariable("id") Long id) {
- int result = storageTaskService.delete(id);
- return ResponseEntity.ok(result);
+ public Result delete(@PathVariable("id") Long id) {
+ int result = storageTaskService.getBaseMapper().deleteById(id);
+ return Result.success(result);
}
}
\ No newline at end of file
--
Gitblit v1.8.0