From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

---
 src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
index d8cc6a2..08ba14d 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
@@ -2,13 +2,16 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.technology.bean.dto.TechnologyRoutingOperationDto;
 import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo;
 import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
 import com.ruoyi.technology.service.TechnologyRoutingOperationService;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,45 +19,55 @@
 
 @RestController
 @RequestMapping("/technologyRoutingOperation")
-@Api(tags = "宸ヨ壓璺嚎宸ュ簭")
+@Tag(name = "宸ヨ壓璺嚎宸ュ簭")
 @RequiredArgsConstructor
 public class TechnologyRoutingOperationController {
 
     private final TechnologyRoutingOperationService technologyRoutingOperationService;
 
     @GetMapping("/page")
-    @ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒嗛〉鏌ヨ")
+    @Operation(summary = "宸ヨ壓璺嚎宸ュ簭鍒嗛〉鏌ヨ")
     public R<IPage<TechnologyRoutingOperationVo>> page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
         return R.ok(technologyRoutingOperationService.pageTechnologyRoutingOperation(page, technologyRoutingOperationDto));
     }
 
     @GetMapping("/list")
-    @ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒楄〃")
+    @Operation(summary = "宸ヨ壓璺嚎宸ュ簭鍒楄〃")
     public R<List<TechnologyRoutingOperationVo>> list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
         return R.ok(technologyRoutingOperationService.listTechnologyRoutingOperation(technologyRoutingOperationDto));
     }
 
     @GetMapping("/{id}")
-    @ApiOperation("宸ヨ壓璺嚎宸ュ簭璇︽儏")
+    @Operation(summary = "宸ヨ壓璺嚎宸ュ簭璇︽儏")
     public R<TechnologyRoutingOperationVo> getInfo(@PathVariable("id") Long id) {
         return R.ok(technologyRoutingOperationService.getTechnologyRoutingOperationInfo(id));
     }
 
+    @Log(title = "宸ヨ壓璺嚎宸ュ簭", businessType = BusinessType.INSERT)
+    @Operation(summary = "鏂板宸ヨ壓璺嚎宸ュ簭")
     @PostMapping("/add")
-    @ApiOperation("鏂板宸ヨ壓璺嚎宸ュ簭")
     public R add(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
         return R.ok(technologyRoutingOperationService.saveTechnologyRoutingOperation(technologyRoutingOperation));
     }
 
+    @Log(title = "宸ヨ壓璺嚎宸ュ簭", businessType = BusinessType.UPDATE)
+    @Operation(summary = "淇敼宸ヨ壓璺嚎宸ュ簭")
     @PutMapping
-    @ApiOperation("淇敼宸ヨ壓璺嚎宸ュ簭")
     public R edit(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
         return R.ok(technologyRoutingOperationService.updateById(technologyRoutingOperation));
     }
 
+    @Log(title = "宸ヨ壓璺嚎宸ュ簭", businessType = BusinessType.DELETE)
+    @Operation(summary = "鍒犻櫎宸ヨ壓璺嚎宸ュ簭")
     @DeleteMapping("/{id}")
-    @ApiOperation("鍒犻櫎宸ヨ壓璺嚎宸ュ簭")
     public R remove(@PathVariable("id") Long id) {
         return R.ok(technologyRoutingOperationService.removeTechnologyRoutingOperation(id));
     }
+
+    @Log(title = "宸ヨ壓璺嚎宸ュ簭", businessType = BusinessType.UPDATE)
+    @Operation(summary = "鎺掑簭宸ヨ壓璺嚎宸ュ簭")
+    @PostMapping ("/sort")
+    public R sort(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
+        return R.ok(technologyRoutingOperationService.sort(technologyRoutingOperation));
+    }
 }

--
Gitblit v1.9.3