From 817b46f0704ac9024ce4e7642b5b9a0aba273b50 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 30 九月 2026 16:30:01 +0800
Subject: [PATCH] fix(migration): 补迁 CustomController/UserController 及运行期缺失配置
---
ruoyi-admin/src/main/resources/application-druid.yml | 11 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java | 62 ++++++++++++++++++++
ruoyi-admin/src/main/resources/application.yml | 4 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dto/UpdateUserDto.java | 24 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 76 +++++++++++++++++++++++++
5 files changed, 176 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dto/UpdateUserDto.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dto/UpdateUserDto.java
new file mode 100644
index 0000000..0efd5a6
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/dto/UpdateUserDto.java
@@ -0,0 +1,24 @@
+package com.ruoyi.web.controller.dto;
+
+public class UpdateUserDto {
+
+ private String id;
+
+ private String ids;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getIds() {
+ return ids;
+ }
+
+ public void setIds(String ids) {
+ this.ids = ids;
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
new file mode 100644
index 0000000..1d11d77
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java
@@ -0,0 +1,62 @@
+package com.ruoyi.web.controller.system;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.Custom;
+import com.ruoyi.system.service.CustomService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.web.bind.annotation.*;
+
+import jakarta.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * 瀹㈡埛绠＄悊
+ *
+ * @author zhuo
+ * @since 2025-02-13
+ */
+@Tag(name = "瀹㈡埛绠＄悊")
+@RestController
+@RequestMapping("/system/custom")
+public class CustomController {
+
+ @Resource
+ private CustomService customService;
+
+ @Operation(summary = "鑾峰彇瀹㈡埛鍒楄〃")
+ @GetMapping("/selectCustomPageList")
+ public Result<IPage<Custom>> selectCustomPageList(Page page, Custom custom) throws Exception {
+ return Result.success(customService.selectCustomPageList(page, custom));
+ }
+ @Operation(summary = "鍒犻櫎瀹㈡埛淇℃伅")
+ @DeleteMapping("/delCustomById")
+ public Result delCustomById(@RequestParam("id") Long id) {
+ return Result.success(customService.delCustomById(id));
+ }
+
+ @Operation(summary = "鏂板瀹㈡埛淇℃伅")
+ @PostMapping("/addCustom")
+ public Result addCustom(@RequestBody Custom custom) {
+ return Result.success(customService.addCustom(custom));
+ }
+
+
+ @Operation(summary = "淇敼瀹㈡埛淇℃伅")
+ @PostMapping("/upCustom")
+ public Result upCustom(@RequestBody Custom custom) {
+ return Result.success(customService.upCustom(custom));
+ }
+
+ @Operation(summary = "鑾峰彇瀹㈡埛鏋氫妇")
+ @GetMapping ("/selectCustomEnum")
+ public Result<List<Custom>> selectCustomEnum(){
+ return Result.success(customService.selectCustomEnum());
+ }
+
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
new file mode 100644
index 0000000..56cb184
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -0,0 +1,76 @@
+package com.ruoyi.web.controller.system;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.system.service.UserService;
+import com.ruoyi.web.controller.dto.UpdateUserDto;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.web.bind.annotation.*;
+
+import jakarta.annotation.Resource;
+import java.util.Map;
+
+
+/**
+ * 鐢ㄦ埛淇℃伅琛�
+ *
+ * @author zhuo
+ * @since 2025-02-13
+ */
+@RestController
+@RequestMapping("/system/newUser")
+public class UserController {
+
+ @Resource
+ private UserService userService;
+
+ /**
+ * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ type : 2: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ * @param user
+ * @param type
+ * @return
+ */
+ @Operation(summary = "鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃")
+ @GetMapping("/selectUserCondition")
+ public Result selectUserCondition(User user, String type){
+ return Result.success(userService.selectUserCondition(user, type));
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
+ * @return
+ */
+ @GetMapping("/getUserNow")
+ @Operation(summary = "鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�")
+ public Result<?> getUserNow(){
+ return Result.success(userService.getUserNow());
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+ * @return
+ */
+ @GetMapping ("/selectUserDepartmentLimsName")
+ @Operation(summary = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬")
+ public Result<?> selectUserDepartmentLimsName(){
+ return Result.success(userService.selectUserDepartmentLimsName());
+ }
+
+ @PostMapping("/upUserDepardLimsId")
+ @Operation(summary = "淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> upUserDepardLimsId(@RequestBody UpdateUserDto dto){
+ return Result.success(userService.upUserDepardLimsId(dto.getIds(), dto.getId()));
+ }
+
+ @DeleteMapping("/delUserDepardLimsId")
+ @Operation(summary = "鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> delUserDepardLimsId(Integer id){
+ return Result.success(userService.delUserDepardLimsId(id));
+ }
+
+
+}
+
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 23a9e3c..e0e9109 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -58,4 +58,13 @@
merge-sql: true
wall:
config:
- multi-statement-allow: true
\ No newline at end of file
+ multi-statement-allow: true
+
+# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+file:
+ path: D:\椤圭洰鏂囦欢瀛樺偍\image
+ # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
+ allowed: png,jpg,jpeg,gif
+
+# 鎶ュ憡 word 瀛樺偍璺緞
+wordUrl: D:\椤圭洰鏂囦欢瀛樺偍\word
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8f4aecb..3ce0188 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -47,6 +47,10 @@
# Spring閰嶇疆
spring:
+ # 涓氬姟浠ｇ爜瀛樺湪 InsReportServiceImpl <-> RawMaterialOrderServiceImpl 鐨勫惊鐜緷璧栵紝
+ # 婧愬伐绋嬬敤 Spring Boot 2.5锛堥粯璁ゅ厑璁革級锛屽崌绾у埌 Boot 4 鍚庨渶鏄惧紡鏀惧紑
+ main:
+ allow-circular-references: true
# 璧勬簮淇℃伅
messages:
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
--
Gitblit v1.9.3