diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java similarity index 94% rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java index 02a59fe7..009455ab 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java @@ -15,7 +15,7 @@ */ package cn.odboy.system.constant; -public interface TransferProtocolConst { +public interface SystemTransferProtocolConst { String PREFIX_HTTP = "http://"; String PREFIX_HTTPS = "https://"; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index d9ae5bc5..14c225f6 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -16,8 +16,8 @@ package cn.odboy.system.controller; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.system.dal.model.response.SystemAuthVo; import cn.odboy.system.dal.model.request.SystemUserLoginArgs; +import cn.odboy.system.dal.model.response.SystemAuthVo; import cn.odboy.system.service.SystemAuthService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index 13bbcbdc..b6b009a0 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -19,8 +19,8 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; -import cn.odboy.system.dal.model.response.SystemDeptVo; import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; +import cn.odboy.system.dal.model.response.SystemDeptVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.KitPageUtil; @@ -59,8 +59,7 @@ public class SystemDeptController { @ApiOperation("查询部门") @PostMapping(value = "/searchDept") @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity> queryDept( - @Validated @RequestBody KitPageArgs pageArgs) throws Exception { + public ResponseEntity> queryDept(@Validated @RequestBody KitPageArgs pageArgs) throws Exception { List depts = systemDeptService.queryAllDeptByArgs(pageArgs.getArgs(), true); return ResponseEntity.ok(KitPageUtil.toPage(depts)); } @@ -68,8 +67,7 @@ public class SystemDeptController { @ApiOperation("查询部门:根据ID获取同级与上级数据") @PostMapping("/searchDeptTree") @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity> queryDeptSuperiorTree(@RequestBody List ids, - @RequestParam(defaultValue = "false") Boolean exclude) { + public ResponseEntity> queryDeptSuperiorTree(@RequestBody List ids, @RequestParam(defaultValue = "false") Boolean exclude) { return ResponseEntity.ok(systemDeptService.searchDeptTree(ids, exclude)); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index ad4ec0d8..e3d3e9ae 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -25,7 +25,6 @@ import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import java.util.List; import java.util.Set; import jakarta.servlet.http.HttpServletResponse; @@ -51,7 +50,7 @@ public class SystemDictController { @ApiOperation("导出字典数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('dict:list')") - public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) throws IOException { + public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) { systemDictService.exportDictXlsx(response, args); } @@ -66,8 +65,7 @@ public class SystemDictController { @ApiOperation("分页查询字典") @PostMapping(value = "/searchDict") @PreAuthorize("@el.check('dict:list')") - public ResponseEntity> queryDictByArgs( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryDictByArgs(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemDictService.searchDict(pageArgs.getArgs(), page)); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index 750612c3..0b7cd08f 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -19,8 +19,8 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs; -import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -49,8 +49,7 @@ public class SystemDictDetailController { @ApiOperation("查询字典详情") @PostMapping(value = "/searchDictDetail") - public ResponseEntity> queryDictDetailByArgs( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryDictDetailByArgs(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemDictDetailService.searchDictDetail(pageArgs.getArgs(), page)); } @@ -75,8 +74,7 @@ public class SystemDictDetailController { @ApiOperation("修改字典详情") @PostMapping(value = "/updateDictDetailById") @PreAuthorize("@el.check('dict:edit')") - public ResponseEntity updateDictDetailById( - @Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) { + public ResponseEntity updateDictDetailById(@Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) { systemDictDetailService.updateDictDetailById(args); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index 8dec8974..81d64ba1 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -49,8 +49,7 @@ public class SystemEmailController { @OperationLog @ApiOperation("修改邮箱配置") @PostMapping(value = "/updateEmailConfigById") - public ResponseEntity updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) - throws Exception { + public ResponseEntity updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) throws Exception { systemEmailService.updateEmailConfigById(emailConfig); return ResponseEntity.ok(null); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index e32ac99d..0ab929cf 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -25,7 +25,6 @@ import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import java.util.Set; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; @@ -50,15 +49,14 @@ public class SystemJobController { @ApiOperation("导出岗位数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('job:list')") - public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) throws IOException { + public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) { systemJobService.exportJobXlsx(response, args); } @ApiOperation("分页查询岗位") @PostMapping(value = "/searchJob") @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity> queryJobByArgs( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryJobByArgs(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemJobService.searchJobByArgs(pageArgs.getArgs(), page)); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index abe94506..938b7d18 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -24,7 +24,6 @@ import cn.odboy.system.service.SystemLocalStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -49,8 +48,7 @@ public class SystemLocalStorageController { @ApiOperation("查询文件") @PostMapping(value = "/searchLocalStorage") @PreAuthorize("@el.check('storage:list')") - public ResponseEntity> queryLocalStorage( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryLocalStorage(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(localStorageService.searchLocalStorage(pageArgs.getArgs(), page)); } @@ -59,7 +57,7 @@ public class SystemLocalStorageController { @ApiOperation("导出本地存储记录数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") - public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { + public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) { localStorageService.exportLocalStorageXlsx(response, args); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index e95c7b6e..992eebd3 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; +import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.dal.model.response.SystemMenuRouterVo; import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.KitPageUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index a33cbb6a..2ccc1927 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -48,8 +48,7 @@ public class SystemOnlineController { @ApiOperation("查询在线用户") @PostMapping(value = "/searchOnlineUser") @PreAuthorize("@el.check()") - public ResponseEntity> queryOnlineUser( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryOnlineUser(@Validated @RequestBody KitPageArgs pageArgs) { IPage page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemUserOnlineInfoDAO.searchOnlineUser(pageArgs.getArgs(), page)); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index b0845b52..d45d5361 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -18,14 +18,13 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemOssStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -52,8 +51,7 @@ public class SystemOssStorageController { @ApiOperation("查询文件") @PostMapping(value = "/searchOssStorage") @PreAuthorize("@el.check('storage:list')") - public ResponseEntity> queryOssStorage( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryOssStorage(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemOssStorageService.searchOssStorage(pageArgs.getArgs(), page)); } @@ -62,7 +60,7 @@ public class SystemOssStorageController { @ApiOperation("导出OSS存储记录数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") - public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { + public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) { systemOssStorageService.exportOssStorageXlsx(response, args); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index 96953918..bcd586d9 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs; import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemQuartzJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -53,8 +53,7 @@ public class SystemQuartzJobController { @ApiOperation("查询定时任务") @PostMapping(value = "/searchQuartzJob") @PreAuthorize("@el.check('quartzJob:list')") - public ResponseEntity> queryQuartzJobByCrud( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryQuartzJobByCrud(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(pageArgs.getArgs(), page)); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 5917f720..d246df5f 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -27,7 +27,6 @@ import cn.odboy.system.service.SystemRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import java.util.List; import java.util.Set; import jakarta.servlet.http.HttpServletResponse; @@ -59,7 +58,7 @@ public class SystemRoleController { @ApiOperation("导出角色数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('role:list')") - public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) throws IOException { + public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) { systemRoleService.exportRoleXlsx(response, args); } diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java index 609bf9a5..ae6dba88 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.Objects; import java.util.Set; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -15,15 +13,12 @@ import lombok.Setter; @Setter public class SystemDeptVo extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(value = "排序") private Integer deptSort; - @NotBlank @ApiModelProperty(value = "部门名称") private String name; - @NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled; @ApiModelProperty(value = "上级部门") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java index 76da62c0..45fdb903 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java @@ -18,7 +18,6 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemDictTb; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -26,7 +25,6 @@ import lombok.Setter; @Setter public class SystemDictDetailVo extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(hidden = true) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java index ff454173..597a02af 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.Objects; import java.util.Set; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -14,7 +13,6 @@ import lombok.Setter; @Setter public class SystemMenuVo extends KitBaseUserTimeTb { - @NotNull(groups = {Update.class}) @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(value = "菜单标题") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java index e95fc3ee..caf2e513 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java @@ -2,29 +2,21 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import io.swagger.annotations.ApiModelProperty; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @Getter @Setter public class SystemQuartzJobVo extends KitBaseUserTimeTb { - - public static final String JOB_KEY = "JOB_KEY"; - @NotNull(groups = {Update.class}) private Long id; @ApiModelProperty(value = "定时器名称") private String jobName; - @NotBlank @ApiModelProperty(value = "Bean名称") private String beanName; - @NotBlank @ApiModelProperty(value = "方法名称") private String methodName; @ApiModelProperty(value = "参数") private String params; - @NotBlank @ApiModelProperty(value = "cron表达式") private String cronExpression; @ApiModelProperty(value = "状态:暂停或启动") @@ -37,7 +29,6 @@ public class SystemQuartzJobVo extends KitBaseUserTimeTb { private String subTask; @ApiModelProperty(value = "失败后暂停") private Boolean pauseAfterFailure; - @NotBlank @ApiModelProperty(value = "备注") private String description; /** diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java index b57a5e97..88a34ce2 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java @@ -7,8 +7,6 @@ import cn.odboy.system.dal.dataobject.SystemUserTb; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import java.util.Set; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -16,10 +14,8 @@ import lombok.Setter; @Setter public class SystemRoleVo extends KitBaseUserTimeTb { - @NotNull(groups = {Update.class}) @ApiModelProperty(value = "ID", hidden = true) private Long id; - @NotBlank @ApiModelProperty(value = "名称", hidden = true) private String name; @ApiModelProperty(value = "数据权限,全部 、 本级 、 自定义") diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java index 27ee7456..12559de4 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java @@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.util.Objects; import java.util.Set; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -17,22 +14,16 @@ import lombok.Setter; @Setter public class SystemUserVo extends SystemUserTb { - @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(hidden = true) private Long deptId; - @NotBlank @ApiModelProperty(value = "用户名称") private String username; - @NotBlank @ApiModelProperty(value = "用户昵称") private String nickName; - @Email - @NotBlank @ApiModelProperty(value = "邮箱") private String email; - @NotBlank @ApiModelProperty(value = "电话号码") private String phone; @ApiModelProperty(value = "用户性别") @@ -43,7 +34,6 @@ public class SystemUserVo extends SystemUserTb { private String avatarPath; @ApiModelProperty(value = "密码") private String password; - @NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled; @ApiModelProperty(value = "是否为admin账号", hidden = true) diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index a010ff44..f172386c 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil; import cn.odboy.base.KitPageResult; import cn.odboy.framework.properties.AppProperties; import cn.odboy.framework.redis.KitRedisHelper; -import cn.odboy.system.dal.model.response.SystemUserJwtVo; import cn.odboy.system.dal.model.export.SystemUserOnlineExportRowVo; +import cn.odboy.system.dal.model.response.SystemUserJwtVo; import cn.odboy.system.dal.model.response.SystemUserOnlineVo; import cn.odboy.system.framework.permission.core.handler.TokenProvider; import cn.odboy.util.KitBeanUtil; diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 2d90df6e..868d2939 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -21,7 +21,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemYesOrNoChConst; -import cn.odboy.system.constant.TransferProtocolConst; +import cn.odboy.system.constant.SystemTransferProtocolConst; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.model.export.SystemMenuExportRowVo; import cn.odboy.system.dal.model.response.SystemMenuMetaVo; @@ -81,9 +81,9 @@ public class SystemMenuService { args.setPid(null); } if (args.getIFrame()) { - if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || - args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) { - throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); + if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) || + args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) { + throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); } } systemMenuMapper.insert(args); @@ -105,9 +105,9 @@ public class SystemMenuService { } SystemMenuTb menu = systemMenuMapper.selectById(args.getId()); if (args.getIFrame()) { - if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || - args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) { - throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); + if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) || + args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) { + throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); } } SystemMenuTb menu1 = this.getMenuByTitle(args.getTitle()); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java similarity index 92% rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java index e6b3e168..009455ab 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java @@ -1,23 +1,23 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package cn.odboy.system.constant; - -public interface TransferProtocolConst { - - String PREFIX_HTTP = "http://"; - String PREFIX_HTTPS = "https://"; - String PREFIX_HTTPS_BAD_REQUEST = "外链必须以http://或者https://开头"; -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.constant; + +public interface SystemTransferProtocolConst { + + String PREFIX_HTTP = "http://"; + String PREFIX_HTTPS = "https://"; + String PREFIX_HTTPS_BAD_REQUEST = "外链必须以http://或者https://开头"; +} diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index 4de03174..47545a24 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -16,8 +16,8 @@ package cn.odboy.system.controller; import cn.odboy.annotation.AnonymousPostMapping; -import cn.odboy.system.dal.model.response.SystemAuthVo; import cn.odboy.system.dal.model.request.SystemUserLoginArgs; +import cn.odboy.system.dal.model.response.SystemAuthVo; import cn.odboy.system.service.SystemAuthService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index 8faf74a1..1662e168 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -19,8 +19,8 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDeptTb; import cn.odboy.system.dal.model.request.SystemCreateDeptArgs; -import cn.odboy.system.dal.model.response.SystemDeptVo; import cn.odboy.system.dal.model.request.SystemQueryDeptArgs; +import cn.odboy.system.dal.model.response.SystemDeptVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDeptService; import cn.odboy.util.KitPageUtil; @@ -59,8 +59,7 @@ public class SystemDeptController { @ApiOperation("查询部门") @PostMapping(value = "/searchDept") @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity> queryDept( - @Validated @RequestBody KitPageArgs pageArgs) throws Exception { + public ResponseEntity> queryDept(@Validated @RequestBody KitPageArgs pageArgs) throws Exception { List depts = systemDeptService.queryAllDeptByArgs(pageArgs.getArgs(), true); return ResponseEntity.ok(KitPageUtil.toPage(depts)); } @@ -68,8 +67,7 @@ public class SystemDeptController { @ApiOperation("查询部门:根据ID获取同级与上级数据") @PostMapping("/searchDeptTree") @PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity> queryDeptSuperiorTree(@RequestBody List ids, - @RequestParam(defaultValue = "false") Boolean exclude) { + public ResponseEntity> queryDeptSuperiorTree(@RequestBody List ids, @RequestParam(defaultValue = "false") Boolean exclude) { return ResponseEntity.ok(systemDeptService.searchDeptTree(ids, exclude)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index c6ffe476..0d55193f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -25,7 +25,6 @@ import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import java.util.List; import java.util.Set; import javax.servlet.http.HttpServletResponse; @@ -51,7 +50,7 @@ public class SystemDictController { @ApiOperation("导出字典数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('dict:list')") - public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) throws IOException { + public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) { systemDictService.exportDictXlsx(response, args); } @@ -66,8 +65,7 @@ public class SystemDictController { @ApiOperation("分页查询字典") @PostMapping(value = "/searchDict") @PreAuthorize("@el.check('dict:list')") - public ResponseEntity> queryDictByArgs( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryDictByArgs(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemDictService.searchDict(pageArgs.getArgs(), page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index be5003c9..fa6ff6cc 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -19,8 +19,8 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictDetailTb; import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs; -import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs; +import cn.odboy.system.dal.model.response.SystemDictDetailVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemDictDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -49,8 +49,7 @@ public class SystemDictDetailController { @ApiOperation("查询字典详情") @PostMapping(value = "/searchDictDetail") - public ResponseEntity> queryDictDetailByArgs( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryDictDetailByArgs(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemDictDetailService.searchDictDetail(pageArgs.getArgs(), page)); } @@ -75,8 +74,7 @@ public class SystemDictDetailController { @ApiOperation("修改字典详情") @PostMapping(value = "/updateDictDetailById") @PreAuthorize("@el.check('dict:edit')") - public ResponseEntity updateDictDetailById( - @Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) { + public ResponseEntity updateDictDetailById(@Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) { systemDictDetailService.updateDictDetailById(args); return ResponseEntity.ok(null); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java index 58a450aa..df210692 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java @@ -49,8 +49,7 @@ public class SystemEmailController { @OperationLog @ApiOperation("修改邮箱配置") @PostMapping(value = "/updateEmailConfigById") - public ResponseEntity updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) - throws Exception { + public ResponseEntity updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) throws Exception { systemEmailService.updateEmailConfigById(emailConfig); return ResponseEntity.ok(null); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index b62e917a..97af85df 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -25,7 +25,6 @@ import cn.odboy.system.service.SystemJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import java.util.Set; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; @@ -50,15 +49,14 @@ public class SystemJobController { @ApiOperation("导出岗位数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('job:list')") - public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) throws IOException { + public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) { systemJobService.exportJobXlsx(response, args); } @ApiOperation("分页查询岗位") @PostMapping(value = "/searchJob") @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity> queryJobByArgs( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryJobByArgs(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemJobService.searchJobByArgs(pageArgs.getArgs(), page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index 82aa1935..4ebaa181 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -24,7 +24,6 @@ import cn.odboy.system.service.SystemLocalStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -49,8 +48,7 @@ public class SystemLocalStorageController { @ApiOperation("查询文件") @PostMapping(value = "/searchLocalStorage") @PreAuthorize("@el.check('storage:list')") - public ResponseEntity> queryLocalStorage( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryLocalStorage(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(localStorageService.searchLocalStorage(pageArgs.getArgs(), page)); } @@ -59,7 +57,7 @@ public class SystemLocalStorageController { @ApiOperation("导出本地存储记录数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") - public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { + public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) { localStorageService.exportLocalStorageXlsx(response, args); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index 59531007..99269a30 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.dal.dataobject.SystemMenuTb; +import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.dal.model.response.SystemMenuRouterVo; import cn.odboy.system.dal.model.response.SystemMenuVo; -import cn.odboy.system.dal.model.request.SystemQueryMenuArgs; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemMenuService; import cn.odboy.util.KitPageUtil; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index bdd29963..7e9a512f 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -48,8 +48,7 @@ public class SystemOnlineController { @ApiOperation("查询在线用户") @PostMapping(value = "/searchOnlineUser") @PreAuthorize("@el.check()") - public ResponseEntity> queryOnlineUser( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryOnlineUser(@Validated @RequestBody KitPageArgs pageArgs) { IPage page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemUserOnlineInfoDAO.searchOnlineUser(pageArgs.getArgs(), page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index 67b8b98f..68124348 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -18,14 +18,13 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemOssStorageTb; -import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.dal.model.request.SystemQueryStorageArgs; +import cn.odboy.system.dal.model.response.SystemOssStorageVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemOssStorageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -52,8 +51,7 @@ public class SystemOssStorageController { @ApiOperation("查询文件") @PostMapping(value = "/searchOssStorage") @PreAuthorize("@el.check('storage:list')") - public ResponseEntity> queryOssStorage( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryOssStorage(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemOssStorageService.searchOssStorage(pageArgs.getArgs(), page)); } @@ -62,7 +60,7 @@ public class SystemOssStorageController { @ApiOperation("导出OSS存储记录数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('storage:list')") - public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException { + public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) { systemOssStorageService.exportOssStorageXlsx(response, args); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index e9ba10dc..d9dfc27e 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -19,9 +19,9 @@ import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemQuartzJobTb; import cn.odboy.system.dal.dataobject.SystemQuartzLogTb; -import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs; import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs; +import cn.odboy.system.dal.model.response.SystemQuartzJobVo; import cn.odboy.system.framework.operalog.OperationLog; import cn.odboy.system.service.SystemQuartzJobService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -53,8 +53,7 @@ public class SystemQuartzJobController { @ApiOperation("查询定时任务") @PostMapping(value = "/searchQuartzJob") @PreAuthorize("@el.check('quartzJob:list')") - public ResponseEntity> queryQuartzJobByCrud( - @Validated @RequestBody KitPageArgs pageArgs) { + public ResponseEntity> queryQuartzJobByCrud(@Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(pageArgs.getArgs(), page)); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index 54d63653..ab97fd81 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -27,7 +27,6 @@ import cn.odboy.system.service.SystemRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.io.IOException; import java.util.List; import java.util.Set; import javax.servlet.http.HttpServletResponse; @@ -59,7 +58,7 @@ public class SystemRoleController { @ApiOperation("导出角色数据") @GetMapping(value = "/download") @PreAuthorize("@el.check('role:list')") - public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) throws IOException { + public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) { systemRoleService.exportRoleXlsx(response, args); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java index 45812df8..ae6dba88 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.Objects; import java.util.Set; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -15,15 +13,12 @@ import lombok.Setter; @Setter public class SystemDeptVo extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(value = "排序") private Integer deptSort; - @NotBlank @ApiModelProperty(value = "部门名称") private String name; - @NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled; @ApiModelProperty(value = "上级部门") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java index fb44f569..45fdb903 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java @@ -18,7 +18,6 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import cn.odboy.system.dal.dataobject.SystemDictTb; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -26,7 +25,6 @@ import lombok.Setter; @Setter public class SystemDictDetailVo extends KitBaseUserTimeTb { - @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(hidden = true) diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java index f3f198bf..597a02af 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.List; import java.util.Objects; import java.util.Set; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -14,7 +13,6 @@ import lombok.Setter; @Setter public class SystemMenuVo extends KitBaseUserTimeTb { - @NotNull(groups = {Update.class}) @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(value = "菜单标题") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java index e7943c48..caf2e513 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java @@ -2,29 +2,21 @@ package cn.odboy.system.dal.model.response; import cn.odboy.base.KitBaseUserTimeTb; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @Getter @Setter public class SystemQuartzJobVo extends KitBaseUserTimeTb { - - public static final String JOB_KEY = "JOB_KEY"; - @NotNull(groups = {Update.class}) private Long id; @ApiModelProperty(value = "定时器名称") private String jobName; - @NotBlank @ApiModelProperty(value = "Bean名称") private String beanName; - @NotBlank @ApiModelProperty(value = "方法名称") private String methodName; @ApiModelProperty(value = "参数") private String params; - @NotBlank @ApiModelProperty(value = "cron表达式") private String cronExpression; @ApiModelProperty(value = "状态:暂停或启动") @@ -37,7 +29,6 @@ public class SystemQuartzJobVo extends KitBaseUserTimeTb { private String subTask; @ApiModelProperty(value = "失败后暂停") private Boolean pauseAfterFailure; - @NotBlank @ApiModelProperty(value = "备注") private String description; /** diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java index 0c5f25c7..88a34ce2 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java @@ -7,8 +7,6 @@ import cn.odboy.system.dal.dataobject.SystemUserTb; import io.swagger.annotations.ApiModelProperty; import java.util.Objects; import java.util.Set; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -16,10 +14,8 @@ import lombok.Setter; @Setter public class SystemRoleVo extends KitBaseUserTimeTb { - @NotNull(groups = {Update.class}) @ApiModelProperty(value = "ID", hidden = true) private Long id; - @NotBlank @ApiModelProperty(value = "名称", hidden = true) private String name; @ApiModelProperty(value = "数据权限,全部 、 本级 、 自定义") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java index b83f4dd2..12559de4 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java @@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.util.Objects; import java.util.Set; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -17,22 +14,16 @@ import lombok.Setter; @Setter public class SystemUserVo extends SystemUserTb { - @NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true) private Long id; @ApiModelProperty(hidden = true) private Long deptId; - @NotBlank @ApiModelProperty(value = "用户名称") private String username; - @NotBlank @ApiModelProperty(value = "用户昵称") private String nickName; - @Email - @NotBlank @ApiModelProperty(value = "邮箱") private String email; - @NotBlank @ApiModelProperty(value = "电话号码") private String phone; @ApiModelProperty(value = "用户性别") @@ -43,7 +34,6 @@ public class SystemUserVo extends SystemUserTb { private String avatarPath; @ApiModelProperty(value = "密码") private String password; - @NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled; @ApiModelProperty(value = "是否为admin账号", hidden = true) diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java index 4592af64..959e9ef9 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java @@ -21,7 +21,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.exception.BadRequestException; import cn.odboy.system.constant.SystemYesOrNoChConst; -import cn.odboy.system.constant.TransferProtocolConst; +import cn.odboy.system.constant.SystemTransferProtocolConst; import cn.odboy.system.dal.dataobject.SystemMenuTb; import cn.odboy.system.dal.model.export.SystemMenuExportRowVo; import cn.odboy.system.dal.model.response.SystemMenuMetaVo; @@ -81,9 +81,9 @@ public class SystemMenuService { args.setPid(null); } if (args.getIFrame()) { - if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || - args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) { - throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); + if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) || + args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) { + throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); } } systemMenuMapper.insert(args); @@ -105,9 +105,9 @@ public class SystemMenuService { } SystemMenuTb menu = systemMenuMapper.selectById(args.getId()); if (args.getIFrame()) { - if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) || - args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) { - throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); + if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) || + args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) { + throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST); } } SystemMenuTb menu1 = this.getMenuByTitle(args.getTitle());