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); 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 # 从库数据源 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; 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") 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 = "项目组人员") 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") 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 = "组名称") 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 = "项目组人员")