Skip to content

Y
yd-csf
Commit bea3beae by zhangxingmin
Options

基本法相关接口

parent 05e2d04b
Showing with 2020 additions and 37 deletions
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiConditionConfigController.java 0 → 100644
package com.yd.csf.api.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result;
import com.yd.csf.api.service.ApiConditionConfigService;
import com.yd.csf.feign.client.conditionconfig.ApiConditionConfigFeignClient;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigAddRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigEditRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigPageRequest;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigDetailResponse;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigPageResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 条件配置信息
*
* @author zxm
* @since 2025-10-17
*/
@RestController
@RequestMapping("/conditionConfig")
@Validated
public class ApiConditionConfigController implements ApiConditionConfigFeignClient {
@Autowired
private ApiConditionConfigService apiConditionConfigService;
/**
* 分页查询-条件配置信息
* @param request
* @return
*/
@Override
public Result<IPage<ApiConditionConfigPageResponse>> page(ApiConditionConfigPageRequest request) {
return apiConditionConfigService.page(request);
}
/**
* 详情-条件配置信息
* @param conditionBizId
* @return
*/
@Override
public Result<ApiConditionConfigDetailResponse> detail(String conditionBizId) {
return apiConditionConfigService.detail(conditionBizId);
}
/**
* 添加-条件配置信息
* @param request
* @return
*/
@Override
public Result add(ApiConditionConfigAddRequest request) {
return apiConditionConfigService.add(request);
}
/**
* 编辑-条件配置信息
* @param request
* @return
*/
@Override
public Result edit(ApiConditionConfigEditRequest request) {
return apiConditionConfigService.edit(request);
}
/**
* 删除-条件配置信息 TODO
* @param conditionBizId
* @return
*/
@Override
public Result del(String conditionBizId) {
return apiConditionConfigService.del(conditionBizId);
}
}
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiConditionTypeController.java 0 → 100644
package com.yd.csf.api.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result;
import com.yd.csf.api.service.ApiConditionTypeService;
import com.yd.csf.feign.client.conditiontype.ApiConditionTypeFeignClient;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeAddRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeEditRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypePageRequest;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypeDetailResponse;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypePageResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 条件类型信息
*
* @author zxm
* @since 2025-10-20
*/
@RestController
@RequestMapping("/conditionType")
@Validated
public class ApiConditionTypeController implements ApiConditionTypeFeignClient {
@Autowired
private ApiConditionTypeService apiConditionTypeService;
/**
* 分页查询-条件类型信息
* @param request
* @return
*/
@Override
public Result<IPage<ApiConditionTypePageResponse>> page(ApiConditionTypePageRequest request) {
return apiConditionTypeService.page(request);
}
/**
* 详情-条件类型信息
* @param conditionTypeBizId
* @return
*/
@Override
public Result<ApiConditionTypeDetailResponse> detail(String conditionTypeBizId) {
return apiConditionTypeService.detail(conditionTypeBizId);
}
/**
* 添加-条件类型信息
* @param request
* @return
*/
@Override
public Result add(ApiConditionTypeAddRequest request) {
return apiConditionTypeService.add(request);
}
/**
* 编辑-条件类型信息
* @param request
* @return
*/
@Override
public Result edit(ApiConditionTypeEditRequest request) {
return apiConditionTypeService.edit(request);
}
/**
* 删除-条件类型信息 TODO
* @param conditionTypeBizId
* @return
*/
@Override
public Result del(String conditionTypeBizId) {
return apiConditionTypeService.del(conditionTypeBizId);
}
}
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiFormulaConfigController.java
package com.yd.csf.api.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result;
import com.yd.csf.api.service.ApiFormulaConfigService;
import com.yd.csf.feign.client.formulaconfig.ApiFormulaConfigFeignClient;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigAddRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigEditRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigPageRequest;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigDetailResponse;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigPageResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -16,4 +25,56 @@ import org.springframework.web.bind.annotation.RestController;
@Validated
public class ApiFormulaConfigController implements ApiFormulaConfigFeignClient {
@Autowired
private ApiFormulaConfigService apiFormulaConfigService;
/**
* 分页查询-公式配置信息
* @param request
* @return
*/
@Override
public Result<IPage<ApiFormulaConfigPageResponse>> page(ApiFormulaConfigPageRequest request) {
return apiFormulaConfigService.page(request);
}
/**
* 详情-公式配置信息
* @param formulaBizId
* @return
*/
@Override
public Result<ApiFormulaConfigDetailResponse> detail(String formulaBizId) {
return apiFormulaConfigService.detail(formulaBizId);
}
/**
* 添加-公式配置信息
* @param request
* @return
*/
@Override
public Result add(ApiFormulaConfigAddRequest request) {
return apiFormulaConfigService.add(request);
}
/**
* 编辑-公式配置信息
* @param request
* @return
*/
@Override
public Result edit(ApiFormulaConfigEditRequest request) {
return apiFormulaConfigService.edit(request);
}
/**
* 删除-公式配置信息 TODO
* @param formulaBizId
* @return
*/
@Override
public Result del(String formulaBizId) {
return apiFormulaConfigService.del(formulaBizId);
}
}
yd-csf-api/src/main/java/com/yd/csf/api/controller/ConditionConfigController.java deleted 100644 → 0
package com.yd.csf.api.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 条件配置表 前端控制器
* </p>
*
* @author zxm
* @since 2025-10-17
*/
@RestController
@RequestMapping("/conditionConfig")
public class ConditionConfigController {
}
yd-csf-api/src/main/java/com/yd/csf/api/service/ApiConditionConfigService.java 0 → 100644
package com.yd.csf.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigAddRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigEditRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigPageRequest;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigDetailResponse;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigPageResponse;
public interface ApiConditionConfigService {
Result<IPage<ApiConditionConfigPageResponse>> page(ApiConditionConfigPageRequest request);
Result<ApiConditionConfigDetailResponse> detail(String conditionBizId);
Result add(ApiConditionConfigAddRequest request);
Result edit(ApiConditionConfigEditRequest request);
Result del(String conditionBizId);
}
yd-csf-api/src/main/java/com/yd/csf/api/service/ApiConditionTypeService.java 0 → 100644
package com.yd.csf.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeAddRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeEditRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypePageRequest;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypeDetailResponse;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypePageResponse;
public interface ApiConditionTypeService {
Result<IPage<ApiConditionTypePageResponse>> page(ApiConditionTypePageRequest request);
Result<ApiConditionTypeDetailResponse> detail(String conditionTypeBizId);
Result add(ApiConditionTypeAddRequest request);
Result edit(ApiConditionTypeEditRequest request);
Result del(String conditionTypeBizId);
}
yd-csf-api/src/main/java/com/yd/csf/api/service/ApiFormulaConfigService.java 0 → 100644
package com.yd.csf.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigAddRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigEditRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigPageRequest;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigDetailResponse;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigPageResponse;
public interface ApiFormulaConfigService {
Result<IPage<ApiFormulaConfigPageResponse>> page(ApiFormulaConfigPageRequest request);
Result<ApiFormulaConfigDetailResponse> detail(String formulaBizId);
Result add(ApiFormulaConfigAddRequest request);
Result edit(ApiFormulaConfigEditRequest request);
Result del(String formulaBizId);
}
yd-csf-api/src/main/java/com/yd/csf/api/service/ApiRelObjectFormulaService.java
......@@ -11,4 +11,6 @@ public interface ApiRelObjectFormulaService {
Result<List<ApiFormulaConfigDto>> apiFormulaConfigDtoList(ApiRelObjectFormulaDto dto);
Result saveRelList(ApiRelObjectFormulaDto dto);
Result saveObjectList(List<ApiRelObjectFormulaDto> objectList,String formulaBizId);
}
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiConditionConfigServiceImpl.java 0 → 100644
package com.yd.csf.api.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.common.constant.CodeGeneratorConstants;
import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
import com.yd.common.utils.CodeGenerator;
import com.yd.common.utils.RandomStringGenerator;
import com.yd.csf.api.service.ApiConditionConfigService;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigAddRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigEditRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigPageRequest;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigDetailResponse;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigPageResponse;
import com.yd.csf.service.dto.ConditionConfigDto;
import com.yd.csf.service.model.ConditionConfig;
import com.yd.csf.service.model.ConditionType;
import com.yd.csf.service.service.IConditionConfigService;
import com.yd.csf.service.service.IConditionTypeService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
@Service
public class ApiConditionConfigServiceImpl implements ApiConditionConfigService {
@Autowired
private IConditionConfigService iConditionConfigService;
@Autowired
private IConditionTypeService iConditionTypeService;
/**
* 分页查询-条件配置信息
* @param request
* @return
*/
@Override
public Result<IPage<ApiConditionConfigPageResponse>> page(ApiConditionConfigPageRequest request) {
Page<ApiConditionConfigPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
IPage<ApiConditionConfigPageResponse> iPage = iConditionConfigService.page(page, request);
return Result.success(iPage);
}
/**
* 详情-条件配置信息
* @param conditionBizId
* @return
*/
@Override
public Result<ApiConditionConfigDetailResponse> detail(String conditionBizId) {
Result<ConditionConfig> result = checkConditionConfigIsExist(conditionBizId);
ConditionConfig conditionConfig = result.getData();
ApiConditionConfigDetailResponse response = new ApiConditionConfigDetailResponse();
BeanUtils.copyProperties(conditionConfig,response);
ConditionType conditionType = iConditionTypeService.queryOne(conditionConfig.getConditionTypeBizId());
if (!Objects.isNull(conditionType)) {
response.setConditionTypeName(conditionType.getName());
}
return Result.success(response);
}
/**
* 添加-条件配置信息
* @param request
* @return
*/
@Override
public Result add(ApiConditionConfigAddRequest request) {
//校验条件名称唯一性
List<ConditionConfig> conditionConfigList = iConditionConfigService.queryList(ConditionConfigDto.builder()
.name(request.getName())
.conditionTypeBizId(request.getConditionTypeBizId())
.build());
if (!CollectionUtils.isEmpty(conditionConfigList)) {
throw new BusinessException("同类型下条件名称已存在");
}
ConditionConfig conditionConfig = new ConditionConfig();
conditionConfig.setConditionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_CONDITION_CONFIG.getCode()));
//条件编码
conditionConfig.setCode(CodeGenerator.generate10Code(CodeGeneratorConstants.PREFIX_CONDITION_CODE));
iConditionConfigService.saveOrUpdate(conditionConfig);
return Result.success();
}
/**
* 编辑-条件配置信息
* @param request
* @return
*/
@Override
public Result edit(ApiConditionConfigEditRequest request) {
Result<ConditionConfig> result = checkConditionConfigIsExist(request.getConditionBizId());
ConditionConfig conditionConfig = result.getData();
//校验条件名称唯一性
List<ConditionConfig> conditionConfigList = iConditionConfigService.queryList(ConditionConfigDto.builder()
.name(request.getName())
.conditionTypeBizId(request.getConditionTypeBizId())
.isExcludeMy(true)
.conditionBizId(request.getConditionBizId())
.build());
if (!CollectionUtils.isEmpty(conditionConfigList)) {
throw new BusinessException("同类型下条件名称已存在");
}
iConditionConfigService.saveOrUpdate(conditionConfig);
return Result.success();
}
/**
* 删除-条件配置信息 TODO
* @param conditionBizId
* @return
*/
@Override
public Result del(String conditionBizId) {
return null;
}
/**
* 校验条件配置信息是否存在
* @param conditionBizId
* @return
*/
public Result<ConditionConfig> checkConditionConfigIsExist(String conditionBizId) {
ConditionConfig conditionConfig = iConditionConfigService.queryOne(conditionBizId);
if (Objects.isNull(conditionConfig)) {
//数据不存在
throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
}
return Result.success(conditionConfig);
}
}
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiConditionTypeServiceImpl.java 0 → 100644
package com.yd.csf.api.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.common.constant.CodeGeneratorConstants;
import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
import com.yd.common.utils.CodeGenerator;
import com.yd.common.utils.RandomStringGenerator;
import com.yd.csf.api.service.ApiConditionTypeService;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeAddRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeEditRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypePageRequest;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypeDetailResponse;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypePageResponse;
import com.yd.csf.service.dto.ConditionTypeDto;
import com.yd.csf.service.model.ConditionType;
import com.yd.csf.service.service.IConditionTypeService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
@Service
public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
@Autowired
private IConditionTypeService iConditionTypeService;
/**
* 分页查询-条件类型信息
* @param request
* @return
*/
@Override
public Result<IPage<ApiConditionTypePageResponse>> page(ApiConditionTypePageRequest request) {
Page<ApiConditionTypePageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
IPage<ApiConditionTypePageResponse> iPage = iConditionTypeService.page(page, request);
return Result.success(iPage);
}
/**
* 详情-条件类型信息
* @param conditionTypeBizId
* @return
*/
@Override
public Result<ApiConditionTypeDetailResponse> detail(String conditionTypeBizId) {
Result<ConditionType> result = checkConditionTypeIsExist(conditionTypeBizId);
ConditionType conditionType = result.getData();
ApiConditionTypeDetailResponse response = new ApiConditionTypeDetailResponse();
BeanUtils.copyProperties(conditionType,response);
return Result.success(response);
}
/**
* 添加-条件类型信息
* @param request
* @return
*/
@Override
public Result add(ApiConditionTypeAddRequest request) {
//校验条件类型名称唯一性
List<ConditionType> conditionTypeList = iConditionTypeService.queryList(ConditionTypeDto.builder()
.name(request.getName())
.build());
if (!CollectionUtils.isEmpty(conditionTypeList)) {
throw new BusinessException("条件类型名称已存在");
}
ConditionType conditionType = new ConditionType();
conditionType.setConditionTypeBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_CONDITION_TYPE.getCode()));
//编码
conditionType.setCode(CodeGenerator.generate10Code(CodeGeneratorConstants.PREFIX_CONDITION_TYPE_CODE));
iConditionTypeService.saveOrUpdate(conditionType);
return Result.success();
}
/**
* 编辑-条件类型信息
* @param request
* @return
*/
@Override
public Result edit(ApiConditionTypeEditRequest request) {
Result<ConditionType> result = checkConditionTypeIsExist(request.getConditionTypeBizId());
ConditionType conditionType = result.getData();
//校验条件类型名称唯一性
List<ConditionType> conditionTypeList = iConditionTypeService.queryList(ConditionTypeDto.builder()
.name(request.getName())
.isExcludeMy(true)
.conditionTypeBizId(request.getConditionTypeBizId())
.build());
if (!CollectionUtils.isEmpty(conditionTypeList)) {
throw new BusinessException("条件类型名称已存在");
}
iConditionTypeService.saveOrUpdate(conditionType);
return Result.success();
}
/**
* 删除-条件类型信息 TODO
* @param conditionTypeBizId
* @return
*/
@Override
public Result del(String conditionTypeBizId) {
return null;
}
/**
* 校验条件类型信息是否存在
* @param conditionTypeBizId
* @return
*/
public Result<ConditionType> checkConditionTypeIsExist(String conditionTypeBizId) {
ConditionType conditionType = iConditionTypeService.queryOne(conditionTypeBizId);
if (Objects.isNull(conditionType)) {
//数据不存在
throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
}
return Result.success(conditionType);
}
}
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiFormulaConfigServiceImpl.java 0 → 100644
package com.yd.csf.api.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.common.constant.CodeGeneratorConstants;
import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
import com.yd.common.utils.CodeGenerator;
import com.yd.common.utils.RandomStringGenerator;
import com.yd.csf.api.service.ApiFormulaConfigService;
import com.yd.csf.api.service.ApiRelObjectFormulaService;
import com.yd.csf.feign.dto.formulaconfig.ApiRelObjectFormulaDto;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigAddRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigEditRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigPageRequest;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigDetailResponse;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigPageResponse;
import com.yd.csf.service.dto.FormulaConfigDto;
import com.yd.csf.service.model.FormulaConfig;
import com.yd.csf.service.service.IFormulaConfigService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService {
@Autowired
private IFormulaConfigService iFormulaConfigService;
@Autowired
private ApiRelObjectFormulaService apiRelObjectFormulaService;
/**
* 分页查询-公式配置信息
* @param request
* @return
*/
@Override
public Result<IPage<ApiFormulaConfigPageResponse>> page(ApiFormulaConfigPageRequest request) {
Page<ApiFormulaConfigPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
IPage<ApiFormulaConfigPageResponse> iPage = iFormulaConfigService.page(page, request);
return Result.success(iPage);
}
/**
* 详情-公式配置信息
* @param formulaBizId
* @return
*/
@Override
public Result<ApiFormulaConfigDetailResponse> detail(String formulaBizId) {
Result<FormulaConfig> result = checkFormulaConfigIsExist(formulaBizId);
FormulaConfig formulaConfig = result.getData();
ApiFormulaConfigDetailResponse response = new ApiFormulaConfigDetailResponse();
BeanUtils.copyProperties(formulaConfig,response);
return Result.success(response);
}
/**
* 添加-公式配置信息
* @param request
* @return
*/
@Override
public Result add(ApiFormulaConfigAddRequest request) {
//校验公式名称唯一性
List<FormulaConfig> formulaConfigList = iFormulaConfigService.queryList(FormulaConfigDto.builder()
.name(request.getName())
.build());
if (!CollectionUtils.isEmpty(formulaConfigList)) {
throw new BusinessException("公式名称已存在");
}
FormulaConfig formulaConfig = new FormulaConfig();
BeanUtils.copyProperties(request,formulaConfig);
formulaConfig.setFormulaBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORMULA_CONFIG.getCode()));
//公式编码
formulaConfig.setCode(CodeGenerator.generate10Code(CodeGeneratorConstants.PREFIX_FORMULA_CODE));
iFormulaConfigService.saveOrUpdate(formulaConfig);
//保存变量对象列表和公式配置关系
apiRelObjectFormulaService.saveObjectList(buildApiRelObjectFormulaDtoList(request.getVariableBizIdList()),formulaConfig.getFormulaBizId());
return Result.success();
}
/**
* 编辑-公式配置信息
* @param request
* @return
*/
@Override
public Result edit(ApiFormulaConfigEditRequest request) {
Result<FormulaConfig> result = checkFormulaConfigIsExist(request.getFormulaBizId());
FormulaConfig formulaConfig = result.getData();
//校验公式名称唯一性
List<FormulaConfig> formulaConfigList = iFormulaConfigService.queryList(FormulaConfigDto.builder()
.name(request.getName())
.isExcludeMy(true)
.formulaBizId(request.getFormulaBizId())
.build());
if (!CollectionUtils.isEmpty(formulaConfigList)) {
throw new BusinessException("公式名称已存在");
}
BeanUtils.copyProperties(request,formulaConfig);
iFormulaConfigService.saveOrUpdate(formulaConfig);
//保存变量对象列表和公式配置关系
apiRelObjectFormulaService.saveObjectList(buildApiRelObjectFormulaDtoList(request.getVariableBizIdList()),formulaConfig.getFormulaBizId());
return Result.success();
}
/**
* 删除-公式配置信息 TODO
* @param formulaBizId
* @return
*/
@Override
public Result del(String formulaBizId) {
return null;
}
/**
* 构造变量对象列表
* @return
*/
public List<ApiRelObjectFormulaDto> buildApiRelObjectFormulaDtoList(List<String> variableBizIdList) {
List<ApiRelObjectFormulaDto> apiRelObjectFormulaDtoList = variableBizIdList.stream().map(variableBizId -> {
return ApiRelObjectFormulaDto.builder()
.objectBizId(variableBizId)
.objectName(CommonEnum.UID_TYPE_VARIABLE.getName())
.objectTableName(CommonEnum.UID_TYPE_VARIABLE.getCode())
.objectType(CommonEnum.UID_TYPE_VARIABLE.getCode())
.build();
}).collect(Collectors.toList());
return apiRelObjectFormulaDtoList;
}
/**
* 校验公式配置信息是否存在
* @param formulaBizId
* @return
*/
public Result<FormulaConfig> checkFormulaConfigIsExist(String formulaBizId) {
FormulaConfig formulaConfig = iFormulaConfigService.queryOne(formulaBizId);
if (Objects.isNull(formulaConfig)) {
//数据不存在
throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
}
return Result.success(formulaConfig);
}
}
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiRelObjectFormulaServiceImpl.java
......@@ -78,4 +78,28 @@ public class ApiRelObjectFormulaServiceImpl implements ApiRelObjectFormulaServic
}
return Result.success();
}
/**
* 保存对象列表和公式配置关系
* @param objectList
* @param formulaBizId
* @return
*/
@Override
public Result saveObjectList(List<ApiRelObjectFormulaDto> objectList, String formulaBizId) {
//先删后新增
iRelObjectFormulaService.delObjectList(formulaBizId);
//新增
if (!CollectionUtils.isEmpty(objectList)) {
List<RelObjectFormula> saveList = objectList.stream().map(dto -> {
RelObjectFormula relObjectFormula = new RelObjectFormula();
BeanUtils.copyProperties(dto,relObjectFormula);
relObjectFormula.setFormulaBizId(formulaBizId);
return relObjectFormula;
}).collect(Collectors.toList());
iRelObjectFormulaService.saveOrUpdateBatch(saveList);
}
return Result.success();
}
}
yd-csf-feign/src/main/java/com/yd/csf/feign/client/conditionconfig/ApiConditionConfigFeignClient.java 0 → 100644
package com.yd.csf.feign.client.conditionconfig;
import com.yd.common.result.Result;
import com.yd.csf.feign.fallback.conditionconfig.ApiConditionConfigFeignFallbackFactory;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigAddRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigEditRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigPageRequest;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigDetailResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
/**
* 香港保险服务-条件配置信息Feign客户端
*/
@FeignClient(name = "yd-csf-api", fallbackFactory = ApiConditionConfigFeignFallbackFactory.class)
public interface ApiConditionConfigFeignClient {
/**
* 分页查询-条件配置信息
* @param request
* @return
*/
@PostMapping("/page")
Result page(@RequestBody ApiConditionConfigPageRequest request);
/**
* 详情-条件配置信息
* @param conditionBizId
* @return
*/
@GetMapping("/detail")
Result<ApiConditionConfigDetailResponse> detail(@NotBlank(message = "条件配置信息表唯一业务ID不能为空不能为空") @RequestParam(value = "conditionBizId") String conditionBizId);
/**
* 添加-条件配置信息
* @param request
* @return
*/
@PostMapping("/add")
Result add(@Validated @RequestBody ApiConditionConfigAddRequest request);
/**
* 编辑-条件配置信息
* @param request
* @return
*/
@PutMapping("/edit")
Result edit(@Validated @RequestBody ApiConditionConfigEditRequest request);
/**
* 删除-条件配置信息 TODO
* @param conditionBizId
* @return
*/
@DeleteMapping("/del")
Result del(@NotBlank(message = "条件配置信息表唯一业务ID不能为空不能为空") @RequestParam(value = "conditionBizId") String conditionBizId);
}
yd-csf-feign/src/main/java/com/yd/csf/feign/client/conditiontype/ApiConditionTypeFeignClient.java 0 → 100644
package com.yd.csf.feign.client.conditiontype;
import com.yd.common.result.Result;
import com.yd.csf.feign.fallback.conditiontype.ApiConditionTypeFeignFallbackFactory;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeAddRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeEditRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypePageRequest;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypeDetailResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
/**
* 香港保险服务-条件类型信息Feign客户端
*/
@FeignClient(name = "yd-csf-api", fallbackFactory = ApiConditionTypeFeignFallbackFactory.class)
public interface ApiConditionTypeFeignClient {
/**
* 分页查询-条件类型信息
* @param request
* @return
*/
@PostMapping("/page")
Result page(@RequestBody ApiConditionTypePageRequest request);
/**
* 详情-条件类型信息
* @param conditionTypeBizId
* @return
*/
@GetMapping("/detail")
Result<ApiConditionTypeDetailResponse> detail(@NotBlank(message = "条件类型信息表唯一业务ID不能为空不能为空") @RequestParam(value = "conditionTypeBizId") String conditionTypeBizId);
/**
* 添加-条件类型信息
* @param request
* @return
*/
@PostMapping("/add")
Result add(@Validated @RequestBody ApiConditionTypeAddRequest request);
/**
* 编辑-条件类型信息
* @param request
* @return
*/
@PutMapping("/edit")
Result edit(@Validated @RequestBody ApiConditionTypeEditRequest request);
/**
* 删除-条件类型信息 TODO
* @param conditionTypeBizId
* @return
*/
@DeleteMapping("/del")
Result del(@NotBlank(message = "条件类型信息表唯一业务ID不能为空不能为空") @RequestParam(value = "conditionTypeBizId") String conditionTypeBizId);
}
yd-csf-feign/src/main/java/com/yd/csf/feign/client/formulaconfig/ApiFormulaConfigFeignClient.java
package com.yd.csf.feign.client.formulaconfig;
import com.yd.common.result.Result;
import com.yd.csf.feign.fallback.formulaconfig.ApiFormulaConfigFeignFallbackFactory;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigAddRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigEditRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigPageRequest;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigDetailResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
/**
* 香港保险服务-公式配置信息Feign客户端
......@@ -9,4 +17,43 @@ import org.springframework.cloud.openfeign.FeignClient;
@FeignClient(name = "yd-csf-api", fallbackFactory = ApiFormulaConfigFeignFallbackFactory.class)
public interface ApiFormulaConfigFeignClient {
/**
* 分页查询-公式配置信息
* @param request
* @return
*/
@PostMapping("/page")
Result page(@RequestBody ApiFormulaConfigPageRequest request);
/**
* 详情-公式配置信息
* @param formulaBizId
* @return
*/
@GetMapping("/detail")
Result<ApiFormulaConfigDetailResponse> detail(@NotBlank(message = "公式配置信息表唯一业务ID不能为空不能为空") @RequestParam(value = "formulaBizId") String formulaBizId);
/**
* 添加-公式配置信息
* @param request
* @return
*/
@PostMapping("/add")
Result add(@Validated @RequestBody ApiFormulaConfigAddRequest request);
/**
* 编辑-公式配置信息
* @param request
* @return
*/
@PutMapping("/edit")
Result edit(@Validated @RequestBody ApiFormulaConfigEditRequest request);
/**
* 删除-公式配置信息 TODO
* @param formulaBizId
* @return
*/
@DeleteMapping("/del")
Result del(@NotBlank(message = "公式配置信息表唯一业务ID不能为空不能为空") @RequestParam(value = "formulaBizId") String formulaBizId);
}
yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/conditionconfig/ApiConditionConfigFeignFallbackFactory.java 0 → 100644
package com.yd.csf.feign.fallback.conditionconfig;
import com.yd.common.result.Result;
import com.yd.csf.feign.client.conditionconfig.ApiConditionConfigFeignClient;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigAddRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigEditRequest;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigPageRequest;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigDetailResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
/**
* 香港保险服务-条件配置信息Feign降级处理
*/
@Slf4j
@Component
public class ApiConditionConfigFeignFallbackFactory implements FallbackFactory<ApiConditionConfigFeignClient> {
@Override
public ApiConditionConfigFeignClient create(Throwable cause) {
return new ApiConditionConfigFeignClient() {
@Override
public Result page(ApiConditionConfigPageRequest request) {
return null;
}
@Override
public Result<ApiConditionConfigDetailResponse> detail(String conditionBizId) {
return null;
}
@Override
public Result add(ApiConditionConfigAddRequest request) {
return null;
}
@Override
public Result edit(ApiConditionConfigEditRequest request) {
return null;
}
@Override
public Result del( String conditionBizId) {
return null;
}
};
}
}
yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/conditiontype/ApiConditionTypeFeignFallbackFactory.java 0 → 100644
package com.yd.csf.feign.fallback.conditiontype;
import com.yd.common.result.Result;
import com.yd.csf.feign.client.conditiontype.ApiConditionTypeFeignClient;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeAddRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypeEditRequest;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypePageRequest;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypeDetailResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
/**
* 香港保险服务-条件类型信息Feign降级处理
*/
@Slf4j
@Component
public class ApiConditionTypeFeignFallbackFactory implements FallbackFactory<ApiConditionTypeFeignClient> {
@Override
public ApiConditionTypeFeignClient create(Throwable cause) {
return new ApiConditionTypeFeignClient() {
@Override
public Result page(ApiConditionTypePageRequest request) {
return null;
}
@Override
public Result<ApiConditionTypeDetailResponse> detail(String conditionTypeBizId) {
return null;
}
@Override
public Result add(ApiConditionTypeAddRequest request) {
return null;
}
@Override
public Result edit(ApiConditionTypeEditRequest request) {
return null;
}
@Override
public Result del(String conditionTypeBizId) {
return null;
}
};
}
}
yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/formulaconfig/ApiFormulaConfigFeignFallbackFactory.java
package com.yd.csf.feign.fallback.formulaconfig;
import com.yd.common.result.Result;
import com.yd.csf.feign.client.formulaconfig.ApiFormulaConfigFeignClient;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigAddRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigEditRequest;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigPageRequest;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigDetailResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import javax.validation.constraints.NotBlank;
/**
* 香港保险服务-受益人信息Feign降级处理
* 香港保险服务-公式配置信息Feign降级处理
*/
@Slf4j
@Component
......@@ -14,6 +21,31 @@ public class ApiFormulaConfigFeignFallbackFactory implements FallbackFactory<Api
@Override
public ApiFormulaConfigFeignClient create(Throwable cause) {
return new ApiFormulaConfigFeignClient() {
@Override
public Result page(ApiFormulaConfigPageRequest request) {
return null;
}
@Override
public Result<ApiFormulaConfigDetailResponse> detail(String formulaBizId) {
return null;
}
@Override
public Result add(ApiFormulaConfigAddRequest request) {
return null;
}
@Override
public Result edit(ApiFormulaConfigEditRequest request) {
return null;
}
@Override
public Result del(String formulaBizId) {
return null;
}
};
}
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/conditionconfig/ApiConditionConfigAddRequest.java 0 → 100644
package com.yd.csf.feign.request.conditionconfig;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@Data
public class ApiConditionConfigAddRequest {
/**
* 条件类型表唯一业务ID
*/
@NotBlank(message = "条件类型表唯一业务ID不能为空")
private String conditionTypeBizId;
/**
* 条件名称
*/
@NotBlank(message = "条件名称不能为空")
private String name;
/**
* 条件描述
*/
private String description;
/**
* 最小值（在范围条件中表示最小值）
*/
private BigDecimal minValue;
/**
* 最大值（在范围条件中表示最大值）
*/
private BigDecimal maxValue;
/**
* 是否包含最小值（是否包含最小值，1表示包含，0表示不包含）
*/
private Integer includeMin;
/**
* 是否包含最大值（是否包含最大值，1表示包含，0表示不包含）
*/
private Integer includeMax;
/**
* 条件值（范围内的值，比例值）
*/
private String conditionalValue;
/**
* 优先级（数字越小优先级越高）
*/
private Integer priority;
/**
* 显示顺序
*/
private Integer displayOrder;
/**
* 状态(0:停用 1:启用)
*/
@NotNull(message = "状态不能为空")
private Integer status;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/conditionconfig/ApiConditionConfigEditRequest.java 0 → 100644
package com.yd.csf.feign.request.conditionconfig;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@Data
public class ApiConditionConfigEditRequest {
/**
* 条件配置表唯一业务ID
*/
@NotBlank(message = "条件配置表唯一业务ID不能为空")
private String conditionBizId;
/**
* 条件类型表唯一业务ID
*/
@NotBlank(message = "条件类型表唯一业务ID不能为空")
private String conditionTypeBizId;
/**
* 条件名称
*/
@NotBlank(message = "条件名称不能为空")
private String name;
/**
* 条件描述
*/
private String description;
/**
* 最小值（在范围条件中表示最小值）
*/
private BigDecimal minValue;
/**
* 最大值（在范围条件中表示最大值）
*/
private BigDecimal maxValue;
/**
* 是否包含最小值（是否包含最小值，1表示包含，0表示不包含）
*/
private Integer includeMin;
/**
* 是否包含最大值（是否包含最大值，1表示包含，0表示不包含）
*/
private Integer includeMax;
/**
* 条件值（范围内的值，比例值）
*/
private String conditionalValue;
/**
* 优先级（数字越小优先级越高）
*/
private Integer priority;
/**
* 显示顺序
*/
private Integer displayOrder;
/**
* 状态(0:停用 1:启用)
*/
@NotNull(message = "状态不能为空")
private Integer status;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/conditionconfig/ApiConditionConfigPageRequest.java 0 → 100644
package com.yd.csf.feign.request.conditionconfig;
import com.yd.common.dto.PageDto;
import lombok.Data;
@Data
public class ApiConditionConfigPageRequest extends PageDto {
/**
* 条件名称
*/
private String name;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/conditiontype/ApiConditionTypeAddRequest.java 0 → 100644
package com.yd.csf.feign.request.conditiontype;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class ApiConditionTypeAddRequest {
/**
* 条件类型名称
*/
@NotBlank(message = "条件类型名称不能为空")
private String name;
/**
* 状态(0:停用 1:启用)
*/
@NotNull(message = "状态不能为空")
private Integer status;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/conditiontype/ApiConditionTypeEditRequest.java 0 → 100644
package com.yd.csf.feign.request.conditiontype;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class ApiConditionTypeEditRequest {
/**
* 条件类型表唯一业务ID
*/
@NotBlank(message = "条件类型表唯一业务ID不能为空")
private String conditionTypeBizId;
/**
* 条件类型名称
*/
@NotBlank(message = "条件类型名称不能为空")
private String name;
/**
* 状态(0:停用 1:启用)
*/
@NotNull(message = "状态不能为空")
private Integer status;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/conditiontype/ApiConditionTypePageRequest.java 0 → 100644
package com.yd.csf.feign.request.conditiontype;
import com.yd.common.dto.PageDto;
import lombok.Data;
@Data
public class ApiConditionTypePageRequest extends PageDto {
/**
* 条件类型名称
*/
private String name;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/formulaconfig/ApiFormulaConfigAddRequest.java 0 → 100644
package com.yd.csf.feign.request.formulaconfig;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class ApiFormulaConfigAddRequest {
/**
* 公式名称
*/
@NotBlank(message = "公式名称不能为空")
private String name;
/**
* 计算公式（变量中文名称组合，用于展示）
*/
@NotBlank(message = "计算公式（变量中文名称组合，用于展示）不能为空")
private String calculationFormulaCn;
/**
* 计算公式（变量表唯一业务ID组合）
*/
@NotBlank(message = "计算公式（变量表唯一业务ID组合）不能为空")
private String calculationFormulaBizId;
/**
* 变量表唯一业务ID列表
*/
@NotEmpty(message = "变量表唯一业务ID列表不能为空")
private List<String> variableBizIdList;
/**
* 描述
*/
private String description;
/**
* 显示顺序
*/
private Integer displayOrder;
/**
* 状态(0:停用 1:启用)
*/
@NotNull(message = "状态不能为空")
private Integer status;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/formulaconfig/ApiFormulaConfigEditRequest.java 0 → 100644
package com.yd.csf.feign.request.formulaconfig;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class ApiFormulaConfigEditRequest {
/**
* 公式配置表唯一业务ID
*/
@NotBlank(message = "公式配置表唯一业务ID不能为空")
private String formulaBizId;
/**
* 公式名称
*/
@NotBlank(message = "公式名称不能为空")
private String name;
/**
* 计算公式（变量中文名称组合，用于展示）
*/
@NotBlank(message = "计算公式（变量中文名称组合，用于展示）不能为空")
private String calculationFormulaCn;
/**
* 计算公式（变量表唯一业务ID组合）
*/
@NotBlank(message = "计算公式（变量表唯一业务ID组合）不能为空")
private String calculationFormulaBizId;
/**
* 变量表唯一业务ID列表
*/
@NotEmpty(message = "变量表唯一业务ID列表不能为空")
private List<String> variableBizIdList;
/**
* 描述
*/
private String description;
/**
* 显示顺序
*/
private Integer displayOrder;
/**
* 状态(0:停用 1:启用)
*/
@NotNull(message = "状态不能为空")
private Integer status;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/formulaconfig/ApiFormulaConfigPageRequest.java 0 → 100644
package com.yd.csf.feign.request.formulaconfig;
import com.yd.common.dto.PageDto;
import lombok.Data;
@Data
public class ApiFormulaConfigPageRequest extends PageDto {
/**
* 公式名称
*/
private String name;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/response/conditionconfig/ApiConditionConfigDetailResponse.java 0 → 100644
package com.yd.csf.feign.response.conditionconfig;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class ApiConditionConfigDetailResponse {
/**
* 主键ID
*/
private Long id;
/**
* 条件配置表唯一业务ID
*/
private String conditionBizId;
/**
* 条件类型表唯一业务ID
*/
private String conditionTypeBizId;
/**
* 条件类型名称
*/
private String conditionTypeName;
/**
* 条件编码
*/
private String code;
/**
* 条件名称
*/
private String name;
/**
* 条件描述
*/
private String description;
/**
* 最小值（在范围条件中表示最小值）
*/
private BigDecimal minValue;
/**
* 最大值（在范围条件中表示最大值）
*/
private BigDecimal maxValue;
/**
* 是否包含最小值（是否包含最小值，1表示包含，0表示不包含）
*/
private Integer includeMin;
/**
* 是否包含最大值（是否包含最大值，1表示包含，0表示不包含）
*/
private Integer includeMax;
/**
* 条件值（范围内的值）
*/
private String conditionalValue;
/**
* 优先级（数字越小优先级越高）
*/
private Integer priority;
/**
* 显示顺序
*/
private Integer displayOrder;
/**
* 状态(0:停用 1:启用)
*/
private Integer status;
/**
* 通用备注
*/
private String remark;
/**
* 删除标识: 0-正常, 1-删除
*/
private Integer isDeleted;
/**
* 创建人ID
*/
private String creatorId;
/**
* 更新人ID
*/
private String updaterId;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新时间
*/
private LocalDateTime updateTime;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/response/conditionconfig/ApiConditionConfigPageResponse.java 0 → 100644
package com.yd.csf.feign.response.conditionconfig;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class ApiConditionConfigPageResponse {
/**
* 主键ID
*/
private Long id;
/**
* 条件配置表唯一业务ID
*/
private String conditionBizId;
/**
* 条件类型表唯一业务ID
*/
private String conditionTypeBizId;
/**
* 条件类型名称
*/
private String conditionTypeName;
/**
* 条件编码
*/
private String code;
/**
* 条件名称
*/
private String name;
/**
* 最小值（在范围条件中表示最小值）
*/
private BigDecimal minValue;
/**
* 最大值（在范围条件中表示最大值）
*/
private BigDecimal maxValue;
/**
* 是否包含最小值（是否包含最小值，1表示包含，0表示不包含）
*/
private Integer includeMin;
/**
* 是否包含最大值（是否包含最大值，1表示包含，0表示不包含）
*/
private Integer includeMax;
/**
* 条件值（范围内的值）
*/
private String conditionalValue;
/**
* 优先级（数字越小优先级越高）
*/
private Integer priority;
/**
* 显示顺序
*/
private Integer displayOrder;
/**
* 状态(0:停用 1:启用)
*/
private Integer status;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新时间
*/
private LocalDateTime updateTime;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/response/conditiontype/ApiConditionTypeDetailResponse.java 0 → 100644
package com.yd.csf.feign.response.conditiontype;
import lombok.Data;
@Data
public class ApiConditionTypeDetailResponse {
}
yd-csf-feign/src/main/java/com/yd/csf/feign/response/conditiontype/ApiConditionTypePageResponse.java 0 → 100644
package com.yd.csf.feign.response.conditiontype;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class ApiConditionTypePageResponse {
/**
* 主键ID
*/
private Long id;
/**
* 条件类型表唯一业务ID
*/
private String conditionTypeBizId;
/**
* 条件类型编码（一个条件类型编码可能包含多个条件）
*/
private String code;
/**
* 条件类型名称
*/
private String name;
/**
* 状态(0:停用 1:启用)
*/
private Integer status;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新时间
*/
private LocalDateTime updateTime;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/response/formulaconfig/ApiFormulaConfigDetailResponse.java 0 → 100644
package com.yd.csf.feign.response.formulaconfig;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class ApiFormulaConfigDetailResponse {
/**
* 主键ID
*/
private Long id;
/**
* 公式配置表唯一业务ID
*/
private String formulaBizId;
/**
* 公式编码
*/
private String code;
/**
* 公式名称
*/
private String name;
/**
* 计算公式（变量中文名称组合，用于展示）
*/
private String calculationFormulaCn;
/**
* 计算公式（变量表唯一业务ID组合）
*/
private String calculationFormulaBizId;
/**
* 描述
*/
private String description;
/**
* 显示顺序
*/
private Integer displayOrder;
/**
* 状态(0:停用 1:启用)
*/
private Integer status;
/**
* 通用备注
*/
private String remark;
/**
* 删除标识: 0-正常, 1-删除
*/
private Integer isDeleted;
/**
* 创建人ID
*/
private String creatorId;
/**
* 更新人ID
*/
private String updaterId;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新时间
*/
private LocalDateTime updateTime;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/response/formulaconfig/ApiFormulaConfigPageResponse.java 0 → 100644
package com.yd.csf.feign.response.formulaconfig;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class ApiFormulaConfigPageResponse {
/**
* 主键ID
*/
private Long id;
/**
* 公式配置表唯一业务ID
*/
private String formulaBizId;
/**
* 公式编码
*/
private String code;
/**
* 公式名称
*/
private String name;
/**
* 计算公式（变量中文名称组合，用于展示）
*/
private String calculationFormulaCn;
/**
* 状态(0:停用 1:启用)
*/
private Integer status;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新时间
*/
private LocalDateTime updateTime;
}
yd-csf-service/src/main/java/com/yd/csf/service/dao/ConditionConfigMapper.java
package com.yd.csf.service.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigPageRequest;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigPageResponse;
import com.yd.csf.service.model.ConditionConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* <p>
......@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ConditionConfigMapper extends BaseMapper<ConditionConfig> {
IPage<ApiConditionConfigPageResponse> page(@Param("page") Page<ApiConditionConfigPageResponse> page,
@Param("request") ApiConditionConfigPageRequest request);
}
yd-csf-service/src/main/java/com/yd/csf/service/dao/ConditionTypeMapper.java
package com.yd.csf.service.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypePageRequest;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypePageResponse;
import com.yd.csf.service.model.ConditionType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* <p>
......@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ConditionTypeMapper extends BaseMapper<ConditionType> {
IPage<ApiConditionTypePageResponse> page(@Param("page") Page<ApiConditionTypePageResponse> page,
@Param("request") ApiConditionTypePageRequest request);
}
yd-csf-service/src/main/java/com/yd/csf/service/dao/FormulaConfigMapper.java
package com.yd.csf.service.dao;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigPageRequest;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigPageResponse;
import com.yd.csf.service.model.FormulaConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* <p>
......@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface FormulaConfigMapper extends BaseMapper<FormulaConfig> {
IPage<ApiFormulaConfigPageResponse> page(@Param("page") Page<ApiFormulaConfigPageResponse> page,
@Param("request") ApiFormulaConfigPageRequest request);
}
yd-csf-service/src/main/java/com/yd/csf/service/dto/ConditionConfigDto.java 0 → 100644
package com.yd.csf.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ConditionConfigDto {
/**
* 条件配置表唯一业务ID
*/
private String conditionBizId;
/**
* 条件类型表唯一业务ID
*/
private String conditionTypeBizId;
/**
* 条件名称
*/
private String name;
/**
* 查询是否排除当前
*/
@Builder.Default
private Boolean isExcludeMy = false;
}
yd-csf-service/src/main/java/com/yd/csf/service/dto/ConditionTypeDto.java
package com.yd.csf.service.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
......@@ -17,4 +17,20 @@ public class ConditionTypeDto {
* 条件类型表唯一业务ID列表
*/
private List<String> conditionTypeBizIdList;
/**
* 条件类型表唯一业务ID
*/
private String conditionTypeBizId;
/**
* 条件类型名称
*/
private String name;
/**
* 查询是否排除当前
*/
@Builder.Default
private Boolean isExcludeMy = false;
}
yd-csf-service/src/main/java/com/yd/csf/service/dto/FormulaConfigDto.java
......@@ -21,4 +21,15 @@ public class FormulaConfigDto {
* 公式配置表唯一业务ID集合
*/
private List<String> formulaBizIdList;
/**
* 公式名称
*/
private String name;
/**
* 查询是否排除当前
*/
@Builder.Default
private Boolean isExcludeMy = false;
}
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionRuleBinding.java
......@@ -94,7 +94,7 @@ public class CommissionRuleBinding implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionRuleConfig.java
......@@ -100,7 +100,7 @@ public class CommissionRuleConfig implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionSqlTemplate.java
......@@ -106,7 +106,7 @@ public class CommissionSqlTemplate implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ConditionConfig.java
......@@ -77,16 +77,16 @@ public class ConditionConfig implements Serializable {
* 是否包含最小值（是否包含最小值，1表示包含，0表示不包含）
*/
@TableField("include_min")
private Boolean includeMin;
private Integer includeMin;
/**
* 是否包含最大值（是否包含最大值，1表示包含，0表示不包含）
*/
@TableField("include_max")
private Boolean includeMax;
private Integer includeMax;
/**
* 条件值（范围内的值）
* 条件值（范围内的值，比例值）
*/
@TableField("conditional_value")
private String conditionalValue;
......@@ -107,7 +107,7 @@ public class ConditionConfig implements Serializable {
* 状态(0:停用 1:启用)
*/
@TableField("status")
private Byte status;
private Integer status;
/**
* 所属租户唯一业务ID（冗余）
......@@ -131,7 +131,7 @@ public class ConditionConfig implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ConditionType.java
......@@ -52,7 +52,7 @@ public class ConditionType implements Serializable {
* 状态(0:停用 1:启用)
*/
@TableField("status")
private Byte status;
private Integer status;
/**
* 所属租户唯一业务ID（冗余）
......@@ -76,7 +76,7 @@ public class ConditionType implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/FormulaConfig.java
......@@ -100,7 +100,7 @@ public class FormulaConfig implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/RelObjectCondition.java
......@@ -88,7 +88,7 @@ public class RelObjectCondition implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/RelObjectFormula.java
......@@ -82,7 +82,7 @@ public class RelObjectFormula implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/RelObjectSql.java
......@@ -82,7 +82,7 @@ public class RelObjectSql implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/RuleItemConfig.java
......@@ -100,7 +100,7 @@ public class RuleItemConfig implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Variable.java
......@@ -94,7 +94,7 @@ public class Variable implements Serializable {
* 删除标识: 0-正常, 1-删除
*/
@TableField("is_deleted")
private Boolean isDeleted;
private Integer isDeleted;
/**
* 创建人ID
......
yd-csf-service/src/main/java/com/yd/csf/service/service/IConditionConfigService.java
package com.yd.csf.service.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigPageRequest;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigPageResponse;
import com.yd.csf.service.dto.ConditionConfigDto;
import com.yd.csf.service.model.ConditionConfig;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 条件配置表 服务类
......@@ -13,4 +20,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IConditionConfigService extends IService<ConditionConfig> {
IPage<ApiConditionConfigPageResponse> page(Page<ApiConditionConfigPageResponse> page,
ApiConditionConfigPageRequest request);
ConditionConfig queryOne(String conditionBizId);
List<ConditionConfig> queryList(ConditionConfigDto dto);
}
yd-csf-service/src/main/java/com/yd/csf/service/service/IConditionTypeService.java
package com.yd.csf.service.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypePageRequest;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypePageResponse;
import com.yd.csf.service.dto.ConditionTypeDto;
import com.yd.csf.service.model.ConditionType;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -17,4 +21,9 @@ import java.util.List;
public interface IConditionTypeService extends IService<ConditionType> {
List<ConditionType> queryList(ConditionTypeDto dto);
ConditionType queryOne(String conditionTypeBizId);
IPage<ApiConditionTypePageResponse> page(Page<ApiConditionTypePageResponse> page,
ApiConditionTypePageRequest request);
}
yd-csf-service/src/main/java/com/yd/csf/service/service/IFormulaConfigService.java
package com.yd.csf.service.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigPageRequest;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigPageResponse;
import com.yd.csf.service.dto.FormulaConfigDto;
import com.yd.csf.service.model.FormulaConfig;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -16,5 +20,10 @@ import java.util.List;
*/
public interface IFormulaConfigService extends IService<FormulaConfig> {
IPage<ApiFormulaConfigPageResponse> page(Page<ApiFormulaConfigPageResponse> page,
ApiFormulaConfigPageRequest request);
List<FormulaConfig> queryList(FormulaConfigDto dto);
FormulaConfig queryOne(String formulaBizId);
}
yd-csf-service/src/main/java/com/yd/csf/service/service/IRelObjectFormulaService.java
......@@ -18,4 +18,6 @@ public interface IRelObjectFormulaService extends IService<RelObjectFormula> {
List<RelObjectFormula> queryList(RelObjectFormulaDto dto);
Boolean del(RelObjectFormulaDto dto);
Boolean delObjectList(String formulaBizId);
}
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/ConditionConfigServiceImpl.java
package com.yd.csf.service.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.conditionconfig.ApiConditionConfigPageRequest;
import com.yd.csf.feign.response.conditionconfig.ApiConditionConfigPageResponse;
import com.yd.csf.service.dto.ConditionConfigDto;
import com.yd.csf.service.model.ConditionConfig;
import com.yd.csf.service.dao.ConditionConfigMapper;
import com.yd.csf.service.model.FormulaConfig;
import com.yd.csf.service.service.IConditionConfigService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
/**
* <p>
......@@ -17,4 +28,35 @@ import org.springframework.stereotype.Service;
@Service
public class ConditionConfigServiceImpl extends ServiceImpl<ConditionConfigMapper, ConditionConfig> implements IConditionConfigService {
@Override
public IPage<ApiConditionConfigPageResponse> page(Page<ApiConditionConfigPageResponse> page,
ApiConditionConfigPageRequest request) {
return baseMapper.page(page,request);
}
/**
* 查询单个对象
* @param conditionBizId
* @return
*/
@Override
public ConditionConfig queryOne(String conditionBizId) {
return this.getOne(new LambdaQueryWrapper<ConditionConfig>().eq(ConditionConfig::getConditionBizId,conditionBizId));
}
/**
* 查询列表
* @param dto
* @return
*/
@Override
public List<ConditionConfig> queryList(ConditionConfigDto dto) {
List<ConditionConfig> list = baseMapper.selectList(new LambdaQueryWrapper<ConditionConfig>()
.eq(StringUtils.isNotBlank(dto.getConditionTypeBizId()),ConditionConfig::getConditionTypeBizId,dto.getConditionTypeBizId())
.eq(StringUtils.isNotBlank(dto.getConditionBizId()) && !dto.getIsExcludeMy(), ConditionConfig::getConditionBizId,dto.getConditionBizId())
.eq(StringUtils.isNotBlank(dto.getName()),ConditionConfig::getName,dto.getName())
.ne(dto.getIsExcludeMy(),ConditionConfig::getConditionBizId,dto.getConditionBizId())
);
return list;
}
}
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/ConditionTypeServiceImpl.java
package com.yd.csf.service.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.conditiontype.ApiConditionTypePageRequest;
import com.yd.csf.feign.response.conditiontype.ApiConditionTypePageResponse;
import com.yd.csf.service.dto.ConditionTypeDto;
import com.yd.csf.service.model.ConditionConfig;
import com.yd.csf.service.model.ConditionType;
import com.yd.csf.service.dao.ConditionTypeMapper;
import com.yd.csf.service.model.FormulaConfig;
import com.yd.csf.service.service.IConditionTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
......@@ -31,8 +37,27 @@ public class ConditionTypeServiceImpl extends ServiceImpl<ConditionTypeMapper, C
@Override
public List<ConditionType> queryList(ConditionTypeDto dto) {
List<ConditionType> list = baseMapper.selectList(new LambdaQueryWrapper<ConditionType>()
.eq(StringUtils.isNotBlank(dto.getConditionTypeBizId()) && !dto.getIsExcludeMy(), ConditionType::getConditionTypeBizId,dto.getConditionTypeBizId())
.eq(StringUtils.isNotBlank(dto.getName()),ConditionType::getName,dto.getName())
.ne(dto.getIsExcludeMy(),ConditionType::getConditionTypeBizId,dto.getConditionTypeBizId())
.in(!CollectionUtils.isEmpty(dto.getConditionTypeBizIdList()),ConditionType::getConditionTypeBizId,dto.getConditionTypeBizIdList())
);
return list;
}
/**
* 查询单个对象
* @param conditionTypeBizId
* @return
*/
@Override
public ConditionType queryOne(String conditionTypeBizId) {
return this.getOne(new LambdaQueryWrapper<ConditionType>().eq(ConditionType::getConditionTypeBizId,conditionTypeBizId));
}
@Override
public IPage<ApiConditionTypePageResponse> page(Page<ApiConditionTypePageResponse> page,
ApiConditionTypePageRequest request) {
return baseMapper.page(page,request);
}
}
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FormulaConfigServiceImpl.java
package com.yd.csf.service.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.formulaconfig.ApiFormulaConfigPageRequest;
import com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigPageResponse;
import com.yd.csf.service.dto.FormulaConfigDto;
import com.yd.csf.service.model.FormulaConfig;
import com.yd.csf.service.dao.FormulaConfigMapper;
import com.yd.csf.service.model.RuleItemConfig;
import com.yd.csf.service.model.Variable;
import com.yd.csf.service.service.IFormulaConfigService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
......@@ -24,6 +29,12 @@ import java.util.List;
@Service
public class FormulaConfigServiceImpl extends ServiceImpl<FormulaConfigMapper, FormulaConfig> implements IFormulaConfigService {
@Override
public IPage<ApiFormulaConfigPageResponse> page(Page<ApiFormulaConfigPageResponse> page,
ApiFormulaConfigPageRequest request) {
return baseMapper.page(page,request);
}
/**
* 查询列表
* @param dto
......@@ -33,8 +44,21 @@ public class FormulaConfigServiceImpl extends ServiceImpl<FormulaConfigMapper, F
public List<FormulaConfig> queryList(FormulaConfigDto dto) {
List<FormulaConfig> list = baseMapper.selectList(new LambdaQueryWrapper<FormulaConfig>()
.in(!CollectionUtils.isEmpty(dto.getFormulaBizIdList()),FormulaConfig::getFormulaBizId,dto.getFormulaBizIdList())
.eq(StringUtils.isNotBlank(dto.getFormulaBizId()) && !dto.getIsExcludeMy(), FormulaConfig::getFormulaBizId,dto.getFormulaBizId())
.eq(StringUtils.isNotBlank(dto.getName()),FormulaConfig::getName,dto.getName())
.ne(dto.getIsExcludeMy(),FormulaConfig::getFormulaBizId,dto.getFormulaBizId())
);
return list;
}
/**
* 查询单个对象
* @param formulaBizId
* @return
*/
@Override
public FormulaConfig queryOne(String formulaBizId) {
return this.getOne(new LambdaQueryWrapper<FormulaConfig>().eq(FormulaConfig::getFormulaBizId,formulaBizId));
}
}
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/RelObjectFormulaServiceImpl.java
......@@ -44,4 +44,14 @@ public class RelObjectFormulaServiceImpl extends ServiceImpl<RelObjectFormulaMap
return this.remove(new LambdaQueryWrapper<RelObjectFormula>().eq(RelObjectFormula::getObjectBizId,dto.getObjectBizId()));
}
/**
* 根据公式ID删除对象列表
* @param formulaBizId
* @return
*/
@Override
public Boolean delObjectList(String formulaBizId) {
return this.remove(new LambdaQueryWrapper<RelObjectFormula>().eq(RelObjectFormula::getFormulaBizId,formulaBizId));
}
}
yd-csf-service/src/main/java/com/yd/csf/service/utils/MyBatisPlusCodeGenerator.java
......@@ -21,7 +21,7 @@ public class MyBatisPlusCodeGenerator {
})
.strategyConfig(builder -> {
builder.addInclude(
"formula_config"
"condition_type"
)
.entityBuilder()
......
yd-csf-service/src/main/resources/mappers/ConditionConfigMapper.xml
......@@ -2,4 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yd.csf.service.dao.ConditionConfigMapper">
<select id="page" resultType="com.yd.csf.feign.response.conditionconfig.ApiConditionConfigPageResponse">
select cc.*,ct.name as conditionTypeName from condition_config cc
left join condition_type ct on cc.condition_type_biz_id = ct.condition_type_biz_id and ct.is_deleted = 0
<where>
<if test="request.name != null and request.name != ''">
and cc.name like concat('%', #{request.name}, '%')
</if>
and cc.is_deleted = 0
</where>
</select>
</mapper>
yd-csf-service/src/main/resources/mappers/ConditionTypeMapper.xml
......@@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yd.csf.service.dao.ConditionTypeMapper">
<select id="page" resultType="com.yd.csf.feign.response.conditiontype.ApiConditionTypePageResponse">
select * from condition_type ct
<where>
<if test="request.name != null and request.name != ''">
and ct.name like concat('%', #{request.name}, '%')
</if>
and ct.is_deleted = 0
</where>
</select>
</mapper>
yd-csf-service/src/main/resources/mappers/FormulaConfigMapper.xml
......@@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yd.csf.service.dao.FormulaConfigMapper">
<select id="page" resultType="com.yd.csf.feign.response.formulaconfig.ApiFormulaConfigPageResponse">
select * from formula_config fc
<where>
<if test="request.name != null and request.name != ''">
and fc.name like concat('%', #{request.name}, '%')
</if>
and fc.is_deleted = 0
</where>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment