diff --git a/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java b/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java index 13a4f3a..7d568f9 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java @@ -29,8 +29,8 @@ public class AuditRecordController { @GetMapping("/list") @Operation(summary = "获取list数据") - public List getAll() { - return auditRecordService.list(); + public Result> getAll() { + return Result.success(auditRecordService.list()); } @PostMapping("/page") diff --git a/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java b/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java index ea590eb..c4a487d 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java +++ b/src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iflytop.handacid.common.base.BasePageQuery; import com.iflytop.handacid.common.model.entity.ReceiveRecord; import com.iflytop.handacid.common.result.PageResult; +import com.iflytop.handacid.common.result.Result; import com.iflytop.handacid.common.service.ReceiveRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,8 +28,8 @@ public class ReceiveRecordController { @GetMapping("/list") @Operation(summary = "获取List数据") - public List getAll() { - return receiveRecordService.list(); + public Result> getAll() { + return Result.success(receiveRecordService.list()); } @PostMapping("/page") @@ -39,26 +40,29 @@ public class ReceiveRecordController { @GetMapping("/{id}") @Operation(summary = "根据ID获取") - public ReceiveRecord getById(@PathVariable Integer id) { - return receiveRecordService.getById(id); + public Result getById(@PathVariable Integer id) { + return Result.success(receiveRecordService.getById(id)); } @PostMapping @Operation(summary = "新增记录") - public boolean create(@RequestBody ReceiveRecord receiveRecord) { - return receiveRecordService.save(receiveRecord); + public Result create(@RequestBody ReceiveRecord receiveRecord) { + boolean flag = receiveRecordService.save(receiveRecord); + return flag? Result.success("添加成功") : Result.failed("添加失败"); } @PutMapping @Operation(summary = "修改记录") - public boolean update(@RequestBody ReceiveRecord receiveRecord) { - return receiveRecordService.updateById(receiveRecord); + public Result update(@RequestBody ReceiveRecord receiveRecord) { + boolean flag = receiveRecordService.updateById(receiveRecord); + return flag? Result.success("修改成功") : Result.failed("修改失败"); } @DeleteMapping("/{id}") @Operation(summary = "删除记录") - public boolean delete(@PathVariable Integer id) { - return receiveRecordService.removeById(id); + public Result delete(@PathVariable Integer id) { + boolean flag = receiveRecordService.removeById(id); + return flag? Result.success("删除成功") : Result.failed("删除失败"); } } diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index 32c95dc..754b6a0 100644 --- a/src/main/resources/sql/init.sql +++ b/src/main/resources/sql/init.sql @@ -88,7 +88,7 @@ CREATE TABLE "receive_record" ( "user_id" INTEGER, "user_name" TEXT, "receiver" TEXT, - "receiverId" INTEGER, + "receiver_id" INTEGER, "solution_id" INTEGER, "solution_name" TEXT, "concentration" TEXT, @@ -163,7 +163,7 @@ CREATE TABLE "user" ( "password" TEXT, "role" TEXT, "fixed_user" TEXT DEFAULT 'DISABLE', - "deleted" INTEGER, + "deleted" TEXT DEFAULT 'DISABLE' , "create_time" TIMESTAMP DEFAULT CURRENT_TIMESTAMP, "update_time" TIMESTAMP DEFAULT CURRENT_TIMESTAMP, UNIQUE ("username" ASC)