a_bazu
/
cloud-server-8
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():修改企业入驻

dev.wei
WeiRan 2024-10-07 23:44:14 +08:00
parent 7063af945e
commit df1c9ad9e8
13 changed files with 262 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java
View File

@ -56,5 +56,5 @@ public class SecurityConstants {
*/
public static final String ROLE_PERMISSION = "role_permission";
public static final String SAAS_KEY = "ent-code";
public static final String SAAS_KEY = "saas_key";
}

3
cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java
View File

@ -84,7 +84,8 @@ public class ManyDataSource implements ApplicationRunner{
public void run(ApplicationArguments args) {
DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class);
DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class);
for (EntInfo entInfo : dataSourceInfoList()) {
List<EntInfo> entInfos = this.dataSourceInfoList();
for (EntInfo entInfo : entInfos) {
DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(
entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort()
);

6
cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java
View File

@ -4,6 +4,7 @@ import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder;
import com.muyu.cloud.common.many.datasource.role.DynamicDataSource;
import com.muyu.cloud.common.saas.contents.SaaSConstant;
import com.muyu.cloud.common.saas.exception.SaaSException;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.utils.ServletUtils;
import com.muyu.common.core.utils.SpringUtils;
import jakarta.servlet.http.HttpServletRequest;
@ -25,8 +26,11 @@ public class SaaSInterceptor implements AsyncHandlerInterceptor {
return true;
}
// SaaSConstant.SAAS_KEY
// SecurityConstants.SAAS_KEY
String SaaSKey = ServletUtils.getHeader(request, SaaSConstant.SAAS_KEY);
if (SaaSKey == null) {
if (SaaSKey == null || "".equals(SaaSKey)) {
throw new SaaSException("SaaS非法访问");
}else {
DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class);

5
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Firm.java
View File

@ -34,6 +34,9 @@ public class Firm {
* 数据库名称
*/
private String databaseName;
/**
* 企业权限Id
*/
private long permissionId;
}

45
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FirmPermission.java 100644
View File

@ -0,0 +1,45 @@
package com.muyu.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* 企业权限
* @Author：weiran
* @Package：com.muyu.domain
* @Project：cloud-server-8
* @name：FirmPermission
* @Date：2024/10/7 9:13
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
public class FirmPermission {
/**
* 企业权限Id
*/
@TableId(value = "permission_id")
private long permissionId;
/**
* 权限等级
*/
private String permissionLevel;
/**
* 车辆数目
*/
private Integer carNumber;
/**
* 车辆类型数目
*/
private Integer carTypeNumber;
}

32
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmUpdPermissionReq.java 100644
View File

@ -0,0 +1,32 @@
package com.muyu.domain.req;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 修改企业权限请求对象
* @Author：weiran
* @Package：com.muyu.domain.req
* @Project：cloud-server-8
* @name：FirmUpdPermissionReq
* @Date：2024/10/7 22:22
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Tag(name = "修改权限请求对象",description = "修改权限请求对象")
public class FirmUpdPermissionReq {
/**
* 企业Id
*/
private Integer firmId;
/**
* 企业权限等级
*/
private String permissionLevel;
}

21
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FirmListResp.java
View File

@ -1,6 +1,7 @@
package com.muyu.domain.resp;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.domain.SysUser;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -110,6 +111,26 @@ public class FirmListResp {
*/
// @TableField(exist = false)
private String firmName;
/**
* 企业权限Id
*/
private long permissionId;
/**
* 权限等级
*/
private String permissionLevel;
/**
* 车辆数目
*/
private Integer carNumber;
/**
* 车辆类型数目
*/
private Integer carTypeNumber;
/**
* 数据库对象构建为返回结果对象

38
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FirmPermissionController.java 100644
View File

@ -0,0 +1,38 @@
package com.muyu.server.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.domain.req.FirmUpdPermissionReq;
import com.muyu.server.service.FirmPermissionService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 企业权限分配控制层
* @Author：weiran
* @Package：com.muyu.server.controller
* @Project：cloud-server-8
* @name：FirmPermission
* @Date：2024/10/7 21:29
*/
@RestController
@RequestMapping("/permission")
public class FirmPermissionController {
@Autowired
private FirmPermissionService firmPermissionService;
/**
* 修改企业权限分配
* @param firmUpdPermissionReq
* @return
*/
@PostMapping("/updpermission")
@Operation(summary = "修改权限分配",description = "修改权限分配")
public Result updpermission(@RequestBody FirmUpdPermissionReq firmUpdPermissionReq){
firmPermissionService.updpermission(firmUpdPermissionReq);
return Result.success(null,"权限更改成功");
}
}

17
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FirmPermissionMapper.java 100644
View File

@ -0,0 +1,17 @@
package com.muyu.server.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.muyu.domain.FirmPermission;
import org.apache.ibatis.annotations.Mapper;
/**
* 企业权限分配持久层
* @Author：weiran
* @Package：com.muyu.server.mapper
* @Project：cloud-server-8
* @name：FirmPermissionMapper
* @Date：2024/10/7 21:32
*/
@Mapper
public interface FirmPermissionMapper extends MPJBaseMapper<FirmPermission> {
}

8
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmManageService.java
View File

@ -3,6 +3,7 @@ package com.muyu.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.system.domain.SysUser;
import com.muyu.domain.req.FirmListReq;
import com.muyu.domain.req.FirmUpdPermissionReq;
import com.muyu.domain.resp.FirmTotalListResp;
import java.util.List;
@ -24,4 +25,11 @@ public interface FirmManageService extends IService<SysUser> {
* @return
*/
FirmTotalListResp firmmessageList(FirmListReq firmListReq);
/**
* 修改企业对应权限
* @param firmUpdPermissionReq
* @param permissionId
*/
void updpermission(FirmUpdPermissionReq firmUpdPermissionReq, long permissionId);
}

23
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmPermissionService.java 100644
View File

@ -0,0 +1,23 @@
package com.muyu.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.domain.FirmPermission;
import com.muyu.domain.req.FirmUpdPermissionReq;
/**
* 企业权限分配业务层
* @Author：weiran
* @Package：com.muyu.server.service
* @Project：cloud-server-8
* @name：FirmPermissionService
* @Date：2024/10/7 21:31
*/
public interface FirmPermissionService extends IService<FirmPermission> {
/**
* 修改企业权限分配
* @param firmUpdPermissionReq
* @return
*/
void updpermission(FirmUpdPermissionReq firmUpdPermissionReq);
}

22
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java
View File

@ -1,12 +1,15 @@
package com.muyu.server.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.system.domain.SysUser;
import com.muyu.domain.Firm;
import com.muyu.domain.FirmPermission;
import com.muyu.domain.req.FirmListReq;
import com.muyu.domain.req.FirmUpdPermissionReq;
import com.muyu.domain.resp.FirmListResp;
import com.muyu.domain.resp.FirmTotalListResp;
import com.muyu.server.mapper.FirmManageMapper;
@ -38,7 +41,9 @@ public class FirmManageServiceImpl extends ServiceImpl<FirmManageMapper, SysUser
*/
@Override
public FirmTotalListResp firmmessageList(FirmListReq firmListReq) {
long findcount = firmService.findcount();
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
long count = this.count(queryWrapper);
MPJLambdaWrapper<SysUser> wrapper = new MPJLambdaWrapper<>();
wrapper.select(SysUser::getUserId,
SysUser::getDeptId,
@ -56,12 +61,25 @@ public class FirmManageServiceImpl extends ServiceImpl<FirmManageMapper, SysUser
SysUser::getDatabaseName,
SysUser::getFirmId)
.selectAll(Firm.class)
.selectAll(FirmPermission.class)
.leftJoin(Firm.class,Firm::getFirmId,SysUser::getFirmId)
.leftJoin(FirmPermission.class,FirmPermission::getPermissionId,Firm::getPermissionId)
.eq(StringUtils.isNotEmpty(firmListReq.getFirmName()),
Firm::getFirmName, firmListReq.getFirmName());
wrapper.last("LIMIT "+((firmListReq.getPageNum()-1)*firmListReq.getPageSize())+","+firmListReq.getPageSize());
List<FirmListResp> firmListResps = firmManageMapper.selectJoinList(FirmListResp.class, wrapper);
return FirmTotalListResp.firmTotalListResp(firmListResps,findcount);
return FirmTotalListResp.firmTotalListResp(firmListResps,count);
}
/**
* 修改企业对应权限
* @param firmUpdPermissionReq
* @param permissionId
*/
@Override
public void updpermission(FirmUpdPermissionReq firmUpdPermissionReq, long permissionId) {
}
}

46
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmPermissionServiceImpl.java 100644
View File

@ -0,0 +1,46 @@
package com.muyu.server.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.domain.FirmPermission;
import com.muyu.domain.req.FirmUpdPermissionReq;
import com.muyu.server.mapper.FirmPermissionMapper;
import com.muyu.server.service.FirmManageService;
import com.muyu.server.service.FirmPermissionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 企业权限分配业务实现层
* @Author：weiran
* @Package：com.muyu.server.service.impl
* @Project：cloud-server-8
* @name：FirmPermissionServiceImpl
* @Date：2024/10/7 21:31
*/
@Service
public class FirmPermissionServiceImpl extends ServiceImpl<FirmPermissionMapper, FirmPermission> implements FirmPermissionService {
@Autowired
private FirmManageService firmManageService;
@Autowired
private FirmPermissionService firmPermissionService;
/**
* 修改企业权限分配
* @param firmUpdPermissionReq
* @return
*/
@Override
public void updpermission(FirmUpdPermissionReq firmUpdPermissionReq) {
String permissionLevel = firmUpdPermissionReq.getPermissionLevel();
//根据权限等级获取对应权限Id
LambdaQueryWrapper<FirmPermission> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(FirmPermission::getPermissionLevel, firmUpdPermissionReq.getPermissionLevel());
List<FirmPermission> list = this.list(queryWrapper);
FirmPermission firmPermission = list.get(0);
long permissionId=firmPermission.getPermissionId();
//修改企业对应权限
firmManageService.updpermission(firmUpdPermissionReq,permissionId);
}
}