irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-06-05 17:21:44 +08:00
parent 6e2c2ec7f1
commit 3b0b1a4d33
6 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java
View File

@@ -4,7 +4,6 @@ import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.service.ISysTenantService; import com.starry.admin.modules.platform.service.ISysTenantService;
import com.starry.admin.modules.platform.vo.SysTenantAddVo; import com.starry.admin.modules.platform.vo.SysTenantAddVo;
import com.starry.admin.modules.platform.vo.SysTenantQueryVo; import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
import com.starry.admin.utils.ExcelUtils;
import com.starry.common.annotation.Log; import com.starry.common.annotation.Log;
import com.starry.common.enums.BusinessType; import com.starry.common.enums.BusinessType;
import com.starry.common.result.R; import com.starry.common.result.R;
@@ -14,7 +13,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
/** /**
@@ -50,16 +48,6 @@ public class SysTenantController {
return R.ok(sysTenantService.selectSysTenantList(vo)); return R.ok(sysTenantService.selectSysTenantList(vo));
} }
/**
* 导出租户表列表
*/
@PreAuthorize("@customSs.hasPermission('platform:tenant:export')")
@Log(title = "租户表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SysTenantQueryVo sysTenantEntity) {
ExcelUtils.exportEasyExcel(response, SysTenantEntity.class, sysTenantService.selectSysTenantList(sysTenantEntity).getRecords(), "租户表数据");
}
/** /**
* 获取租户表详细信息 * 获取租户表详细信息
*/ */

3
play-admin/src/main/java/com/starry/admin/modules/platform/service/ISysTenantService.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.starry.admin.modules.platform.entity.SysTenantEntity; import com.starry.admin.modules.platform.entity.SysTenantEntity;
import com.starry.admin.modules.platform.vo.SysTenantQueryVo; import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
import com.starry.admin.modules.platform.vo.TenantResultVo;
import com.starry.common.result.R; import com.starry.common.result.R;
import java.util.List; import java.util.List;
@@ -46,7 +45,7 @@ public interface ISysTenantService extends IService<SysTenantEntity> {
* @param sysTenantEntity 租户表 * @param sysTenantEntity 租户表
* @return 租户表集合 * @return 租户表集合
*/ */
IPage<TenantResultVo> selectSysTenantList(SysTenantQueryVo sysTenantEntity); IPage<SysTenantEntity> selectSysTenantList(SysTenantQueryVo sysTenantEntity);
/** /**
* 新增租户表 * 新增租户表

27
play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java
View File

@@ -16,7 +16,6 @@ import com.starry.admin.modules.platform.mapper.SysTenantMapper;
import com.starry.admin.modules.platform.mapper.SysTenantPackageMapper; import com.starry.admin.modules.platform.mapper.SysTenantPackageMapper;
import com.starry.admin.modules.platform.service.ISysTenantService; import com.starry.admin.modules.platform.service.ISysTenantService;
import com.starry.admin.modules.platform.vo.SysTenantQueryVo; import com.starry.admin.modules.platform.vo.SysTenantQueryVo;
import com.starry.admin.modules.platform.vo.TenantResultVo;
import com.starry.admin.modules.system.entity.*; import com.starry.admin.modules.system.entity.*;
import com.starry.admin.modules.system.mapper.*; import com.starry.admin.modules.system.mapper.*;
import com.starry.admin.modules.system.service.SysRoleMenuService; import com.starry.admin.modules.system.service.SysRoleMenuService;
@@ -37,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -103,21 +103,23 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
* @return 租户表 * @return 租户表
*/ */
@Override @Override
public IPage<TenantResultVo> selectSysTenantList(SysTenantQueryVo vo) { public IPage<SysTenantEntity> selectSysTenantList(SysTenantQueryVo vo) {
LambdaQueryWrapper<SysTenantEntity> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysTenantEntity> wrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotBlank(vo.getTenantStatus())) { wrapper.orderByDesc(SysTenantEntity::getTenantId);
wrapper.eq(SysTenantEntity::getTenantStatus, vo.getTenantStatus()); //if (StrUtil.isNotBlank(vo.getTenantStatus())) {
} // wrapper.eq(SysTenantEntity::getTenantStatus, vo.getTenantStatus());
//}
if (StrUtil.isNotBlank(vo.getTenantName())) { if (StrUtil.isNotBlank(vo.getTenantName())) {
wrapper.like(SysTenantEntity::getTenantName, vo.getTenantName()); wrapper.like(SysTenantEntity::getTenantName, vo.getTenantName());
} }
if (StrUtil.isNotBlank(vo.getBeginTime())) { //if (StrUtil.isNotBlank(vo.getBeginTime())) {
wrapper.ge(SysTenantEntity::getTenantTime, vo.getBeginTime()); // wrapper.ge(SysTenantEntity::getTenantTime, vo.getBeginTime());
} //}
if (StrUtil.isNotBlank(vo.getEndTime())) { //if (StrUtil.isNotBlank(vo.getEndTime())) {
wrapper.le(SysTenantEntity::getTenantTime, vo.getEndTime()); // wrapper.le(SysTenantEntity::getTenantTime, vo.getEndTime());
} //}
return sysTenantMapper.selectSysTenantList(new Page<>(vo.getPageNum(), vo.getPageSize()), vo); Page<SysTenantEntity> page = new Page<>(vo.getPageNum(), vo.getPageSize());
return this.baseMapper.selectPage(page, wrapper);
} }
/** /**
@@ -195,6 +197,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
// 生成随机key，用来生成域名，关键！ // 生成随机key，用来生成域名，关键！
sysTenantEntity.setTenantKey(RandomUtil.randomString(8)); sysTenantEntity.setTenantKey(RandomUtil.randomString(8));
// 创建租户 // 创建租户
sysTenantEntity.setCreatedTime(new Date());
sysTenantMapper.insert(sysTenantEntity); sysTenantMapper.insert(sysTenantEntity);
// 创建默认部门--部门默认名称以租户名称 // 创建默认部门--部门默认名称以租户名称
Long deptId = createDept(sysTenantEntity); Long deptId = createDept(sysTenantEntity);

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantAddVo.java
View File

@@ -23,7 +23,7 @@ public class SysTenantAddVo extends BaseEntity<SysTenantAddVo> {
* 租户类型;0:公司;1:部门;2:个人;3:其他 * 租户类型;0:公司;1:部门;2:个人;3:其他
*/ */
@NotBlank(message = "租户类型不能为空") @NotBlank(message = "租户类型不能为空")
private String tenantType; private String tenantType = "0";
/** /**
* 用户状态;0:正常,1:停用 * 用户状态;0:正常,1:停用

2
play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java
View File

@@ -152,7 +152,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenuEntity
for (SysMenuEntity menu : menus) { for (SysMenuEntity menu : menus) {
RouterVo router = new RouterVo(); RouterVo router = new RouterVo();
// 0:隐藏 // 0:隐藏
router.setHidden("0".equals(menu.getVisible())); router.setHidden("0".equals(menu.getVisible().toString()));
router.setName(getRouteName(menu)); router.setName(getRouteName(menu));
router.setPath(getRouterPath(menu)); router.setPath(getRouterPath(menu));
router.setComponent(getComponent(menu)); router.setComponent(getComponent(menu));

10
play-admin/src/main/resources/application-test.yml
View File

@@ -9,7 +9,7 @@ spring:
# 配置MySQL的驱动程序类 # 配置MySQL的驱动程序类
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
# 数据库连接地址(以MySql为例) # 数据库连接地址(以MySql为例)
url: jdbc:p6spy:mysql://122.51.20.105:3306/play-with?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&serverTimezone=UTC url: jdbc:p6spy:mysql://122.51.20.105:3306/play-with?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
# 数据库对应的用户名 # 数据库对应的用户名
username: root username: root
# 数据库对应的密码 # 数据库对应的密码
@@ -67,10 +67,10 @@ spring:
# HTML 中 Reset All 按钮 # HTML 中 Reset All 按钮
reset-enable: true reset-enable: true
redis: redis:
host: 127.0.0.1 # Redis服务器地址 host: 122.51.20.105 # Redis服务器地址
database: 1 # Redis数据库索引（默认为0） database: 10 # Redis数据库索引（默认为0）
port: 6379 # Redis服务器连接端口 port: 19087 # Redis服务器连接端口
password: Spinfo@0123 password: arcikXa7ZkEBGtLf
timeout: 3000ms # 连接超时时间（毫秒） timeout: 3000ms # 连接超时时间（毫秒）