From 55b94886f07ddd77d0b9ebbbf2d6ff8e92f682a4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 16 七月 2024 16:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
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