From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/projectManagement/controller/InfoController.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
index 1acbd65..ed44f79 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
@@ -1,7 +1,8 @@
package com.ruoyi.projectManagement.controller;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.projectManagement.dto.InfoStageDto;
import com.ruoyi.projectManagement.dto.UpdateStateInfo;
import com.ruoyi.projectManagement.service.InfoService;
@@ -25,63 +26,68 @@
@RequestMapping("/projectManagement/info")
@Tag(name = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
-public class InfoController extends BaseController {
+public class InfoController {
private final InfoService infoService;
private final InfoStageHandleService infoStageHandleService;
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
- public R<?> save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
+ @Log(title = "椤圭洰淇℃伅-淇濆瓨", businessType = BusinessType.INSERT)
+ public AjaxResult save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
infoService.save(saveInfoVo);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/updateStatus")
@Operation(summary = "淇敼鐘舵��")
- public R<?> updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
+ @Log(title = "椤圭洰淇℃伅-淇敼鐘舵��", businessType = BusinessType.UPDATE)
+ public AjaxResult updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
infoService.updateStatus(updateStateInfo);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable Long id) {
+ @Log(title = "椤圭洰淇℃伅-鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult delete(@PathVariable Long id) {
infoService.deleteInfo(id);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/listPage")
@Operation(summary = "鍒嗛〉鍒楄〃")
- public R<?> listPage(@RequestBody @Valid SearchInfoVo vo) {
- return R.ok(infoService.searchListInfo(vo));
+ public AjaxResult listPage(@RequestBody @Valid SearchInfoVo vo) {
+ return AjaxResult.success(infoService.searchListInfo(vo));
}
@PostMapping("/{id}")
@Operation(summary = "璇︽儏")
- public R<?> getInfoById(@PathVariable Long id) {
- return R.ok(infoService.getInfoById(id));
+ public AjaxResult getInfoById(@PathVariable Long id) {
+ return AjaxResult.success(infoService.getInfoById(id));
}
@PostMapping("/saveStage")
@Operation(summary = "淇濆瓨闃舵")
- public R<?> saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
+ @Log(title = "椤圭洰淇℃伅-淇濆瓨闃舵", businessType = BusinessType.INSERT)
+ public AjaxResult saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
infoStageHandleService.save(dto);
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/listStage/{id}")
@Operation(summary = "鍒楄〃闃舵")
- public R<?> listStage(@PathVariable Long id) {
- return R.ok(infoStageHandleService.getListVoByInfoId(id));
+ public AjaxResult listStage(@PathVariable Long id) {
+ return AjaxResult.success(infoStageHandleService.getListVoByInfoId(id));
}
@PostMapping("/deleteStage/{id}")
@Operation(summary = "鍒犻櫎闃舵")
- public R<?> deleteStage(@PathVariable Long id) {
+ @Log(title = "椤圭洰淇℃伅-鍒犻櫎闃舵", businessType = BusinessType.DELETE)
+ public AjaxResult deleteStage(@PathVariable Long id) {
infoStageHandleService.deleteById(id);
- return R.ok();
+ return AjaxResult.success();
}
--
Gitblit v1.9.3