From d9233e1d67a7095996bd66d78f4de209ee1a804b Mon Sep 17 00:00:00 2001 From: Odboy Date: Wed, 9 Apr 2025 19:05:50 +0800 Subject: [PATCH] =?UTF-8?q?upd:=20=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InitialActiveJobApplicationRunner.java | 2 +- .../job/mapper/QuartzJobMapper.java | 4 +- .../service/impl/QuartzJobServiceImpl.java | 4 +- .../main/resources/mapper/QuartzJobMapper.xml | 4 +- .../core/context/SpringSecurityConfig.java | 2 +- .../system/rest/UserController.java | 2 +- .../system/service/UserService.java | 2 +- .../system/service/impl/UserServiceImpl.java | 2 +- .../tools/mapper/LocalStorageMapper.java | 2 +- .../tools/mapper/QiniuContentMapper.java | 3 +- .../service/impl/LocalStorageServiceImpl.java | 4 +- .../service/impl/QiniuContentServiceImpl.java | 4 +- .../resources/mapper/LocalStorageMapper.xml | 2 +- .../resources/mapper/QiniuContentMapper.xml | 2 +- cutejava/doc/编码规范.md | 68 ------------------- 15 files changed, 19 insertions(+), 88 deletions(-) delete mode 100644 cutejava/doc/编码规范.md diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/InitialActiveJobApplicationRunner.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/InitialActiveJobApplicationRunner.java index b6b8a8ef..7a92b6f3 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/InitialActiveJobApplicationRunner.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/context/InitialActiveJobApplicationRunner.java @@ -23,7 +23,7 @@ public class InitialActiveJobApplicationRunner implements ApplicationRunner { */ @Override public void run(ApplicationArguments applicationArguments) { - List quartzJobs = quartzJobMapper.selectActiveQuartzJob(); + List quartzJobs = quartzJobMapper.queryActiveQuartzJob(); quartzJobs.forEach(quartzManage::addJob); log.info("Timing task injection complete"); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java index d3aac0ce..d7a48441 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java @@ -11,7 +11,7 @@ import java.util.List; @Mapper public interface QuartzJobMapper extends BaseMapper { - IPage queryQuartzJobPage(@Param("criteria") QueryQuartzJobRequest criteria, Page page); + IPage queryQuartzJobPageByArgs(@Param("criteria") QueryQuartzJobRequest criteria, Page page); - List selectActiveQuartzJob(); + List queryActiveQuartzJob(); } diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java index 9181e161..d68da25e 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java @@ -43,7 +43,7 @@ public class QuartzJobServiceImpl extends ServiceImpl queryJobPage(QueryQuartzJobRequest criteria, Page page) { - return PageUtil.toPage(quartzJobMapper.queryQuartzJobPage(criteria, page)); + return PageUtil.toPage(quartzJobMapper.queryQuartzJobPageByArgs(criteria, page)); } @Override @@ -53,7 +53,7 @@ public class QuartzJobServiceImpl extends ServiceImpl selectJobByCriteria(QueryQuartzJobRequest criteria) { - return quartzJobMapper.queryQuartzJobPage(criteria, PageUtil.getCount(quartzJobMapper)).getRecords(); + return quartzJobMapper.queryQuartzJobPageByArgs(criteria, PageUtil.getCount(quartzJobMapper)).getRecords(); } @Override diff --git a/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml b/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml index f5a419c2..bee32629 100644 --- a/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml +++ b/cutejava/cutejava-job/src/main/resources/mapper/QuartzJobMapper.xml @@ -1,7 +1,7 @@ - SELECT * FROM sys_quartz_job @@ -15,7 +15,7 @@ ORDER BY id DESC - SELECT * FROM sys_quartz_job WHERE is_pause = 0 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java index 07b2d2c1..00c03b4a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/SpringSecurityConfig.java @@ -110,6 +110,6 @@ public class SpringSecurityConfig { } private TokenConfigurer securityConfigurerAdapter() { - return new TokenConfigurer(tokenProvider, securityProperties, onlineUserService); + return new TokenConfigurer(tokenProvider, onlineUserService); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java index 82a68ecd..f1d9c509 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java @@ -103,7 +103,7 @@ public class UserController { checkLevel(resources); // 默认密码 123456 resources.setPassword(passwordEncoder.encode("123456")); - userService.saveUser(resources); + userService.createUser(resources); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java index 9c641478..669f3730 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java @@ -27,7 +27,7 @@ public interface UserService extends IService { * * @param resources / */ - void saveUser(User resources); + void createUser(User resources); /** * 编辑用户 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java index 5c06fe3b..d3f6d205 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java @@ -79,7 +79,7 @@ public class UserServiceImpl extends ServiceImpl implements Us @Override @Transactional(rollbackFor = Exception.class) - public void saveUser(User resources) { + public void createUser(User resources) { resources.setDeptId(resources.getDept().getId()); if (userMapper.getUserByUsername(resources.getUsername()) != null) { throw new EntityExistException(User.class, "username", resources.getUsername()); diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java index 49efcf57..c5803565 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java @@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface LocalStorageMapper extends BaseMapper { - IPage queryLocalStoragePage(@Param("criteria") QueryLocalStorageRequest criteria, Page page); + IPage queryLocalStoragePageByArgs(@Param("criteria") QueryLocalStorageRequest criteria, Page page); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java index 52804bce..af8e53de 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java @@ -12,6 +12,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface QiniuContentMapper extends BaseMapper { QiniuContent getQiniuContentByName(@Param("name") String name); - - IPage queryQiniuContentPage(@Param("criteria") QueryQiniuRequest criteria, Page page); + IPage queryQiniuContentPageByArgs(@Param("criteria") QueryQiniuRequest criteria, Page page); } \ No newline at end of file diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java index 201502b9..ebab6da5 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/LocalStorageServiceImpl.java @@ -35,12 +35,12 @@ public class LocalStorageServiceImpl extends ServiceImpl queryLocalStoragePage(QueryLocalStorageRequest criteria, Page page) { - return PageUtil.toPage(localStorageMapper.queryLocalStoragePage(criteria, page)); + return PageUtil.toPage(localStorageMapper.queryLocalStoragePageByArgs(criteria, page)); } @Override public List selectLocalStorageByCriteria(QueryLocalStorageRequest criteria) { - return localStorageMapper.queryLocalStoragePage(criteria, PageUtil.getCount(localStorageMapper)).getRecords(); + return localStorageMapper.queryLocalStoragePageByArgs(criteria, PageUtil.getCount(localStorageMapper)).getRecords(); } @Override diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java index 96662819..bd1f209b 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/QiniuContentServiceImpl.java @@ -47,12 +47,12 @@ public class QiniuContentServiceImpl extends ServiceImpl queryQiniuContentPage(QueryQiniuRequest criteria, Page page) { - return PageUtil.toPage(qiniuContentMapper.queryQiniuContentPage(criteria, page)); + return PageUtil.toPage(qiniuContentMapper.queryQiniuContentPageByArgs(criteria, page)); } @Override public List selectQiniuContentByCriteria(QueryQiniuRequest criteria) { - return qiniuContentMapper.queryQiniuContentPage(criteria, PageUtil.getCount(qiniuContentMapper)).getRecords(); + return qiniuContentMapper.queryQiniuContentPageByArgs(criteria, PageUtil.getCount(qiniuContentMapper)).getRecords(); } @Override diff --git a/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml b/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml index e1e55f05..b13b3a37 100644 --- a/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml +++ b/cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml @@ -1,7 +1,7 @@ - select * from tool_local_storage diff --git a/cutejava/cutejava-tools/src/main/resources/mapper/QiniuContentMapper.xml b/cutejava/cutejava-tools/src/main/resources/mapper/QiniuContentMapper.xml index 604b7286..4f52067b 100644 --- a/cutejava/cutejava-tools/src/main/resources/mapper/QiniuContentMapper.xml +++ b/cutejava/cutejava-tools/src/main/resources/mapper/QiniuContentMapper.xml @@ -7,7 +7,7 @@ WHERE name = #{name} - SELECT * FROM tool_qiniu_content diff --git a/cutejava/doc/编码规范.md b/cutejava/doc/编码规范.md deleted file mode 100644 index 3a1fc3b1..00000000 --- a/cutejava/doc/编码规范.md +++ /dev/null @@ -1,68 +0,0 @@ -## Mapper（持久层） - -- 分页&列表(2合1)：query{TableSimpleName}By{ParamName} - - queryUserByCriteria - - queryHostByCriteria -- 分页查询：query{TableSimpleName}PageBy{ParamName} - - queryUserPageByCriteria - - queryUserPageByUserId -- 查询列表：select{TableSimpleName}ListBy{ParamName} - - selectUserListByCriteria - - selectUserListByUserId -- 查询一个：get{TableSimpleName}By{ParamName} - - getUserByUserId - - getUserByCriteria -- 批量更新：update{ParamName}ByIds - - updateHostNameByIds - - updateHostIPByIds -- 批量删除：delete{TableSimpleName}ByIds - - deleteHostByIds - - deleteUserByIds -- 统计数量：get{具体语义}Count - - getUserOnlineCount - - getAlarmTotalCount - -## Service（业务层） - -- 分页查询：describe{TableSimpleName}Page - - describeUserPage - - describeHostPage -- 查询列表：describe{TableSimpleName}List - - describeUserList - - describeHostList -- 查询元数据：describe{TableSimpleName}{AttributeName}MetadataOptions - - describeHostIpMetadataOptions - - describeUserSexMetadataOptions -- 批量更新：modify{TableSimpleName}Attribute - - modifyHostAttribute - - modifyUserAttribute - - modifyHostIp - - modifyUserSex -- 批量删除：delete{TableSimpleName}ByIds - - deleteHostByIds - - deleteUserByIds -- 执行业务：{action}{TableSimpleName}{s} - - createInstance 创建实例 - - createInstances 批量创建实例 - - startInstance 启动实例 - - stopInstance 停止实例 - - rebootInstance 重启实例 - - renewInstance 续费实例 - - reActiveInstance 激活实例 -- 其他业务动词参考 - - create 创建 - - delete 删除 - - modify 修改 - - scale 扩容 - - attach 追加 - - remove 移除 - - upgrade 升级 - - sync 同步 - - install 安装 - - unInstall 卸载 - - grant 授权 - - pause 暂停 - - cancel 取消 - - resume 重新开始 - - check 检查 - - deploy 部署