dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system

Browse Source
This commit is contained in:
xiao-fajia 2024-08-13 18:38:37 +08:00
commit 819430bc73
18 changed files with 278 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java
View File

@ -25,10 +25,10 @@ public class BaseConstants {
public static final String PASSWORD_DEFAULT = "123456";
/**租户下部门名称*/
public static final String DEPT_NAME_CORP_NAME = "政企客户";
/**计算下次保险时间*/
public static final String COMPUTE_TYPE_BX = "bx";
/**计算下次保养时间*/
public static final String COMPUTE_TYPE_BY = "by";
/**私家车*/
public static final String CAR_CATEGORY_PRIVATE = "01";
/**货车*/
public static final String CAR_CATEGORY_TRUCK = "02";
/**计算下次检测时间*/
public static final String COMPUTE_TYPE_JC = "jc";
/**企业管理-员工管理表名称*/

2
dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/CompanyServiceImpl.java
View File

@ -85,6 +85,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
//上级部门为本租户顶级部门
DeptRespDTO parentDept = deptApi.getDeptByParentId(0L);
deptRespDTO.setParentId(parentDept.getId());
//所属企业ID为新增的企业ID
deptRespDTO.setCorpId(companyRespVO.getId());
Long deptId = deptApi.saveDept(deptRespDTO);
/*3.新增企业管理员用户信息并配置角色*/
UserDTO userDTO = new UserDTO();

15
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CarMainController.java
View File

@ -120,6 +120,21 @@ public class CarMainController {
return success(pageResult);
}
/**
* 测算车辆下一次保养/检测/保险时间
* @author PQZ
* @date 11:48 2024/8/13
* @param pageReqVO CarMainReqVO
* @return cn.iocoder.yudao.framework.common.pojo.CommonResult<cn.iocoder.yudao.module.custom.vo.CarMainRespVO>
**/
@PostMapping("/compute")
@Operation(summary = "测算车辆下一次保养/检测/保险时间")
public CommonResult<CarMainRespVO> compute(@RequestBody CarMainReqVO pageReqVO) {
CarMainRespVO result = carMainService.compute(pageReqVO);
return success(result);
}
/**
* 导出车辆信息
*

6
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarBrand.java
View File

@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
@ -80,5 +82,9 @@ public class CarBrand extends BaseDO {
*/
@Schema(description = "品牌键值", example = "1")
private String brandValue;
/**保养里程规则*/
private BigDecimal ruleMileage;
/**保养时间规则（月）*/
private Integer ruleTime;
}

6
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarModel.java
View File

@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
@ -64,5 +66,9 @@ public class CarModel extends BaseDO {
* 品牌id
*/
private String brandId;
/**保养里程规则*/
private BigDecimal ruleMileage;
/**保养时间规则（月）*/
private Integer ruleTime;
}

2
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/CarMainService.java
View File

@ -76,7 +76,7 @@ public interface CarMainService extends IService<CarMain> {
* @param reqVO TODO
* @return java.time.LocalDateTime
**/
LocalDateTime compute(CarMainReqVO reqVO);
CarMainRespVO compute(CarMainReqVO reqVO);
}

232
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CarMainServiceImpl.java
View File

@ -3,15 +3,17 @@ package cn.iocoder.yudao.module.custom.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.custom.entity.CarBrand;
import cn.iocoder.yudao.module.custom.entity.CarMain;
import cn.iocoder.yudao.module.custom.entity.CarModel;
import cn.iocoder.yudao.module.custom.entity.CustomerCar;
import cn.iocoder.yudao.module.custom.mapper.CarMainMapper;
import cn.iocoder.yudao.module.custom.mapper.CustomerCarMapper;
import cn.iocoder.yudao.module.custom.service.CarBrandService;
import cn.iocoder.yudao.module.custom.service.CarMainService;
import cn.iocoder.yudao.module.custom.service.CarModelService;
import cn.iocoder.yudao.module.custom.service.CustomerCarService;
import cn.iocoder.yudao.module.custom.vo.CarMainReqVO;
import cn.iocoder.yudao.module.custom.vo.CarMainRespVO;
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
import cn.iocoder.yudao.module.custom.vo.*;
import cn.iocoder.yudao.module.label.entity.BusiLabel;
import cn.iocoder.yudao.module.label.service.BusiLabelService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -21,12 +23,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.Duration;
import java.time.LocalDateTime;
import java.time.Period;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.common.BaseConstants.COMPUTE_TYPE_BX;
import static cn.iocoder.yudao.common.BaseConstants.CUS_SIGN_CAR;
import static cn.iocoder.yudao.common.BaseConstants.*;
/**
* 车辆信息 Service 实现类
@ -34,7 +38,7 @@ import static cn.iocoder.yudao.common.BaseConstants.CUS_SIGN_CAR;
* @author 后台管理员
*/
@Service
public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> implements CarMainService{
public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> implements CarMainService {
@Autowired
private CustomerCarMapper customerCarMapper;
@ -45,6 +49,11 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
@Autowired
private BusiLabelService busiLabelService;
@Resource
private CarBrandService carBrandService;
@Resource
private CarModelService carModelService;
/**
* 创建车辆信息
@ -57,11 +66,14 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
//车牌号license_number，车架号vin，发动机号码engine_number 重复校验
int checkResult = isDataKeyValueRepeat(createReqVO);
//如果查重失败
if (checkResult != 0){
switch (checkResult){
case 1: return CommonResult.error(4051,"该车牌号已在系统中登记");
case 2: return CommonResult.error(4052,"该车架号已在系统中登记");
case 3: return CommonResult.error(4053,"该发动机号码已在系统中登记");
if (checkResult != 0) {
switch (checkResult) {
case 1:
return CommonResult.error(4051, "该车牌号已在系统中登记");
case 2:
return CommonResult.error(4052, "该车架号已在系统中登记");
case 3:
return CommonResult.error(4053, "该发动机号码已在系统中登记");
}
}
@ -71,10 +83,10 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
CarMain carMain = BeanUtils.toBean(createReqVO, CarMain.class);
carMain.setCarBrand(brandAndModel.get(0));
//判断是否仅填入了品牌
if(brandAndModel.size()>1){
if (brandAndModel.size() > 1) {
//填入了型号
carMain.setCarModel(brandAndModel.get(1));
}else {
} else {
carMain.setCarModel("");
}
//todo 计算下次保养时间，下次保养里程，下次年检时间，保险到期时间
@ -89,15 +101,18 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
* @param updateReqVO 更新信息
*/
@Override
public CommonResult<String> updateCarMain(CarMainReqVO updateReqVO){
public CommonResult<String> updateCarMain(CarMainReqVO updateReqVO) {
//车牌号license_number，车架号vin，发动机号码engine_number 重复校验
int checkResult = isDataKeyValueRepeat(updateReqVO);
//如果查重失败
if (checkResult != 0){
switch (checkResult){
case 1: return CommonResult.error(4051,"该车牌号已在系统中登记");
case 2: return CommonResult.error(4052,"该车架号已在系统中登记");
case 3: return CommonResult.error(4053,"该发动机号码已在系统中登记");
if (checkResult != 0) {
switch (checkResult) {
case 1:
return CommonResult.error(4051, "该车牌号已在系统中登记");
case 2:
return CommonResult.error(4052, "该车架号已在系统中登记");
case 3:
return CommonResult.error(4053, "该发动机号码已在系统中登记");
}
}
@ -107,10 +122,10 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
CarMain carMain = BeanUtils.toBean(updateReqVO, CarMain.class);
carMain.setCarBrand(brandAndModel.get(0));
//判断是否仅填入了品牌
if(brandAndModel.size()>1){
if (brandAndModel.size() > 1) {
//填入了型号
carMain.setCarModel(brandAndModel.get(1));
}else {
} else {
carMain.setCarModel("");
}
//todo 计算下次保养时间，下次保养里程，下次年检时间，保险到期时间
@ -127,7 +142,7 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
public void deleteCarMain(String id) {
//判断车辆是否发生过业务
CarMain target = baseMapper.selectById(id);
if (ObjectUtil.isEmpty(target.getRecentlyHandledBusiness()) && !"".equals(target.getRecentlyHandledBusiness()) ){
if (ObjectUtil.isEmpty(target.getRecentlyHandledBusiness()) && !"".equals(target.getRecentlyHandledBusiness())) {
}
// 逻辑删除
@ -172,7 +187,7 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
//取分页参数
Page<CarMainReqVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
//分页查询
return baseMapper.findPage(page,pageReqVO);
return baseMapper.findPage(page, pageReqVO);
}
/**
@ -185,7 +200,7 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
public void bindCustomAndCar(CarMainReqVO saveReqVO) {
List<CustomerCar> customerCars = new ArrayList<>();
List<CustomerMainRespVO> cusList = saveReqVO.getCusList();
if (ObjectUtil.isNotEmpty(cusList)){
if (ObjectUtil.isNotEmpty(cusList)) {
//组装数据
cusList.forEach(item -> {
CustomerCar customerCar = new CustomerCar();
@ -195,44 +210,169 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
customerCars.add(customerCar);
});
}
customerCarService.bindCustomerCar(saveReqVO.getId(),CUS_SIGN_CAR,customerCars);
customerCarService.bindCustomerCar(saveReqVO.getId(), CUS_SIGN_CAR, customerCars);
}
/**
* 测算车辆下一次保养/检测/保险时间
* @author PQZ
* @date 7:45 2024/8/9
*
* @param reqVO CarMainReqVO
* @return java.time.LocalDateTime
* @author PQZ
* @date 7:45 2024/8/9
**/
@Override
public LocalDateTime compute(CarMainReqVO reqVO) {
LocalDateTime resultTime;
public CarMainRespVO compute(CarMainReqVO reqVO) {
CarMainRespVO respVO = new CarMainRespVO();
/*1、测算车辆保险到期时间，车辆保险购买时间不可为空*/
if (null != reqVO.getInsuranceDate()) {
respVO.setInsuranceExpiryDate(reqVO.getInsuranceDate().plusYears(1));
}
/*2、测算车辆年检临期(车辆类型及车辆注册时间不可为空)*/
if (null != reqVO.getCarCategory() && null != reqVO.getCarRegisterDate()) {
respVO.setNextInspectionDate(computeNextInsp(reqVO.getInspectionDate(), reqVO.getCarCategory(), reqVO.getCarRegisterDate()));
}
/*3、测算车辆保养里程及下次保养时间*/
List<String> brandAndModel = reqVO.getBrandAndModel();
//根据品牌型号获取保养规则
BrandAndModelDTO rule = getBrandAndModel(brandAndModel);
//设置保养里程
if (null != reqVO.getMaintenanceMileage()) {
respVO.setNextMaintenanceMileage(reqVO.getMaintenanceMileage().add(rule.getRuleMileage()));
}
//设置保养时间
if (null != reqVO.getMaintenanceDate()) {
respVO.setNextMaintenanceDate(reqVO.getMaintenanceDate().plusMonths(rule.getRuleTime()));
}
return respVO;
}
return null;
/**
* 根据品牌型号获取保养规则
*
* @param brandAndModel List<String>品牌型号集合
* @return cn.iocoder.yudao.module.custom.vo.BrandAndModelDTO
* @author PQZ
* @date 11:41 2024/8/13
**/
private BrandAndModelDTO getBrandAndModel(List<String> brandAndModel) {
BrandAndModelDTO result = new BrandAndModelDTO();
int ruleTime = 0;
BigDecimal ruleMileage = new BigDecimal(0);
if (null != brandAndModel && brandAndModel.size() > 0) {
//优先以车辆型号绑定的里程及保养时间为准
if (brandAndModel.size() > 1) {
//取车辆型号id
String modelId = brandAndModel.get(1);
//查询车辆型号
CarModel carModel = carModelService.getById(modelId);
if (null != carModel) {
ruleTime = carModel.getRuleTime();
ruleMileage = carModel.getRuleMileage();
}
} else {
//没有选择型号情况，以车辆品牌绑定规则为准
String brandId = brandAndModel.get(0);
//查询车辆品牌
CarBrand carBrand = carBrandService.getById(brandId);
if (null != carBrand){
ruleTime = carBrand.getRuleTime();
ruleMileage = carBrand.getRuleMileage();
}
}
}
result.setRuleTime(ruleTime);
result.setRuleMileage(ruleMileage);
return result;
}
/**
* 计算车辆下次年检时间
*
* @param inspectionDate 年检时间
* @param carCategory 车辆类型
* @param carRegisterDate 车辆类别
* @return java.time.LocalDateTime
* @author PQZ
* @date 9:51 2024/8/13
**/
private LocalDateTime computeNextInsp(LocalDateTime inspectionDate, String carCategory, LocalDateTime carRegisterDate) {
/*1、基础参数定义*/
LocalDateTime resultTime = null;
//车辆是否存在年检时间
boolean isInspNull = null != inspectionDate;
//当前时间
LocalDateTime currentTime = LocalDateTime.now();
//计算当前时间与车辆注册日期的差值
Period period = Period.between(carRegisterDate.toLocalDate(), currentTime.toLocalDate());
//年份差值
int yearPeriod = period.getYears();
if (CAR_CATEGORY_PRIVATE.equals(carCategory)) {
/*2、计算私家车类型车辆下次年检日期*/
//私家车计算规则，第6、10年需要年检，过后1年1检
if (yearPeriod < 6) {
//小于6年情况在第六年车检
resultTime = carRegisterDate.plusYears(6);
} else if (yearPeriod < 10) {
//大于6年小于10年情况
resultTime = carRegisterDate.plusYears(10);
} else {
//大于10情况,一年一检
if (isInspNull) {
resultTime = inspectionDate.plusYears(1);
}
}
} else if (CAR_CATEGORY_TRUCK.equals(carCategory)) {
/*2、计算货车类型车辆下次年检日期*/
//货车测算必须传入年检时间
if (isInspNull) {
if (yearPeriod <= 10) {
//10年内，一年一检
resultTime = inspectionDate.plusYears(1);
} else {
//大于10年半年一检
resultTime = inspectionDate.plusMonths(6);
}
}
} else {
/*3、计算非营运车辆下次年检日期*/
//非营运车辆必须传入年检时间
if (isInspNull) {
if (yearPeriod <= 5) {
//5年内，一年一检
resultTime = inspectionDate.plusYears(1);
} else {
//大于5年半年一检
resultTime = inspectionDate.plusMonths(6);
}
}
}
return resultTime;
}
/**
* 车牌号，车架号，发动机号码 查重
*
* @param reqVO
* @return 0无重复，1车牌号重复，2车架号重复，发动机号码重复
*/
private int isDataKeyValueRepeat(CarMainReqVO reqVO){
private int isDataKeyValueRepeat(CarMainReqVO reqVO) {
//车牌号license_number 查重
if(ObjectUtil.isNotEmpty(reqVO.getLicenseNumber())){
if (ObjectUtil.isNotEmpty(reqVO.getLicenseNumber())) {
CarMain target = new CarMain();
target.setLicenseNumber(reqVO.getLicenseNumber());
List<CarMain> results = baseMapper.isDataKeyValueRepeat(target);
//判断是否登记过这个车牌号的车辆
if (results.size()>0){
if (results.size() > 0) {
//无id是新增，有相应登记记录
if(ObjectUtil.isEmpty(reqVO.getId()) ){
if (ObjectUtil.isEmpty(reqVO.getId())) {
return 1;
}
//有id是修改，如果登记过，比较id查验是否是当前要修改的车辆本身
for (CarMain item: results) {
if (!item.getId().equals(reqVO.getId())){
for (CarMain item : results) {
if (!item.getId().equals(reqVO.getId())) {
return 1;
}
@ -241,19 +381,19 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
}
//车架号vin 查重
}
if (ObjectUtil.isNotEmpty(reqVO.getVin())){
if (ObjectUtil.isNotEmpty(reqVO.getVin())) {
CarMain target = new CarMain();
target.setVin(reqVO.getVin());
List<CarMain> results = baseMapper.isDataKeyValueRepeat(target);
//判断是否登记过这个车架号的车辆
if (results.size()>0){
if (results.size() > 0) {
//无id是新增，有相应登记记录
if(ObjectUtil.isEmpty(reqVO.getId()) ){
if (ObjectUtil.isEmpty(reqVO.getId())) {
return 2;
}
//有id是修改，如果登记过，比较id查验是否是当前要修改的车辆本身
for (CarMain item: results) {
if (!item.getId().equals(reqVO.getId())){
for (CarMain item : results) {
if (!item.getId().equals(reqVO.getId())) {
return 2;
}
@ -262,19 +402,19 @@ public class CarMainServiceImpl extends ServiceImpl<CarMainMapper, CarMain> impl
}
//发动机号码engine_number 查重
}
if (ObjectUtil.isNotEmpty(reqVO.getEngineNumber())){
if (ObjectUtil.isNotEmpty(reqVO.getEngineNumber())) {
CarMain target = new CarMain();
target.setEngineNumber(reqVO.getEngineNumber());
List<CarMain> results = baseMapper.isDataKeyValueRepeat(target);
//判断是否登记过这个发动机号的车辆
if (results.size()>0){
if (results.size() > 0) {
//无id是新增，有相应登记记录
if(ObjectUtil.isEmpty(reqVO.getId()) ){
if (ObjectUtil.isEmpty(reqVO.getId())) {
return 3;
}
//有id是修改，如果登记过，比较id查验是否是当前要修改的车辆本身
for (CarMain item: results) {
if (!item.getId().equals(reqVO.getId())){
for (CarMain item : results) {
if (!item.getId().equals(reqVO.getId())) {
return 3;
}

19
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/BrandAndModelDTO.java Normal file
View File

@ -0,0 +1,19 @@
package cn.iocoder.yudao.module.custom.vo;
import lombok.Data;
import java.math.BigDecimal;
/**
* 保养里程及规则DTO
* @author PQZ
* @date 11:37 2024/8/13
**/
@Data
public class BrandAndModelDTO{
/**保养里程规则*/
private BigDecimal ruleMileage;
/**保养时间规则（月）*/
private Integer ruleTime;
}

6
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarBrandReqVO.java
View File

@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.custom.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@ -47,5 +49,9 @@ public class CarBrandReqVO extends PageParam {
@Schema(description = "品牌键值")
private String brandValue;
/**保养里程规则*/
private BigDecimal ruleMileage;
/**保养时间规则（月）*/
private Integer ruleTime;
}

6
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarModelReqVO.java
View File

@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.custom.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@ -41,6 +43,10 @@ public class CarModelReqVO extends PageParam {
@Schema(description = "品牌id", example = "李四")
private String brandId;
/**保养里程规则*/
private BigDecimal ruleMileage;
/**保养时间规则（月）*/
private Integer ruleTime;

2
dl-module-base/src/main/resources/mapper/custom/CarBrandMapper.xml
View File

@ -15,6 +15,8 @@
tbcb.logo_img,
tbcb.english_name,
tbcb.abb_name,
tbcb.rule_mileage,
tbcb.rule_time,
tbcb.brand_value,
tbcb.deleted,
tbcb.tenant_id

2
dl-module-base/src/main/resources/mapper/custom/CarModelMapper.xml
View File

@ -7,6 +7,8 @@
tbcmod.sort,
tbcmod.model_name,
tbcmod.model_value,
tbcmod.rule_mileage,
tbcmod.rule_time,
tbcmod.remark,
tbcmod.creator,
tbcmod.create_time,

4
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/dto/DeptRespDTO.java
View File

@ -15,6 +15,10 @@ public class DeptRespDTO {
* 部门编号
*/
private Long id;
/**
* 所属企业ID
*/
private String corpId;
/**
* 部门名称
*/

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
View File

@ -24,7 +24,7 @@ public class AuthLoginReqVO {
@Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudaoyuanma")
@NotEmpty(message = "登录账号不能为空")
@Length(min = 4, max = 16, message = "账号长度为 4-16 位")
@Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
// @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
private String username;
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java
View File

@ -12,6 +12,9 @@ public class DeptRespVO {
@Schema(description = "部门编号", example = "1024")
private Long id;
@Schema(description = "所属企业ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String corpId;
@Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name;

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
View File

@ -17,6 +17,9 @@ public class DeptSaveReqVO {
@Schema(description = "部门编号", example = "1024")
private Long id;
@Schema(description = "所属企业 ID", example = "1024")
private String corpId;
@Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@NotBlank(message = "部门名称不能为空")
@Size(max = 30, message = "部门名称长度不能超过 30 个字符")

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java
View File

@ -28,6 +28,10 @@ public class DeptDO extends TenantBaseDO {
*/
@TableId
private Long id;
/**
* 所属企业ID，可能为null
*/
private String corpId;
/**
* 部门名称
*/

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
View File

@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper;
import cn.iocoder.yudao.module.system.dal.redis.RedisKeyConstants;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@ -49,7 +50,13 @@ public class DeptServiceImpl implements DeptService {
createReqVO.setAncestors(validateParentDept(null, createReqVO.getParentId()));
// 校验部门名的唯一性
validateDeptNameUnique(null, createReqVO.getParentId(), createReqVO.getName());
if(StringUtils.isEmpty(createReqVO.getCorpId()) && !DeptDO.PARENT_ID_ROOT.equals(createReqVO.getParentId())){
//没有传企业ID，且不是最顶级部门，自动取上一节点的企业ID（如果有的话）
DeptDO parentDept = this.getDept(createReqVO.getParentId());
if(StringUtils.isNotEmpty(parentDept.getCorpId())){
createReqVO.setCorpId(parentDept.getCorpId());
}
}
// 插入部门
DeptDO dept = BeanUtils.toBean(createReqVO, DeptDO.class);
deptMapper.insert(dept);