|
@@ -22,6 +22,7 @@ import com.persagy.dmp.rwd.digital.domain.CalculatingDTO;
|
|
|
import com.persagy.dmp.rwd.digital.service.CalculateService;
|
|
|
import com.persagy.dmp.rwd.digital.service.IObjectDigitalService;
|
|
|
import com.persagy.dmp.rwd.digital.service.IObjectRelationService;
|
|
|
+import com.persagy.dmp.rwd.digital.utils.ObjectDigitalCriteriaHelper;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -177,7 +178,7 @@ public class CoordinateCalculateServiceImpl implements CalculateService {
|
|
|
*/
|
|
|
private void deleteRelDataByCondition(CalculatingDTO calculatingDTO, Set<String> fromIds, Set<String> toIds) {
|
|
|
fromIds.addAll(toIds);
|
|
|
- QueryWrapper<ObjectRelation> queryWrapper = createCommonQueryWrapper(fromIds,calculatingDTO);
|
|
|
+ QueryWrapper<ObjectRelation> queryWrapper = ObjectDigitalCriteriaHelper.createCommonQueryWrapper(fromIds,calculatingDTO);
|
|
|
queryWrapper.eq(StrUtil.toUnderlineCase(ObjectRelation.GRAPH_CODE_HUM),calculatingDTO.getGraphCode());
|
|
|
queryWrapper.eq(StrUtil.toUnderlineCase(ObjectRelation.REL_CODE_HUM),calculatingDTO.getRelCode());
|
|
|
if (StrUtil.isNotBlank(calculatingDTO.getRelValue())){
|
|
@@ -198,7 +199,7 @@ public class CoordinateCalculateServiceImpl implements CalculateService {
|
|
|
* Update By lijie 2021/9/11 15:36
|
|
|
*/
|
|
|
private List<ObjectDigital> queryPlaneData(Set<String> toIds, String objType, String toInfoCode, CalculatingDTO calculatingDTO) {
|
|
|
- QueryWrapper<ObjectDigital> queryWrapper = createCommonQueryWrapper(toIds,calculatingDTO);
|
|
|
+ QueryWrapper<ObjectDigital> queryWrapper = ObjectDigitalCriteriaHelper.createCommonQueryWrapper(toIds,calculatingDTO);
|
|
|
if (StrUtil.isNotBlank(objType)){
|
|
|
queryWrapper.eq(ObjectDigital.OBJ_TYPE,objType);
|
|
|
}
|
|
@@ -214,30 +215,6 @@ public class CoordinateCalculateServiceImpl implements CalculateService {
|
|
|
}
|
|
|
|
|
|
/***
|
|
|
- * Description: 创建通用查询条件对象
|
|
|
- * @param ids : 对象id数组
|
|
|
- * @param calculatingDTO : 请求参数
|
|
|
- * @return : com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<com.persagy.dmp.digital.entity.ObjectDigital>
|
|
|
- * @author : lijie
|
|
|
- * @date :2021/9/11 15:41
|
|
|
- * Update By lijie 2021/9/11 15:41
|
|
|
- */
|
|
|
- private <T> QueryWrapper<T> createCommonQueryWrapper(Set<String> ids, CalculatingDTO calculatingDTO) {
|
|
|
- QueryWrapper<T> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(ObjectDigital.PROP_VALID,Boolean.TRUE);
|
|
|
- if (CollUtil.isNotEmpty(ids)){
|
|
|
- queryWrapper.in(ObjectDigital.PROP_ID,ids);
|
|
|
- }
|
|
|
- if (StrUtil.isNotBlank(calculatingDTO.getGroupCode())){
|
|
|
- queryWrapper.eq(StrUtil.toUnderlineCase(CommonConstant.QUERY_GROUPCODE),calculatingDTO.getGroupCode());
|
|
|
- }
|
|
|
- if (StrUtil.isNotBlank(calculatingDTO.getProjectId())){
|
|
|
- queryWrapper.eq(StrUtil.toUnderlineCase(CommonConstant.QUERY_PROJECTID),calculatingDTO.getProjectId());
|
|
|
- }
|
|
|
- return queryWrapper;
|
|
|
- }
|
|
|
-
|
|
|
- /***
|
|
|
* Description: 查询来源数据
|
|
|
* @param fromIds : 来源id集合
|
|
|
* @param objType : 对象分类
|
|
@@ -249,7 +226,7 @@ public class CoordinateCalculateServiceImpl implements CalculateService {
|
|
|
* Update By lijie 2021/9/11 15:32
|
|
|
*/
|
|
|
private List<ObjectDigital> queryPointData(Set<String> fromIds, String objType, String fromInfoCode, CalculatingDTO calculatingDTO) {
|
|
|
- QueryWrapper<ObjectDigital> queryWrapper = createCommonQueryWrapper(fromIds, calculatingDTO);
|
|
|
+ QueryWrapper<ObjectDigital> queryWrapper = ObjectDigitalCriteriaHelper.createCommonQueryWrapper(fromIds, calculatingDTO);
|
|
|
if (StrUtil.isNotBlank(objType)){
|
|
|
queryWrapper.eq(ObjectDigital.OBJ_TYPE,objType);
|
|
|
}
|