|
@@ -78,6 +78,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
arrays.put("$in", objTypes);
|
|
|
condition.putPOJO("objType", arrays);
|
|
|
}
|
|
|
+ condition.put("valid", 1);
|
|
|
classCriteria.setCriteria(condition);
|
|
|
if (StrUtil.isNotBlank(ascOrder)) {
|
|
|
classCriteria.setOrders(Collections.singletonList(OrderItem.asc(ascOrder)));
|
|
@@ -111,6 +112,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
if (StrUtil.isNotBlank(graphCode)) {
|
|
|
criteria.put("code", graphCode);
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
List<GraphDefine> graphDefines = DigitalGraphDefineFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
|
return graphDefines;
|
|
@@ -129,6 +131,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
if (StrUtil.isNotBlank(relCode)) {
|
|
|
criteria.put("code", relCode);
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
List<RelationDefine> relationDefines = DigitalRelationDefineFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
|
return relationDefines;
|
|
@@ -179,6 +182,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
ObjectNode criteria = objectMapper.createObjectNode();
|
|
|
criteria.put("projectId", projectId);
|
|
|
criteria.put("graphCode", graphCode);
|
|
|
+ criteria.put("valid", 1);
|
|
|
projectCriteria.setCriteria(criteria);
|
|
|
List<ObjectNode> projectList = DigitalRelationProjectCalFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, projectCriteria);
|
|
|
if (CollectionUtil.isEmpty(projectList)) {
|
|
@@ -230,6 +234,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
if (StrUtil.isNotBlank(zoneType)) {
|
|
|
criteria.put("zoneType", zoneType);
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
List<ObjectNode> objectNodes = DigitalRelationProjectCalFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
|
if (CollectionUtil.isEmpty(objectNodes)) {
|
|
@@ -250,6 +255,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
if (StrUtil.isNotBlank(zoneType)) {
|
|
|
criteria.put("relValue", zoneType);
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
queryCriteria.setOnlyCount(true);
|
|
|
CommonResult<List<ObjectRelation>> result = DigitalRelationFacade.queryPrototype(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
@@ -267,6 +273,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
if (StrUtil.isNotBlank(objType)) {
|
|
|
criteria.put("objType", objType);
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
queryCriteria.setOnlyCount(true);
|
|
|
CommonResult<List<ObjectNode>> result = DigitalObjectFacade.queryPrototype(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
@@ -287,6 +294,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
arrays.put("$in", ids);
|
|
|
criteria.putPOJO("id", arrays);
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
List<ObjectNode> objectNodes = DigitalObjectFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
|
return objectNodes;
|
|
@@ -309,6 +317,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
ObjectNode criteria = objectMapper.createObjectNode();
|
|
|
criteria.put(key, value);
|
|
|
criteria.put("objType", objType);
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
queryCriteria.setPage(1L);
|
|
|
queryCriteria.setSize(50000L);
|
|
@@ -335,6 +344,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
if (StrUtil.isNotBlank(objTo)) {
|
|
|
criteria.put("objTo", objTo);
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
List<ObjectRelation> objectRelations = DigitalRelationFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
|
|
|
if (CollectionUtil.isEmpty(objectRelations)) {
|
|
@@ -373,6 +383,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
arrays.put("$in", objTypes);
|
|
|
criteria.putPOJO("objType", arrays);
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
objectCriteria.setPage(1L);
|
|
|
objectCriteria.setSize(500L);
|
|
|
objectCriteria.setCriteria(criteria);
|
|
@@ -409,7 +420,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
arrays.put("$in", objTos);
|
|
|
criteria.putPOJO("objTo", arrays);
|
|
|
}
|
|
|
-
|
|
|
+ criteria.put("valid", 1);
|
|
|
queryCriteria.setPage(1L);
|
|
|
queryCriteria.setSize(500L);
|
|
|
queryCriteria.setCriteria(criteria);
|
|
@@ -437,6 +448,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
arrays.put("$in", classCodes);
|
|
|
condition.putPOJO("classCode", arrays);
|
|
|
}
|
|
|
+ condition.put("valid", 1);
|
|
|
queryCriteria.setCriteria(condition);
|
|
|
queryCriteria.setPage(1L);
|
|
|
queryCriteria.setSize(500L);
|
|
@@ -645,6 +657,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
condition.put("$like", content);
|
|
|
criteria.putPOJO("name", condition); // 模糊查询
|
|
|
}
|
|
|
+ criteria.put("valid", 1);
|
|
|
projectCriteria.setCriteria(criteria);
|
|
|
projectCriteria.setOrders(Collections.singletonList(OrderItem.asc("relCode")));
|
|
|
return DigitalRelationProjectCalFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, projectCriteria);
|