yujunjun/openspg
1
0
Fork 0
mirror of https://github.com/OpenSPG/openspg.git synced 2025-11-13 17:07:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/branch0101' into branch0101

Browse Source 
# Conflicts:
#	python/knext/knext/examples/financial/schema/financial_schema_helper.py
This commit is contained in:
Qu 2023-12-28 21:02:09 +08:00
commit 64e07ce051
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SPGTypeMappingProcessor.java
View File

@ -28,10 +28,9 @@ import com.antgroup.openspg.builder.model.record.BaseRecord;
import com.antgroup.openspg.builder.model.record.BuilderRecord; import com.antgroup.openspg.builder.model.record.BuilderRecord;
import com.antgroup.openspg.core.schema.model.identifier.SPGTypeIdentifier; import com.antgroup.openspg.core.schema.model.identifier.SPGTypeIdentifier;
import com.antgroup.openspg.core.schema.model.type.BaseSPGType; import com.antgroup.openspg.core.schema.model.type.BaseSPGType;
import com.google.common.collect.Lists;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j

1
builder/runner/local/pom.xml
View File

@ -37,6 +37,7 @@
<mainClass>com.antgroup.openspg.builder.runner.local.LocalBuilderMain</mainClass> <mainClass>com.antgroup.openspg.builder.runner.local.LocalBuilderMain</mainClass>
</manifest> </manifest>
</archive> </archive>
<outputDirectory>../../../python/knext/knext/lib</outputDirectory>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>

28
python/knext/knext/examples/financial/schema/financial_schema_helper.py
View File

@ -26,51 +26,51 @@ class Financial:
name = PropertyHelper("name") name = PropertyHelper("name")
stdId = PropertyHelper("stdId") stdId = PropertyHelper("stdId")
alias = PropertyHelper("alias") alias = PropertyHelper("alias")
class AreaRiskEvent(SPGTypeHelper): class AreaRiskEvent(SPGTypeHelper):
description = PropertyHelper("description") description = PropertyHelper("description")
id = PropertyHelper("id") id = PropertyHelper("id")
name = PropertyHelper("name") name = PropertyHelper("name")
eventTime = PropertyHelper("eventTime")
object = PropertyHelper("object")
subject = PropertyHelper("subject") subject = PropertyHelper("subject")
object = PropertyHelper("object")
eventTime = PropertyHelper("eventTime")
class Company(SPGTypeHelper): class Company(SPGTypeHelper):
description = PropertyHelper("description") description = PropertyHelper("description")
id = PropertyHelper("id") id = PropertyHelper("id")
name = PropertyHelper("name") name = PropertyHelper("name")
orgCertNo = PropertyHelper("orgCertNo") orgCertNo = PropertyHelper("orgCertNo")
establishDate = PropertyHelper("establishDate")
regArea = PropertyHelper("regArea")
regCapital = PropertyHelper("regCapital") regCapital = PropertyHelper("regCapital")
businessScope = PropertyHelper("businessScope")
legalPerson = PropertyHelper("legalPerson") legalPerson = PropertyHelper("legalPerson")
regArea = PropertyHelper("regArea")
establishDate = PropertyHelper("establishDate")
businessScope = PropertyHelper("businessScope")
class CompanyEvent(SPGTypeHelper): class CompanyEvent(SPGTypeHelper):
description = PropertyHelper("description") description = PropertyHelper("description")
id = PropertyHelper("id") id = PropertyHelper("id")
name = PropertyHelper("name") name = PropertyHelper("name")
location = PropertyHelper("location")
eventTime = PropertyHelper("eventTime") eventTime = PropertyHelper("eventTime")
happenedTime = PropertyHelper("happenedTime")
subject = PropertyHelper("subject") subject = PropertyHelper("subject")
location = PropertyHelper("location")
happenedTime = PropertyHelper("happenedTime")
object = PropertyHelper("object") object = PropertyHelper("object")
class Indicator(SPGTypeHelper): class Indicator(SPGTypeHelper):
description = PropertyHelper("description") description = PropertyHelper("description")
id = PropertyHelper("id") id = PropertyHelper("id")
name = PropertyHelper("name") name = PropertyHelper("name")
stdId = PropertyHelper("stdId") stdId = PropertyHelper("stdId")
alias = PropertyHelper("alias") alias = PropertyHelper("alias")
class State(SPGTypeHelper): class State(SPGTypeHelper):
description = PropertyHelper("description") description = PropertyHelper("description")
id = PropertyHelper("id") id = PropertyHelper("id")
name = PropertyHelper("name") name = PropertyHelper("name")
causes = PropertyHelper("causes")
alias = PropertyHelper("alias")
derivedFrom = PropertyHelper("derivedFrom") derivedFrom = PropertyHelper("derivedFrom")
causes = PropertyHelper("causes")
stdId = PropertyHelper("stdId") stdId = PropertyHelper("stdId")
alias = PropertyHelper("alias")
AdministrativeArea = AdministrativeArea("Financial.AdministrativeArea") AdministrativeArea = AdministrativeArea("Financial.AdministrativeArea")
AreaRiskEvent = AreaRiskEvent("Financial.AreaRiskEvent") AreaRiskEvent = AreaRiskEvent("Financial.AreaRiskEvent")

3
reasoner/runner/local-runner/pom.xml
View File

@ -127,9 +127,10 @@
</descriptorRefs> </descriptorRefs>
<archive> <archive>
<manifest> <manifest>
<mainClass>com.antgroup.openspg.builder.runner.local.LocalBuilderMain</mainClass> <mainClass>com.antgroup.openspg.reasoner.runner.local.LocalReasonerMain</mainClass>
</manifest> </manifest>
</archive> </archive>
<outputDirectory>../../../python/knext/knext/lib</outputDirectory>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>