Selaa lähdekoodia

所有已写接口新增valid为1的查询条件

zhangqiankun 3 vuotta sitten
vanhempi
commit
8eacc1afcb
33 muutettua tiedostoa jossa 46 lisäystä ja 1 poistoa
  1. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java
  2. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2FlRelationObject.java
  3. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2ShRelationObject.java
  4. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2SpRelationObject.java
  5. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2BdRelationObject.java
  6. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2FlRelationObject.java
  7. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchSubsetBd2FlRelationObject.java
  8. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkMixMechRelationObject.java
  9. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkNaturalRelationObject.java
  10. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkOnewayMechRelationObject.java
  11. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqBackupRelationObject.java
  12. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqNormalRelationObject.java
  13. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyBackupRelationObject.java
  14. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyNormalRelationObject.java
  15. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2BdRelationObject.java
  16. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2FlRelationObject.java
  17. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2ShRelationObject.java
  18. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2BdRelationObject.java
  19. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2FlRelationObject.java
  20. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2ShRelationObject.java
  21. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2SpRelationObject.java
  22. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2BdRelationObject.java
  23. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2FlRelationObject.java
  24. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2SpRelationObject.java
  25. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkConnectRelationObject.java
  26. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkTransparentRelationObject.java
  27. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2EqRelationObject.java
  28. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SpRelationObject.java
  29. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SyRelationObject.java
  30. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFCloseRelationObject.java
  31. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFOpenRelationObject.java
  32. 1 0
      src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkNormalRelationObject.java
  33. 14 1
      src/main/java/com/persagy/proxy/report/service/impl/RelationReportService.java

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2BdRelationObject.java

@@ -38,6 +38,7 @@ public class ArchForArchSh2BdRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sh2Bd.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2FlRelationObject.java

@@ -44,6 +44,7 @@ public class ArchForArchSh2FlRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sh2Fl.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2ShRelationObject.java

@@ -44,6 +44,7 @@ public class ArchForArchSh2ShRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sh2Sh.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSh2SpRelationObject.java

@@ -44,6 +44,7 @@ public class ArchForArchSh2SpRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sh2Sp.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2BdRelationObject.java

@@ -44,6 +44,7 @@ public class ArchForArchSp2BdRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sp2Bd.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchForArchSp2FlRelationObject.java

@@ -44,6 +44,7 @@ public class ArchForArchSp2FlRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.ArchForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sp2Fl.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ArchSubsetBd2FlRelationObject.java

@@ -42,6 +42,7 @@ public class ArchSubsetBd2FlRelationObject extends AbstractRelationObject {
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.ArchSubset.name());
 		objectNode.put("relCode", RelCodeEnum.Bd2Fl.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkMixMechRelationObject.java

@@ -43,6 +43,7 @@ public class ConvectionNetworkMixMechRelationObject extends AbstractReportRelati
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_2.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_2.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkNaturalRelationObject.java

@@ -43,6 +43,7 @@ public class ConvectionNetworkNaturalRelationObject extends AbstractReportRelati
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_1.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_1.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/ConvectionNetworkOnewayMechRelationObject.java

@@ -43,6 +43,7 @@ public class ConvectionNetworkOnewayMechRelationObject extends AbstractReportRel
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_3.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.SP2SP_CONVECTIONNETWORK_3.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqBackupRelationObject.java

@@ -43,6 +43,7 @@ public class EquipPowerEqBackupRelationObject extends AbstractReportRelationObje
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_2.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_2.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerEqNormalRelationObject.java

@@ -43,6 +43,7 @@ public class EquipPowerEqNormalRelationObject extends AbstractReportRelationObje
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_1.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_1.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyBackupRelationObject.java

@@ -43,6 +43,7 @@ public class EquipPowerSyBackupRelationObject extends AbstractReportRelationObje
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_4.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_4.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/EquipPowerSyNormalRelationObject.java

@@ -43,6 +43,7 @@ public class EquipPowerSyNormalRelationObject extends AbstractReportRelationObje
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_3.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.EQ2EQ_EQUIPPOWER_3.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2BdRelationObject.java

@@ -44,6 +44,7 @@ public class MechForArchEq2BdRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Eq2Bd.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2FlRelationObject.java

@@ -44,6 +44,7 @@ public class MechForArchEq2FlRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Eq2Fl.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchEq2ShRelationObject.java

@@ -44,6 +44,7 @@ public class MechForArchEq2ShRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Eq2Sh.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2BdRelationObject.java

@@ -44,6 +44,7 @@ public class MechForArchSy2BdRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sy2Bd.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2FlRelationObject.java

@@ -44,6 +44,7 @@ public class MechForArchSy2FlRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sy2Fl.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2ShRelationObject.java

@@ -44,6 +44,7 @@ public class MechForArchSy2ShRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sy2Sh.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechForArchSy2SpRelationObject.java

@@ -44,6 +44,7 @@ public class MechForArchSy2SpRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechForArch.name());
 		objectNode.put("relCode", RelCodeEnum.Sy2Sp.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2BdRelationObject.java

@@ -44,6 +44,7 @@ public class MechInArchEq2BdRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechInArch.name());
 		objectNode.put("relCode", RelCodeEnum.Eq2Bd.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2FlRelationObject.java

@@ -44,6 +44,7 @@ public class MechInArchEq2FlRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechInArch.name());
 		objectNode.put("relCode", RelCodeEnum.Eq2Fl.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/MechInArchEq2SpRelationObject.java

@@ -44,6 +44,7 @@ public class MechInArchEq2SpRelationObject extends AbstractReportRelationObject
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", GraphCodeEnum.MechInArch.name());
 		objectNode.put("relCode", RelCodeEnum.Eq2Sp.name());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkConnectRelationObject.java

@@ -43,6 +43,7 @@ public class RadiationNetworkConnectRelationObject extends AbstractReportRelatio
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_1.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_1.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/RadiationNetworkTransparentRelationObject.java

@@ -43,6 +43,7 @@ public class RadiationNetworkTransparentRelationObject extends AbstractReportRel
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_2.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.SP2SP_RADIATIONNETWORK_2.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2EqRelationObject.java

@@ -43,6 +43,7 @@ public class SensorRelationshipSs2EqRelationObject extends AbstractReportRelatio
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2EQ_SENSORRELATIONSHIP_SS2EQ.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.EQ2EQ_SENSORRELATIONSHIP_SS2EQ.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SpRelationObject.java

@@ -44,6 +44,7 @@ public class SensorRelationshipSs2SpRelationObject extends AbstractReportRelatio
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/SensorRelationshipSs2SyRelationObject.java

@@ -43,6 +43,7 @@ public class SensorRelationshipSs2SyRelationObject extends AbstractReportRelatio
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.EQ2SY_SENSORRELATIONSHIP_SS2SY.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.EQ2SY_SENSORRELATIONSHIP_SS2SY.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFCloseRelationObject.java

@@ -43,6 +43,7 @@ public class TrafficNetworkFFCloseRelationObject extends AbstractReportRelationO
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_3.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_3.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkFFOpenRelationObject.java

@@ -43,6 +43,7 @@ public class TrafficNetworkFFOpenRelationObject extends AbstractReportRelationOb
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_2.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_2.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 1 - 0
src/main/java/com/persagy/proxy/adm/strategy/relationdata/TrafficNetworkNormalRelationObject.java

@@ -43,6 +43,7 @@ public class TrafficNetworkNormalRelationObject extends AbstractReportRelationOb
 		ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
 		objectNode.put("graphCode", AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_1.getGraphCode());
 		objectNode.put("relCode", AdmRelationTypeEnum.SP2SP_TRAFFICNETWORK_1.getRelCode());
+		objectNode.put("valid", 1);
 		queryCriteria.setCriteria(objectNode);
 		queryCriteria.setOnlyCount(true);
 		

+ 14 - 1
src/main/java/com/persagy/proxy/report/service/impl/RelationReportService.java

@@ -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);