fangqiao/qiaoba-boot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
ailanyin
2023-06-25 17:22:05 +08:00
parent 3fd3a09888
commit caeae9127f
51 changed files with 235 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qiaoba-modules/pom.xml
View File

@ -20,4 +20,6 @@
<module>qiaoba-module-demo</module>
</modules>
<description>qiaoba-modules: 新建的模块, 统一放在这个模块下面</description>
</project>

10
qiaoba-modules/qiaoba-module-demo/pom.xml
View File

@ -11,6 +11,10 @@
<artifactId>qiaoba-module-demo</artifactId>
<description>
示例模块
此模块主要用于典型案例的demo, 切勿引入到 qiaoba-application 模块中
</description>
<dependencies>
<dependency>
<groupId>com.qiaoba</groupId>
@ -24,5 +28,9 @@
<groupId>com.qiaoba</groupId>
<artifactId>qiaoba-common-web</artifactId>
</dependency>
<dependency>
<groupId>com.qiaoba</groupId>
<artifactId>qiaoba-common-doc</artifactId>
</dependency>
</dependencies>
</project>
</project>

18
qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/DemoApplication.java Normal file
View File

@ -0,0 +1,18 @@
package com.qiaoba.module.demo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**
* DemoApplication
*
* @author ailanyin
* @version 1.0
* @since 2023/6/25 8:52
*/
@SpringBootApplication
public class DemoApplication {
public static void main(String[] args) {
SpringApplication.run(DemoApplication.class, args);
}
}

25
qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/controller/Lock4jController.java → qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/controller/DemoLock4jController.java
View File

@ -2,22 +2,34 @@ package com.qiaoba.module.demo.controller;
import com.baomidou.lock.annotation.Lock4j;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.module.demo.service.Lock4jService;
import com.qiaoba.module.demo.service.DemoLock4jService;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* Demo-Lock4j web层
*
* @author ailanyin
* @version 1.0
* @since 2022-09-22 04:20:28
*/
@RestController
@RequestMapping("/demo/lock4j")
@RequiredArgsConstructor
public class Lock4jController {
@Tag(name = "Demo-Lock4j")
@Slf4j
public class DemoLock4jController {
private final Lock4jService lock4jService;
private final DemoLock4jService demoLock4JService;
@GetMapping("/api-lock")
public AjaxResult apiLock() {
lock4jService.apiLock();
log.info("开始执行 apiLock, 当前线程{}", Thread.currentThread().getName());
demoLock4JService.apiLock();
return AjaxResult.success();
}
@ -29,9 +41,10 @@ public class Lock4jController {
* @return AjaxResult
*/
@GetMapping("/annotation-lock")
@Lock4j(keys = {"#accountId"}, expire = 20000, acquireTimeout = 10000)
@Lock4j(name = "annotationLock", acquireTimeout = 1000)
public AjaxResult annotationLock() {
lock4jService.annotationLock();
log.info("开始执行 annotationLock, 当前线程{}", Thread.currentThread().getName());
demoLock4JService.annotationLock();
return AjaxResult.success();
}
}

9
qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/Lock4jService.java → qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/DemoLock4jService.java
View File

@ -1,6 +1,13 @@
package com.qiaoba.module.demo.service;
public interface Lock4jService {
/**
* Demo-Lock4j 业务层
*
* @author ailanyin
* @version 1.0
* @since 2022-09-22 04:20:28
*/
public interface DemoLock4jService {
/**
* 分布式锁-编程式加锁

20
qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/impl/Lock4jServiceImpl.java → qiaoba-modules/qiaoba-module-demo/src/main/java/com/qiaoba/module/demo/service/impl/DemoLock4jServiceImpl.java
View File

@ -4,15 +4,22 @@ import cn.hutool.core.thread.ThreadUtil;
import com.baomidou.lock.LockInfo;
import com.baomidou.lock.LockTemplate;
import com.qiaoba.common.base.exceptions.ServiceException;
import com.qiaoba.module.demo.service.Lock4jService;
import com.qiaoba.module.demo.service.DemoLock4jService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* Demo-Lock4j 业务层实现
*
* @author ailanyin
* @version 1.0
* @since 2022-09-22 04:20:28
*/
@Service
@RequiredArgsConstructor
@Slf4j
public class Lock4jServiceImpl implements Lock4jService {
public class DemoLock4jServiceImpl implements DemoLock4jService {
private final LockTemplate lockTemplate;
@ -20,15 +27,16 @@ public class Lock4jServiceImpl implements Lock4jService {
public void apiLock() {
//... 各种不需要上锁的操作
String lockKey = "lock4j:apiLock";
final LockInfo lockInfo = lockTemplate.lock(lockKey);
// expire = -1 锁自动续期
final LockInfo lockInfo = lockTemplate.lock(lockKey, -1, 1000);
//申请锁失败
if (null == lockInfo) {
throw new ServiceException("业务处理中，请稍后再试...");
}
//申请锁成功
try {
ThreadUtil.sleep(10 * 1000);
log.info("执行 apiLock, 当前线程{}", Thread.currentThread().getName());
ThreadUtil.sleep(30 * 1000);
log.info("执行完毕 apiLock, 当前线程{}", Thread.currentThread().getName());
} finally {
lockTemplate.releaseLock(lockInfo);
}
@ -38,6 +46,6 @@ public class Lock4jServiceImpl implements Lock4jService {
public void annotationLock() {
// 休眠 10s
ThreadUtil.sleep(10 * 1000);
log.info("执行 apiLock, 当前线程{}", Thread.currentThread().getName());
log.info("执行完毕 annotationLock, 当前线程{}", Thread.currentThread().getName());
}
}

15
qiaoba-modules/qiaoba-module-demo/src/main/resources/application.yml Normal file
View File

@ -0,0 +1,15 @@
server:
port: 8080
springdoc:
swagger-ui:
path: /swagger-ui.html
tags-sorter: alpha
operations-sorter: alpha
api-docs:
path: /v3/api-docs
group-configs:
- group: 'Demo'
paths-to-match: '/**'
packages-to-scan: com.qiaoba.module.demo.controller

2
qiaoba-modules/qiaoba-module-file/pom.xml
View File

@ -11,6 +11,8 @@
<artifactId>qiaoba-module-file</artifactId>
<description>文件模块</description>
<dependencies>
<dependency>
<groupId>com.qiaoba</groupId>

3
qiaoba-modules/qiaoba-module-job/pom.xml
View File

@ -11,5 +11,6 @@
<artifactId>qiaoba-module-job</artifactId>
<description>定时任务模块</description>
</project>
</project>

2
qiaoba-modules/qiaoba-module-monitor/pom.xml
View File

@ -11,6 +11,8 @@
<artifactId>qiaoba-module-monitor</artifactId>
<description>监控模块</description>
<dependencies>
<dependency>
<groupId>com.qiaoba</groupId>

2
qiaoba-modules/qiaoba-module-system/pom.xml
View File

@ -11,6 +11,8 @@
<artifactId>qiaoba-module-system</artifactId>
<description>系统模块</description>
<dependencies>
<dependency>
<groupId>com.qiaoba</groupId>

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java
View File

@ -41,7 +41,7 @@ public class SysDictTypeController {
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictTypeParam param) throws Exception {
List<SysDictType> list = sysDictTypeService.selectList(param);
ExcelUtil.exportExcel(list, SysDictType.class, "字典类型" , response);
ExcelUtil.exportExcel(list, SysDictType.class, "字典类型", response);
}
@PreAuthorize("hasAuthority('system:dict:query')")

7
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysMenuController.java
View File

@ -2,7 +2,6 @@ package com.qiaoba.module.system.controller;
import com.qiaoba.api.system.entity.SysMenu;
import com.qiaoba.api.system.entity.param.SysMenuParam;
import com.qiaoba.api.system.entity.vo.SysMenuVo;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.module.system.service.SysMenuService;
import io.swagger.v3.oas.annotations.Operation;
@ -32,7 +31,7 @@ public class SysMenuController {
@GetMapping("/list")
@Operation(summary = "获取列表")
public AjaxResult list(SysMenuParam param) {
List<SysMenuVo> menus = sysMenuService.selectVoList(param);
List<SysMenu> menus = sysMenuService.selectList(param);
return AjaxResult.success(menus);
}
@ -67,7 +66,7 @@ public class SysMenuController {
@GetMapping("/tree-select")
@Operation(summary = "构建菜单树")
public AjaxResult treeSelect(SysMenuParam param) {
List<SysMenuVo> menus = sysMenuService.selectVoList(param);
List<SysMenu> menus = sysMenuService.selectList(param);
return AjaxResult.success(sysMenuService.buildMenuTree(menus));
}
@ -76,7 +75,7 @@ public class SysMenuController {
public AjaxResult roleMenuTreeSelect(@PathVariable("roleId") String roleId) {
AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", sysMenuService.selectMenuIdsByRoleId(roleId));
ajax.put("menus", sysMenuService.buildMenuTree(sysMenuService.selectVoList(new SysMenuParam())));
ajax.put("menus", sysMenuService.buildMenuTree(sysMenuService.selectList(new SysMenuParam())));
return ajax;
}
}

4
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysMenuMapper.java
View File

@ -1,9 +1,9 @@
package com.qiaoba.module.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qiaoba.api.system.entity.SysMenu;
import com.qiaoba.api.system.entity.vo.SysMenuVo;
import com.qiaoba.common.database.annotations.SelectOneRow;
import com.qiaoba.common.database.mapper.BaseMapperPlus;
import java.util.List;
import java.util.Set;
@ -15,7 +15,7 @@ import java.util.Set;
* @version 1.0
* @since 2023/5/5 11:36
*/
public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, SysMenuVo> {
public interface SysMenuMapper extends BaseMapper<SysMenu> {
/**
* 校验菜单名称是否唯一

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysLoginService.java
View File

@ -1,8 +1,6 @@
package com.qiaoba.module.system.service;
import com.qiaoba.api.system.entity.SysUser;
import com.qiaoba.api.system.entity.dto.LoginDto;
import com.qiaoba.common.base.result.AjaxResult;
import java.util.Map;

3
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysMenuService.java
View File

@ -1,6 +1,7 @@
package com.qiaoba.module.system.service;
import cn.hutool.core.lang.tree.Tree;
import com.qiaoba.api.system.entity.SysMenu;
import com.qiaoba.api.system.entity.vo.RouterVo;
import com.qiaoba.api.system.entity.vo.SysMenuVo;
import com.qiaoba.api.system.service.SysMenuApiService;
@ -24,7 +25,7 @@ public interface SysMenuService extends SysMenuApiService {
* @param menus 菜单列表
* @return 下拉树结构列表
*/
List<Tree<String>> buildMenuTree(List<SysMenuVo> menus);
List<Tree<String>> buildMenuTree(List<SysMenu> menus);
/**
* 根据角色ID查询菜单树信息

6
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysMenuServiceImpl.java
View File

@ -56,8 +56,8 @@ public class SysMenuServiceImpl implements SysMenuService {
}
@Override
public List<SysMenuVo> selectVoList(SysMenuParam param) {
return sysMenuMapper.selectVoList(param2Wrapper((param)));
public List<SysMenu> selectList(SysMenuParam param) {
return sysMenuMapper.selectList(param2Wrapper((param)));
}
@Override
@ -81,7 +81,7 @@ public class SysMenuServiceImpl implements SysMenuService {
}
@Override
public List<Tree<String>> buildMenuTree(List<SysMenuVo> menus) {
public List<Tree<String>> buildMenuTree(List<SysMenu> menus) {
TreeNodeConfig config = TreeNodeConfig.DEFAULT_CONFIG.setNameKey(BaseConstant.TREE_KEY_NAME);
return TreeUtil.build(menus, BaseConstant.DEFAULT_PARENT_ID_VALUE, config, (menu, tree) ->
tree.setId(menu.getMenuId())

1
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.qiaoba.api.system.entity.dto.DataScopeDto;
import com.qiaoba.api.system.entity.dto.SysRoleDto;
import com.qiaoba.api.system.entity.param.SysRoleParam;
import com.qiaoba.auth.utils.SecurityUtil;
import com.qiaoba.common.base.constants.BaseConstant;
import com.qiaoba.common.base.exceptions.ServiceException;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserDetailsServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.qiaoba.module.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.qiaoba.api.system.entity.SysUser;
import com.qiaoba.api.auth.service.SysUserDetailsApiService;
import com.qiaoba.api.system.entity.SysUser;
import com.qiaoba.auth.constants.SecurityConstant;
import com.qiaoba.auth.entity.LoginUser;
import com.qiaoba.auth.entity.SecurityUser;

1
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserRoleServiceImpl.java
View File

@ -14,7 +14,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java
View File

@ -103,7 +103,7 @@ public class SysUserServiceImpl implements SysUserService {
}
@Override
@DataScope(userAlias = "u",deptAlias = "t2")
@DataScope(userAlias = "u", deptAlias = "t2")
public TableDataInfo<SysUserVo> selectVoPageList(SysUserParam param, PageQuery pageQuery) {
Page<SysUserVo> page = sysUserMapper.selectVoPageList(pageQuery.build(), param);
return TableDataInfo.build(page);

5
qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysConfigMapper.xml
View File

@ -12,8 +12,9 @@
</select>
<select id="selectByIds" resultType="com.qiaoba.api.system.entity.SysConfig">
select config_id, config_name, config_key, config_value, config_type, create_user, create_time, update_user, update_time, remark
from sys_config where config_id in
select config_id, config_name, config_key, config_value, config_type, create_user, create_time, update_user,
update_time, remark
from sys_config where config_id in
<foreach item="configId" collection="list" open="(" separator="," close=")">
#{configId}
</foreach>

2
qiaoba-modules/qiaoba-module-tenant/pom.xml
View File

@ -11,6 +11,8 @@
<artifactId>qiaoba-module-tenant</artifactId>
<description>租户模块</description>
<dependencies>
<dependency>
<groupId>com.qiaoba</groupId>

7
qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/runner/SysTenantRunner.java
View File

@ -8,6 +8,13 @@ import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Service;
/**
* 项目启动完成后-将主库中的租户信息同步到 Redis 中
*
* @author ailanyin
* @version 1.0
* @since 2022-09-22 04:20:28
*/
@Service
@RequiredArgsConstructor
public class SysTenantRunner implements ApplicationRunner {

2
qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantDatasourceService.java
View File

@ -72,7 +72,7 @@ public interface SysTenantDatasourceService {
/**
* 将租户下的除datasourceId之外的其他数据源设置为备用
*
* @param tenantId tenantId
* @param tenantId tenantId
* @param excludeId 排除Id
*/
void setBackupDatasourceExcludeId(String tenantId, String excludeId);

3
qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/SysTenantService.java
View File

@ -4,9 +4,6 @@ import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;
import com.qiaoba.module.tenant.entity.SysTenant;
import com.qiaoba.module.tenant.entity.param.SysTenantParam;
import com.qiaoba.module.tenant.entity.vo.TenantSettingVo;
import java.sql.Connection;
/**
* 租户管理 服务层

2
qiaoba-modules/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java
View File

@ -62,7 +62,7 @@ public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceServic
@Override
public void setBackupDatasourceExcludeId(String tenantId, String excludeId) {
sysTenantDatasourceMapper.setBackupDatasourceExcludeId(tenantId,excludeId,BaseEnum.NO.getCode());
sysTenantDatasourceMapper.setBackupDatasourceExcludeId(tenantId, excludeId, BaseEnum.NO.getCode());
}
private QueryWrapper<SysTenantDatasource> paramToWrapper(SysTenantDatasourceParam param) {