From 468d10f386bdd6b46b31abcb71fa5ee2d1e5dc21 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 09 四月 2025 10:40:41 +0800
Subject: [PATCH] 项目组管理
---
ruoyi-admin/src/main/resources/application-test.yml | 15 ++++-----------
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 1 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/TimeRangeQueryBody.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/dto/UpAndDownDTO.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/vo/TProjectTeamVO.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/dto/TProjectTeamDTO.java | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java | 6 +++---
ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java | 2 +-
8 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
index d743b56..453ee82 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
@@ -62,7 +62,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:projectTeam:add')")
@Log(title = "项目组信息-新增项目组", businessType = BusinessType.INSERT)
- @ApiOperation(value = "添加项目组")
+ @ApiOperation(value = "添加项目组",response = TProjectTeamDTO.class)
@PostMapping(value = "/api/add")
public R<Boolean> add(@RequestBody String param) {
TProjectTeamDTO dto = JSON.parseObject(param,TProjectTeamDTO.class);
@@ -142,8 +142,8 @@
* 修改项目组
*/
@PreAuthorize("@ss.hasPermi('system:projectTeam:upAndDown')")
- @Log(title = "项目组信息-修改项目组", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "修改项目组")
+ @Log(title = "项目组信息-修改项目组状态", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改项目组状态",response = UpAndDownDTO.class)
@PostMapping(value = "/api/upAndDown")
public R<Boolean> upAndDown(@RequestBody String param) {
UpAndDownDTO dto = JSON.parseObject(param,UpAndDownDTO.class);
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 6cc5d39..29641c5 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -69,20 +69,13 @@
# redis 配置
redis:
# 地址
-# host: 127.0.0.1
-# # 端口，默认为6379
-# port: 6379
-# # 数据库索引
-# database: 0
-# # 密码
-# password: 123456
- host: xzgt.test.591taxi.cn
+ host: 127.0.0.1
# 端口，默认为6379
- port: 16379
+ port: 6379
# 数据库索引
database: 0
# 密码
- password: 8f5z9g52gx4bg
+ password: 123456
# 连接超时时间
timeout: 10s
lettuce:
@@ -102,7 +95,7 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://127.0.0.1:3306/laboratory?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/laboratory?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: 123456
# 从库数据源
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 7769715..fecb55c 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -11,6 +11,7 @@
import com.ruoyi.system.dto.SysRoleDTO;
import com.ruoyi.system.query.SysRoleQuery;
import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.vo.RoleInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/TimeRangeQueryBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/TimeRangeQueryBody.java
index 7a9239f..93f735e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/TimeRangeQueryBody.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/TimeRangeQueryBody.java
@@ -9,7 +9,7 @@
import java.util.Date;
import java.util.Objects;
-@ApiModel("时间范围分页dto")
+@ApiModel(value = "时间范围分页dto")
public class TimeRangeQueryBody extends BasePage {
@ApiModelProperty("开始时间 格式 yyyy-MM-dd")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TProjectTeamDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TProjectTeamDTO.java
index 4575551..411c1b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TProjectTeamDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TProjectTeamDTO.java
@@ -5,11 +5,12 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
-@ApiModel(value = "项目组信息DTO")
+@ApiModel(value = "添加编辑项目组DTO")
public class TProjectTeamDTO extends TProjectTeam {
@ApiModelProperty(value = "项目组人员")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpAndDownDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpAndDownDTO.java
index 25e71f2..f62f892 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpAndDownDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpAndDownDTO.java
@@ -7,7 +7,7 @@
import java.io.Serializable;
@Data
-@ApiModel(value = "启用禁用dto")
+@ApiModel(value = "启用禁用DTO")
public class UpAndDownDTO implements Serializable {
@ApiModelProperty(value = "id")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java
index 32b1bd8..73203ae 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java
@@ -6,7 +6,7 @@
import lombok.Data;
@Data
-@ApiModel("项目团队分页query")
+@ApiModel(value = "项目组分页query")
public class TProjectTeamQuery extends TimeRangeQueryBody {
@ApiModelProperty(value = "组名称")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TProjectTeamVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TProjectTeamVO.java
index 1ab27b8..11d3bee 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TProjectTeamVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TProjectTeamVO.java
@@ -9,7 +9,7 @@
import java.util.List;
@Data
-@ApiModel(value = "项目组信息VO")
+@ApiModel(value = "项目组返回VO")
public class TProjectTeamVO extends TProjectTeam {
@ApiModelProperty(value = "项目组人员")
--
Gitblit v1.7.1