From 9d60fe173302622146a23538d52b5df26e173ff7 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Fri, 4 Jul 2025 10:08:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6=E5=8F=91?= =?UTF-8?q?=E5=B8=83:=208.2.22=20=20=201)=20=E8=A7=84=E5=88=99=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0=20Java=20?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=BC=95=E6=93=8E=20=20=202)=20=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=BC=95=E6=93=8E=E4=B8=AD=EF=BC=8C=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=B8=AD=EF=BC=8C=E5=B0=86=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=99=84=E5=8A=A0=E5=B1=9E=E6=80=A7=E4=B8=AD=E7=9A=84=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=80=BC=E5=8F=98=E9=87=8F=E6=9B=BF=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=20=20=203)=20=E8=A7=84=E5=88=99=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E4=B8=AD=EF=BC=8C=E6=A8=A1=E5=9E=8B=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=B0=86=E5=8F=82=E6=95=B0=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=AD=E7=9A=84=E6=9E=9A=E4=B8=BE=E5=80=BC?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=9B=BF=E6=8D=A2=E6=88=90=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creditreport/core/CreditReportParser.java | 28 +- .../creditreport/core/company/Document.java | 44 +- .../io/sc/creditreport/core/company/EA01.java | 10 +- .../sc/creditreport/core/company/EA01A.java | 4 +- .../sc/creditreport/core/company/EA01B.java | 4 +- .../sc/creditreport/core/company/EA01C.java | 6 +- .../sc/creditreport/core/company/EA01CH.java | 4 +- .../sc/creditreport/core/company/EA01D.java | 2 +- .../sc/creditreport/core/company/EA01E.java | 4 +- .../io/sc/creditreport/core/company/EAA.java | 2 +- .../io/sc/creditreport/core/company/EB01.java | 4 +- .../sc/creditreport/core/company/EB01A.java | 22 +- .../sc/creditreport/core/company/EB01B.java | 10 +- .../io/sc/creditreport/core/company/EB02.java | 6 +- .../sc/creditreport/core/company/EB02A.java | 22 +- .../sc/creditreport/core/company/EB02AH.java | 8 +- .../sc/creditreport/core/company/EB02B.java | 16 +- .../sc/creditreport/core/company/EB02BH.java | 6 +- .../sc/creditreport/core/company/EB02C.java | 4 +- .../sc/creditreport/core/company/EB02CH.java | 22 +- .../io/sc/creditreport/core/company/EB03.java | 4 +- .../sc/creditreport/core/company/EB03A.java | 4 +- .../sc/creditreport/core/company/EB03AH.java | 8 +- .../sc/creditreport/core/company/EB03B.java | 4 +- .../sc/creditreport/core/company/EB03BH.java | 6 +- .../io/sc/creditreport/core/company/EB04.java | 14 +- .../io/sc/creditreport/core/company/EB05.java | 4 +- .../sc/creditreport/core/company/EB05A.java | 4 +- .../sc/creditreport/core/company/EB05AH.java | 18 +- .../sc/creditreport/core/company/EB05B.java | 4 +- .../sc/creditreport/core/company/EB05BH.java | 12 +- .../io/sc/creditreport/core/company/EBA.java | 2 +- .../io/sc/creditreport/core/company/EBB.java | 2 +- .../io/sc/creditreport/core/company/EBC.java | 2 +- .../io/sc/creditreport/core/company/EBD.java | 2 +- .../io/sc/creditreport/core/company/EBE.java | 2 +- .../io/sc/creditreport/core/company/EC01.java | 18 +- .../io/sc/creditreport/core/company/EC02.java | 6 +- .../sc/creditreport/core/company/EC020H.java | 14 +- .../io/sc/creditreport/core/company/EC03.java | 4 +- .../sc/creditreport/core/company/EC030H.java | 10 +- .../io/sc/creditreport/core/company/EC04.java | 10 +- .../io/sc/creditreport/core/company/EC05.java | 4 +- .../sc/creditreport/core/company/EC050H.java | 10 +- .../io/sc/creditreport/core/company/ECA.java | 10 +- .../io/sc/creditreport/core/company/ED01.java | 6 +- .../sc/creditreport/core/company/ED01A.java | 40 +- .../sc/creditreport/core/company/ED01B.java | 4 +- .../sc/creditreport/core/company/ED01BH.java | 28 +- .../sc/creditreport/core/company/ED01C.java | 4 +- .../sc/creditreport/core/company/ED01CH.java | 10 +- .../io/sc/creditreport/core/company/ED02.java | 22 +- .../io/sc/creditreport/core/company/ED03.java | 16 +- .../io/sc/creditreport/core/company/ED04.java | 4 +- .../sc/creditreport/core/company/ED04A.java | 26 +- .../sc/creditreport/core/company/ED04B.java | 16 +- .../io/sc/creditreport/core/company/ED05.java | 26 +- .../io/sc/creditreport/core/company/ED06.java | 26 +- .../io/sc/creditreport/core/company/ED07.java | 48 +- .../io/sc/creditreport/core/company/ED08.java | 26 +- .../io/sc/creditreport/core/company/ED09.java | 22 +- .../io/sc/creditreport/core/company/EDA.java | 6 +- .../io/sc/creditreport/core/company/EDB.java | 4 +- .../io/sc/creditreport/core/company/EDC.java | 2 +- .../io/sc/creditreport/core/company/EDD.java | 6 +- .../io/sc/creditreport/core/company/EE01.java | 4 +- .../sc/creditreport/core/company/EE01A.java | 12 +- .../sc/creditreport/core/company/EE01B.java | 4 +- .../sc/creditreport/core/company/EE01BH.java | 10 +- .../io/sc/creditreport/core/company/EEA.java | 2 +- .../io/sc/creditreport/core/company/EF01.java | 8 +- .../io/sc/creditreport/core/company/EF02.java | 24 +- .../io/sc/creditreport/core/company/EF03.java | 22 +- .../io/sc/creditreport/core/company/EF04.java | 18 +- .../io/sc/creditreport/core/company/EF05.java | 4 +- .../sc/creditreport/core/company/EF05A.java | 18 +- .../sc/creditreport/core/company/EF05B.java | 4 +- .../sc/creditreport/core/company/EF05BH.java | 10 +- .../io/sc/creditreport/core/company/EF06.java | 12 +- .../io/sc/creditreport/core/company/EF07.java | 12 +- .../io/sc/creditreport/core/company/EF08.java | 12 +- .../io/sc/creditreport/core/company/EF09.java | 12 +- .../io/sc/creditreport/core/company/EF10.java | 12 +- .../io/sc/creditreport/core/company/EF11.java | 8 +- .../io/sc/creditreport/core/company/EF12.java | 10 +- .../io/sc/creditreport/core/company/EF13.java | 12 +- .../io/sc/creditreport/core/company/EF14.java | 10 +- .../io/sc/creditreport/core/company/EFA.java | 2 +- .../io/sc/creditreport/core/company/EFB.java | 4 +- .../io/sc/creditreport/core/company/EFC.java | 2 +- .../io/sc/creditreport/core/company/EFD.java | 2 +- .../io/sc/creditreport/core/company/EFE.java | 10 +- .../io/sc/creditreport/core/company/EFF.java | 6 +- .../io/sc/creditreport/core/company/EFG.java | 2 +- .../io/sc/creditreport/core/company/EG01.java | 4 +- .../sc/creditreport/core/company/EG01A.java | 12 +- .../sc/creditreport/core/company/EG01B.java | 174 +- .../io/sc/creditreport/core/company/EG02.java | 4 +- .../sc/creditreport/core/company/EG02A.java | 12 +- .../sc/creditreport/core/company/EG02B.java | 120 +- .../io/sc/creditreport/core/company/EG03.java | 4 +- .../sc/creditreport/core/company/EG03A.java | 12 +- .../sc/creditreport/core/company/EG03B.java | 128 +- .../io/sc/creditreport/core/company/EG04.java | 4 +- .../sc/creditreport/core/company/EG04A.java | 12 +- .../sc/creditreport/core/company/EG04B.java | 38 +- .../io/sc/creditreport/core/company/EG05.java | 4 +- .../sc/creditreport/core/company/EG05A.java | 12 +- .../sc/creditreport/core/company/EG05B.java | 114 +- .../io/sc/creditreport/core/company/EG06.java | 4 +- .../sc/creditreport/core/company/EG06A.java | 12 +- .../sc/creditreport/core/company/EG06B.java | 126 +- .../io/sc/creditreport/core/company/EG07.java | 4 +- .../sc/creditreport/core/company/EG07A.java | 12 +- .../sc/creditreport/core/company/EG07B.java | 100 +- .../io/sc/creditreport/core/company/EG08.java | 4 +- .../sc/creditreport/core/company/EG08A.java | 12 +- .../sc/creditreport/core/company/EG08B.java | 94 +- .../io/sc/creditreport/core/company/EG09.java | 4 +- .../sc/creditreport/core/company/EG09A.java | 12 +- .../sc/creditreport/core/company/EG09B.java | 76 +- .../io/sc/creditreport/core/company/EG10.java | 4 +- .../sc/creditreport/core/company/EG10A.java | 12 +- .../sc/creditreport/core/company/EG10B.java | 50 +- .../io/sc/creditreport/core/company/EGA.java | 20 +- .../io/sc/creditreport/core/company/EH01.java | 8 +- .../io/sc/creditreport/core/company/EHA.java | 2 +- .../io/sc/creditreport/core/company/EI01.java | 10 +- .../io/sc/creditreport/core/company/EIA.java | 2 +- .../sc/creditreport/core/person/Document.java | 48 +- .../io/sc/creditreport/core/person/PA01.java | 10 +- .../io/sc/creditreport/core/person/PA01A.java | 4 +- .../io/sc/creditreport/core/person/PA01B.java | 10 +- .../io/sc/creditreport/core/person/PA01C.java | 4 +- .../sc/creditreport/core/person/PA01CH.java | 4 +- .../io/sc/creditreport/core/person/PA01D.java | 8 +- .../io/sc/creditreport/core/person/PA01E.java | 2 +- .../io/sc/creditreport/core/person/PAH.java | 2 +- .../io/sc/creditreport/core/person/PAP.java | 2 +- .../io/sc/creditreport/core/person/PB01.java | 4 +- .../io/sc/creditreport/core/person/PB01A.java | 18 +- .../io/sc/creditreport/core/person/PB01B.java | 4 +- .../sc/creditreport/core/person/PB01BH.java | 4 +- .../io/sc/creditreport/core/person/PB02.java | 12 +- .../io/sc/creditreport/core/person/PB03.java | 8 +- .../io/sc/creditreport/core/person/PB04.java | 22 +- .../io/sc/creditreport/core/person/PBS.java | 2 +- .../io/sc/creditreport/core/person/PC01.java | 8 +- .../io/sc/creditreport/core/person/PC02.java | 20 +- .../io/sc/creditreport/core/person/PC02A.java | 6 +- .../sc/creditreport/core/person/PC02AH.java | 8 +- .../io/sc/creditreport/core/person/PC02B.java | 8 +- .../sc/creditreport/core/person/PC02BH.java | 6 +- .../io/sc/creditreport/core/person/PC02C.java | 4 +- .../io/sc/creditreport/core/person/PC02D.java | 4 +- .../sc/creditreport/core/person/PC02DH.java | 10 +- .../io/sc/creditreport/core/person/PC02E.java | 10 +- .../io/sc/creditreport/core/person/PC02F.java | 10 +- .../io/sc/creditreport/core/person/PC02G.java | 10 +- .../io/sc/creditreport/core/person/PC02H.java | 14 +- .../io/sc/creditreport/core/person/PC02I.java | 14 +- .../io/sc/creditreport/core/person/PC02K.java | 4 +- .../sc/creditreport/core/person/PC02KH.java | 10 +- .../io/sc/creditreport/core/person/PC03.java | 4 +- .../sc/creditreport/core/person/PC030H.java | 6 +- .../io/sc/creditreport/core/person/PC04.java | 4 +- .../sc/creditreport/core/person/PC040H.java | 6 +- .../io/sc/creditreport/core/person/PC05.java | 4 +- .../io/sc/creditreport/core/person/PC05A.java | 8 +- .../io/sc/creditreport/core/person/PC05B.java | 16 +- .../io/sc/creditreport/core/person/PCA.java | 2 +- .../io/sc/creditreport/core/person/PCE.java | 2 +- .../io/sc/creditreport/core/person/PCJ.java | 2 +- .../io/sc/creditreport/core/person/PCO.java | 2 +- .../io/sc/creditreport/core/person/PCR.java | 2 +- .../io/sc/creditreport/core/person/PD01.java | 18 +- .../io/sc/creditreport/core/person/PD01A.java | 40 +- .../io/sc/creditreport/core/person/PD01B.java | 18 +- .../io/sc/creditreport/core/person/PD01C.java | 46 +- .../io/sc/creditreport/core/person/PD01D.java | 6 +- .../sc/creditreport/core/person/PD01DH.java | 4 +- .../io/sc/creditreport/core/person/PD01E.java | 8 +- .../sc/creditreport/core/person/PD01EH.java | 6 +- .../io/sc/creditreport/core/person/PD01F.java | 4 +- .../sc/creditreport/core/person/PD01FH.java | 10 +- .../io/sc/creditreport/core/person/PD01G.java | 4 +- .../sc/creditreport/core/person/PD01GH.java | 4 +- .../io/sc/creditreport/core/person/PD01H.java | 4 +- .../sc/creditreport/core/person/PD01HH.java | 8 +- .../io/sc/creditreport/core/person/PD01Z.java | 4 +- .../sc/creditreport/core/person/PD01ZH.java | 6 +- .../io/sc/creditreport/core/person/PD02.java | 4 +- .../io/sc/creditreport/core/person/PD02A.java | 26 +- .../io/sc/creditreport/core/person/PD02Z.java | 4 +- .../sc/creditreport/core/person/PD02ZH.java | 6 +- .../io/sc/creditreport/core/person/PD03.java | 4 +- .../io/sc/creditreport/core/person/PD03A.java | 32 +- .../io/sc/creditreport/core/person/PD03Z.java | 4 +- .../sc/creditreport/core/person/PD03ZH.java | 6 +- .../io/sc/creditreport/core/person/PDA.java | 2 +- .../io/sc/creditreport/core/person/PE01.java | 4 +- .../io/sc/creditreport/core/person/PE01A.java | 16 +- .../io/sc/creditreport/core/person/PE01Z.java | 4 +- .../sc/creditreport/core/person/PE01ZH.java | 6 +- .../io/sc/creditreport/core/person/PF01.java | 4 +- .../io/sc/creditreport/core/person/PF01A.java | 6 +- .../io/sc/creditreport/core/person/PF01Z.java | 4 +- .../sc/creditreport/core/person/PF01ZH.java | 6 +- .../io/sc/creditreport/core/person/PF02.java | 4 +- .../io/sc/creditreport/core/person/PF02A.java | 16 +- .../io/sc/creditreport/core/person/PF02Z.java | 4 +- .../sc/creditreport/core/person/PF02ZH.java | 6 +- .../io/sc/creditreport/core/person/PF03.java | 4 +- .../io/sc/creditreport/core/person/PF03A.java | 20 +- .../io/sc/creditreport/core/person/PF03Z.java | 4 +- .../sc/creditreport/core/person/PF03ZH.java | 6 +- .../io/sc/creditreport/core/person/PF04.java | 4 +- .../io/sc/creditreport/core/person/PF04A.java | 12 +- .../io/sc/creditreport/core/person/PF04Z.java | 4 +- .../sc/creditreport/core/person/PF04ZH.java | 6 +- .../io/sc/creditreport/core/person/PF05.java | 4 +- .../io/sc/creditreport/core/person/PF05A.java | 20 +- .../io/sc/creditreport/core/person/PF05Z.java | 4 +- .../sc/creditreport/core/person/PF05ZH.java | 6 +- .../io/sc/creditreport/core/person/PF06.java | 4 +- .../io/sc/creditreport/core/person/PF06A.java | 14 +- .../io/sc/creditreport/core/person/PF06Z.java | 4 +- .../sc/creditreport/core/person/PF06ZH.java | 6 +- .../io/sc/creditreport/core/person/PF07.java | 4 +- .../io/sc/creditreport/core/person/PF07A.java | 14 +- .../io/sc/creditreport/core/person/PF07Z.java | 4 +- .../sc/creditreport/core/person/PF07ZH.java | 6 +- .../io/sc/creditreport/core/person/PF08.java | 4 +- .../io/sc/creditreport/core/person/PF08A.java | 8 +- .../io/sc/creditreport/core/person/PF08Z.java | 4 +- .../sc/creditreport/core/person/PF08ZH.java | 6 +- .../io/sc/creditreport/core/person/PG01.java | 8 +- .../sc/creditreport/core/person/PG010H.java | 6 +- .../io/sc/creditreport/core/person/PH01.java | 8 +- .../io/sc/creditreport/core/person/PHF.java | 2 +- .../io/sc/creditreport/core/person/PIM.java | 2 +- .../io/sc/creditreport/core/person/PMM.java | 2 +- .../io/sc/creditreport/core/person/PND.java | 2 +- .../io/sc/creditreport/core/person/PNO.java | 2 +- .../io/sc/creditreport/core/person/POM.java | 2 +- .../io/sc/creditreport/core/person/POQ.java | 2 +- .../io/sc/creditreport/core/person/POS.java | 2 +- .../io/sc/creditreport/core/person/POT.java | 2 +- .../io/sc/creditreport/core/person/PPO.java | 2 +- .../io/sc/creditreport/core/person/PPQ.java | 2 +- .../io/sc/creditreport/core/person/PQO.java | 2 +- .../io/sc/creditreport/core/person/PRH.java | 2 +- .../io/sc/creditreport/core/person/PRM.java | 2 +- .../io/sc/creditreport/core/person/PSM.java | 2 +- .../plugins/rule-engine-function.json | 70 +- .../core/i18n/messages.properties | 4 +- .../core/i18n/messages_tw_CN.properties | 4 +- .../core/i18n/messages_zh_CN.properties | 4 +- .../impl/ExecutorFactoryServiceImpl.java | 56 +- .../spring/service/impl/LocalLoaderImpl.java | 8 +- .../META-INF/platform/plugins/parameters.json | 20 +- .../client/spring/i18n/parameters.properties | 4 + .../spring/i18n/parameters_tw_CN.properties | 21 + .../spring/i18n/parameters_zh_CN.properties | 30 +- .../io/sc/engine/rule/client/Executor.java | 2 + .../engine/rule/client/ExecutorBuilder.java | 17 +- .../rule/client/enums/GeneratorType.java | 15 + .../rule/client/local/LocalExecutor.java | 31 +- .../rule/client/remote/RemoteExecutor.java | 7 + .../rule/client/runtime/EngineRuntime.java | 41 +- .../runtime/impl/GroovyEngineRuntime.java | 104 +- .../runtime/impl/JavaEngineRuntime.java | 215 + .../groovy/GroovyScriptEngineService.java | 37 +- .../groovy/GroovyScriptEngineServiceImpl.java | 39 +- .../impl/groovy/GroovyScriptExecutor.java | 2 +- .../runtime/impl/java/JavaEngineService.java | 46 + .../impl/java/JavaEngineServiceImpl.java | 62 + .../platform/plugins/directories.json | 3 + .../io/sc/engine/rule/client/test/Test.java | 14 +- .../io/sc/engine/rule/client/test/Test2.java | 50 + .../src/test/resources/logback-test.xml | 2 +- .../io/sc/engine/rule/core/ExecuteResult.java | 8 + .../sc/engine/rule/core/ParameterResult.java | 3 +- .../sc/engine/rule/core/code/ExecuteUnit.java | 5 + .../rule/core/code/ExecuteUnit4Lib.java | 5 + .../rule/core/code/ExecuteUnit4Resource.java | 123 +- .../sc/engine/rule/core/code/SourceCode.java | 4 + .../rule/core/code/SourceCodeGenerator.java | 2 + ...va => GroovyExecuteUnit4LibGenerator.java} | 5 +- ... GroovyExecuteUnit4ResourceGenerator.java} | 5 +- .../generator/GroovySourceCodeGenerator.java | 28 +- .../JavaExecuteUnit4LibGenerator.java | 67 + .../JavaExecuteUnit4ResourceGenerator.java | 76 + .../generator/JavaSourceCodeGenerator.java | 51 + .../generator/impl/DictionaryGenerator.java | 30 +- .../generator/impl/IndicatorGenerator.java | 67 +- .../generator/impl/ParameterGenerator.java | 105 +- .../generator/impl/processor/Arithmetic.java | 3 +- .../impl/processor/ConditionRange.java | 9 +- .../impl/processor/DecisionTree.java | 13 +- .../impl/processor/ExecutionFlow.java | 16 +- .../generator/impl/processor/MathFormula.java | 2 +- .../generator/impl/processor/OptionValue.java | 12 +- .../generator/impl/processor/RuleSet.java | 12 +- .../generator/impl/processor/ScoreCard.java | 2 +- .../generator/impl/processor/SingleRule.java | 2 +- .../impl/processor/SqlFieldMapping.java | 78 +- .../generator/impl/processor/WhenThen.java | 9 +- .../core/function/ArithmeticFunction.java | 78 +- .../core/util/GroovyExpressionReplacer.java | 43 +- .../sc/engine/rule/core/util/IdReplacer.java | 30 +- .../util/PlaceHolderEnumExpressionUtil.java | 6 +- .../engine/rule/core/util/ValueTypeUtil.java | 6 +- .../code/java/template/argument_render.tpl | 52 + .../code/java/template/dictionary_render.tpl | 14 + .../code/java/template/functions_render.tpl | 7 + .../rule/core/code/java/template/impl/lib.tpl | 175 + .../core/code/java/template/impl/resource.tpl | 195 + .../core/code/java/template/import_render.tpl | 103 + .../core/code/java/template/lib_render.tpl | 80 + .../core/code/java/template/model_render.tpl | 30 + .../code/java/template/package_render.tpl | 3 + .../code/java/template/parameter_render.tpl | 103 + .../java/template/processor/arithmetic.tpl | 1 + .../template/processor/conditionRange.tpl | 1 + .../template/processor/decision_table.tpl | 1 + .../template/processor/decision_table_2c.tpl | 1 + .../java/template/processor/decision_tree.tpl | 1 + .../template/processor/execution_flow.tpl | 1 + .../java/template/processor/groovy_script.tpl | 1 + .../java/template/processor/http_request.tpl | 1 + .../java/template/processor/math_formula.tpl | 1 + .../java/template/processor/numberRange.tpl | 1 + .../template/processor/object_properties.tpl | 1 + .../java/template/processor/option_value.tpl | 1 + .../code/java/template/processor/pmml.tpl | 4 + .../code/java/template/processor/rule_set.tpl | 1 + .../java/template/processor/score_card.tpl | 1 + .../java/template/processor/single_rule.tpl | 1 + .../core/code/java/template/processor/sql.tpl | 1 + .../code/java/template/processor/ternary.tpl | 1 + .../java/template/processor/when_then.tpl | 1 + .../core/code/template/dictionary_render.tpl | 3 +- .../rule/core/code/template/impl/lib.tpl | 12 +- .../rule/core/code/template/import_render.tpl | 5 + .../rule/core/code/template/processor/sql.tpl | 2 +- .../src/i18n/messages.json | 1 + .../src/i18n/messages_tw_CN.json | 1 + .../src/i18n/messages_zh_CN.json | 1 + .../src/views/resources/designer/Option.vue | 34 +- .../views/resources/designer/Parameter.vue | 2 +- .../ParameterAndValueTypeWebController.java | 1 - .../dictionary/entity/DictionaryEntity.java | 13 + .../controller/ExecuteUnitWebController.java | 28 + .../service/ExecuteUnitService.java | 4 +- .../service/impl/ExecuteUnitServiceImpl.java | 33 +- .../function/entity/FunctionEntity.java | 27 +- .../rule/server/lib/entity/LibEntity.java | 13 + .../entity/ParameterInOptionItemEntity.java | 31 +- .../ParameterInOptionItemServiceImpl.java | 72 +- .../service/impl/ResourceServiceImpl.java | 14 +- .../service/impl/TestCaseServiceImpl.java | 4 +- .../META-INF/platform/plugins/parameters.json | 18 +- .../rule/server/i18n/parameters.properties | 16 +- .../server/i18n/parameters_tw_CN.properties | 16 +- .../server/i18n/parameters_zh_CN.properties | 16 +- .../rule/server/sample/引擎示例.json | 3571 ++++++++++------- .../sc/platform/orm/entity/AuditorEntity.java | 73 - .../java/io/sc/platform/util/StringUtil.java | 14 +- .../io/sc/platform/util/TypeConvertor.java | 14 + .../util/compiler/file/FileJavaCompiler.java | 37 + .../compiler/file/StringJavaFileObject.java | 20 + .../compiler/memory/JavaCompileException.java | 22 + .../compiler/memory/MemoryJavaCompiler.java | 75 + .../memory/MemoryJavaCompilerClassLoader.java | 33 + .../memory/MemoryJavaFileManager.java | 62 + .../compiler/memory/MemoryJavaFileObject.java | 20 + .../compiler/memory/NewInstanceException.java | 22 + .../service/impl/CreditReportServiceImpl.java | 6 +- 379 files changed, 6615 insertions(+), 3510 deletions(-) create mode 100644 io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters_tw_CN.properties create mode 100644 io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/enums/GeneratorType.java create mode 100644 io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/JavaEngineRuntime.java create mode 100644 io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/java/JavaEngineService.java create mode 100644 io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/java/JavaEngineServiceImpl.java create mode 100644 io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/directories.json create mode 100644 io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/client/test/Test2.java rename io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/{ExecuteUnit4LibGenerator.java => GroovyExecuteUnit4LibGenerator.java} (93%) rename io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/{ExecuteUnit4ResourceGenerator.java => GroovyExecuteUnit4ResourceGenerator.java} (93%) create mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaExecuteUnit4LibGenerator.java create mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaExecuteUnit4ResourceGenerator.java create mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaSourceCodeGenerator.java create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/argument_render.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/dictionary_render.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/functions_render.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/impl/lib.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/impl/resource.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/import_render.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/lib_render.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/model_render.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/package_render.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/parameter_render.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/arithmetic.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/conditionRange.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_table.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_table_2c.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_tree.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/execution_flow.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/groovy_script.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/http_request.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/math_formula.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/numberRange.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/object_properties.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/option_value.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/pmml.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/rule_set.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/score_card.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/single_rule.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/sql.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/ternary.tpl create mode 100644 io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/when_then.tpl create mode 100644 io.sc.platform.util/src/main/java/io/sc/platform/util/compiler/file/FileJavaCompiler.java create mode 100644 io.sc.platform.util/src/main/java/io/sc/platform/util/compiler/file/StringJavaFileObject.java create mode 100644 io.sc.platform.util/src/main/java/io/sc/platform/util/compiler/memory/JavaCompileException.java create mode 100644 io.sc.platform.util/src/main/java/io/sc/platform/util/compiler/memory/MemoryJavaCompiler.java create mode 100644 io.sc.platform.util/src/main/java/io/sc/platform/util/compiler/memory/MemoryJavaCompilerClassLoader.java create mode 100644 io.sc.platform.util/src/main/java/io/sc/platform/util/compiler/memory/MemoryJavaFileManager.java create mode 100644 io.sc.platform.util/src/main/java/io/sc/platform/util/compiler/memory/MemoryJavaFileObject.java create mode 100644 io.sc.platform.util/src/main/java/io/sc/platform/util/compiler/memory/NewInstanceException.java diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/CreditReportParser.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/CreditReportParser.java index 2f3c836d..633bf2b7 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/CreditReportParser.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/CreditReportParser.java @@ -1,22 +1,28 @@ package io.sc.creditreport.core; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; -import io.sc.platform.util.ObjectMapperUtil; -import org.springframework.util.StringUtils; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; public class CreditReportParser { + private static XmlMapper mapper =new XmlMapper(); + + static { + mapper.configure(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES,false); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE,false); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + mapper.enable(MapperFeature.USE_STD_BEAN_NAMING); + } + public static io.sc.creditreport.core.person.Document parsePersonCreditReport(String xml) throws JsonProcessingException { - if(StringUtils.hasText(xml)) { - return ObjectMapperUtil.xml().readValue(xml, io.sc.creditreport.core.person.Document.class); - } - return null; + return mapper.readValue(xml, io.sc.creditreport.core.person.Document.class); } public static io.sc.creditreport.core.company.Document parseCompanyCreditReport(String xml) throws JsonProcessingException { - System.out.println(">>>>>>>>>>>>" + xml); - if(StringUtils.hasText(xml)) { - return ObjectMapperUtil.xml().readValue(xml, io.sc.creditreport.core.company.Document.class); - } - return null; + return mapper.readValue(xml, io.sc.creditreport.core.company.Document.class); } } diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/Document.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/Document.java index 12dfa35d..d9c82b7e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/Document.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/Document.java @@ -12,91 +12,91 @@ import java.util.List; public class Document { //报告头 @JacksonXmlProperty(localName = "EAA") - private EAA eaa; + public EAA eaa; //信用提示信息 @JacksonXmlProperty(localName = "EBA") - private EBA eba; + public EBA eba; //借贷交易汇总信息 @JacksonXmlProperty(localName = "EBB") - private EBB ebb; + public EBB ebb; //担保交易汇总信息 @JacksonXmlProperty(localName = "EBC") - private EBC ebc; + public EBC ebc; //授信协议汇总信息 @JacksonXmlProperty(localName = "EBD") - private EBD ebd; + public EBD ebd; //相关还款责任汇总信息 @JacksonXmlProperty(localName = "EBE") - private EBE ebe; + public EBE ebe; //基本信息 @JacksonXmlProperty(localName = "ECA") - private ECA eca; + public ECA eca; //借贷账户信息 @JacksonXmlProperty(localName = "EDA") - private EDA eda; + public EDA eda; //担保账户信息 @JacksonXmlProperty(localName = "EDB") - private EDB edb; + public EDB edb; //授信协议信息 @JacksonXmlProperty(localName = "EDC") - private EDC edc; + public EDC edc; //相关还款责任信息 @JacksonXmlProperty(localName = "EDD") - private EDD edd; + public EDD edd; //公共事业缴费账户信息 @JacksonXmlProperty(localName = "EEA") - private EEA eea; + public EEA eea; //欠税信息 @JacksonXmlProperty(localName = "EFA") - private EFA efa; + public EFA efa; //法院信息 @JacksonXmlProperty(localName = "EFB") - private EFB efb; + public EFB efb; //行政处罚信息 @JacksonXmlProperty(localName = "EFC") - private EFC efc; + public EFC efc; //住房公积金参缴信息 @JacksonXmlProperty(localName = "EFD") - private EFD efd; + public EFD efd; //获得认证/奖励相关信息 @JacksonXmlProperty(localName = "EFE") - private EFE efe; + public EFE efe; //进出口检验相关信息 @JacksonXmlProperty(localName = "EFF") - private EFF eff; + public EFF eff; //融资规模控制信息 @JacksonXmlProperty(localName = "EFG") - private EFG efg; + public EFG efg; //财务信息 @JacksonXmlProperty(localName = "EGA") - private EGA ega; + public EGA ega; //评级信息 @JacksonXmlProperty(localName = "EHA") - private EHA eha; + public EHA eha; //声明及异议标注信息 @JacksonXmlProperty(localName = "EIA") - private EIA eia; + public EIA eia; public EAA getEaa(){ return this.eaa; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01.java index 5cda9a29..0bca0e48 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01.java @@ -11,23 +11,23 @@ import java.util.List; public class EA01 { //报告标识信息段 @JacksonXmlProperty(localName = "EA01A") - private EA01A ea01a; + public EA01A ea01a; //查询请求信息段 @JacksonXmlProperty(localName = "EA01B") - private EA01B ea01b; + public EA01B ea01b; //身份标识信息段 @JacksonXmlProperty(localName = "EA01C") - private EA01C ea01c; + public EA01C ea01c; //异议提示信息段 @JacksonXmlProperty(localName = "EA01D") - private EA01D ea01d; + public EA01D ea01d; //汇率说明信息段 @JacksonXmlProperty(localName = "EA01E") - private EA01E ea01e; + public EA01E ea01e; public EA01A getEa01a(){ return this.ea01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01A.java index c448de43..86efbbf8 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01A.java @@ -11,11 +11,11 @@ import java.util.List; public class EA01A { //报告编号 @JacksonXmlProperty(localName = "EA01AI01") - private String ea01ai01; + public String ea01ai01; //报告生成时间 @JacksonXmlProperty(localName = "EA01AR01") - private Date ea01ar01; + public Date ea01ar01; public String getEa01ai01(){ return this.ea01ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01B.java index ce1faf11..6a3535cf 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01B.java @@ -11,11 +11,11 @@ import java.util.List; public class EA01B { //查询机构代码 @JacksonXmlProperty(localName = "EA01BI01") - private String ea01bi01; + public String ea01bi01; //查询原因 @JacksonXmlProperty(localName = "EA01BD02") - private String ea01bd02; + public String ea01bd02; public String getEa01bi01(){ return this.ea01bi01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01C.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01C.java index ab01016b..aa59fdb0 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01C.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01C.java @@ -11,16 +11,16 @@ import java.util.List; public class EA01C { //企业名称 @JacksonXmlProperty(localName = "EA01CQ01") - private String ea01cq01; + public String ea01cq01; //企业身份标识个数 @JacksonXmlProperty(localName = "EA01CS01") - private String ea01cs01; + public String ea01cs01; //企业身份信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EA01CH") - private List ea01ch =new ArrayList<>(); + public List ea01ch =new ArrayList<>(); public String getEa01cq01(){ return this.ea01cq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01CH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01CH.java index 98e8d349..72f47b99 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01CH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01CH.java @@ -11,11 +11,11 @@ import java.util.List; public class EA01CH { //企业身份标识类型 @JacksonXmlProperty(localName = "EA01CD01") - private String ea01cd01; + public String ea01cd01; //企业身份标识号码 @JacksonXmlProperty(localName = "EA01CI01") - private String ea01ci01; + public String ea01ci01; public String getEa01cd01(){ return this.ea01cd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01D.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01D.java index 40d51ff4..a25dd42c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01D.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01D.java @@ -11,7 +11,7 @@ import java.util.List; public class EA01D { //异议标注数目 @JacksonXmlProperty(localName = "EA01DS01") - private String ea01ds01; + public String ea01ds01; public String getEa01ds01(){ return this.ea01ds01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01E.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01E.java index 3d33d620..5bb48bea 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01E.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EA01E.java @@ -11,11 +11,11 @@ import java.util.List; public class EA01E { //美元折人民币汇率 @JacksonXmlProperty(localName = "EA01EQ01") - private Double ea01eq01; + public Double ea01eq01; //汇率有效日期 @JacksonXmlProperty(localName = "EA01ER01") - private String ea01er01; + public String ea01er01; public Double getEa01eq01(){ return this.ea01eq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EAA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EAA.java index 9fceb4a9..e24ae600 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EAA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EAA.java @@ -11,7 +11,7 @@ import java.util.List; public class EAA { //报告头信息单元 @JacksonXmlProperty(localName = "EA01") - private EA01 ea01; + public EA01 ea01; public EA01 getEa01(){ return this.ea01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01.java index 9220efa5..64d3afd6 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01.java @@ -11,11 +11,11 @@ import java.util.List; public class EB01 { //信贷交易提示信息段 @JacksonXmlProperty(localName = "EB01A") - private EB01A eb01a; + public EB01A eb01a; //非信贷交易及公共信息提示信息段 @JacksonXmlProperty(localName = "EB01B") - private EB01B eb01b; + public EB01B eb01b; public EB01A getEb01a(){ return this.eb01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01A.java index 9eecd82b..2216fe73 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01A.java @@ -11,47 +11,47 @@ import java.util.List; public class EB01A { //首次有信贷交易的年份 @JacksonXmlProperty(localName = "EB01AR01") - private String eb01ar01; + public String eb01ar01; //首次有相关还款责任的年份 @JacksonXmlProperty(localName = "EB01AR02") - private String eb01ar02; + public String eb01ar02; //发生信贷交易的机构数 @JacksonXmlProperty(localName = "EB01AS01") - private String eb01as01; + public String eb01as01; //当前有未结清信贷交易的机构数 @JacksonXmlProperty(localName = "EB01AS02") - private String eb01as02; + public String eb01as02; //借贷交易余额 @JacksonXmlProperty(localName = "EB01AJ01") - private String eb01aj01; + public String eb01aj01; //被追偿的借贷交易余额 @JacksonXmlProperty(localName = "EB01AJ02") - private String eb01aj02; + public String eb01aj02; //关注类借贷交易余额 @JacksonXmlProperty(localName = "EB01AJ03") - private String eb01aj03; + public String eb01aj03; //不良类借贷交易余额 @JacksonXmlProperty(localName = "EB01AJ04") - private String eb01aj04; + public String eb01aj04; //担保交易余额 @JacksonXmlProperty(localName = "EB01AJ05") - private String eb01aj05; + public String eb01aj05; //关注类担保交易余额 @JacksonXmlProperty(localName = "EB01AJ06") - private String eb01aj06; + public String eb01aj06; //不良类担保交易余额 @JacksonXmlProperty(localName = "EB01AJ07") - private String eb01aj07; + public String eb01aj07; public String getEb01ar01(){ return this.eb01ar01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01B.java index c01dbec3..62ae023d 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB01B.java @@ -11,23 +11,23 @@ import java.util.List; public class EB01B { //非信贷交易账户数 @JacksonXmlProperty(localName = "EB01BS01") - private String eb01bs01; + public String eb01bs01; //欠税记录条数 @JacksonXmlProperty(localName = "EB01BS02") - private String eb01bs02; + public String eb01bs02; //民事判决记录条数 @JacksonXmlProperty(localName = "EB01BS03") - private String eb01bs03; + public String eb01bs03; //强制执行记录条数 @JacksonXmlProperty(localName = "EB01BS04") - private String eb01bs04; + public String eb01bs04; //行政处罚记录条数 @JacksonXmlProperty(localName = "EB01BS05") - private String eb01bs05; + public String eb01bs05; public String getEb01bs01(){ return this.eb01bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02.java index d54cf370..c65ba22a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02.java @@ -11,15 +11,15 @@ import java.util.List; public class EB02 { //未结清借贷交易汇总信息段 @JacksonXmlProperty(localName = "EB02A") - private EB02A eb02a; + public EB02A eb02a; //已结清借贷交易汇总信息段 @JacksonXmlProperty(localName = "EB02B") - private EB02B eb02b; + public EB02B eb02b; //负债历史汇总信息段 @JacksonXmlProperty(localName = "EB02C") - private EB02C eb02c; + public EB02C eb02c; public EB02A getEb02a(){ return this.eb02a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02A.java index c1f6090c..55ae98f6 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02A.java @@ -11,48 +11,48 @@ import java.util.List; public class EB02A { //资产处置业务账户数 @JacksonXmlProperty(localName = "EB02AS01") - private String eb02as01; + public String eb02as01; //资产处置业务余额 @JacksonXmlProperty(localName = "EB02AJ01") - private String eb02aj01; + public String eb02aj01; //最近一次处置日期 @JacksonXmlProperty(localName = "EB02AR01") - private Date eb02ar01; + public Date eb02ar01; //垫款业务账户数 @JacksonXmlProperty(localName = "EB02AS02") - private String eb02as02; + public String eb02as02; //垫款业务余额 @JacksonXmlProperty(localName = "EB02AJ02") - private String eb02aj02; + public String eb02aj02; //垫款最近一次还款日期 @JacksonXmlProperty(localName = "EB02AR02") - private Date eb02ar02; + public Date eb02ar02; //逾期总额 @JacksonXmlProperty(localName = "EB02AJ03") - private String eb02aj03; + public String eb02aj03; //逾期本金 @JacksonXmlProperty(localName = "EB02AJ04") - private String eb02aj04; + public String eb02aj04; //逾期利息及其他 @JacksonXmlProperty(localName = "EB02AJ05") - private String eb02aj05; + public String eb02aj05; //其他借贷交易分类汇总条目数量 @JacksonXmlProperty(localName = "EB02AS03") - private String eb02as03; + public String eb02as03; //其他借贷交易分类汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EB02AH") - private List eb02ah =new ArrayList<>(); + public List eb02ah =new ArrayList<>(); public String getEb02as01(){ return this.eb02as01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02AH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02AH.java index 68fb87a1..e1f94bc0 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02AH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02AH.java @@ -11,19 +11,19 @@ import java.util.List; public class EB02AH { //业务类型 @JacksonXmlProperty(localName = "EB02AD01") - private String eb02ad01; + public String eb02ad01; //资产质量分类 @JacksonXmlProperty(localName = "EB02AD02") - private String eb02ad02; + public String eb02ad02; //账户数 @JacksonXmlProperty(localName = "EB02AS04") - private String eb02as04; + public String eb02as04; //余额 @JacksonXmlProperty(localName = "EB02AJ06") - private String eb02aj06; + public String eb02aj06; public String getEb02ad01(){ return this.eb02ad01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02B.java index f964b410..d60a936a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02B.java @@ -11,36 +11,36 @@ import java.util.List; public class EB02B { //资产处置业务账户数 @JacksonXmlProperty(localName = "EB02BS01") - private String eb02bs01; + public String eb02bs01; //资产处置业务金额 @JacksonXmlProperty(localName = "EB02BJ01") - private String eb02bj01; + public String eb02bj01; //处置完成日期 @JacksonXmlProperty(localName = "EB02BR01") - private Date eb02br01; + public Date eb02br01; //结清日期 @JacksonXmlProperty(localName = "EB02BR02") - private Date eb02br02; + public Date eb02br02; //垫款业务账户数 @JacksonXmlProperty(localName = "EB02BS02") - private String eb02bs02; + public String eb02bs02; //垫款业务金额 @JacksonXmlProperty(localName = "EB02BJ02") - private String eb02bj02; + public String eb02bj02; //其他借贷交易分类汇总条目数量 @JacksonXmlProperty(localName = "EB02BS03") - private String eb02bs03; + public String eb02bs03; //其他借贷交易分类汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EB02BH") - private List eb02bh =new ArrayList<>(); + public List eb02bh =new ArrayList<>(); public String getEb02bs01(){ return this.eb02bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02BH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02BH.java index 6d960176..0806b330 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02BH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02BH.java @@ -11,15 +11,15 @@ import java.util.List; public class EB02BH { //业务类型 @JacksonXmlProperty(localName = "EB02BD01") - private String eb02bd01; + public String eb02bd01; //资产质量分类 @JacksonXmlProperty(localName = "EB02BD02") - private String eb02bd02; + public String eb02bd02; //账户数 @JacksonXmlProperty(localName = "EB02BS04") - private String eb02bs04; + public String eb02bs04; public String getEb02bd01(){ return this.eb02bd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02C.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02C.java index f88c1e86..69971b1a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02C.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02C.java @@ -11,12 +11,12 @@ import java.util.List; public class EB02C { //月份数 @JacksonXmlProperty(localName = "EB02CS01") - private String eb02cs01; + public String eb02cs01; //负债历史汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EB02CH") - private List eb02ch =new ArrayList<>(); + public List eb02ch =new ArrayList<>(); public String getEb02cs01(){ return this.eb02cs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02CH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02CH.java index 448ffb34..68faba09 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02CH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB02CH.java @@ -11,47 +11,47 @@ import java.util.List; public class EB02CH { //月份 @JacksonXmlProperty(localName = "EB02CR01") - private String eb02cr01; + public String eb02cr01; //全部负债账户数 @JacksonXmlProperty(localName = "EB02CS02") - private String eb02cs02; + public String eb02cs02; //全部负债余额 @JacksonXmlProperty(localName = "EB02CJ01") - private String eb02cj01; + public String eb02cj01; //关注类负债账户数 @JacksonXmlProperty(localName = "EB02CS03") - private String eb02cs03; + public String eb02cs03; //关注类负债余额 @JacksonXmlProperty(localName = "EB02CJ02") - private String eb02cj02; + public String eb02cj02; //不良类负债账户数 @JacksonXmlProperty(localName = "EB02CS04") - private String eb02cs04; + public String eb02cs04; //不良类负债余额 @JacksonXmlProperty(localName = "EB02CJ03") - private String eb02cj03; + public String eb02cj03; //逾期账户数 @JacksonXmlProperty(localName = "EB02CS05") - private String eb02cs05; + public String eb02cs05; //逾期总额 @JacksonXmlProperty(localName = "EB02CJ04") - private String eb02cj04; + public String eb02cj04; //逾期本金账户数 @JacksonXmlProperty(localName = "EB02CS06") - private String eb02cs06; + public String eb02cs06; //逾期本金 @JacksonXmlProperty(localName = "EB02CJ05") - private String eb02cj05; + public String eb02cj05; public String getEb02cr01(){ return this.eb02cr01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03.java index b2391a8f..c104643e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03.java @@ -11,11 +11,11 @@ import java.util.List; public class EB03 { //未结清担保交易汇总信息段 @JacksonXmlProperty(localName = "EB03A") - private EB03A eb03a; + public EB03A eb03a; //已结清担保交易汇总信息段 @JacksonXmlProperty(localName = "EB03B") - private EB03B eb03b; + public EB03B eb03b; public EB03A getEb03a(){ return this.eb03a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03A.java index b1d46aa6..4191b5de 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03A.java @@ -11,12 +11,12 @@ import java.util.List; public class EB03A { //担保交易分类汇总条目数量 @JacksonXmlProperty(localName = "EB03AS01") - private String eb03as01; + public String eb03as01; //未结清担保交易汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EB03AH") - private List eb03ah =new ArrayList<>(); + public List eb03ah =new ArrayList<>(); public String getEb03as01(){ return this.eb03as01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03AH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03AH.java index 8576f2f9..c17521f1 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03AH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03AH.java @@ -11,19 +11,19 @@ import java.util.List; public class EB03AH { //业务类型 @JacksonXmlProperty(localName = "EB03AD01") - private String eb03ad01; + public String eb03ad01; //资产质量分类 @JacksonXmlProperty(localName = "EB03AD02") - private String eb03ad02; + public String eb03ad02; //账户数 @JacksonXmlProperty(localName = "EB03AS02") - private String eb03as02; + public String eb03as02; //余额 @JacksonXmlProperty(localName = "EB03AJ01") - private String eb03aj01; + public String eb03aj01; public String getEb03ad01(){ return this.eb03ad01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03B.java index 2957f283..32cf08f9 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03B.java @@ -11,12 +11,12 @@ import java.util.List; public class EB03B { //担保交易分类汇总条目数量 @JacksonXmlProperty(localName = "EB03BS01") - private String eb03bs01; + public String eb03bs01; //已结清担保交易汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EB03BH") - private List eb03bh =new ArrayList<>(); + public List eb03bh =new ArrayList<>(); public String getEb03bs01(){ return this.eb03bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03BH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03BH.java index 376a99f1..5feaa203 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03BH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB03BH.java @@ -11,15 +11,15 @@ import java.util.List; public class EB03BH { //业务类型 @JacksonXmlProperty(localName = "EB03BD01") - private String eb03bd01; + public String eb03bd01; //资产质量分类 @JacksonXmlProperty(localName = "EB03BD02") - private String eb03bd02; + public String eb03bd02; //账户数 @JacksonXmlProperty(localName = "EB03BS02") - private String eb03bs02; + public String eb03bs02; public String getEb03bd01(){ return this.eb03bd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB04.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB04.java index 3b8ddb47..edc434e3 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB04.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB04.java @@ -11,31 +11,31 @@ import java.util.List; public class EB04 { //非循环信用额度合计 @JacksonXmlProperty(localName = "EB040J01") - private String eb040j01; + public String eb040j01; //已使用的非循环信用额度合计 @JacksonXmlProperty(localName = "EB040J02") - private String eb040j02; + public String eb040j02; //剩余可用的非循环额度合计 @JacksonXmlProperty(localName = "EB040J03") - private String eb040j03; + public String eb040j03; //循环信用额度合计 @JacksonXmlProperty(localName = "EB040J04") - private String eb040j04; + public String eb040j04; //已使用的循环信用额度合计 @JacksonXmlProperty(localName = "EB040J05") - private String eb040j05; + public String eb040j05; //剩余可用的循环额度合计 @JacksonXmlProperty(localName = "EB040J06") - private String eb040j06; + public String eb040j06; //是否包含授信限额 @JacksonXmlProperty(localName = "EB040D01") - private String eb040d01; + public String eb040d01; public String getEb040j01(){ return this.eb040j01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05.java index c07a8efa..616cd106 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05.java @@ -11,11 +11,11 @@ import java.util.List; public class EB05 { //借贷交易相关还款责任汇总信息段 @JacksonXmlProperty(localName = "EB05A") - private EB05A eb05a; + public EB05A eb05a; //担保交易相关还款责任汇总信息段 @JacksonXmlProperty(localName = "EB05B") - private EB05B eb05b; + public EB05B eb05b; public EB05A getEb05a(){ return this.eb05a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05A.java index 611bf00c..5e3d5f90 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05A.java @@ -11,12 +11,12 @@ import java.util.List; public class EB05A { //还款责任类型数量 @JacksonXmlProperty(localName = "EB05AS01") - private String eb05as01; + public String eb05as01; //借贷交易相关还款责任汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EB05AH") - private List eb05ah =new ArrayList<>(); + public List eb05ah =new ArrayList<>(); public String getEb05as01(){ return this.eb05as01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05AH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05AH.java index 4a8107bd..bb632257 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05AH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05AH.java @@ -11,39 +11,39 @@ import java.util.List; public class EB05AH { //责任类型 @JacksonXmlProperty(localName = "EB05AD01") - private String eb05ad01; + public String eb05ad01; //被追偿账户的还款责任金额 @JacksonXmlProperty(localName = "EB05AJ01") - private String eb05aj01; + public String eb05aj01; //被追偿账户数 @JacksonXmlProperty(localName = "EB05AS02") - private String eb05as02; + public String eb05as02; //被追偿账户余额 @JacksonXmlProperty(localName = "EB05AJ02") - private String eb05aj02; + public String eb05aj02; //其他借贷交易的还款责任金额 @JacksonXmlProperty(localName = "EB05AJ03") - private String eb05aj03; + public String eb05aj03; //其他借贷交易账户数 @JacksonXmlProperty(localName = "EB05AS03") - private String eb05as03; + public String eb05as03; //其他借贷交易账户余额 @JacksonXmlProperty(localName = "EB05AJ04") - private String eb05aj04; + public String eb05aj04; //其他借贷交易账户关注类余额 @JacksonXmlProperty(localName = "EB05AJ05") - private String eb05aj05; + public String eb05aj05; //其他借贷交易账户不良类余额 @JacksonXmlProperty(localName = "EB05AJ06") - private String eb05aj06; + public String eb05aj06; public String getEb05ad01(){ return this.eb05ad01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05B.java index aa32fed9..9e3442bb 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05B.java @@ -11,12 +11,12 @@ import java.util.List; public class EB05B { //还款责任类型数量 @JacksonXmlProperty(localName = "EB05BS01") - private String eb05bs01; + public String eb05bs01; //担保交易相关还款责任汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EB05BH") - private List eb05bh =new ArrayList<>(); + public List eb05bh =new ArrayList<>(); public String getEb05bs01(){ return this.eb05bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05BH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05BH.java index 00a60c87..4e36a108 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05BH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EB05BH.java @@ -11,27 +11,27 @@ import java.util.List; public class EB05BH { //责任类型 @JacksonXmlProperty(localName = "EB05BD01") - private String eb05bd01; + public String eb05bd01; //还款责任金额 @JacksonXmlProperty(localName = "EB05BJ01") - private String eb05bj01; + public String eb05bj01; //账户数 @JacksonXmlProperty(localName = "EB05BS02") - private String eb05bs02; + public String eb05bs02; //余额 @JacksonXmlProperty(localName = "EB05BJ02") - private String eb05bj02; + public String eb05bj02; //关注类余额 @JacksonXmlProperty(localName = "EB05BJ03") - private String eb05bj03; + public String eb05bj03; //不良类余额 @JacksonXmlProperty(localName = "EB05BJ04") - private String eb05bj04; + public String eb05bj04; public String getEb05bd01(){ return this.eb05bd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBA.java index 90b2a8c5..66810df4 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBA.java @@ -11,7 +11,7 @@ import java.util.List; public class EBA { //信用提示信息单元 @JacksonXmlProperty(localName = "EB01") - private EB01 eb01; + public EB01 eb01; public EB01 getEb01(){ return this.eb01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBB.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBB.java index 91df67a7..71bd8b68 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBB.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBB.java @@ -11,7 +11,7 @@ import java.util.List; public class EBB { //借贷交易汇总信息单元 @JacksonXmlProperty(localName = "EB02") - private EB02 eb02; + public EB02 eb02; public EB02 getEb02(){ return this.eb02; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBC.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBC.java index f5215328..86979715 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBC.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBC.java @@ -11,7 +11,7 @@ import java.util.List; public class EBC { //担保交易汇总信息单元 @JacksonXmlProperty(localName = "EB03") - private EB03 eb03; + public EB03 eb03; public EB03 getEb03(){ return this.eb03; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBD.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBD.java index 269628bf..1b10112b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBD.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBD.java @@ -11,7 +11,7 @@ import java.util.List; public class EBD { //授信协议汇总信息记录 @JacksonXmlProperty(localName = "EB04") - private EB04 eb04; + public EB04 eb04; public EB04 getEb04(){ return this.eb04; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBE.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBE.java index 15694d52..8876f9c8 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBE.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EBE.java @@ -11,7 +11,7 @@ import java.util.List; public class EBE { //相关还款责任汇总信息单元 @JacksonXmlProperty(localName = "EB05") - private EB05 eb05; + public EB05 eb05; public EB05 getEb05(){ return this.eb05; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC01.java index e9faa21c..87076f79 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC01.java @@ -11,39 +11,39 @@ import java.util.List; public class EC01 { //经济类型 @JacksonXmlProperty(localName = "EC010D01") - private String ec010d01; + public String ec010d01; //组织机构类型 @JacksonXmlProperty(localName = "EC010D02") - private String ec010d02; + public String ec010d02; //企业规模 @JacksonXmlProperty(localName = "EC010D03") - private String ec010d03; + public String ec010d03; //所属行业 @JacksonXmlProperty(localName = "EC010D04") - private String ec010d04; + public String ec010d04; //登记地址 @JacksonXmlProperty(localName = "EC010Q01") - private String ec010q01; + public String ec010q01; //成立年份 @JacksonXmlProperty(localName = "EC010R01") - private String ec010r01; + public String ec010r01; //登记证书有效截止日期 @JacksonXmlProperty(localName = "EC010R02") - private Date ec010r02; + public Date ec010r02; //办公/经营地址 @JacksonXmlProperty(localName = "EC010Q02") - private String ec010q02; + public String ec010q02; //存续状态 @JacksonXmlProperty(localName = "EC010D05") - private String ec010d05; + public String ec010d05; public String getEc010d01(){ return this.ec010d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC02.java index 1326e4c0..d21cc8cc 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC02.java @@ -11,16 +11,16 @@ import java.util.List; public class EC02 { //注册资本（折人民币合计） @JacksonXmlProperty(localName = "EC020J01") - private String ec020j01; + public String ec020j01; //主要出资人个数 @JacksonXmlProperty(localName = "EC020S01") - private String ec020s01; + public String ec020s01; //出资人信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EC020H") - private List ec020h =new ArrayList<>(); + public List ec020h =new ArrayList<>(); public String getEc020j01(){ return this.ec020j01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC020H.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC020H.java index 12bf7f26..a482114c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC020H.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC020H.java @@ -11,31 +11,31 @@ import java.util.List; public class EC020H { //出资人类型 @JacksonXmlProperty(localName = "EC020D01") - private String ec020d01; + public String ec020d01; //出资人身份类别 @JacksonXmlProperty(localName = "EC020D02") - private String ec020d02; + public String ec020d02; //出资人名称 @JacksonXmlProperty(localName = "EC020Q01") - private String ec020q01; + public String ec020q01; //出资人身份标识类型 @JacksonXmlProperty(localName = "EC020D03") - private String ec020d03; + public String ec020d03; //出资人身份标识号码 @JacksonXmlProperty(localName = "EC020I01") - private String ec020i01; + public String ec020i01; //出资比例 @JacksonXmlProperty(localName = "EC020Q02") - private Double ec020q02; + public Double ec020q02; //更新日期 @JacksonXmlProperty(localName = "EC020R01") - private Date ec020r01; + public Date ec020r01; public String getEc020d01(){ return this.ec020d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC03.java index 4c652676..273493fa 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC03.java @@ -11,12 +11,12 @@ import java.util.List; public class EC03 { //主要组成人员个数 @JacksonXmlProperty(localName = "EC030S01") - private String ec030s01; + public String ec030s01; //主要组成人员信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EC030H") - private List ec030h =new ArrayList<>(); + public List ec030h =new ArrayList<>(); public String getEc030s01(){ return this.ec030s01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC030H.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC030H.java index 3d7d1ab8..ac77c2c0 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC030H.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC030H.java @@ -11,23 +11,23 @@ import java.util.List; public class EC030H { //姓名 @JacksonXmlProperty(localName = "EC030Q01") - private String ec030q01; + public String ec030q01; //证件类型 @JacksonXmlProperty(localName = "EC030D01") - private String ec030d01; + public String ec030d01; //证件号码 @JacksonXmlProperty(localName = "EC030I01") - private String ec030i01; + public String ec030i01; //职位 @JacksonXmlProperty(localName = "EC030D02") - private String ec030d02; + public String ec030d02; //更新日期 @JacksonXmlProperty(localName = "EC030R01") - private Date ec030r01; + public Date ec030r01; public String getEc030q01(){ return this.ec030q01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC04.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC04.java index 76024c94..d58a551e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC04.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC04.java @@ -11,23 +11,23 @@ import java.util.List; public class EC04 { //上级机构类型 @JacksonXmlProperty(localName = "EC040D01") - private String ec040d01; + public String ec040d01; //上级机构名称 @JacksonXmlProperty(localName = "EC040Q01") - private String ec040q01; + public String ec040q01; //上级机构身份标识类型 @JacksonXmlProperty(localName = "EC040D02") - private String ec040d02; + public String ec040d02; //上级机构身份标识号码 @JacksonXmlProperty(localName = "EC040I01") - private String ec040i01; + public String ec040i01; //更新日期 @JacksonXmlProperty(localName = "EC040R01") - private Date ec040r01; + public Date ec040r01; public String getEc040d01(){ return this.ec040d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC05.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC05.java index af4a30a2..72a00889 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC05.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC05.java @@ -11,12 +11,12 @@ import java.util.List; public class EC05 { //实际控制人个数 @JacksonXmlProperty(localName = "EC050S01") - private String ec050s01; + public String ec050s01; //实际控制人信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EC050H") - private List ec050h =new ArrayList<>(); + public List ec050h =new ArrayList<>(); public String getEc050s01(){ return this.ec050s01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC050H.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC050H.java index 213136fc..457f3bef 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC050H.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EC050H.java @@ -11,23 +11,23 @@ import java.util.List; public class EC050H { //实际控制人身份类型 @JacksonXmlProperty(localName = "EC050D01") - private String ec050d01; + public String ec050d01; //实际控制人名称 @JacksonXmlProperty(localName = "EC050Q01") - private String ec050q01; + public String ec050q01; //实际控制人身份标识类型 @JacksonXmlProperty(localName = "EC050D02") - private String ec050d02; + public String ec050d02; //实际控制人身份标识号码 @JacksonXmlProperty(localName = "EC050I01") - private String ec050i01; + public String ec050i01; //更新日期 @JacksonXmlProperty(localName = "EC050R01") - private Date ec050r01; + public Date ec050r01; public String getEc050d01(){ return this.ec050d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ECA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ECA.java index 516b6e1b..6cda37c5 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ECA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ECA.java @@ -11,23 +11,23 @@ import java.util.List; public class ECA { //基本概况信息单元 @JacksonXmlProperty(localName = "EC01") - private EC01 ec01; + public EC01 ec01; //注册资本及主要出资人信息单元 @JacksonXmlProperty(localName = "EC02") - private EC02 ec02; + public EC02 ec02; //主要组成人员信息单元 @JacksonXmlProperty(localName = "EC03") - private EC03 ec03; + public EC03 ec03; //上级机构信息单元 @JacksonXmlProperty(localName = "EC04") - private EC04 ec04; + public EC04 ec04; //实际控制人信息单元 @JacksonXmlProperty(localName = "EC05") - private EC05 ec05; + public EC05 ec05; public EC01 getEc01(){ return this.ec01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01.java index 195cd66f..4b9d8786 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01.java @@ -11,15 +11,15 @@ import java.util.List; public class ED01 { //基本信息段 @JacksonXmlProperty(localName = "ED01A") - private ED01A ed01a; + public ED01A ed01a; //还款表现信息段 @JacksonXmlProperty(localName = "ED01B") - private ED01B ed01b; + public ED01B ed01b; //特定交易信息段 @JacksonXmlProperty(localName = "ED01C") - private ED01C ed01c; + public ED01C ed01c; public ED01A getEd01a(){ return this.ed01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01A.java index 71122244..bd2cc9ba 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01A.java @@ -11,83 +11,83 @@ import java.util.List; public class ED01A { //借贷账户编号 @JacksonXmlProperty(localName = "ED01AI01") - private String ed01ai01; + public String ed01ai01; //账户活动状态 @JacksonXmlProperty(localName = "ED01AD01") - private String ed01ad01; + public String ed01ad01; //借贷账户类型 @JacksonXmlProperty(localName = "ED01AD02") - private String ed01ad02; + public String ed01ad02; //借款期限 @JacksonXmlProperty(localName = "ED01AD03") - private Date ed01ad03; + public Date ed01ad03; //业务管理机构类型 @JacksonXmlProperty(localName = "ED01AD04") - private String ed01ad04; + public String ed01ad04; //业务管理机构代码 @JacksonXmlProperty(localName = "ED01AI02") - private String ed01ai02; + public String ed01ai02; //授信协议编号 @JacksonXmlProperty(localName = "ED01AI03") - private String ed01ai03; + public String ed01ai03; //借贷业务种类大类 @JacksonXmlProperty(localName = "ED01AD05") - private String ed01ad05; + public String ed01ad05; //借贷业务种类细分 @JacksonXmlProperty(localName = "ED01AD06") - private String ed01ad06; + public String ed01ad06; //开户日期 @JacksonXmlProperty(localName = "ED01AR01") - private Date ed01ar01; + public Date ed01ar01; //币种 @JacksonXmlProperty(localName = "ED01AD07") - private String ed01ad07; + public String ed01ad07; //借款金额 @JacksonXmlProperty(localName = "ED01AJ01") - private String ed01aj01; + public String ed01aj01; //信用额度 @JacksonXmlProperty(localName = "ED01AJ02") - private String ed01aj02; + public String ed01aj02; //到期日期 @JacksonXmlProperty(localName = "ED01AR02") - private Date ed01ar02; + public Date ed01ar02; //担保方式 @JacksonXmlProperty(localName = "ED01AD08") - private String ed01ad08; + public String ed01ad08; //其他还款保证方式 @JacksonXmlProperty(localName = "ED01AD09") - private String ed01ad09; + public String ed01ad09; //发放形式 @JacksonXmlProperty(localName = "ED01AD10") - private String ed01ad10; + public String ed01ad10; //共同借款标识 @JacksonXmlProperty(localName = "ED01AD11") - private String ed01ad11; + public String ed01ad11; //关闭日期 @JacksonXmlProperty(localName = "ED01AR03") - private Date ed01ar03; + public Date ed01ar03; //信息报告日期 @JacksonXmlProperty(localName = "ED01AR04") - private Date ed01ar04; + public Date ed01ar04; public String getEd01ai01(){ return this.ed01ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01B.java index b89ae07f..8b02d36b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01B.java @@ -11,12 +11,12 @@ import java.util.List; public class ED01B { //还款表现记录条数 @JacksonXmlProperty(localName = "ED01BS01") - private String ed01bs01; + public String ed01bs01; //还款表现信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED01BH") - private List ed01bh =new ArrayList<>(); + public List ed01bh =new ArrayList<>(); public String getEd01bs01(){ return this.ed01bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01BH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01BH.java index 38868c91..2fd5c589 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01BH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01BH.java @@ -11,59 +11,59 @@ import java.util.List; public class ED01BH { //信息报告日期 @JacksonXmlProperty(localName = "ED01BR01") - private Date ed01br01; + public Date ed01br01; //余额 @JacksonXmlProperty(localName = "ED01BJ01") - private String ed01bj01; + public String ed01bj01; //余额变化日期 @JacksonXmlProperty(localName = "ED01BR02") - private Date ed01br02; + public Date ed01br02; //五级分类 @JacksonXmlProperty(localName = "ED01BD01") - private String ed01bd01; + public String ed01bd01; //五级分类认定日期 @JacksonXmlProperty(localName = "ED01BR03") - private Date ed01br03; + public Date ed01br03; //最近一次实际还款日期 @JacksonXmlProperty(localName = "ED01BR04") - private Date ed01br04; + public Date ed01br04; //最近一次实际还款总额 @JacksonXmlProperty(localName = "ED01BJ02") - private String ed01bj02; + public String ed01bj02; //最近一次还款形式 @JacksonXmlProperty(localName = "ED01BD02") - private String ed01bd02; + public String ed01bd02; //最近一次约定还款日期 @JacksonXmlProperty(localName = "ED01BR05") - private Date ed01br05; + public Date ed01br05; //最近一次应还总额 @JacksonXmlProperty(localName = "ED01BJ03") - private String ed01bj03; + public String ed01bj03; //逾期总额 @JacksonXmlProperty(localName = "ED01BJ04") - private String ed01bj04; + public String ed01bj04; //逾期本金 @JacksonXmlProperty(localName = "ED01BJ05") - private String ed01bj05; + public String ed01bj05; //逾期月数 @JacksonXmlProperty(localName = "ED01BS02") - private String ed01bs02; + public String ed01bs02; //剩余还款月数 @JacksonXmlProperty(localName = "ED01BS03") - private String ed01bs03; + public String ed01bs03; public Date getEd01br01(){ return this.ed01br01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01C.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01C.java index 5c7648bd..4879a9be 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01C.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01C.java @@ -11,12 +11,12 @@ import java.util.List; public class ED01C { //特定交易个数 @JacksonXmlProperty(localName = "ED01CS01") - private String ed01cs01; + public String ed01cs01; //特定交易信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED01CH") - private List ed01ch =new ArrayList<>(); + public List ed01ch =new ArrayList<>(); public String getEd01cs01(){ return this.ed01cs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01CH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01CH.java index 52c3db69..081a7d33 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01CH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED01CH.java @@ -11,23 +11,23 @@ import java.util.List; public class ED01CH { //交易类型 @JacksonXmlProperty(localName = "ED01CD01") - private String ed01cd01; + public String ed01cd01; //交易日期 @JacksonXmlProperty(localName = "ED01CR01") - private Date ed01cr01; + public Date ed01cr01; //交易金额 @JacksonXmlProperty(localName = "ED01CJ01") - private String ed01cj01; + public String ed01cj01; //到期日期变更月数 @JacksonXmlProperty(localName = "ED01CS02") - private String ed01cs02; + public String ed01cs02; //交易明细信息 @JacksonXmlProperty(localName = "ED01CQ01") - private String ed01cq01; + public String ed01cq01; public String getEd01cd01(){ return this.ed01cd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED02.java index 48ed4e60..fc55ba74 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED02.java @@ -11,47 +11,47 @@ import java.util.List; public class ED02 { //贴现账户分机构汇总信息编号 @JacksonXmlProperty(localName = "ED020I01") - private String ed020i01; + public String ed020i01; //业务管理机构类型 @JacksonXmlProperty(localName = "ED020D01") - private String ed020d01; + public String ed020d01; //业务管理机构代码 @JacksonXmlProperty(localName = "ED020I02") - private String ed020i02; + public String ed020i02; //业务种类 @JacksonXmlProperty(localName = "ED020D02") - private String ed020d02; + public String ed020d02; //五级分类 @JacksonXmlProperty(localName = "ED020D03") - private String ed020d03; + public String ed020d03; //未结清账户数 @JacksonXmlProperty(localName = "ED020S01") - private String ed020s01; + public String ed020s01; //余额合计 @JacksonXmlProperty(localName = "ED020J01") - private String ed020j01; + public String ed020j01; //逾期总额合计 @JacksonXmlProperty(localName = "ED020J02") - private String ed020j02; + public String ed020j02; //逾期本金合计 @JacksonXmlProperty(localName = "ED020J03") - private String ed020j03; + public String ed020j03; //已结清账户数 @JacksonXmlProperty(localName = "ED020S02") - private String ed020s02; + public String ed020s02; //已结清账户贴现金额合计 @JacksonXmlProperty(localName = "ED020J04") - private String ed020j04; + public String ed020j04; public String getEd020i01(){ return this.ed020i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED03.java index a3a5eb83..a602279e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED03.java @@ -11,35 +11,35 @@ import java.util.List; public class ED03 { //欠息信息编号 @JacksonXmlProperty(localName = "ED030I01") - private String ed030i01; + public String ed030i01; //业务管理机构类型 @JacksonXmlProperty(localName = "ED030D01") - private String ed030d01; + public String ed030d01; //业务管理机构代码 @JacksonXmlProperty(localName = "ED030I02") - private String ed030i02; + public String ed030i02; //币种 @JacksonXmlProperty(localName = "ED030D02") - private String ed030d02; + public String ed030d02; //欠息余额 @JacksonXmlProperty(localName = "ED030J01") - private String ed030j01; + public String ed030j01; //余额变化日期 @JacksonXmlProperty(localName = "ED030R01") - private Date ed030r01; + public Date ed030r01; //欠息类型 @JacksonXmlProperty(localName = "ED030D03") - private String ed030d03; + public String ed030d03; //信息报告日期 @JacksonXmlProperty(localName = "ED030R02") - private Date ed030r02; + public Date ed030r02; public String getEd030i01(){ return this.ed030i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04.java index 316cf9c4..2127d054 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04.java @@ -11,11 +11,11 @@ import java.util.List; public class ED04 { //基本信息段 @JacksonXmlProperty(localName = "ED04A") - private ED04A ed04a; + public ED04A ed04a; //在保责任信息段 @JacksonXmlProperty(localName = "ED04B") - private ED04B ed04b; + public ED04B ed04b; public ED04A getEd04a(){ return this.ed04a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04A.java index d78fcf1e..f771a004 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04A.java @@ -11,55 +11,55 @@ import java.util.List; public class ED04A { //担保账户编号 @JacksonXmlProperty(localName = "ED04AI01") - private String ed04ai01; + public String ed04ai01; //担保账户类型 @JacksonXmlProperty(localName = "ED04AD01") - private String ed04ad01; + public String ed04ad01; //业务管理机构类型 @JacksonXmlProperty(localName = "ED04AD02") - private String ed04ad02; + public String ed04ad02; //业务管理机构代码 @JacksonXmlProperty(localName = "ED04AI02") - private String ed04ai02; + public String ed04ai02; //授信协议编号 @JacksonXmlProperty(localName = "ED04AI03") - private String ed04ai03; + public String ed04ai03; //担保交易业务种类细分 @JacksonXmlProperty(localName = "ED04AD03") - private String ed04ad03; + public String ed04ad03; //开立日期 @JacksonXmlProperty(localName = "ED04AR01") - private Date ed04ar01; + public Date ed04ar01; //币种 @JacksonXmlProperty(localName = "ED04AD04") - private String ed04ad04; + public String ed04ad04; //金额 @JacksonXmlProperty(localName = "ED04AJ01") - private String ed04aj01; + public String ed04aj01; //到期日期 @JacksonXmlProperty(localName = "ED04AR02") - private Date ed04ar02; + public Date ed04ar02; //反担保方式 @JacksonXmlProperty(localName = "ED04AD05") - private String ed04ad05; + public String ed04ad05; //其他还款保证方式 @JacksonXmlProperty(localName = "ED04AD06") - private String ed04ad06; + public String ed04ad06; //保证金比例 @JacksonXmlProperty(localName = "ED04AQ01") - private String ed04aq01; + public String ed04aq01; public String getEd04ai01(){ return this.ed04ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04B.java index 2322ca00..c72311b5 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED04B.java @@ -11,35 +11,35 @@ import java.util.List; public class ED04B { //信息报告日期 @JacksonXmlProperty(localName = "ED04BR01") - private Date ed04br01; + public Date ed04br01; //账户活动状态 @JacksonXmlProperty(localName = "ED04BD01") - private String ed04bd01; + public String ed04bd01; //余额 @JacksonXmlProperty(localName = "ED04BJ01") - private String ed04bj01; + public String ed04bj01; //五级分类 @JacksonXmlProperty(localName = "ED04BD02") - private String ed04bd02; + public String ed04bd02; //风险敞口 @JacksonXmlProperty(localName = "ED04BJ02") - private String ed04bj02; + public String ed04bj02; //代偿（垫款）标志 @JacksonXmlProperty(localName = "ED04BD03") - private String ed04bd03; + public String ed04bd03; //共同债务标识 @JacksonXmlProperty(localName = "ED04BD04") - private String ed04bd04; + public String ed04bd04; //关闭日期 @JacksonXmlProperty(localName = "ED04BR02") - private Date ed04br02; + public Date ed04br02; public Date getEd04br01(){ return this.ed04br01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED05.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED05.java index 3697cee4..f6cb4be3 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED05.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED05.java @@ -11,55 +11,55 @@ import java.util.List; public class ED05 { //担保账户分机构汇总信息编号 @JacksonXmlProperty(localName = "ED050I01") - private String ed050i01; + public String ed050i01; //业务管理机构类型 @JacksonXmlProperty(localName = "ED050D01") - private String ed050d01; + public String ed050d01; //业务管理机构代码 @JacksonXmlProperty(localName = "ED050I02") - private String ed050i02; + public String ed050i02; //担保交易业务种类细分 @JacksonXmlProperty(localName = "ED050D02") - private String ed050d02; + public String ed050d02; //五级分类 @JacksonXmlProperty(localName = "ED050D03") - private String ed050d03; + public String ed050d03; //未结清账户数 @JacksonXmlProperty(localName = "ED050S01") - private String ed050s01; + public String ed050s01; //余额 @JacksonXmlProperty(localName = "ED050J01") - private String ed050j01; + public String ed050j01; //30天内到期的余额 @JacksonXmlProperty(localName = "ED050J02") - private String ed050j02; + public String ed050j02; //60天内到期的余额 @JacksonXmlProperty(localName = "ED050J03") - private String ed050j03; + public String ed050j03; //90天内到期的余额 @JacksonXmlProperty(localName = "ED050J04") - private String ed050j04; + public String ed050j04; //90天后到期的余额 @JacksonXmlProperty(localName = "ED050J05") - private String ed050j05; + public String ed050j05; //已结清账户数 @JacksonXmlProperty(localName = "ED050S02") - private String ed050s02; + public String ed050s02; //垫款标志 @JacksonXmlProperty(localName = "ED050D04") - private String ed050d04; + public String ed050d04; public String getEd050i01(){ return this.ed050i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED06.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED06.java index 63e57961..84cb8d3c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED06.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED06.java @@ -11,55 +11,55 @@ import java.util.List; public class ED06 { //授信协议编号 @JacksonXmlProperty(localName = "ED060I01") - private String ed060i01; + public String ed060i01; //业务管理机构类型 @JacksonXmlProperty(localName = "ED060D01") - private String ed060d01; + public String ed060d01; //业务管理机构代码 @JacksonXmlProperty(localName = "ED060I02") - private String ed060i02; + public String ed060i02; //授信额度类型 @JacksonXmlProperty(localName = "ED060D02") - private String ed060d02; + public String ed060d02; //额度循环标志 @JacksonXmlProperty(localName = "ED060D03") - private String ed060d03; + public String ed060d03; //币种 @JacksonXmlProperty(localName = "ED060D04") - private String ed060d04; + public String ed060d04; //授信额度 @JacksonXmlProperty(localName = "ED060J01") - private String ed060j01; + public String ed060j01; //已用额度 @JacksonXmlProperty(localName = "ED060J04") - private String ed060j04; + public String ed060j04; //授信限额 @JacksonXmlProperty(localName = "ED060J03") - private String ed060j03; + public String ed060j03; //授信限额编号 @JacksonXmlProperty(localName = "ED060I03") - private String ed060i03; + public String ed060i03; //生效日期 @JacksonXmlProperty(localName = "ED060R01") - private Date ed060r01; + public Date ed060r01; //终止日期 @JacksonXmlProperty(localName = "ED060R02") - private Date ed060r02; + public Date ed060r02; //信息报告日期 @JacksonXmlProperty(localName = "ED060R03") - private Date ed060r03; + public Date ed060r03; public String getEd060i01(){ return this.ed060i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED07.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED07.java index c7ede844..a435761b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED07.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED07.java @@ -11,99 +11,99 @@ import java.util.List; public class ED07 { //账户编号 @JacksonXmlProperty(localName = "ED070I01") - private String ed070i01; + public String ed070i01; //主借款人身份类别 @JacksonXmlProperty(localName = "ED070D01") - private String ed070d01; + public String ed070d01; //账户类型 @JacksonXmlProperty(localName = "ED070D02") - private String ed070d02; + public String ed070d02; //相关还款责任人类型 @JacksonXmlProperty(localName = "ED070D03") - private String ed070d03; + public String ed070d03; //币种（相关还款责任金额） @JacksonXmlProperty(localName = "ED070D10") - private String ed070d10; + public String ed070d10; //相关还款责任金额 @JacksonXmlProperty(localName = "ED070J01") - private String ed070j01; + public String ed070j01; //业务管理机构类型 @JacksonXmlProperty(localName = "ED070D04") - private String ed070d04; + public String ed070d04; //业务管理机构代码 @JacksonXmlProperty(localName = "ED070I02") - private String ed070i02; + public String ed070i02; //业务种类 @JacksonXmlProperty(localName = "ED070D05") - private String ed070d05; + public String ed070d05; //业务种类细分 @JacksonXmlProperty(localName = "ED070D06") - private String ed070d06; + public String ed070d06; //开立日期 @JacksonXmlProperty(localName = "ED070R01") - private Date ed070r01; + public Date ed070r01; //到期日期 @JacksonXmlProperty(localName = "ED070R02") - private Date ed070r02; + public Date ed070r02; //币种 @JacksonXmlProperty(localName = "ED070D07") - private String ed070d07; + public String ed070d07; //余额 @JacksonXmlProperty(localName = "ED070J02") - private String ed070j02; + public String ed070j02; //借款金额 @JacksonXmlProperty(localName = "ED070J05") - private String ed070j05; + public String ed070j05; //信用额度 @JacksonXmlProperty(localName = "ED070J06") - private String ed070j06; + public String ed070j06; //保证合同编号 @JacksonXmlProperty(localName = "ED070I03") - private String ed070i03; + public String ed070i03; //五级分类 @JacksonXmlProperty(localName = "ED070D08") - private String ed070d08; + public String ed070d08; //逾期总额 @JacksonXmlProperty(localName = "ED070J03") - private String ed070j03; + public String ed070j03; //逾期本金 @JacksonXmlProperty(localName = "ED070J04") - private String ed070j04; + public String ed070j04; //逾期月数 @JacksonXmlProperty(localName = "ED070S01") - private String ed070s01; + public String ed070s01; //还款状态 @JacksonXmlProperty(localName = "ED070D09") - private String ed070d09; + public String ed070d09; //剩余还款月数 @JacksonXmlProperty(localName = "ED070S02") - private String ed070s02; + public String ed070s02; //信息报告日期 @JacksonXmlProperty(localName = "ED070R03") - private Date ed070r03; + public Date ed070r03; public String getEd070i01(){ return this.ed070i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED08.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED08.java index d56f13db..8eb32b9e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED08.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED08.java @@ -11,55 +11,55 @@ import java.util.List; public class ED08 { //贴现账户分机构汇总信息编号 @JacksonXmlProperty(localName = "ED080I01") - private String ed080i01; + public String ed080i01; //相关还款责任类型 @JacksonXmlProperty(localName = "ED080D01") - private String ed080d01; + public String ed080d01; //业务管理机构类型 @JacksonXmlProperty(localName = "ED080D02") - private String ed080d02; + public String ed080d02; //业务管理机构代码 @JacksonXmlProperty(localName = "ED080I02") - private String ed080i02; + public String ed080i02; //业务种类细分 @JacksonXmlProperty(localName = "ED080D03") - private String ed080d03; + public String ed080d03; //五级分类 @JacksonXmlProperty(localName = "ED080D04") - private String ed080d04; + public String ed080d04; //保证合同编号 @JacksonXmlProperty(localName = "ED080I03") - private String ed080i03; + public String ed080i03; //相关还款责任金额 @JacksonXmlProperty(localName = "ED080J01") - private String ed080j01; + public String ed080j01; //账户数 @JacksonXmlProperty(localName = "ED080S01") - private String ed080s01; + public String ed080s01; //余额 @JacksonXmlProperty(localName = "ED080J02") - private String ed080j02; + public String ed080j02; //逾期总额 @JacksonXmlProperty(localName = "ED080J03") - private String ed080j03; + public String ed080j03; //逾期本金 @JacksonXmlProperty(localName = "ED080J04") - private String ed080j04; + public String ed080j04; //借款金额 @JacksonXmlProperty(localName = "ED080J05") - private String ed080j05; + public String ed080j05; public String getEd080i01(){ return this.ed080i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED09.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED09.java index d6af334f..663c24d1 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED09.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/ED09.java @@ -11,47 +11,47 @@ import java.util.List; public class ED09 { //担保账户分机构汇总信息编号 @JacksonXmlProperty(localName = "ED090I01") - private String ed090i01; + public String ed090i01; //相关还款责任类型 @JacksonXmlProperty(localName = "ED090D01") - private String ed090d01; + public String ed090d01; //业务管理机构类型 @JacksonXmlProperty(localName = "ED090D02") - private String ed090d02; + public String ed090d02; //业务管理机构代码 @JacksonXmlProperty(localName = "ED090I02") - private String ed090i02; + public String ed090i02; //业务种类细分 @JacksonXmlProperty(localName = "ED090D03") - private String ed090d03; + public String ed090d03; //五级分类 @JacksonXmlProperty(localName = "ED090D04") - private String ed090d04; + public String ed090d04; //保证合同编号 @JacksonXmlProperty(localName = "ED090I03") - private String ed090i03; + public String ed090i03; //相关还款责任金额 @JacksonXmlProperty(localName = "ED090J01") - private String ed090j01; + public String ed090j01; //账户数 @JacksonXmlProperty(localName = "ED090S01") - private String ed090s01; + public String ed090s01; //余额 @JacksonXmlProperty(localName = "ED090J02") - private String ed090j02; + public String ed090j02; //担保金额 @JacksonXmlProperty(localName = "ED090J03") - private String ed090j03; + public String ed090j03; public String getEd090i01(){ return this.ed090i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDA.java index b0da89de..6aee8ae7 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDA.java @@ -12,17 +12,17 @@ public class EDA { //借贷账户信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED01") - private List ed01 =new ArrayList<>(); + public List ed01 =new ArrayList<>(); //贴现账户分机构汇总信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED02") - private List ed02 =new ArrayList<>(); + public List ed02 =new ArrayList<>(); //欠息信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED03") - private List ed03 =new ArrayList<>(); + public List ed03 =new ArrayList<>(); public List getEd01(){ return this.ed01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDB.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDB.java index f6aeb509..3ec0d971 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDB.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDB.java @@ -12,12 +12,12 @@ public class EDB { //担保账户信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED04") - private List ed04 =new ArrayList<>(); + public List ed04 =new ArrayList<>(); //担保账户分机构汇总信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED05") - private List ed05 =new ArrayList<>(); + public List ed05 =new ArrayList<>(); public List getEd04(){ return this.ed04; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDC.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDC.java index 904bdc37..40b9d1b7 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDC.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDC.java @@ -12,7 +12,7 @@ public class EDC { //授信协议信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED06") - private List ed06 =new ArrayList<>(); + public List ed06 =new ArrayList<>(); public List getEd06(){ return this.ed06; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDD.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDD.java index 6d9e2668..13f44475 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDD.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EDD.java @@ -12,17 +12,17 @@ public class EDD { //相关还款责任借贷账户（不含贴现）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED07") - private List ed07 =new ArrayList<>(); + public List ed07 =new ArrayList<>(); //相关还款责任贴现账户分机构汇总信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED08") - private List ed08 =new ArrayList<>(); + public List ed08 =new ArrayList<>(); //相关还款责任担保账户分机构汇总信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "ED09") - private List ed09 =new ArrayList<>(); + public List ed09 =new ArrayList<>(); public List getEd07(){ return this.ed07; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01.java index 6a870f79..a59a7373 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01.java @@ -11,11 +11,11 @@ import java.util.List; public class EE01 { //基本信息段 @JacksonXmlProperty(localName = "EE01A") - private EE01A ee01a; + public EE01A ee01a; //过去 24 个月缴费情况信息段 @JacksonXmlProperty(localName = "EE01B") - private EE01B ee01b; + public EE01B ee01b; public EE01A getEe01a(){ return this.ee01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01A.java index a82696ba..2ae8b11d 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01A.java @@ -11,27 +11,27 @@ import java.util.List; public class EE01A { //公用事业缴费账户编号 @JacksonXmlProperty(localName = "EE01AI01") - private String ee01ai01; + public String ee01ai01; //公用事业单位名称 @JacksonXmlProperty(localName = "EE01AQ01") - private String ee01aq01; + public String ee01aq01; //业务类型 @JacksonXmlProperty(localName = "EE01AD01") - private String ee01ad01; + public String ee01ad01; //缴费状态 @JacksonXmlProperty(localName = "EE01AD02") - private String ee01ad02; + public String ee01ad02; //累计欠费金额 @JacksonXmlProperty(localName = "EE01AJ01") - private String ee01aj01; + public String ee01aj01; //统计年月 @JacksonXmlProperty(localName = "EE01AR01") - private String ee01ar01; + public String ee01ar01; public String getEe01ai01(){ return this.ee01ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01B.java index d737b038..08c5f999 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01B.java @@ -11,12 +11,12 @@ import java.util.List; public class EE01B { //缴费记录条数 @JacksonXmlProperty(localName = "EE01BS01") - private String ee01bs01; + public String ee01bs01; //缴费情况信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EE01BH") - private List ee01bh =new ArrayList<>(); + public List ee01bh =new ArrayList<>(); public String getEe01bs01(){ return this.ee01bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01BH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01BH.java index b87dd5c3..fed2ad33 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01BH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EE01BH.java @@ -11,23 +11,23 @@ import java.util.List; public class EE01BH { //统计年月 @JacksonXmlProperty(localName = "EE01BR01") - private String ee01br01; + public String ee01br01; //缴费状态 @JacksonXmlProperty(localName = "EE01BD01") - private String ee01bd01; + public String ee01bd01; //本月应缴金额 @JacksonXmlProperty(localName = "EE01BJ01") - private String ee01bj01; + public String ee01bj01; //本月实缴金额 @JacksonXmlProperty(localName = "EE01BJ02") - private String ee01bj02; + public String ee01bj02; //累计欠费金额 @JacksonXmlProperty(localName = "EE01BJ03") - private String ee01bj03; + public String ee01bj03; public String getEe01br01(){ return this.ee01br01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EEA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EEA.java index a62a090b..cc450e88 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EEA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EEA.java @@ -12,7 +12,7 @@ public class EEA { //公共事业缴费账户信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EE01") - private List ee01 =new ArrayList<>(); + public List ee01 =new ArrayList<>(); public List getEe01(){ return this.ee01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF01.java index 80c9d10e..17e7992b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF01.java @@ -11,19 +11,19 @@ import java.util.List; public class EF01 { //欠税记录编号 @JacksonXmlProperty(localName = "EF010I01") - private String ef010i01; + public String ef010i01; //主管税务机关名称 @JacksonXmlProperty(localName = "EF010Q01") - private String ef010q01; + public String ef010q01; //欠税总额 @JacksonXmlProperty(localName = "EF010J01") - private Date ef010j01; + public Date ef010j01; //欠税统计时间 @JacksonXmlProperty(localName = "EF010R01") - private String ef010r01; + public String ef010r01; public String getEf010i01(){ return this.ef010i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF02.java index 6c43a893..e0e7f39a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF02.java @@ -11,51 +11,51 @@ import java.util.List; public class EF02 { //民事判决记录编号 @JacksonXmlProperty(localName = "EF020I01") - private String ef020i01; + public String ef020i01; //立案法院名称 @JacksonXmlProperty(localName = "EF020Q01") - private String ef020q01; + public String ef020q01; //案号 @JacksonXmlProperty(localName = "EF020I02") - private String ef020i02; + public String ef020i02; //立案日期 @JacksonXmlProperty(localName = "EF020R01") - private Date ef020r01; + public Date ef020r01; //案由 @JacksonXmlProperty(localName = "EF020Q02") - private String ef020q02; + public String ef020q02; //诉讼地位 @JacksonXmlProperty(localName = "EF020D01") - private String ef020d01; + public String ef020d01; //审判程序 @JacksonXmlProperty(localName = "EF020D02") - private String ef020d02; + public String ef020d02; //诉讼标的 @JacksonXmlProperty(localName = "EF020Q03") - private String ef020q03; + public String ef020q03; //诉讼标的金额 @JacksonXmlProperty(localName = "EF020J01") - private String ef020j01; + public String ef020j01; //结案方式 @JacksonXmlProperty(localName = "EF020D03") - private String ef020d03; + public String ef020d03; //判决/调解生效日期 @JacksonXmlProperty(localName = "EF020R02") - private Date ef020r02; + public Date ef020r02; //判决/调解结果 @JacksonXmlProperty(localName = "EF020Q04") - private String ef020q04; + public String ef020q04; public String getEf020i01(){ return this.ef020i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF03.java index 0cb64470..2e49e607 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF03.java @@ -11,47 +11,47 @@ import java.util.List; public class EF03 { //强制执行记录编号 @JacksonXmlProperty(localName = "EF030I01") - private String ef030i01; + public String ef030i01; //执行法院名称 @JacksonXmlProperty(localName = "EF030Q01") - private String ef030q01; + public String ef030q01; //案号 @JacksonXmlProperty(localName = "EF030I02") - private String ef030i02; + public String ef030i02; //立案日期 @JacksonXmlProperty(localName = "EF030R01") - private Date ef030r01; + public Date ef030r01; //执行案由 @JacksonXmlProperty(localName = "EF030Q02") - private String ef030q02; + public String ef030q02; //申请执行标的 @JacksonXmlProperty(localName = "EF030Q03") - private String ef030q03; + public String ef030q03; //申请执行标的金额 @JacksonXmlProperty(localName = "EF030J01") - private String ef030j01; + public String ef030j01; //案件状态 @JacksonXmlProperty(localName = "EF030Q04") - private String ef030q04; + public String ef030q04; //结案方式 @JacksonXmlProperty(localName = "EF030D01") - private String ef030d01; + public String ef030d01; //已执行标的 @JacksonXmlProperty(localName = "EF030Q05") - private String ef030q05; + public String ef030q05; //已执行标的金额 @JacksonXmlProperty(localName = "EF030J02") - private String ef030j02; + public String ef030j02; public String getEf030i01(){ return this.ef030i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF04.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF04.java index 32416eeb..027a15e1 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF04.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF04.java @@ -11,39 +11,39 @@ import java.util.List; public class EF04 { //行政处罚记录编号 @JacksonXmlProperty(localName = "EF040I01") - private String ef040i01; + public String ef040i01; //处罚机构名称 @JacksonXmlProperty(localName = "EF040Q01") - private String ef040q01; + public String ef040q01; //处罚决定书文号 @JacksonXmlProperty(localName = "EF040I02") - private String ef040i02; + public String ef040i02; //违法行为 @JacksonXmlProperty(localName = "EF040Q02") - private String ef040q02; + public String ef040q02; //处罚决定 @JacksonXmlProperty(localName = "EF040Q03") - private String ef040q03; + public String ef040q03; //处罚日期 @JacksonXmlProperty(localName = "EF040R01") - private Date ef040r01; + public Date ef040r01; //处罚金额 @JacksonXmlProperty(localName = "EF040J01") - private String ef040j01; + public String ef040j01; //处罚执行情况 @JacksonXmlProperty(localName = "EF040Q04") - private String ef040q04; + public String ef040q04; //行政复议结果 @JacksonXmlProperty(localName = "EF040Q05") - private String ef040q05; + public String ef040q05; public String getEf040i01(){ return this.ef040i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05.java index 442f8eed..6b0bed49 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05.java @@ -11,11 +11,11 @@ import java.util.List; public class EF05 { //基本信息段 @JacksonXmlProperty(localName = "EF05A") - private EF05A ef05a; + public EF05A ef05a; //过去 24 个月缴费情况信息段 @JacksonXmlProperty(localName = "EF05B") - private EF05B ef05b; + public EF05B ef05b; public EF05A getEf05a(){ return this.ef05a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05A.java index 8f0db01d..9345634c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05A.java @@ -11,39 +11,39 @@ import java.util.List; public class EF05A { //账户编号 @JacksonXmlProperty(localName = "EF05AI01") - private String ef05ai01; + public String ef05ai01; //初缴年月 @JacksonXmlProperty(localName = "EF05AR01") - private String ef05ar01; + public String ef05ar01; //职工人数 @JacksonXmlProperty(localName = "EF05AS01") - private String ef05as01; + public String ef05as01; //缴费基数 @JacksonXmlProperty(localName = "EF05AJ01") - private String ef05aj01; + public String ef05aj01; //最近一次缴费日期 @JacksonXmlProperty(localName = "EF05AR02") - private Date ef05ar02; + public Date ef05ar02; //缴至年月 @JacksonXmlProperty(localName = "EF05AR03") - private String ef05ar03; + public String ef05ar03; //缴费状态 @JacksonXmlProperty(localName = "EF05AD01") - private String ef05ad01; + public String ef05ad01; //累计欠费金额 @JacksonXmlProperty(localName = "EF05AJ02") - private String ef05aj02; + public String ef05aj02; //统计年月 @JacksonXmlProperty(localName = "EF05AR04") - private String ef05ar04; + public String ef05ar04; public String getEf05ai01(){ return this.ef05ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05B.java index 629bb1be..1bc866ff 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05B.java @@ -11,12 +11,12 @@ import java.util.List; public class EF05B { //缴费记录条数 @JacksonXmlProperty(localName = "EF05BS01") - private String ef05bs01; + public String ef05bs01; //缴费情况信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF05BH") - private List ef05bh =new ArrayList<>(); + public List ef05bh =new ArrayList<>(); public String getEf05bs01(){ return this.ef05bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05BH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05BH.java index aac16522..d83b185a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05BH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF05BH.java @@ -11,23 +11,23 @@ import java.util.List; public class EF05BH { //统计年月 @JacksonXmlProperty(localName = "EF05BR01") - private String ef05br01; + public String ef05br01; //缴费状态 @JacksonXmlProperty(localName = "EF05BD01") - private String ef05bd01; + public String ef05bd01; //本月应缴金额 @JacksonXmlProperty(localName = "EF05BJ01") - private String ef05bj01; + public String ef05bj01; //本月实缴金额 @JacksonXmlProperty(localName = "EF05BJ02") - private String ef05bj02; + public String ef05bj02; //累计欠费金额 @JacksonXmlProperty(localName = "EF05BJ03") - private String ef05bj03; + public String ef05bj03; public String getEf05br01(){ return this.ef05br01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF06.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF06.java index 0607d954..aafebbaa 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF06.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF06.java @@ -11,27 +11,27 @@ import java.util.List; public class EF06 { //许可记录编号 @JacksonXmlProperty(localName = "EF060I01") - private String ef060i01; + public String ef060i01; //许可部门名称 @JacksonXmlProperty(localName = "EF060Q01") - private String ef060q01; + public String ef060q01; //许可类型 @JacksonXmlProperty(localName = "EF060Q02") - private String ef060q02; + public String ef060q02; //许可日期 @JacksonXmlProperty(localName = "EF060R01") - private Date ef060r01; + public Date ef060r01; //截止日期 @JacksonXmlProperty(localName = "EF060R02") - private Date ef060r02; + public Date ef060r02; //许可内容 @JacksonXmlProperty(localName = "EF060Q03") - private String ef060q03; + public String ef060q03; public String getEf060i01(){ return this.ef060i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF07.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF07.java index aa89b3a3..ecf1daa9 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF07.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF07.java @@ -11,27 +11,27 @@ import java.util.List; public class EF07 { //认证记录编号 @JacksonXmlProperty(localName = "EF070I01") - private String ef070i01; + public String ef070i01; //认证部门名称 @JacksonXmlProperty(localName = "EF070Q01") - private String ef070q01; + public String ef070q01; //认证类型 @JacksonXmlProperty(localName = "EF070Q02") - private String ef070q02; + public String ef070q02; //认证日期 @JacksonXmlProperty(localName = "EF070R01") - private Date ef070r01; + public Date ef070r01; //截止日期 @JacksonXmlProperty(localName = "EF070R02") - private Date ef070r02; + public Date ef070r02; //认证内容 @JacksonXmlProperty(localName = "EF070Q03") - private String ef070q03; + public String ef070q03; public String getEf070i01(){ return this.ef070i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF08.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF08.java index cffc5ead..d16048bd 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF08.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF08.java @@ -11,27 +11,27 @@ import java.util.List; public class EF08 { //资质记录编号 @JacksonXmlProperty(localName = "EF080I01") - private String ef080i01; + public String ef080i01; //认定部门名称 @JacksonXmlProperty(localName = "EF080Q01") - private String ef080q01; + public String ef080q01; //资质类型 @JacksonXmlProperty(localName = "EF080Q02") - private String ef080q02; + public String ef080q02; //批准日期 @JacksonXmlProperty(localName = "EF080R01") - private Date ef080r01; + public Date ef080r01; //截止日期 @JacksonXmlProperty(localName = "EF080R02") - private Date ef080r02; + public Date ef080r02; //资质内容 @JacksonXmlProperty(localName = "EF080Q03") - private String ef080q03; + public String ef080q03; public String getEf080i01(){ return this.ef080i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF09.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF09.java index 4a1939ba..3d7e8142 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF09.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF09.java @@ -11,27 +11,27 @@ import java.util.List; public class EF09 { //奖励记录编号 @JacksonXmlProperty(localName = "EF090I01") - private String ef090i01; + public String ef090i01; //奖励部门名称 @JacksonXmlProperty(localName = "EF090Q01") - private String ef090q01; + public String ef090q01; //奖励名称 @JacksonXmlProperty(localName = "EF090Q02") - private String ef090q02; + public String ef090q02; //授予日期 @JacksonXmlProperty(localName = "EF090R01") - private Date ef090r01; + public Date ef090r01; //截止日期 @JacksonXmlProperty(localName = "EF090R02") - private Date ef090r02; + public Date ef090r02; //奖励事实 @JacksonXmlProperty(localName = "EF090Q03") - private String ef090q03; + public String ef090q03; public String getEf090i01(){ return this.ef090i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF10.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF10.java index fd1449f7..85e794d5 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF10.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF10.java @@ -11,27 +11,27 @@ import java.util.List; public class EF10 { //信息编号 @JacksonXmlProperty(localName = "EF100I01") - private String ef100i01; + public String ef100i01; //专利名称 @JacksonXmlProperty(localName = "EF100Q01") - private String ef100q01; + public String ef100q01; //专利号 @JacksonXmlProperty(localName = "EF100I02") - private String ef100i02; + public String ef100i02; //申请日期 @JacksonXmlProperty(localName = "EF100R01") - private Date ef100r01; + public Date ef100r01; //授予日期 @JacksonXmlProperty(localName = "EF100R02") - private Date ef100r02; + public Date ef100r02; //专利有效期 @JacksonXmlProperty(localName = "EF100S01") - private String ef100s01; + public String ef100s01; public String getEf100i01(){ return this.ef100i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF11.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF11.java index 5d8a6d96..30c1aeb3 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF11.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF11.java @@ -11,19 +11,19 @@ import java.util.List; public class EF11 { //信息编号 @JacksonXmlProperty(localName = "EF110I01") - private String ef110i01; + public String ef110i01; //批准部门名称 @JacksonXmlProperty(localName = "EF110Q01") - private String ef110q01; + public String ef110q01; //出口商品名称 @JacksonXmlProperty(localName = "EF110Q02") - private String ef110q02; + public String ef110q02; //生效日期 @JacksonXmlProperty(localName = "EF110R01") - private Date ef110r01; + public Date ef110r01; public String getEf110i01(){ return this.ef110i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF12.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF12.java index 2445aec5..07e375d1 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF12.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF12.java @@ -11,23 +11,23 @@ import java.util.List; public class EF12 { //信息编号 @JacksonXmlProperty(localName = "EF120I01") - private String ef120i01; + public String ef120i01; //批准部门名称 @JacksonXmlProperty(localName = "EF120Q01") - private String ef120q01; + public String ef120q01; //免验商品名称 @JacksonXmlProperty(localName = "EF120Q02") - private String ef120q02; + public String ef120q02; //免验号 @JacksonXmlProperty(localName = "EF120I02") - private String ef120i02; + public String ef120i02; //截至日期 @JacksonXmlProperty(localName = "EF120R02") - private Date ef120r02; + public Date ef120r02; public String getEf120i01(){ return this.ef120i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF13.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF13.java index af1801ae..6d409569 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF13.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF13.java @@ -11,27 +11,27 @@ import java.util.List; public class EF13 { //信息编号 @JacksonXmlProperty(localName = "EF130I01") - private String ef130i01; + public String ef130i01; //监管部门名称 @JacksonXmlProperty(localName = "EF130Q01") - private String ef130q01; + public String ef130q01; //管辖直属局 @JacksonXmlProperty(localName = "EF130Q02") - private String ef130q02; + public String ef130q02; //监管级别 @JacksonXmlProperty(localName = "EF130D01") - private String ef130d01; + public String ef130d01; //生效日期 @JacksonXmlProperty(localName = "EF130R01") - private Date ef130r01; + public Date ef130r01; //截至日期 @JacksonXmlProperty(localName = "EF130R02") - private Date ef130r02; + public Date ef130r02; public String getEf130i01(){ return this.ef130i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF14.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF14.java index 50976ea4..8e5b026c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF14.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EF14.java @@ -11,23 +11,23 @@ import java.util.List; public class EF14 { //信息编号 @JacksonXmlProperty(localName = "EF140I01") - private String ef140i01; + public String ef140i01; //所属名录 @JacksonXmlProperty(localName = "EF140D01") - private String ef140d01; + public String ef140d01; //融资控制类型 @JacksonXmlProperty(localName = "EF140D02") - private String ef140d02; + public String ef140d02; //年度 @JacksonXmlProperty(localName = "EF140R01") - private String ef140r01; + public String ef140r01; //规模 @JacksonXmlProperty(localName = "EF140J01") - private String ef140j01; + public String ef140j01; public String getEf140i01(){ return this.ef140i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFA.java index 788ca69e..36dd0907 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFA.java @@ -12,7 +12,7 @@ public class EFA { //欠税记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF01") - private List ef01 =new ArrayList<>(); + public List ef01 =new ArrayList<>(); public List getEf01(){ return this.ef01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFB.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFB.java index a5b14da8..ab88c7fb 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFB.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFB.java @@ -12,12 +12,12 @@ public class EFB { //民事判决记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF02") - private List ef02 =new ArrayList<>(); + public List ef02 =new ArrayList<>(); //强制执行记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF03") - private List ef03 =new ArrayList<>(); + public List ef03 =new ArrayList<>(); public List getEf02(){ return this.ef02; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFC.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFC.java index 6cf832c5..68782c3b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFC.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFC.java @@ -12,7 +12,7 @@ public class EFC { //行政处罚信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF04") - private List ef04 =new ArrayList<>(); + public List ef04 =new ArrayList<>(); public List getEf04(){ return this.ef04; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFD.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFD.java index 1e728b07..c06cc716 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFD.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFD.java @@ -12,7 +12,7 @@ public class EFD { //住房公积金参缴信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF05") - private List ef05 =new ArrayList<>(); + public List ef05 =new ArrayList<>(); public List getEf05(){ return this.ef05; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFE.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFE.java index 1a0bb529..37ea19cc 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFE.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFE.java @@ -12,27 +12,27 @@ public class EFE { //获得许可记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF06") - private List ef06 =new ArrayList<>(); + public List ef06 =new ArrayList<>(); //获得认证记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF07") - private List ef07 =new ArrayList<>(); + public List ef07 =new ArrayList<>(); //获得资质记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF08") - private List ef08 =new ArrayList<>(); + public List ef08 =new ArrayList<>(); //获得奖励记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF09") - private List ef09 =new ArrayList<>(); + public List ef09 =new ArrayList<>(); //拥有专利情况信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF10") - private List ef10 =new ArrayList<>(); + public List ef10 =new ArrayList<>(); public List getEf06(){ return this.ef06; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFF.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFF.java index 5a2614f4..8bd8847d 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFF.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFF.java @@ -12,17 +12,17 @@ public class EFF { //出入境检验疫绿色通道信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF11") - private List ef11 =new ArrayList<>(); + public List ef11 =new ArrayList<>(); //进出口商品免验信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF12") - private List ef12 =new ArrayList<>(); + public List ef12 =new ArrayList<>(); //进出口商品检验分类监管信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF13") - private List ef13 =new ArrayList<>(); + public List ef13 =new ArrayList<>(); public List getEf11(){ return this.ef11; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFG.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFG.java index 40e8eed0..2364b076 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFG.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EFG.java @@ -12,7 +12,7 @@ public class EFG { //融资规模控制信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EF14") - private List ef14 =new ArrayList<>(); + public List ef14 =new ArrayList<>(); public List getEf14(){ return this.ef14; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01.java index 57743a96..afc9b034 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01.java @@ -11,11 +11,11 @@ import java.util.List; public class EG01 { //基础段 @JacksonXmlProperty(localName = "EG01A") - private EG01A eg01a; + public EG01A eg01a; //企业资产负债表（2002 版）段 @JacksonXmlProperty(localName = "EG01B") - private EG01B eg01b; + public EG01B eg01b; public EG01A getEg01a(){ return this.eg01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01A.java index 1e423cf2..3d9f1c4a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG01A { //财务报表编号 @JacksonXmlProperty(localName = "EG01AI01") - private String eg01ai01; + public String eg01ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG01AD01") - private String eg01ad01; + public String eg01ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG01AI02") - private String eg01ai02; + public String eg01ai02; //报表年份 @JacksonXmlProperty(localName = "EG01AR01") - private String eg01ar01; + public String eg01ar01; //报表类型 @JacksonXmlProperty(localName = "EG01AD02") - private String eg01ad02; + public String eg01ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG01AD03") - private String eg01ad03; + public String eg01ad03; public String getEg01ai01(){ return this.eg01ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01B.java index faff73dc..abb12bf8 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG01B.java @@ -11,351 +11,351 @@ import java.util.List; public class EG01B { //货币资金 @JacksonXmlProperty(localName = "EG01BJ01") - private String eg01bj01; + public String eg01bj01; //短期投资 @JacksonXmlProperty(localName = "EG01BJ02") - private String eg01bj02; + public String eg01bj02; //应收票据 @JacksonXmlProperty(localName = "EG01BJ03") - private String eg01bj03; + public String eg01bj03; //应收股利 @JacksonXmlProperty(localName = "EG01BJ04") - private String eg01bj04; + public String eg01bj04; //应收利息 @JacksonXmlProperty(localName = "EG01BJ05") - private String eg01bj05; + public String eg01bj05; //应收账款 @JacksonXmlProperty(localName = "EG01BJ06") - private String eg01bj06; + public String eg01bj06; //其他应收款 @JacksonXmlProperty(localName = "EG01BJ07") - private String eg01bj07; + public String eg01bj07; //预付账款 @JacksonXmlProperty(localName = "EG01BJ08") - private String eg01bj08; + public String eg01bj08; //期货保证金 @JacksonXmlProperty(localName = "EG01BJ09") - private String eg01bj09; + public String eg01bj09; //应收补贴款 @JacksonXmlProperty(localName = "EG01BJ10") - private String eg01bj10; + public String eg01bj10; //应收出口退税 @JacksonXmlProperty(localName = "EG01BJ11") - private String eg01bj11; + public String eg01bj11; //存货 @JacksonXmlProperty(localName = "EG01BJ12") - private String eg01bj12; + public String eg01bj12; //存货原材料 @JacksonXmlProperty(localName = "EG01BJ13") - private String eg01bj13; + public String eg01bj13; //存货产成品 @JacksonXmlProperty(localName = "EG01BJ14") - private String eg01bj14; + public String eg01bj14; //待摊费用 @JacksonXmlProperty(localName = "EG01BJ15") - private String eg01bj15; + public String eg01bj15; //待处理流动资产净损失 @JacksonXmlProperty(localName = "EG01BJ16") - private String eg01bj16; + public String eg01bj16; //一年内到期的长期债权投资 @JacksonXmlProperty(localName = "EG01BJ17") - private String eg01bj17; + public String eg01bj17; //其他流动资产 @JacksonXmlProperty(localName = "EG01BJ18") - private String eg01bj18; + public String eg01bj18; //流动资产合计 @JacksonXmlProperty(localName = "EG01BJ19") - private String eg01bj19; + public String eg01bj19; //长期投资 @JacksonXmlProperty(localName = "EG01BJ20") - private String eg01bj20; + public String eg01bj20; //长期股权投资 @JacksonXmlProperty(localName = "EG01BJ21") - private String eg01bj21; + public String eg01bj21; //长期债权投资 @JacksonXmlProperty(localName = "EG01BJ22") - private String eg01bj22; + public String eg01bj22; //合并价差 @JacksonXmlProperty(localName = "EG01BJ23") - private String eg01bj23; + public String eg01bj23; //长期投资合计 @JacksonXmlProperty(localName = "EG01BJ24") - private String eg01bj24; + public String eg01bj24; //固定资产原价 @JacksonXmlProperty(localName = "EG01BJ25") - private String eg01bj25; + public String eg01bj25; //累计折旧 @JacksonXmlProperty(localName = "EG01BJ26") - private String eg01bj26; + public String eg01bj26; //固定资产净值 @JacksonXmlProperty(localName = "EG01BJ27") - private String eg01bj27; + public String eg01bj27; //固定资产值减值准备 @JacksonXmlProperty(localName = "EG01BJ28") - private String eg01bj28; + public String eg01bj28; //固定资产净额 @JacksonXmlProperty(localName = "EG01BJ29") - private String eg01bj29; + public String eg01bj29; //固定资产清理 @JacksonXmlProperty(localName = "EG01BJ30") - private String eg01bj30; + public String eg01bj30; //工程物资 @JacksonXmlProperty(localName = "EG01BJ31") - private String eg01bj31; + public String eg01bj31; //在建工程 @JacksonXmlProperty(localName = "EG01BJ32") - private String eg01bj32; + public String eg01bj32; //待处理固定资产净损失 @JacksonXmlProperty(localName = "EG01BJ33") - private String eg01bj33; + public String eg01bj33; //固定资产合计 @JacksonXmlProperty(localName = "EG01BJ34") - private String eg01bj34; + public String eg01bj34; //无形资产 @JacksonXmlProperty(localName = "EG01BJ35") - private String eg01bj35; + public String eg01bj35; //（无形资产科目下）土地使用权 @JacksonXmlProperty(localName = "EG01BJ36") - private String eg01bj36; + public String eg01bj36; //递延资产 @JacksonXmlProperty(localName = "EG01BJ37") - private String eg01bj37; + public String eg01bj37; //（递延资产科目下）固定资产修理 @JacksonXmlProperty(localName = "EG01BJ38") - private String eg01bj38; + public String eg01bj38; //（递延资产科目下）固定资产改良支出 @JacksonXmlProperty(localName = "EG01BJ39") - private String eg01bj39; + public String eg01bj39; //其他长期资产 @JacksonXmlProperty(localName = "EG01BJ40") - private String eg01bj40; + public String eg01bj40; //（其他长期资产科目下）特准储备物资 @JacksonXmlProperty(localName = "EG01BJ41") - private String eg01bj41; + public String eg01bj41; //无形及其他资产合计 @JacksonXmlProperty(localName = "EG01BJ42") - private String eg01bj42; + public String eg01bj42; //递延税款借项 @JacksonXmlProperty(localName = "EG01BJ43") - private String eg01bj43; + public String eg01bj43; //资产总计 @JacksonXmlProperty(localName = "EG01BJ44") - private String eg01bj44; + public String eg01bj44; //短期借款 @JacksonXmlProperty(localName = "EG01BJ45") - private String eg01bj45; + public String eg01bj45; //应付票据 @JacksonXmlProperty(localName = "EG01BJ46") - private String eg01bj46; + public String eg01bj46; //应付账款 @JacksonXmlProperty(localName = "EG01BJ47") - private String eg01bj47; + public String eg01bj47; //预收账款 @JacksonXmlProperty(localName = "EG01BJ48") - private String eg01bj48; + public String eg01bj48; //应付工资 @JacksonXmlProperty(localName = "EG01BJ49") - private String eg01bj49; + public String eg01bj49; //应付福利费 @JacksonXmlProperty(localName = "EG01BJ50") - private String eg01bj50; + public String eg01bj50; //应付利润 @JacksonXmlProperty(localName = "EG01BJ51") - private String eg01bj51; + public String eg01bj51; //应交税金 @JacksonXmlProperty(localName = "EG01BJ52") - private String eg01bj52; + public String eg01bj52; //其他应交款 @JacksonXmlProperty(localName = "EG01BJ53") - private String eg01bj53; + public String eg01bj53; //其他应付款 @JacksonXmlProperty(localName = "EG01BJ54") - private String eg01bj54; + public String eg01bj54; //预提费用 @JacksonXmlProperty(localName = "EG01BJ55") - private String eg01bj55; + public String eg01bj55; //预计负债 @JacksonXmlProperty(localName = "EG01BJ56") - private String eg01bj56; + public String eg01bj56; //一年内到期的长期负债 @JacksonXmlProperty(localName = "EG01BJ57") - private String eg01bj57; + public String eg01bj57; //其他流动负债 @JacksonXmlProperty(localName = "EG01BJ58") - private String eg01bj58; + public String eg01bj58; //流动负债合计 @JacksonXmlProperty(localName = "EG01BJ59") - private String eg01bj59; + public String eg01bj59; //长期借款 @JacksonXmlProperty(localName = "EG01BJ60") - private String eg01bj60; + public String eg01bj60; //应付债券 @JacksonXmlProperty(localName = "EG01BJ61") - private String eg01bj61; + public String eg01bj61; //长期应付款 @JacksonXmlProperty(localName = "EG01BJ62") - private String eg01bj62; + public String eg01bj62; //专项应付款 @JacksonXmlProperty(localName = "EG01BJ63") - private String eg01bj63; + public String eg01bj63; //其他长期负债 @JacksonXmlProperty(localName = "EG01BJ64") - private String eg01bj64; + public String eg01bj64; //（其他长期负债科目下）特准储备基金 @JacksonXmlProperty(localName = "EG01BJ65") - private String eg01bj65; + public String eg01bj65; //长期负债合计 @JacksonXmlProperty(localName = "EG01BJ66") - private String eg01bj66; + public String eg01bj66; //递延税款贷项 @JacksonXmlProperty(localName = "EG01BJ67") - private String eg01bj67; + public String eg01bj67; //负债合计 @JacksonXmlProperty(localName = "EG01BJ68") - private String eg01bj68; + public String eg01bj68; //少数股东权益 @JacksonXmlProperty(localName = "EG01BJ69") - private String eg01bj69; + public String eg01bj69; //实收资本 @JacksonXmlProperty(localName = "EG01BJ70") - private String eg01bj70; + public String eg01bj70; //国家资本 @JacksonXmlProperty(localName = "EG01BJ71") - private String eg01bj71; + public String eg01bj71; //集体资本 @JacksonXmlProperty(localName = "EG01BJ72") - private String eg01bj72; + public String eg01bj72; //法人资本 @JacksonXmlProperty(localName = "EG01BJ73") - private String eg01bj73; + public String eg01bj73; //资本 @JacksonXmlProperty(localName = "EG01BJ74") - private String eg01bj74; + public String eg01bj74; //资本 @JacksonXmlProperty(localName = "EG01BJ75") - private String eg01bj75; + public String eg01bj75; //个人资本 @JacksonXmlProperty(localName = "EG01BJ76") - private String eg01bj76; + public String eg01bj76; //外商资本 @JacksonXmlProperty(localName = "EG01BJ77") - private String eg01bj77; + public String eg01bj77; //资本公积 @JacksonXmlProperty(localName = "EG01BJ78") - private String eg01bj78; + public String eg01bj78; //盈余公积 @JacksonXmlProperty(localName = "EG01BJ79") - private String eg01bj79; + public String eg01bj79; //（盈余公积科目下）法定盈余公积 @JacksonXmlProperty(localName = "EG01BJ80") - private String eg01bj80; + public String eg01bj80; //（盈余公积科目下）公益金 @JacksonXmlProperty(localName = "EG01BJ81") - private String eg01bj81; + public String eg01bj81; //（盈余公积科目下）补充流动资本 @JacksonXmlProperty(localName = "EG01BJ82") - private String eg01bj82; + public String eg01bj82; //未确认的投资损失 @JacksonXmlProperty(localName = "EG01BJ83") - private String eg01bj83; + public String eg01bj83; //未分配利润 @JacksonXmlProperty(localName = "EG01BJ84") - private String eg01bj84; + public String eg01bj84; //外币报表折算差额 @JacksonXmlProperty(localName = "EG01BJ85") - private String eg01bj85; + public String eg01bj85; //所有者权益合计 @JacksonXmlProperty(localName = "EG01BJ86") - private String eg01bj86; + public String eg01bj86; //负债和所有者权益总计 @JacksonXmlProperty(localName = "EG01BJ87") - private String eg01bj87; + public String eg01bj87; public String getEg01bj01(){ return this.eg01bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02.java index 32d72275..0a683390 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02.java @@ -11,11 +11,11 @@ import java.util.List; public class EG02 { //基础段 @JacksonXmlProperty(localName = "EG02A") - private EG02A eg02a; + public EG02A eg02a; //企业资产负债表（2007版）段 @JacksonXmlProperty(localName = "EG02B") - private EG02B eg02b; + public EG02B eg02b; public EG02A getEg02a(){ return this.eg02a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02A.java index 84b3976e..086d894e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG02A { //财务报表编号 @JacksonXmlProperty(localName = "EG02AI01") - private String eg02ai01; + public String eg02ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG02AD01") - private String eg02ad01; + public String eg02ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG02AI02") - private String eg02ai02; + public String eg02ai02; //报表年份 @JacksonXmlProperty(localName = "EG02AR01") - private String eg02ar01; + public String eg02ar01; //报表类型 @JacksonXmlProperty(localName = "EG02AD02") - private String eg02ad02; + public String eg02ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG02AD03") - private String eg02ad03; + public String eg02ad03; public String getEg02ai01(){ return this.eg02ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02B.java index fb2420e7..5d4e0f96 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG02B.java @@ -11,243 +11,243 @@ import java.util.List; public class EG02B { //货币资金 @JacksonXmlProperty(localName = "EG02BJ01") - private String eg02bj01; + public String eg02bj01; //交易性金融资产 @JacksonXmlProperty(localName = "EG02BJ02") - private String eg02bj02; + public String eg02bj02; //应收票据 @JacksonXmlProperty(localName = "EG02BJ03") - private String eg02bj03; + public String eg02bj03; //应收账款 @JacksonXmlProperty(localName = "EG02BJ04") - private String eg02bj04; + public String eg02bj04; //预付账款 @JacksonXmlProperty(localName = "EG02BJ05") - private String eg02bj05; + public String eg02bj05; //应收利息 @JacksonXmlProperty(localName = "EG02BJ06") - private String eg02bj06; + public String eg02bj06; //应收股利 @JacksonXmlProperty(localName = "EG02BJ07") - private String eg02bj07; + public String eg02bj07; //其他应收款 @JacksonXmlProperty(localName = "EG02BJ08") - private String eg02bj08; + public String eg02bj08; //存货 @JacksonXmlProperty(localName = "EG02BJ09") - private String eg02bj09; + public String eg02bj09; //一年内到期的非流动资产 @JacksonXmlProperty(localName = "EG02BJ10") - private String eg02bj10; + public String eg02bj10; //其他流动资产 @JacksonXmlProperty(localName = "EG02BJ11") - private String eg02bj11; + public String eg02bj11; //流动资产合计 @JacksonXmlProperty(localName = "EG02BJ12") - private String eg02bj12; + public String eg02bj12; //可供出售的金融资产 @JacksonXmlProperty(localName = "EG02BJ13") - private String eg02bj13; + public String eg02bj13; //持有至到期投资 @JacksonXmlProperty(localName = "EG02BJ14") - private String eg02bj14; + public String eg02bj14; //长期股权投资 @JacksonXmlProperty(localName = "EG02BJ15") - private String eg02bj15; + public String eg02bj15; //长期应收款 @JacksonXmlProperty(localName = "EG02BJ16") - private String eg02bj16; + public String eg02bj16; //投资性房地产 @JacksonXmlProperty(localName = "EG02BJ17") - private String eg02bj17; + public String eg02bj17; //固定资产 @JacksonXmlProperty(localName = "EG02BJ18") - private String eg02bj18; + public String eg02bj18; //在建工程 @JacksonXmlProperty(localName = "EG02BJ19") - private String eg02bj19; + public String eg02bj19; //工程物资 @JacksonXmlProperty(localName = "EG02BJ20") - private String eg02bj20; + public String eg02bj20; //固定资产清理 @JacksonXmlProperty(localName = "EG02BJ21") - private String eg02bj21; + public String eg02bj21; //生产性生物资产 @JacksonXmlProperty(localName = "EG02BJ22") - private String eg02bj22; + public String eg02bj22; //油气资产 @JacksonXmlProperty(localName = "EG02BJ23") - private String eg02bj23; + public String eg02bj23; //无形资产 @JacksonXmlProperty(localName = "EG02BJ24") - private String eg02bj24; + public String eg02bj24; //开发支出 @JacksonXmlProperty(localName = "EG02BJ25") - private String eg02bj25; + public String eg02bj25; //商誉 @JacksonXmlProperty(localName = "EG02BJ26") - private String eg02bj26; + public String eg02bj26; //长期待摊费用 @JacksonXmlProperty(localName = "EG02BJ27") - private String eg02bj27; + public String eg02bj27; //递延所得税资产 @JacksonXmlProperty(localName = "EG02BJ28") - private String eg02bj28; + public String eg02bj28; //其他非流动资产 @JacksonXmlProperty(localName = "EG02BJ29") - private String eg02bj29; + public String eg02bj29; //非流动资产合计 @JacksonXmlProperty(localName = "EG02BJ30") - private String eg02bj30; + public String eg02bj30; //资产总计 @JacksonXmlProperty(localName = "EG02BJ31") - private String eg02bj31; + public String eg02bj31; //短期借款 @JacksonXmlProperty(localName = "EG02BJ32") - private String eg02bj32; + public String eg02bj32; //交易性金融负债 @JacksonXmlProperty(localName = "EG02BJ33") - private String eg02bj33; + public String eg02bj33; //应付票据 @JacksonXmlProperty(localName = "EG02BJ34") - private String eg02bj34; + public String eg02bj34; //应付账款 @JacksonXmlProperty(localName = "EG02BJ35") - private String eg02bj35; + public String eg02bj35; //预收账款 @JacksonXmlProperty(localName = "EG02BJ36") - private String eg02bj36; + public String eg02bj36; //应付利息 @JacksonXmlProperty(localName = "EG02BJ37") - private String eg02bj37; + public String eg02bj37; //应付职工薪酬 @JacksonXmlProperty(localName = "EG02BJ38") - private String eg02bj38; + public String eg02bj38; //应交税费 @JacksonXmlProperty(localName = "EG02BJ39") - private String eg02bj39; + public String eg02bj39; //应付股利 @JacksonXmlProperty(localName = "EG02BJ40") - private String eg02bj40; + public String eg02bj40; //其他应付款 @JacksonXmlProperty(localName = "EG02BJ41") - private String eg02bj41; + public String eg02bj41; //一年内到期的非流动负债 @JacksonXmlProperty(localName = "EG02BJ42") - private String eg02bj42; + public String eg02bj42; //其他流动负债 @JacksonXmlProperty(localName = "EG02BJ43") - private String eg02bj43; + public String eg02bj43; //流动负债合计 @JacksonXmlProperty(localName = "EG02BJ44") - private String eg02bj44; + public String eg02bj44; //长期借款 @JacksonXmlProperty(localName = "EG02BJ45") - private String eg02bj45; + public String eg02bj45; //应付债券 @JacksonXmlProperty(localName = "EG02BJ46") - private String eg02bj46; + public String eg02bj46; //长期应付款 @JacksonXmlProperty(localName = "EG02BJ47") - private String eg02bj47; + public String eg02bj47; //专项应付款 @JacksonXmlProperty(localName = "EG02BJ48") - private String eg02bj48; + public String eg02bj48; //预计负债 @JacksonXmlProperty(localName = "EG02BJ49") - private String eg02bj49; + public String eg02bj49; //递延所得税负债 @JacksonXmlProperty(localName = "EG02BJ50") - private String eg02bj50; + public String eg02bj50; //其他非流动负债 @JacksonXmlProperty(localName = "EG02BJ51") - private String eg02bj51; + public String eg02bj51; //非流动负债合计 @JacksonXmlProperty(localName = "EG02BJ52") - private String eg02bj52; + public String eg02bj52; //负债合计 @JacksonXmlProperty(localName = "EG02BJ53") - private String eg02bj53; + public String eg02bj53; //实收资本（或股本） @JacksonXmlProperty(localName = "EG02BJ54") - private String eg02bj54; + public String eg02bj54; //资本公积 @JacksonXmlProperty(localName = "EG02BJ55") - private String eg02bj55; + public String eg02bj55; //减：库存股 @JacksonXmlProperty(localName = "EG02BJ56") - private String eg02bj56; + public String eg02bj56; //盈余公积 @JacksonXmlProperty(localName = "EG02BJ57") - private String eg02bj57; + public String eg02bj57; //未分配利润 @JacksonXmlProperty(localName = "EG02BJ58") - private String eg02bj58; + public String eg02bj58; //所有者权益合计 @JacksonXmlProperty(localName = "EG02BJ59") - private String eg02bj59; + public String eg02bj59; //负债和所有者权益合计 @JacksonXmlProperty(localName = "EG02BJ60") - private String eg02bj60; + public String eg02bj60; public String getEg02bj01(){ return this.eg02bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03.java index cc63239d..d1bfd1e0 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03.java @@ -11,11 +11,11 @@ import java.util.List; public class EG03 { //基础段 @JacksonXmlProperty(localName = "EG03A") - private EG03A eg03a; + public EG03A eg03a; //企业利润及利润分配表（2002版）段 @JacksonXmlProperty(localName = "EG03B") - private EG03B eg03b; + public EG03B eg03b; public EG03A getEg03a(){ return this.eg03a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03A.java index ecf074cc..3ff2d25c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG03A { //财务报表编号 @JacksonXmlProperty(localName = "EG03AI01") - private String eg03ai01; + public String eg03ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG03AD01") - private String eg03ad01; + public String eg03ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG03AI02") - private String eg03ai02; + public String eg03ai02; //报表年份 @JacksonXmlProperty(localName = "EG03AR01") - private String eg03ar01; + public String eg03ar01; //报表类型 @JacksonXmlProperty(localName = "EG03AD02") - private String eg03ad02; + public String eg03ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG03AD03") - private String eg03ad03; + public String eg03ad03; public String getEg03ai01(){ return this.eg03ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03B.java index f5db0d05..b120461a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG03B.java @@ -11,259 +11,259 @@ import java.util.List; public class EG03B { //主营业务收入 @JacksonXmlProperty(localName = "EG03BJ01") - private String eg03bj01; + public String eg03bj01; //（主营业务收入科目下）出口产品销售收入 @JacksonXmlProperty(localName = "EG03BJ02") - private String eg03bj02; + public String eg03bj02; //（主营业务收入科目下）进口产品销售收入 @JacksonXmlProperty(localName = "EG03BJ03") - private String eg03bj03; + public String eg03bj03; //销售折扣与折让 @JacksonXmlProperty(localName = "EG03BJ04") - private String eg03bj04; + public String eg03bj04; //主营业务收入净额 @JacksonXmlProperty(localName = "EG03BJ05") - private String eg03bj05; + public String eg03bj05; //主营业务成本 @JacksonXmlProperty(localName = "EG03BJ06") - private String eg03bj06; + public String eg03bj06; //（主营业务成本科目下）出口产品销售成本 @JacksonXmlProperty(localName = "EG03BJ07") - private String eg03bj07; + public String eg03bj07; //主营业务税金及附加 @JacksonXmlProperty(localName = "EG03BJ08") - private String eg03bj08; + public String eg03bj08; //经营费用 @JacksonXmlProperty(localName = "EG03BJ09") - private String eg03bj09; + public String eg03bj09; //其他（业务成本） @JacksonXmlProperty(localName = "EG03BJ10") - private String eg03bj10; + public String eg03bj10; //递延收益 @JacksonXmlProperty(localName = "EG03BJ11") - private String eg03bj11; + public String eg03bj11; //代购代销收入 @JacksonXmlProperty(localName = "EG03BJ12") - private String eg03bj12; + public String eg03bj12; //其他（收入） @JacksonXmlProperty(localName = "EG03BJ13") - private String eg03bj13; + public String eg03bj13; //主营业务利润 @JacksonXmlProperty(localName = "EG03BJ14") - private String eg03bj14; + public String eg03bj14; //其他业务利润 @JacksonXmlProperty(localName = "EG03BJ15") - private String eg03bj15; + public String eg03bj15; //营业费用 @JacksonXmlProperty(localName = "EG03BJ16") - private String eg03bj16; + public String eg03bj16; //管理费用 @JacksonXmlProperty(localName = "EG03BJ17") - private String eg03bj17; + public String eg03bj17; //财务费用 @JacksonXmlProperty(localName = "EG03BJ18") - private String eg03bj18; + public String eg03bj18; //其他（费用） @JacksonXmlProperty(localName = "EG03BJ19") - private String eg03bj19; + public String eg03bj19; //营业利润 @JacksonXmlProperty(localName = "EG03BJ20") - private String eg03bj20; + public String eg03bj20; //投资收益 @JacksonXmlProperty(localName = "EG03BJ21") - private String eg03bj21; + public String eg03bj21; //期货收益 @JacksonXmlProperty(localName = "EG03BJ22") - private String eg03bj22; + public String eg03bj22; //补贴收入 @JacksonXmlProperty(localName = "EG03BJ23") - private String eg03bj23; + public String eg03bj23; //（补贴收入科目下）补贴前亏损的企业补贴收入 @JacksonXmlProperty(localName = "EG03BJ24") - private String eg03bj24; + public String eg03bj24; //营业外收入 @JacksonXmlProperty(localName = "EG03BJ25") - private String eg03bj25; + public String eg03bj25; //（营业外收入科目下）处置固定资产净收益 @JacksonXmlProperty(localName = "EG03BJ26") - private String eg03bj26; + public String eg03bj26; //（营业外收入科目下）非货币性交易收益 @JacksonXmlProperty(localName = "EG03BJ27") - private String eg03bj27; + public String eg03bj27; //（营业外收入科目下）出售无形资产收益 @JacksonXmlProperty(localName = "EG03BJ28") - private String eg03bj28; + public String eg03bj28; //（营业外收入科目下）罚款净收入 @JacksonXmlProperty(localName = "EG03BJ29") - private String eg03bj29; + public String eg03bj29; //其他（利润） @JacksonXmlProperty(localName = "EG03BJ30") - private String eg03bj30; + public String eg03bj30; //（其他科目下）用以前年度含量工资节余弥补利润 @JacksonXmlProperty(localName = "EG03BJ31") - private String eg03bj31; + public String eg03bj31; //营业外支出 @JacksonXmlProperty(localName = "EG03BJ32") - private String eg03bj32; + public String eg03bj32; //（营业外支出科目下）处置固定资产净损失 @JacksonXmlProperty(localName = "EG03BJ33") - private String eg03bj33; + public String eg03bj33; //（营业外支出科目下）债务重组损失 @JacksonXmlProperty(localName = "EG03BJ34") - private String eg03bj34; + public String eg03bj34; //（营业外支出科目下）罚款支出 @JacksonXmlProperty(localName = "EG03BJ35") - private String eg03bj35; + public String eg03bj35; //（营业外支出科目下）捐赠支出 @JacksonXmlProperty(localName = "EG03BJ36") - private String eg03bj36; + public String eg03bj36; //其他支出 @JacksonXmlProperty(localName = "EG03BJ37") - private String eg03bj37; + public String eg03bj37; //（其他支出）结转的含量工资包干节余 @JacksonXmlProperty(localName = "EG03BJ38") - private String eg03bj38; + public String eg03bj38; //利润总额 @JacksonXmlProperty(localName = "EG03BJ39") - private String eg03bj39; + public String eg03bj39; //所得税 @JacksonXmlProperty(localName = "EG03BJ40") - private String eg03bj40; + public String eg03bj40; //少数股东损益 @JacksonXmlProperty(localName = "EG03BJ41") - private String eg03bj41; + public String eg03bj41; //未确认的投资损失 @JacksonXmlProperty(localName = "EG03BJ42") - private String eg03bj42; + public String eg03bj42; //净利润 @JacksonXmlProperty(localName = "EG03BJ43") - private String eg03bj43; + public String eg03bj43; //年初未分配利润 @JacksonXmlProperty(localName = "EG03BJ44") - private String eg03bj44; + public String eg03bj44; //盈余公积补亏 @JacksonXmlProperty(localName = "EG03BJ45") - private String eg03bj45; + public String eg03bj45; //其他调整因素 @JacksonXmlProperty(localName = "EG03BJ46") - private String eg03bj46; + public String eg03bj46; //可供分配的利润 @JacksonXmlProperty(localName = "EG03BJ47") - private String eg03bj47; + public String eg03bj47; //单项留用的利润 @JacksonXmlProperty(localName = "EG03BJ48") - private String eg03bj48; + public String eg03bj48; //补充流动资本 @JacksonXmlProperty(localName = "EG03BJ49") - private String eg03bj49; + public String eg03bj49; //提取法定盈余公积 @JacksonXmlProperty(localName = "EG03BJ50") - private String eg03bj50; + public String eg03bj50; //提取法定公益金 @JacksonXmlProperty(localName = "EG03BJ51") - private String eg03bj51; + public String eg03bj51; //提取职工奖励及福利基金 @JacksonXmlProperty(localName = "EG03BJ52") - private String eg03bj52; + public String eg03bj52; //提取储备基金 @JacksonXmlProperty(localName = "EG03BJ53") - private String eg03bj53; + public String eg03bj53; //提取企业发展基金 @JacksonXmlProperty(localName = "EG03BJ54") - private String eg03bj54; + public String eg03bj54; //利润归还投资 @JacksonXmlProperty(localName = "EG03BJ55") - private String eg03bj55; + public String eg03bj55; //（可供分配的利润科目下）其他 @JacksonXmlProperty(localName = "EG03BJ56") - private String eg03bj56; + public String eg03bj56; //可供投资者分配的利润 @JacksonXmlProperty(localName = "EG03BJ57") - private String eg03bj57; + public String eg03bj57; //应付优先股股利 @JacksonXmlProperty(localName = "EG03BJ58") - private String eg03bj58; + public String eg03bj58; //提取任意盈余公积 @JacksonXmlProperty(localName = "EG03BJ59") - private String eg03bj59; + public String eg03bj59; //应付普通股股利 @JacksonXmlProperty(localName = "EG03BJ60") - private String eg03bj60; + public String eg03bj60; //转作资本的普通股股利 @JacksonXmlProperty(localName = "EG03BJ61") - private String eg03bj61; + public String eg03bj61; //（可供投资者分配的利润科目下）其他 @JacksonXmlProperty(localName = "EG03BJ62") - private String eg03bj62; + public String eg03bj62; //未分配利润 @JacksonXmlProperty(localName = "EG03BJ63") - private String eg03bj63; + public String eg03bj63; //（未分配利润科目下）应由以后年度税前利润弥补的亏损 @JacksonXmlProperty(localName = "EG03BJ64") - private String eg03bj64; + public String eg03bj64; public String getEg03bj01(){ return this.eg03bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04.java index d59cc215..d66f8b72 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04.java @@ -11,11 +11,11 @@ import java.util.List; public class EG04 { //基础段 @JacksonXmlProperty(localName = "EG04A") - private EG04A eg04a; + public EG04A eg04a; //企业利润及利润分配表（2007版）段 @JacksonXmlProperty(localName = "EG04B") - private EG04B eg04b; + public EG04B eg04b; public EG04A getEg04a(){ return this.eg04a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04A.java index a584d01a..d56cecb9 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG04A { //财务报表编号 @JacksonXmlProperty(localName = "EG04AI01") - private String eg04ai01; + public String eg04ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG04AD01") - private String eg04ad01; + public String eg04ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG04AI02") - private String eg04ai02; + public String eg04ai02; //报表年份 @JacksonXmlProperty(localName = "EG04AR01") - private String eg04ar01; + public String eg04ar01; //报表类型 @JacksonXmlProperty(localName = "EG04AD02") - private String eg04ad02; + public String eg04ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG04AD03") - private String eg04ad03; + public String eg04ad03; public String getEg04ai01(){ return this.eg04ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04B.java index aeed4449..6a76486b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG04B.java @@ -11,79 +11,79 @@ import java.util.List; public class EG04B { //营业收入 @JacksonXmlProperty(localName = "EG04BJ01") - private String eg04bj01; + public String eg04bj01; //营业成本 @JacksonXmlProperty(localName = "EG04BJ02") - private String eg04bj02; + public String eg04bj02; //营业税金及附加 @JacksonXmlProperty(localName = "EG04BJ03") - private String eg04bj03; + public String eg04bj03; //销售费用 @JacksonXmlProperty(localName = "EG04BJ04") - private String eg04bj04; + public String eg04bj04; //管理费用 @JacksonXmlProperty(localName = "EG04BJ05") - private String eg04bj05; + public String eg04bj05; //财务费用 @JacksonXmlProperty(localName = "EG04BJ06") - private String eg04bj06; + public String eg04bj06; //资产减值损失 @JacksonXmlProperty(localName = "EG04BJ07") - private String eg04bj07; + public String eg04bj07; //公允价值变动净收益 @JacksonXmlProperty(localName = "EG04BJ08") - private String eg04bj08; + public String eg04bj08; //投资净收益 @JacksonXmlProperty(localName = "EG04BJ09") - private String eg04bj09; + public String eg04bj09; //对联营企业和合营企业的投资收益 @JacksonXmlProperty(localName = "EG04BJ10") - private String eg04bj10; + public String eg04bj10; //营业利润 @JacksonXmlProperty(localName = "EG04BJ11") - private String eg04bj11; + public String eg04bj11; //营业外收入 @JacksonXmlProperty(localName = "EG04BJ12") - private String eg04bj12; + public String eg04bj12; //营业外支出 @JacksonXmlProperty(localName = "EG04BJ13") - private String eg04bj13; + public String eg04bj13; //非流动资产损失（其中：非流动资产处置损失） @JacksonXmlProperty(localName = "EG04BJ14") - private String eg04bj14; + public String eg04bj14; //利润总额 @JacksonXmlProperty(localName = "EG04BJ15") - private String eg04bj15; + public String eg04bj15; //所得税费用 @JacksonXmlProperty(localName = "EG04BJ16") - private String eg04bj16; + public String eg04bj16; //净利润 @JacksonXmlProperty(localName = "EG04BJ17") - private String eg04bj17; + public String eg04bj17; //基本每股收益 @JacksonXmlProperty(localName = "EG04BJ18") - private String eg04bj18; + public String eg04bj18; //稀释每股收益 @JacksonXmlProperty(localName = "EG04BJ19") - private String eg04bj19; + public String eg04bj19; public String getEg04bj01(){ return this.eg04bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05.java index 131b9d16..49562d74 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05.java @@ -11,11 +11,11 @@ import java.util.List; public class EG05 { //基础段 @JacksonXmlProperty(localName = "EG05A") - private EG05A eg05a; + public EG05A eg05a; //企业现金流量表（2002版）段 @JacksonXmlProperty(localName = "EG05B") - private EG05B eg05b; + public EG05B eg05b; public EG05A getEg05a(){ return this.eg05a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05A.java index 129c3457..cb71759b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG05A { //财务报表编号 @JacksonXmlProperty(localName = "EG05AI01") - private String eg05ai01; + public String eg05ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG05AD01") - private String eg05ad01; + public String eg05ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG05AI02") - private String eg05ai02; + public String eg05ai02; //报表年份 @JacksonXmlProperty(localName = "EG05AR01") - private String eg05ar01; + public String eg05ar01; //报表类型 @JacksonXmlProperty(localName = "EG05AD02") - private String eg05ad02; + public String eg05ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG05AD03") - private String eg05ad03; + public String eg05ad03; public String getEg05ai01(){ return this.eg05ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05B.java index d000b72e..dc086939 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG05B.java @@ -11,231 +11,231 @@ import java.util.List; public class EG05B { //销售商品和提供劳务收到的现金 @JacksonXmlProperty(localName = "EG05BJ01") - private String eg05bj01; + public String eg05bj01; //收到的税费返还 @JacksonXmlProperty(localName = "EG05BJ02") - private String eg05bj02; + public String eg05bj02; //收到的其他与经营活动有关的现金 @JacksonXmlProperty(localName = "EG05BJ03") - private String eg05bj03; + public String eg05bj03; //经营活动现金流入小计 @JacksonXmlProperty(localName = "EG05BJ04") - private String eg05bj04; + public String eg05bj04; //购买商品、接受劳务支付的现金 @JacksonXmlProperty(localName = "EG05BJ05") - private String eg05bj05; + public String eg05bj05; //支付给职工以及为职工支付的现金 @JacksonXmlProperty(localName = "EG05BJ06") - private String eg05bj06; + public String eg05bj06; //支付的各项税费 @JacksonXmlProperty(localName = "EG05BJ07") - private String eg05bj07; + public String eg05bj07; //支付的其他与经营活动有关的现金 @JacksonXmlProperty(localName = "EG05BJ08") - private String eg05bj08; + public String eg05bj08; //经营活动现金流出小计 @JacksonXmlProperty(localName = "EG05BJ09") - private String eg05bj09; + public String eg05bj09; //经营活动产生的现金流量净额 @JacksonXmlProperty(localName = "EG05BJ10") - private String eg05bj10; + public String eg05bj10; //收回投资所收到的现金 @JacksonXmlProperty(localName = "EG05BJ11") - private String eg05bj11; + public String eg05bj11; //取得投资收益所收到的现金 @JacksonXmlProperty(localName = "EG05BJ12") - private String eg05bj12; + public String eg05bj12; //处置固定资产无形资产和其他长期资产所收回的现金净额 @JacksonXmlProperty(localName = "EG05BJ13") - private String eg05bj13; + public String eg05bj13; //收到的其他与投资活动有关的现金 @JacksonXmlProperty(localName = "EG05BJ14") - private String eg05bj14; + public String eg05bj14; //投资活动现金流入小计 @JacksonXmlProperty(localName = "EG05BJ15") - private String eg05bj15; + public String eg05bj15; //购建固定资产无形资产和其他长期资产所支付的现金 @JacksonXmlProperty(localName = "EG05BJ16") - private String eg05bj16; + public String eg05bj16; //投资所支付的现金 @JacksonXmlProperty(localName = "EG05BJ17") - private String eg05bj17; + public String eg05bj17; //支付的其他与投资活动有关的现金 @JacksonXmlProperty(localName = "EG05BJ18") - private String eg05bj18; + public String eg05bj18; //投资活动现金流出小计 @JacksonXmlProperty(localName = "EG05BJ19") - private String eg05bj19; + public String eg05bj19; //投资活动产生的现金流量净额 @JacksonXmlProperty(localName = "EG05BJ20") - private String eg05bj20; + public String eg05bj20; //吸收投资所收到的现金 @JacksonXmlProperty(localName = "EG05BJ21") - private String eg05bj21; + public String eg05bj21; //借款所收到的现金 @JacksonXmlProperty(localName = "EG05BJ22") - private String eg05bj22; + public String eg05bj22; //收到的其他与筹资活动有关的现金 @JacksonXmlProperty(localName = "EG05BJ23") - private String eg05bj23; + public String eg05bj23; //筹资活动现金流入小计 @JacksonXmlProperty(localName = "EG05BJ24") - private String eg05bj24; + public String eg05bj24; //偿还债务所支付的现金 @JacksonXmlProperty(localName = "EG05BJ25") - private String eg05bj25; + public String eg05bj25; //分配股利、利润或偿付利息所支付的现金 @JacksonXmlProperty(localName = "EG05BJ26") - private String eg05bj26; + public String eg05bj26; //支付的其他与筹资活动有关的现金 @JacksonXmlProperty(localName = "EG05BJ27") - private String eg05bj27; + public String eg05bj27; //筹资活动现金流出小计 @JacksonXmlProperty(localName = "EG05BJ28") - private String eg05bj28; + public String eg05bj28; //筹集活动产生的现金流量净额 @JacksonXmlProperty(localName = "EG05BJ29") - private String eg05bj29; + public String eg05bj29; //汇率变动对现金的影响 @JacksonXmlProperty(localName = "EG05BJ30") - private String eg05bj30; + public String eg05bj30; //现金及现金等价物净增加额 @JacksonXmlProperty(localName = "EG05BJ31") - private String eg05bj31; + public String eg05bj31; //净利润 @JacksonXmlProperty(localName = "EG05BJ32") - private String eg05bj32; + public String eg05bj32; //计提的资产减值准备 @JacksonXmlProperty(localName = "EG05BJ33") - private String eg05bj33; + public String eg05bj33; //固定资产拆旧 @JacksonXmlProperty(localName = "EG05BJ34") - private String eg05bj34; + public String eg05bj34; //无形资产摊销 @JacksonXmlProperty(localName = "EG05BJ35") - private String eg05bj35; + public String eg05bj35; //长期待摊费用摊销 @JacksonXmlProperty(localName = "EG05BJ36") - private String eg05bj36; + public String eg05bj36; //待摊费用减少 @JacksonXmlProperty(localName = "EG05BJ37") - private String eg05bj37; + public String eg05bj37; //预提费用增加 @JacksonXmlProperty(localName = "EG05BJ38") - private String eg05bj38; + public String eg05bj38; //处置固定资产无形资产和其他长期资产的损失 @JacksonXmlProperty(localName = "EG05BJ39") - private String eg05bj39; + public String eg05bj39; //固定资产报废损失 @JacksonXmlProperty(localName = "EG05BJ40") - private String eg05bj40; + public String eg05bj40; //财务费用 @JacksonXmlProperty(localName = "EG05BJ41") - private String eg05bj41; + public String eg05bj41; //投资损失 @JacksonXmlProperty(localName = "EG05BJ42") - private String eg05bj42; + public String eg05bj42; //递延税款贷项 @JacksonXmlProperty(localName = "EG05BJ43") - private String eg05bj43; + public String eg05bj43; //存货的减少 @JacksonXmlProperty(localName = "EG05BJ44") - private String eg05bj44; + public String eg05bj44; //经营性应收项目的减少 @JacksonXmlProperty(localName = "EG05BJ45") - private String eg05bj45; + public String eg05bj45; //经营性应付项目的增加 @JacksonXmlProperty(localName = "EG05BJ46") - private String eg05bj46; + public String eg05bj46; //（净利润调节为经营活动现金流量科目下）其他 @JacksonXmlProperty(localName = "EG05BJ47") - private String eg05bj47; + public String eg05bj47; //经营活动产生的现金流量净额 @JacksonXmlProperty(localName = "EG05BJ48") - private String eg05bj48; + public String eg05bj48; //债务转为资本 @JacksonXmlProperty(localName = "EG05BJ49") - private String eg05bj49; + public String eg05bj49; //一年内到期的可转换公司债券 @JacksonXmlProperty(localName = "EG05BJ50") - private String eg05bj50; + public String eg05bj50; //融资租入固定资产 @JacksonXmlProperty(localName = "EG05BJ51") - private String eg05bj51; + public String eg05bj51; //（不涉及现金收支的投资和筹 @JacksonXmlProperty(localName = "EG05BJ52") - private String eg05bj52; + public String eg05bj52; //资活动科目下）其他现金的期末余额 @JacksonXmlProperty(localName = "EG05BJ53") - private String eg05bj53; + public String eg05bj53; //现金的期初余额 @JacksonXmlProperty(localName = "EG05BJ54") - private String eg05bj54; + public String eg05bj54; //现金等价物的期末余额 @JacksonXmlProperty(localName = "EG05BJ55") - private String eg05bj55; + public String eg05bj55; //现金等价物的期初余额 @JacksonXmlProperty(localName = "EG05BJ56") - private String eg05bj56; + public String eg05bj56; //现金及现金等价物净增加额 @JacksonXmlProperty(localName = "EG05BJ57") - private String eg05bj57; + public String eg05bj57; public String getEg05bj01(){ return this.eg05bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06.java index 70ef9d3e..4459a23b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06.java @@ -11,11 +11,11 @@ import java.util.List; public class EG06 { //基础段 @JacksonXmlProperty(localName = "EG06A") - private EG06A eg06a; + public EG06A eg06a; //企业现金流量表（2007版）段 @JacksonXmlProperty(localName = "EG06B") - private EG06B eg06b; + public EG06B eg06b; public EG06A getEg06a(){ return this.eg06a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06A.java index c7c20e38..e819de00 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG06A { //财务报表编号 @JacksonXmlProperty(localName = "EG06AI01") - private String eg06ai01; + public String eg06ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG06AD01") - private String eg06ad01; + public String eg06ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG06AI02") - private String eg06ai02; + public String eg06ai02; //报表年份 @JacksonXmlProperty(localName = "EG06AR01") - private String eg06ar01; + public String eg06ar01; //报表类型 @JacksonXmlProperty(localName = "EG06AD02") - private String eg06ad02; + public String eg06ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG06AD03") - private String eg06ad03; + public String eg06ad03; public String getEg06ai01(){ return this.eg06ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06B.java index cec5c7c6..33fddbca 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG06B.java @@ -11,255 +11,255 @@ import java.util.List; public class EG06B { //销售商品和提供劳务收到的现金 @JacksonXmlProperty(localName = "EG06BJ01") - private String eg06bj01; + public String eg06bj01; //收到的税费返还 @JacksonXmlProperty(localName = "EG06BJ02") - private String eg06bj02; + public String eg06bj02; //收到其他与经营活动有关的现金 @JacksonXmlProperty(localName = "EG06BJ03") - private String eg06bj03; + public String eg06bj03; //经营活动现金流入小计 @JacksonXmlProperty(localName = "EG06BJ04") - private String eg06bj04; + public String eg06bj04; //购买商品、接受劳务支付的现金 @JacksonXmlProperty(localName = "EG06BJ05") - private String eg06bj05; + public String eg06bj05; //支付给职工以及为职工支付的现金 @JacksonXmlProperty(localName = "EG06BJ06") - private String eg06bj06; + public String eg06bj06; //支付的各项税费 @JacksonXmlProperty(localName = "EG06BJ07") - private String eg06bj07; + public String eg06bj07; //支付其他与经营活动有关的现金 @JacksonXmlProperty(localName = "EG06BJ08") - private String eg06bj08; + public String eg06bj08; //经营活动现金流出小计 @JacksonXmlProperty(localName = "EG06BJ09") - private String eg06bj09; + public String eg06bj09; //经营活动产生的现金流量净额 @JacksonXmlProperty(localName = "EG06BJ10") - private String eg06bj10; + public String eg06bj10; //收回投资所收到的现金 @JacksonXmlProperty(localName = "EG06BJ11") - private String eg06bj11; + public String eg06bj11; //取得投资收益所收到的现金 @JacksonXmlProperty(localName = "EG06BJ12") - private String eg06bj12; + public String eg06bj12; //处置固定资产无形资产和其他长期资产所收回的现金净额 @JacksonXmlProperty(localName = "EG06BJ13") - private String eg06bj13; + public String eg06bj13; //处置子公司及其他营业单位收到的现金净额 @JacksonXmlProperty(localName = "EG06BJ14") - private String eg06bj14; + public String eg06bj14; //收到其他与投资活动有关的现金 @JacksonXmlProperty(localName = "EG06BJ15") - private String eg06bj15; + public String eg06bj15; //投资活动现金流入小计 @JacksonXmlProperty(localName = "EG06BJ16") - private String eg06bj16; + public String eg06bj16; //购建固定资产无形资产和其他长期资产所支付的现金 @JacksonXmlProperty(localName = "EG06BJ17") - private String eg06bj17; + public String eg06bj17; //投资所支付的现金 @JacksonXmlProperty(localName = "EG06BJ18") - private String eg06bj18; + public String eg06bj18; //取得子公司及其他营业单位支付的现金净额 @JacksonXmlProperty(localName = "EG06BJ19") - private String eg06bj19; + public String eg06bj19; //支付其他与投资活动有关的现金 @JacksonXmlProperty(localName = "EG06BJ20") - private String eg06bj20; + public String eg06bj20; //投资活动现金流出小计 @JacksonXmlProperty(localName = "EG06BJ21") - private String eg06bj21; + public String eg06bj21; //投资活动产生的现金流量净额 @JacksonXmlProperty(localName = "EG06BJ22") - private String eg06bj22; + public String eg06bj22; //吸收投资收到的现金 @JacksonXmlProperty(localName = "EG06BJ23") - private String eg06bj23; + public String eg06bj23; //取得借款收到的现金 @JacksonXmlProperty(localName = "EG06BJ24") - private String eg06bj24; + public String eg06bj24; //收到其他与筹资活动有关的现金 @JacksonXmlProperty(localName = "EG06BJ25") - private String eg06bj25; + public String eg06bj25; //筹资活动现金流入小计 @JacksonXmlProperty(localName = "EG06BJ26") - private String eg06bj26; + public String eg06bj26; //偿还债务所支付的现金 @JacksonXmlProperty(localName = "EG06BJ27") - private String eg06bj27; + public String eg06bj27; //分配股利、利润或偿付利息所支付的现金 @JacksonXmlProperty(localName = "EG06BJ28") - private String eg06bj28; + public String eg06bj28; //支付其他与筹资活动有关的现金 @JacksonXmlProperty(localName = "EG06BJ29") - private String eg06bj29; + public String eg06bj29; //筹资活动现金流出小计 @JacksonXmlProperty(localName = "EG06BJ30") - private String eg06bj30; + public String eg06bj30; //筹集活动产生的现金流量净额 @JacksonXmlProperty(localName = "EG06BJ31") - private String eg06bj31; + public String eg06bj31; //汇率变动对现金及现金等价物的影响 @JacksonXmlProperty(localName = "EG06BJ32") - private String eg06bj32; + public String eg06bj32; //现金及现金等价物净增加额 @JacksonXmlProperty(localName = "EG06BJ33") - private String eg06bj33; + public String eg06bj33; //期初现金及现金等价物余额 @JacksonXmlProperty(localName = "EG06BJ34") - private String eg06bj34; + public String eg06bj34; //期末现金及现金等价物余额 @JacksonXmlProperty(localName = "EG06BJ35") - private String eg06bj35; + public String eg06bj35; //净利润 @JacksonXmlProperty(localName = "EG06BJ36") - private String eg06bj36; + public String eg06bj36; //资产减值准备 @JacksonXmlProperty(localName = "EG06BJ37") - private String eg06bj37; + public String eg06bj37; //固定资产折旧、油气资产折耗、生产性生物资产折旧 @JacksonXmlProperty(localName = "EG06BJ38") - private String eg06bj38; + public String eg06bj38; //无形资产摊销 @JacksonXmlProperty(localName = "EG06BJ39") - private String eg06bj39; + public String eg06bj39; //长期待摊费用摊销 @JacksonXmlProperty(localName = "EG06BJ40") - private String eg06bj40; + public String eg06bj40; //待摊费用减少 @JacksonXmlProperty(localName = "EG06BJ41") - private String eg06bj41; + public String eg06bj41; //预提费用增加 @JacksonXmlProperty(localName = "EG06BJ42") - private String eg06bj42; + public String eg06bj42; //处置固定资产无形资产和其他长期资产的损失 @JacksonXmlProperty(localName = "EG06BJ43") - private String eg06bj43; + public String eg06bj43; //固定资产报废损失 @JacksonXmlProperty(localName = "EG06BJ44") - private String eg06bj44; + public String eg06bj44; //公允价值变动损失 @JacksonXmlProperty(localName = "EG06BJ45") - private String eg06bj45; + public String eg06bj45; //财务费用 @JacksonXmlProperty(localName = "EG06BJ46") - private String eg06bj46; + public String eg06bj46; //投资损失 @JacksonXmlProperty(localName = "EG06BJ47") - private String eg06bj47; + public String eg06bj47; //递延所得税资产减少 @JacksonXmlProperty(localName = "EG06BJ48") - private String eg06bj48; + public String eg06bj48; //递延所得税负债增加 @JacksonXmlProperty(localName = "EG06BJ49") - private String eg06bj49; + public String eg06bj49; //存货的减少 @JacksonXmlProperty(localName = "EG06BJ50") - private String eg06bj50; + public String eg06bj50; //经营性应收项目的减少 @JacksonXmlProperty(localName = "EG06BJ51") - private String eg06bj51; + public String eg06bj51; //经营性应付项目的增加 @JacksonXmlProperty(localName = "EG06BJ52") - private String eg06bj52; + public String eg06bj52; //（净利润调节为经营活动现金流量科目下）其他 @JacksonXmlProperty(localName = "EG06BJ53") - private String eg06bj53; + public String eg06bj53; //经营活动产生的现金流量净额 @JacksonXmlProperty(localName = "EG06BJ54") - private String eg06bj54; + public String eg06bj54; //债务转为资本 @JacksonXmlProperty(localName = "EG06BJ55") - private String eg06bj55; + public String eg06bj55; //一年内到期的可转换公司债券 @JacksonXmlProperty(localName = "EG06BJ56") - private String eg06bj56; + public String eg06bj56; //融资租入固定资产 @JacksonXmlProperty(localName = "EG06BJ57") - private String eg06bj57; + public String eg06bj57; //现金的期末余额 @JacksonXmlProperty(localName = "EG06BJ58") - private String eg06bj58; + public String eg06bj58; //现金的期初余额 @JacksonXmlProperty(localName = "EG06BJ59") - private String eg06bj59; + public String eg06bj59; //现金等价物的期末余额 @JacksonXmlProperty(localName = "EG06BJ60") - private String eg06bj60; + public String eg06bj60; //现金等价物的期初余额 @JacksonXmlProperty(localName = "EG06BJ61") - private String eg06bj61; + public String eg06bj61; //现金及现金等价物净增加额 @JacksonXmlProperty(localName = "EG06BJ62") - private String eg06bj62; + public String eg06bj62; //（不涉及现金收支的投资和筹资活动科目下）其他 @JacksonXmlProperty(localName = "EG06BJ63") - private String eg06bj63; + public String eg06bj63; public String getEg06bj01(){ return this.eg06bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07.java index 135df8cd..b611201c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07.java @@ -11,11 +11,11 @@ import java.util.List; public class EG07 { //基础段 @JacksonXmlProperty(localName = "EG07A") - private EG07A eg07a; + public EG07A eg07a; //事业单位资产负债表（1997版）段 @JacksonXmlProperty(localName = "EG07B") - private EG07B eg07b; + public EG07B eg07b; public EG07A getEg07a(){ return this.eg07a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07A.java index ddc7644b..70d574c3 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG07A { //财务报表编号 @JacksonXmlProperty(localName = "EG07AI01") - private String eg07ai01; + public String eg07ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG07AD01") - private String eg07ad01; + public String eg07ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG07AI02") - private String eg07ai02; + public String eg07ai02; //报表年份 @JacksonXmlProperty(localName = "EG07AR01") - private String eg07ar01; + public String eg07ar01; //报表类型 @JacksonXmlProperty(localName = "EG07AD02") - private String eg07ad02; + public String eg07ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG07AD03") - private String eg07ad03; + public String eg07ad03; public String getEg07ai01(){ return this.eg07ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07B.java index 37d660b8..37a1a8d5 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG07B.java @@ -11,203 +11,203 @@ import java.util.List; public class EG07B { //现金 @JacksonXmlProperty(localName = "EG07BJ01") - private String eg07bj01; + public String eg07bj01; //银行存款 @JacksonXmlProperty(localName = "EG07BJ02") - private String eg07bj02; + public String eg07bj02; //应收票据 @JacksonXmlProperty(localName = "EG07BJ03") - private String eg07bj03; + public String eg07bj03; //应收账款 @JacksonXmlProperty(localName = "EG07BJ04") - private String eg07bj04; + public String eg07bj04; //预付账款 @JacksonXmlProperty(localName = "EG07BJ05") - private String eg07bj05; + public String eg07bj05; //其他应收款 @JacksonXmlProperty(localName = "EG07BJ06") - private String eg07bj06; + public String eg07bj06; //材料 @JacksonXmlProperty(localName = "EG07BJ07") - private String eg07bj07; + public String eg07bj07; //产成品 @JacksonXmlProperty(localName = "EG07BJ08") - private String eg07bj08; + public String eg07bj08; //对外投资 @JacksonXmlProperty(localName = "EG07BJ09") - private String eg07bj09; + public String eg07bj09; //固定资产 @JacksonXmlProperty(localName = "EG07BJ10") - private String eg07bj10; + public String eg07bj10; //无形资产 @JacksonXmlProperty(localName = "EG07BJ11") - private String eg07bj11; + public String eg07bj11; //资产合计 @JacksonXmlProperty(localName = "EG07BJ12") - private String eg07bj12; + public String eg07bj12; //拨出经费 @JacksonXmlProperty(localName = "EG07BJ13") - private String eg07bj13; + public String eg07bj13; //拨出专款 @JacksonXmlProperty(localName = "EG07BJ14") - private String eg07bj14; + public String eg07bj14; //专款支出 @JacksonXmlProperty(localName = "EG07BJ15") - private String eg07bj15; + public String eg07bj15; //事业支出 @JacksonXmlProperty(localName = "EG07BJ16") - private String eg07bj16; + public String eg07bj16; //经营支出 @JacksonXmlProperty(localName = "EG07BJ17") - private String eg07bj17; + public String eg07bj17; //成本费用 @JacksonXmlProperty(localName = "EG07BJ18") - private String eg07bj18; + public String eg07bj18; //销售税金 @JacksonXmlProperty(localName = "EG07BJ19") - private String eg07bj19; + public String eg07bj19; //上缴上级支出 @JacksonXmlProperty(localName = "EG07BJ20") - private String eg07bj20; + public String eg07bj20; //对附属单位补助 @JacksonXmlProperty(localName = "EG07BJ21") - private String eg07bj21; + public String eg07bj21; //结转自筹基建 @JacksonXmlProperty(localName = "EG07BJ22") - private String eg07bj22; + public String eg07bj22; //支出合计 @JacksonXmlProperty(localName = "EG07BJ23") - private String eg07bj23; + public String eg07bj23; //资产部类总计 @JacksonXmlProperty(localName = "EG07BJ24") - private String eg07bj24; + public String eg07bj24; //借记款项 @JacksonXmlProperty(localName = "EG07BJ25") - private String eg07bj25; + public String eg07bj25; //应付票据 @JacksonXmlProperty(localName = "EG07BJ26") - private String eg07bj26; + public String eg07bj26; //应付账款 @JacksonXmlProperty(localName = "EG07BJ27") - private String eg07bj27; + public String eg07bj27; //预收账款 @JacksonXmlProperty(localName = "EG07BJ28") - private String eg07bj28; + public String eg07bj28; //其他应付款 @JacksonXmlProperty(localName = "EG07BJ29") - private String eg07bj29; + public String eg07bj29; //应缴预算款 @JacksonXmlProperty(localName = "EG07BJ30") - private String eg07bj30; + public String eg07bj30; //应缴财政专户款 @JacksonXmlProperty(localName = "EG07BJ31") - private String eg07bj31; + public String eg07bj31; //应交税金 @JacksonXmlProperty(localName = "EG07BJ32") - private String eg07bj32; + public String eg07bj32; //负债合计 @JacksonXmlProperty(localName = "EG07BJ33") - private String eg07bj33; + public String eg07bj33; //事业基金 @JacksonXmlProperty(localName = "EG07BJ34") - private String eg07bj34; + public String eg07bj34; //一般基金 @JacksonXmlProperty(localName = "EG07BJ35") - private String eg07bj35; + public String eg07bj35; //投资基金 @JacksonXmlProperty(localName = "EG07BJ36") - private String eg07bj36; + public String eg07bj36; //固定基金 @JacksonXmlProperty(localName = "EG07BJ37") - private String eg07bj37; + public String eg07bj37; //专用基金 @JacksonXmlProperty(localName = "EG07BJ38") - private String eg07bj38; + public String eg07bj38; //事业结余 @JacksonXmlProperty(localName = "EG07BJ39") - private String eg07bj39; + public String eg07bj39; //经营结余 @JacksonXmlProperty(localName = "EG07BJ40") - private String eg07bj40; + public String eg07bj40; //净资产合计 @JacksonXmlProperty(localName = "EG07BJ41") - private String eg07bj41; + public String eg07bj41; //财政补助收入 @JacksonXmlProperty(localName = "EG07BJ42") - private String eg07bj42; + public String eg07bj42; //上级补助收入 @JacksonXmlProperty(localName = "EG07BJ43") - private String eg07bj43; + public String eg07bj43; //拨入专款 @JacksonXmlProperty(localName = "EG07BJ44") - private String eg07bj44; + public String eg07bj44; //事业收入 @JacksonXmlProperty(localName = "EG07BJ45") - private String eg07bj45; + public String eg07bj45; //经营收入 @JacksonXmlProperty(localName = "EG07BJ46") - private String eg07bj46; + public String eg07bj46; //附属单位缴款 @JacksonXmlProperty(localName = "EG07BJ47") - private String eg07bj47; + public String eg07bj47; //其他收入 @JacksonXmlProperty(localName = "EG07BJ48") - private String eg07bj48; + public String eg07bj48; //收入合计 @JacksonXmlProperty(localName = "EG07BJ49") - private String eg07bj49; + public String eg07bj49; //负债部类总计 @JacksonXmlProperty(localName = "EG07BJ50") - private String eg07bj50; + public String eg07bj50; public String getEg07bj01(){ return this.eg07bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08.java index b2169fc9..17882b70 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08.java @@ -11,11 +11,11 @@ import java.util.List; public class EG08 { //基础段 @JacksonXmlProperty(localName = "EG08A") - private EG08A eg08a; + public EG08A eg08a; //事业单位资产负债表（2013版）段 @JacksonXmlProperty(localName = "EG08B") - private EG08B eg08b; + public EG08B eg08b; public EG08A getEg08a(){ return this.eg08a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08A.java index 08ccc759..b101d207 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG08A { //财务报表编号 @JacksonXmlProperty(localName = "EG08AI01") - private String eg08ai01; + public String eg08ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG08AD01") - private String eg08ad01; + public String eg08ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG08AI02") - private String eg08ai02; + public String eg08ai02; //报表年份 @JacksonXmlProperty(localName = "EG08AR01") - private String eg08ar01; + public String eg08ar01; //报表类型 @JacksonXmlProperty(localName = "EG08AD02") - private String eg08ad02; + public String eg08ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG08AD03") - private String eg08ad03; + public String eg08ad03; public String getEg08ai01(){ return this.eg08ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08B.java index 28528683..3a0cac2d 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG08B.java @@ -11,191 +11,191 @@ import java.util.List; public class EG08B { //货币资金 @JacksonXmlProperty(localName = "EG08BJ01") - private String eg08bj01; + public String eg08bj01; //短期投资 @JacksonXmlProperty(localName = "EG08BJ02") - private String eg08bj02; + public String eg08bj02; //财政应返还额度 @JacksonXmlProperty(localName = "EG08BJ03") - private String eg08bj03; + public String eg08bj03; //应收票据 @JacksonXmlProperty(localName = "EG08BJ04") - private String eg08bj04; + public String eg08bj04; //应收账款 @JacksonXmlProperty(localName = "EG08BJ05") - private String eg08bj05; + public String eg08bj05; //预付账款 @JacksonXmlProperty(localName = "EG08BJ06") - private String eg08bj06; + public String eg08bj06; //其他应收款 @JacksonXmlProperty(localName = "EG08BJ07") - private String eg08bj07; + public String eg08bj07; //存货 @JacksonXmlProperty(localName = "EG08BJ08") - private String eg08bj08; + public String eg08bj08; //其他流动资产 @JacksonXmlProperty(localName = "EG08BJ09") - private String eg08bj09; + public String eg08bj09; //流动资产合计 @JacksonXmlProperty(localName = "EG08BJ10") - private String eg08bj10; + public String eg08bj10; //长期投资 @JacksonXmlProperty(localName = "EG08BJ11") - private String eg08bj11; + public String eg08bj11; //固定资产 @JacksonXmlProperty(localName = "EG08BJ12") - private String eg08bj12; + public String eg08bj12; //固定资产原价 @JacksonXmlProperty(localName = "EG08BJ13") - private String eg08bj13; + public String eg08bj13; //累计折旧 @JacksonXmlProperty(localName = "EG08BJ14") - private String eg08bj14; + public String eg08bj14; //在建工程 @JacksonXmlProperty(localName = "EG08BJ15") - private String eg08bj15; + public String eg08bj15; //无形资产 @JacksonXmlProperty(localName = "EG08BJ16") - private String eg08bj16; + public String eg08bj16; //无形资产原价 @JacksonXmlProperty(localName = "EG08BJ17") - private String eg08bj17; + public String eg08bj17; //累计摊销 @JacksonXmlProperty(localName = "EG08BJ18") - private String eg08bj18; + public String eg08bj18; //待处置资产损溢 @JacksonXmlProperty(localName = "EG08BJ19") - private String eg08bj19; + public String eg08bj19; //非流动资产合计 @JacksonXmlProperty(localName = "EG08BJ20") - private String eg08bj20; + public String eg08bj20; //资产总计 @JacksonXmlProperty(localName = "EG08BJ21") - private String eg08bj21; + public String eg08bj21; //短期借款 @JacksonXmlProperty(localName = "EG08BJ22") - private String eg08bj22; + public String eg08bj22; //应缴税费 @JacksonXmlProperty(localName = "EG08BJ23") - private String eg08bj23; + public String eg08bj23; //应缴国库款 @JacksonXmlProperty(localName = "EG08BJ24") - private String eg08bj24; + public String eg08bj24; //应缴财政专户款 @JacksonXmlProperty(localName = "EG08BJ25") - private String eg08bj25; + public String eg08bj25; //应付职工薪酬 @JacksonXmlProperty(localName = "EG08BJ26") - private String eg08bj26; + public String eg08bj26; //应付票据 @JacksonXmlProperty(localName = "EG08BJ27") - private String eg08bj27; + public String eg08bj27; //应付账款 @JacksonXmlProperty(localName = "EG08BJ28") - private String eg08bj28; + public String eg08bj28; //预收账款 @JacksonXmlProperty(localName = "EG08BJ29") - private String eg08bj29; + public String eg08bj29; //其他应付款 @JacksonXmlProperty(localName = "EG08BJ30") - private String eg08bj30; + public String eg08bj30; //其他流动负债 @JacksonXmlProperty(localName = "EG08BJ31") - private String eg08bj31; + public String eg08bj31; //流动负债合计 @JacksonXmlProperty(localName = "EG08BJ32") - private String eg08bj32; + public String eg08bj32; //长期借款 @JacksonXmlProperty(localName = "EG08BJ33") - private String eg08bj33; + public String eg08bj33; //长期应付款 @JacksonXmlProperty(localName = "EG08BJ34") - private String eg08bj34; + public String eg08bj34; //非流动负债合计 @JacksonXmlProperty(localName = "EG08BJ35") - private String eg08bj35; + public String eg08bj35; //负债合计 @JacksonXmlProperty(localName = "EG08BJ36") - private String eg08bj36; + public String eg08bj36; //事业基金 @JacksonXmlProperty(localName = "EG08BJ37") - private String eg08bj37; + public String eg08bj37; //非流动资产基金 @JacksonXmlProperty(localName = "EG08BJ38") - private String eg08bj38; + public String eg08bj38; //专用基金 @JacksonXmlProperty(localName = "EG08BJ39") - private String eg08bj39; + public String eg08bj39; //财政补助结转 @JacksonXmlProperty(localName = "EG08BJ40") - private String eg08bj40; + public String eg08bj40; //财政补助结余 @JacksonXmlProperty(localName = "EG08BJ41") - private String eg08bj41; + public String eg08bj41; //非财政补助结转 @JacksonXmlProperty(localName = "EG08BJ42") - private String eg08bj42; + public String eg08bj42; //非财政补助结余 @JacksonXmlProperty(localName = "EG08BJ43") - private String eg08bj43; + public String eg08bj43; //事业结余 @JacksonXmlProperty(localName = "EG08BJ44") - private String eg08bj44; + public String eg08bj44; //经营结余 @JacksonXmlProperty(localName = "EG08BJ45") - private String eg08bj45; + public String eg08bj45; //净资产合计 @JacksonXmlProperty(localName = "EG08BJ46") - private String eg08bj46; + public String eg08bj46; //负债和净资产总计 @JacksonXmlProperty(localName = "EG08BJ47") - private String eg08bj47; + public String eg08bj47; public String getEg08bj01(){ return this.eg08bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09.java index 1dfc32a1..913f7f48 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09.java @@ -11,11 +11,11 @@ import java.util.List; public class EG09 { //基础段 @JacksonXmlProperty(localName = "EG09A") - private EG09A eg09a; + public EG09A eg09a; //事业单位收入支出表（1997版）段 @JacksonXmlProperty(localName = "EG09B") - private EG09B eg09b; + public EG09B eg09b; public EG09A getEg09a(){ return this.eg09a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09A.java index b10bc63b..5bf182a6 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG09A { //财务报表编号 @JacksonXmlProperty(localName = "EG09AI01") - private String eg09ai01; + public String eg09ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG09AD01") - private String eg09ad01; + public String eg09ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG09AI02") - private String eg09ai02; + public String eg09ai02; //报表年份 @JacksonXmlProperty(localName = "EG09AR01") - private String eg09ar01; + public String eg09ar01; //报表类型 @JacksonXmlProperty(localName = "EG09AD02") - private String eg09ad02; + public String eg09ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG09AD03") - private String eg09ad03; + public String eg09ad03; public String getEg09ai01(){ return this.eg09ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09B.java index 6889ae42..c1613b1c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG09B.java @@ -11,155 +11,155 @@ import java.util.List; public class EG09B { //财政补助收入 @JacksonXmlProperty(localName = "EG09BJ01") - private String eg09bj01; + public String eg09bj01; //上级补助收入 @JacksonXmlProperty(localName = "EG09BJ02") - private String eg09bj02; + public String eg09bj02; //附属单位缴款 @JacksonXmlProperty(localName = "EG09BJ03") - private String eg09bj03; + public String eg09bj03; //事业收入 @JacksonXmlProperty(localName = "EG09BJ04") - private String eg09bj04; + public String eg09bj04; //预算外资金收入 @JacksonXmlProperty(localName = "EG09BJ05") - private String eg09bj05; + public String eg09bj05; //其他收入 @JacksonXmlProperty(localName = "EG09BJ06") - private String eg09bj06; + public String eg09bj06; //事业收入小计 @JacksonXmlProperty(localName = "EG09BJ07") - private String eg09bj07; + public String eg09bj07; //经营收入 @JacksonXmlProperty(localName = "EG09BJ08") - private String eg09bj08; + public String eg09bj08; //经营收入小计 @JacksonXmlProperty(localName = "EG09BJ09") - private String eg09bj09; + public String eg09bj09; //拨入专款 @JacksonXmlProperty(localName = "EG09BJ10") - private String eg09bj10; + public String eg09bj10; //拨入专款小计 @JacksonXmlProperty(localName = "EG09BJ11") - private String eg09bj11; + public String eg09bj11; //收入总计 @JacksonXmlProperty(localName = "EG09BJ12") - private String eg09bj12; + public String eg09bj12; //拨出经费 @JacksonXmlProperty(localName = "EG09BJ13") - private String eg09bj13; + public String eg09bj13; //上缴上级支出 @JacksonXmlProperty(localName = "EG09BJ14") - private String eg09bj14; + public String eg09bj14; //对附属单位补助 @JacksonXmlProperty(localName = "EG09BJ15") - private String eg09bj15; + public String eg09bj15; //事业支出 @JacksonXmlProperty(localName = "EG09BJ16") - private String eg09bj16; + public String eg09bj16; //财政补助支出 @JacksonXmlProperty(localName = "EG09BJ17") - private String eg09bj17; + public String eg09bj17; //预算外资金支出 @JacksonXmlProperty(localName = "EG09BJ18") - private String eg09bj18; + public String eg09bj18; //销售税金 @JacksonXmlProperty(localName = "EG09BJ19") - private String eg09bj19; + public String eg09bj19; //结转自筹基建 @JacksonXmlProperty(localName = "EG09BJ20") - private String eg09bj20; + public String eg09bj20; //事业支出小计 @JacksonXmlProperty(localName = "EG09BJ21") - private String eg09bj21; + public String eg09bj21; //经营支出 @JacksonXmlProperty(localName = "EG09BJ22") - private String eg09bj22; + public String eg09bj22; //销售税金 @JacksonXmlProperty(localName = "EG09BJ23") - private String eg09bj23; + public String eg09bj23; //经营支出小计 @JacksonXmlProperty(localName = "EG09BJ24") - private String eg09bj24; + public String eg09bj24; //拨出专款 @JacksonXmlProperty(localName = "EG09BJ25") - private String eg09bj25; + public String eg09bj25; //专款支出 @JacksonXmlProperty(localName = "EG09BJ26") - private String eg09bj26; + public String eg09bj26; //专款小计 @JacksonXmlProperty(localName = "EG09BJ27") - private String eg09bj27; + public String eg09bj27; //支出总计 @JacksonXmlProperty(localName = "EG09BJ28") - private String eg09bj28; + public String eg09bj28; //事业结余 @JacksonXmlProperty(localName = "EG09BJ29") - private String eg09bj29; + public String eg09bj29; //正常收入结余 @JacksonXmlProperty(localName = "EG09BJ30") - private String eg09bj30; + public String eg09bj30; //收回以前年度事业支出 @JacksonXmlProperty(localName = "EG09BJ31") - private String eg09bj31; + public String eg09bj31; //经营结余 @JacksonXmlProperty(localName = "EG09BJ32") - private String eg09bj32; + public String eg09bj32; //以前年度经营亏损 @JacksonXmlProperty(localName = "EG09BJ33") - private String eg09bj33; + public String eg09bj33; //结余分配 @JacksonXmlProperty(localName = "EG09BJ34") - private String eg09bj34; + public String eg09bj34; //应交所得税 @JacksonXmlProperty(localName = "EG09BJ35") - private String eg09bj35; + public String eg09bj35; //提取专用基金 @JacksonXmlProperty(localName = "EG09BJ36") - private String eg09bj36; + public String eg09bj36; //转入事业基金 @JacksonXmlProperty(localName = "EG09BJ37") - private String eg09bj37; + public String eg09bj37; //其他结余分配 @JacksonXmlProperty(localName = "EG09BJ38") - private String eg09bj38; + public String eg09bj38; public String getEg09bj01(){ return this.eg09bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10.java index 7fb39fbe..7a2e9436 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10.java @@ -11,11 +11,11 @@ import java.util.List; public class EG10 { //基础段 @JacksonXmlProperty(localName = "EG10A") - private EG10A eg10a; + public EG10A eg10a; //事业单位收入支出表（2013版）段 @JacksonXmlProperty(localName = "EG10B") - private EG10B eg10b; + public EG10B eg10b; public EG10A getEg10a(){ return this.eg10a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10A.java index af053659..3b990121 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10A.java @@ -11,27 +11,27 @@ import java.util.List; public class EG10A { //财务报表编号 @JacksonXmlProperty(localName = "EG10AI01") - private String eg10ai01; + public String eg10ai01; //业务管理机构 @JacksonXmlProperty(localName = "EG10AD01") - private String eg10ad01; + public String eg10ad01; //业务管理机构代码 @JacksonXmlProperty(localName = "EG10AI02") - private String eg10ai02; + public String eg10ai02; //报表年份 @JacksonXmlProperty(localName = "EG10AR01") - private String eg10ar01; + public String eg10ar01; //报表类型 @JacksonXmlProperty(localName = "EG10AD02") - private String eg10ad02; + public String eg10ad02; //报表类型细分 @JacksonXmlProperty(localName = "EG10AD03") - private String eg10ad03; + public String eg10ad03; public String getEg10ai01(){ return this.eg10ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10B.java index 323e9c4c..a5655131 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EG10B.java @@ -11,103 +11,103 @@ import java.util.List; public class EG10B { //本期财政补助结转结余 @JacksonXmlProperty(localName = "EG10BJ01") - private String eg10bj01; + public String eg10bj01; //财政补助收入 @JacksonXmlProperty(localName = "EG10BJ02") - private String eg10bj02; + public String eg10bj02; //事业支出（财政补助支出） @JacksonXmlProperty(localName = "EG10BJ03") - private String eg10bj03; + public String eg10bj03; //本期事业结转结余 @JacksonXmlProperty(localName = "EG10BJ04") - private String eg10bj04; + public String eg10bj04; //事业类收入 @JacksonXmlProperty(localName = "EG10BJ05") - private String eg10bj05; + public String eg10bj05; //事业收入 @JacksonXmlProperty(localName = "EG10BJ06") - private String eg10bj06; + public String eg10bj06; //上级补助收入 @JacksonXmlProperty(localName = "EG10BJ07") - private String eg10bj07; + public String eg10bj07; //附属单位上缴收入 @JacksonXmlProperty(localName = "EG10BJ08") - private String eg10bj08; + public String eg10bj08; //其他收入 @JacksonXmlProperty(localName = "EG10BJ09") - private String eg10bj09; + public String eg10bj09; //（其他收入科目下）捐赠收入 @JacksonXmlProperty(localName = "EG10BJ10") - private String eg10bj10; + public String eg10bj10; //事业类支出 @JacksonXmlProperty(localName = "EG10BJ11") - private String eg10bj11; + public String eg10bj11; //事业支出（非财政补助支出） @JacksonXmlProperty(localName = "EG10BJ12") - private String eg10bj12; + public String eg10bj12; //上缴上级支出 @JacksonXmlProperty(localName = "EG10BJ13") - private String eg10bj13; + public String eg10bj13; //对附属单位补助支出 @JacksonXmlProperty(localName = "EG10BJ14") - private String eg10bj14; + public String eg10bj14; //其他支出 @JacksonXmlProperty(localName = "EG10BJ15") - private String eg10bj15; + public String eg10bj15; //本期经营结余 @JacksonXmlProperty(localName = "EG10BJ16") - private String eg10bj16; + public String eg10bj16; //经营收入 @JacksonXmlProperty(localName = "EG10BJ17") - private String eg10bj17; + public String eg10bj17; //经营支出 @JacksonXmlProperty(localName = "EG10BJ18") - private String eg10bj18; + public String eg10bj18; //弥补以前年度亏损后的经营结余 @JacksonXmlProperty(localName = "EG10BJ19") - private String eg10bj19; + public String eg10bj19; //本年非财政补助结转结余 @JacksonXmlProperty(localName = "EG10BJ20") - private String eg10bj20; + public String eg10bj20; //非财政补助结转 @JacksonXmlProperty(localName = "EG10BJ21") - private String eg10bj21; + public String eg10bj21; //本年非财政补助结余 @JacksonXmlProperty(localName = "EG10BJ22") - private String eg10bj22; + public String eg10bj22; //应缴企业所得税 @JacksonXmlProperty(localName = "EG10BJ23") - private String eg10bj23; + public String eg10bj23; //提取专用基金 @JacksonXmlProperty(localName = "EG10BJ24") - private String eg10bj24; + public String eg10bj24; //转入事业基金 @JacksonXmlProperty(localName = "EG10BJ25") - private String eg10bj25; + public String eg10bj25; public String getEg10bj01(){ return this.eg10bj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EGA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EGA.java index af14ccf1..360c2f8a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EGA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EGA.java @@ -12,52 +12,52 @@ public class EGA { //企业资产负债表（2002版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG01") - private List eg01 =new ArrayList<>(); + public List eg01 =new ArrayList<>(); //企业资产负债表（2007版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG02") - private List eg02 =new ArrayList<>(); + public List eg02 =new ArrayList<>(); //企业利润表及利润分配表（2002版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG03") - private List eg03 =new ArrayList<>(); + public List eg03 =new ArrayList<>(); //企业利润表及利润分配表（2007版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG04") - private List eg04 =new ArrayList<>(); + public List eg04 =new ArrayList<>(); //企业现金流量表（2002版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG05") - private List eg05 =new ArrayList<>(); + public List eg05 =new ArrayList<>(); //企业现金流量表（2007版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG06") - private List eg06 =new ArrayList<>(); + public List eg06 =new ArrayList<>(); //事业单位资产负债表（1997版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG07") - private List eg07 =new ArrayList<>(); + public List eg07 =new ArrayList<>(); //事业单位资产负债表（2013版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG08") - private List eg08 =new ArrayList<>(); + public List eg08 =new ArrayList<>(); //事业单位收入支出表（1997版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG09") - private List eg09 =new ArrayList<>(); + public List eg09 =new ArrayList<>(); //事业单位收入支出表（2013版）信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EG10") - private List eg10 =new ArrayList<>(); + public List eg10 =new ArrayList<>(); public List getEg01(){ return this.eg01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EH01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EH01.java index 848f5096..9a310e79 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EH01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EH01.java @@ -11,19 +11,19 @@ import java.util.List; public class EH01 { //评级信息编号 @JacksonXmlProperty(localName = "EH010I01") - private String eh010i01; + public String eh010i01; //评级机构名称 @JacksonXmlProperty(localName = "EH010Q01") - private String eh010q01; + public String eh010q01; //评级日期 @JacksonXmlProperty(localName = "EH010R01") - private Date eh010r01; + public Date eh010r01; //评级结果 @JacksonXmlProperty(localName = "EH010D01") - private String eh010d01; + public String eh010d01; public String getEh010i01(){ return this.eh010i01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EHA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EHA.java index f98486e2..7d70180f 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EHA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EHA.java @@ -12,7 +12,7 @@ public class EHA { //评级信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EH01") - private List eh01 =new ArrayList<>(); + public List eh01 =new ArrayList<>(); public List getEh01(){ return this.eh01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EI01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EI01.java index 03301e8d..2fbaf8b2 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EI01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EI01.java @@ -11,23 +11,23 @@ import java.util.List; public class EI01 { //对象类型 @JacksonXmlProperty(localName = "EI010D01") - private String ei010d01; + public String ei010d01; //对象标识 @JacksonXmlProperty(localName = "EI010I01") - private String ei010i01; + public String ei010i01; //标注及声明类型 @JacksonXmlProperty(localName = "EI010D02") - private String ei010d02; + public String ei010d02; //标注或声明内容 @JacksonXmlProperty(localName = "EI010Q01") - private String ei010q01; + public String ei010q01; //添加日期 @JacksonXmlProperty(localName = "EI010R01") - private Date ei010r01; + public Date ei010r01; public String getEi010d01(){ return this.ei010d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EIA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EIA.java index ed4be55b..de7635ae 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EIA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/company/EIA.java @@ -12,7 +12,7 @@ public class EIA { //声明及异议标注信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "EI01") - private List ei01 =new ArrayList<>(); + public List ei01 =new ArrayList<>(); public List getEi01(){ return this.ei01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/Document.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/Document.java index 26a8a2f5..f2d2ecb7 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/Document.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/Document.java @@ -12,99 +12,99 @@ import java.util.List; public class Document { //报告头 @JacksonXmlProperty(localName = "PRH") - private PRH prh; + public PRH prh; //身份信息 @JacksonXmlProperty(localName = "PIM") - private PIM pim; + public PIM pim; //婚姻信息 @JacksonXmlProperty(localName = "PMM") - private PMM pmm; + public PMM pmm; //居住信息 @JacksonXmlProperty(localName = "PRM") - private PRM prm; + public PRM prm; //职业信息 @JacksonXmlProperty(localName = "POM") - private POM pom; + public POM pom; //评分信息 @JacksonXmlProperty(localName = "PSM") - private PSM psm; + public PSM psm; //信贷交易信息概要 @JacksonXmlProperty(localName = "PCO") - private PCO pco; + public PCO pco; //非信贷交易信息概要 @JacksonXmlProperty(localName = "PNO") - private PNO pno; + public PNO pno; //公共信息概要 @JacksonXmlProperty(localName = "PPO") - private PPO ppo; + public PPO ppo; //查询记录概要 @JacksonXmlProperty(localName = "PQO") - private PQO pqo; + public PQO pqo; //授信协议信息 @JacksonXmlProperty(localName = "PCA") - private PCA pca; + public PCA pca; //借贷账户信息 @JacksonXmlProperty(localName = "PDA") - private PDA pda; + public PDA pda; //相关还款责任信息 @JacksonXmlProperty(localName = "PCR") - private PCR pcr; + public PCR pcr; //后付费业务信息 @JacksonXmlProperty(localName = "PND") - private PND pnd; + public PND pnd; //欠税记录 @JacksonXmlProperty(localName = "POT") - private POT pot; + public POT pot; //民事判决记录 @JacksonXmlProperty(localName = "PCJ") - private PCJ pcj; + public PCJ pcj; //强制执行记录 @JacksonXmlProperty(localName = "PCE") - private PCE pce; + public PCE pce; //行政处罚记录 @JacksonXmlProperty(localName = "PAP") - private PAP pap; + public PAP pap; //住房公积金参缴记录 @JacksonXmlProperty(localName = "PHF") - private PHF phf; + public PHF phf; //低保救助记录 @JacksonXmlProperty(localName = "PBS") - private PBS pbs; + public PBS pbs; //执业资格记录 @JacksonXmlProperty(localName = "PPQ") - private PPQ ppq; + public PPQ ppq; //行政奖励记录 @JacksonXmlProperty(localName = "PAH") - private PAH pah; + public PAH pah; //其他标注及声明信息 @JacksonXmlProperty(localName = "POS") - private POS pos; + public POS pos; //查询记录 @JacksonXmlProperty(localName = "POQ") - private POQ poq; + public POQ poq; public PRH getPrh(){ return this.prh; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01.java index ddb8632c..b11f0fe3 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01.java @@ -11,23 +11,23 @@ import java.util.List; public class PA01 { //报告标识信息段 @JacksonXmlProperty(localName = "PA01A") - private PA01A pa01a; + public PA01A pa01a; //本次查询请求信息段 @JacksonXmlProperty(localName = "PA01B") - private PA01B pa01b; + public PA01B pa01b; //其他身份标识信息段 @JacksonXmlProperty(localName = "PA01C") - private PA01C pa01c; + public PA01C pa01c; //防欺诈警示信息段 @JacksonXmlProperty(localName = "PA01D") - private PA01D pa01d; + public PA01D pa01d; //异议提示信息段 @JacksonXmlProperty(localName = "PA01E") - private PA01E pa01e; + public PA01E pa01e; public PA01A getPa01a(){ return this.pa01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01A.java index ec20aaa3..cf027bf5 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01A.java @@ -11,11 +11,11 @@ import java.util.List; public class PA01A { //报告编号 @JacksonXmlProperty(localName = "PA01AI01") - private String pa01ai01; + public String pa01ai01; //报告时间 @JacksonXmlProperty(localName = "PA01AR01") - private Date pa01ar01; + public Date pa01ar01; public String getPa01ai01(){ return this.pa01ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01B.java index 0da5728d..3584764c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01B.java @@ -11,23 +11,23 @@ import java.util.List; public class PA01B { //被查询者姓名 @JacksonXmlProperty(localName = "PA01BQ01") - private String pa01bq01; + public String pa01bq01; //被查询者证件类型 @JacksonXmlProperty(localName = "PA01BD01") - private String pa01bd01; + public String pa01bd01; //被查询者证件号码 @JacksonXmlProperty(localName = "PA01BI01") - private String pa01bi01; + public String pa01bi01; //查询机构代码 @JacksonXmlProperty(localName = "PA01BI02") - private String pa01bi02; + public String pa01bi02; //查询原因代码 @JacksonXmlProperty(localName = "PA01BD02") - private String pa01bd02; + public String pa01bd02; public String getPa01bq01(){ return this.pa01bq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01C.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01C.java index b6df028b..729b08a2 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01C.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01C.java @@ -11,12 +11,12 @@ import java.util.List; public class PA01C { //身份标识个数 @JacksonXmlProperty(localName = "PA01CS01") - private String pa01cs01; + public String pa01cs01; //身份信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PA01CH") - private List pa01ch =new ArrayList<>(); + public List pa01ch =new ArrayList<>(); public String getPa01cs01(){ return this.pa01cs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01CH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01CH.java index c065ce50..e950b7ba 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01CH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01CH.java @@ -11,11 +11,11 @@ import java.util.List; public class PA01CH { //证件类型 @JacksonXmlProperty(localName = "PA01CD01") - private String pa01cd01; + public String pa01cd01; //证件号码 @JacksonXmlProperty(localName = "PA01CI01") - private String pa01ci01; + public String pa01ci01; public String getPa01cd01(){ return this.pa01cd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01D.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01D.java index 7b776f16..2e91538f 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01D.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01D.java @@ -11,19 +11,19 @@ import java.util.List; public class PA01D { //防欺诈警示标志 @JacksonXmlProperty(localName = "PA01DQ01") - private String pa01dq01; + public String pa01dq01; //防欺诈警示联系电话 @JacksonXmlProperty(localName = "PA01DQ02") - private String pa01dq02; + public String pa01dq02; //防欺诈警示生效日期 @JacksonXmlProperty(localName = "PA01DR01") - private Date pa01dr01; + public Date pa01dr01; //防欺诈警示截止日期 @JacksonXmlProperty(localName = "PA01DR02") - private Date pa01dr02; + public Date pa01dr02; public String getPa01dq01(){ return this.pa01dq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01E.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01E.java index 604ed221..86fc0e8d 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01E.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PA01E.java @@ -11,7 +11,7 @@ import java.util.List; public class PA01E { //异议标注数目 @JacksonXmlProperty(localName = "PA01ES01") - private String pa01es01; + public String pa01es01; public String getPa01es01(){ return this.pa01es01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PAH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PAH.java index 416cc84e..6680e1eb 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PAH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PAH.java @@ -12,7 +12,7 @@ public class PAH { //行政奖励记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF08") - private List pf08 =new ArrayList<>(); + public List pf08 =new ArrayList<>(); public List getPf08(){ return this.pf08; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PAP.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PAP.java index dc87b289..75db1732 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PAP.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PAP.java @@ -12,7 +12,7 @@ public class PAP { //行政处罚记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF04") - private List pf04 =new ArrayList<>(); + public List pf04 =new ArrayList<>(); public List getPf04(){ return this.pf04; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01.java index d6fe70dd..de0cc050 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01.java @@ -11,11 +11,11 @@ import java.util.List; public class PB01 { //基本概况信息段 @JacksonXmlProperty(localName = "PB01A") - private PB01A pb01a; + public PB01A pb01a; //手机号码信息段 @JacksonXmlProperty(localName = "PB01B") - private PB01B pb01b; + public PB01B pb01b; public PB01A getPb01a(){ return this.pb01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01A.java index c8e57f07..2b8fd1c0 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01A.java @@ -11,39 +11,39 @@ import java.util.List; public class PB01A { //性别 @JacksonXmlProperty(localName = "PB01AD01") - private String pb01ad01; + public String pb01ad01; //出生日期 @JacksonXmlProperty(localName = "PB01AR01") - private Date pb01ar01; + public Date pb01ar01; //学历 @JacksonXmlProperty(localName = "PB01AD02") - private String pb01ad02; + public String pb01ad02; //学位 @JacksonXmlProperty(localName = "PB01AD03") - private String pb01ad03; + public String pb01ad03; //就业状况 @JacksonXmlProperty(localName = "PB01AD04") - private String pb01ad04; + public String pb01ad04; //电子邮箱 @JacksonXmlProperty(localName = "PB01AQ01") - private String pb01aq01; + public String pb01aq01; //通讯地址 @JacksonXmlProperty(localName = "PB01AQ02") - private String pb01aq02; + public String pb01aq02; //国籍 @JacksonXmlProperty(localName = "PB01AD05") - private String pb01ad05; + public String pb01ad05; //户籍地址 @JacksonXmlProperty(localName = "PB01AQ03") - private String pb01aq03; + public String pb01aq03; public String getPb01ad01(){ return this.pb01ad01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01B.java index 59adba85..3b2d9d24 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01B.java @@ -11,12 +11,12 @@ import java.util.List; public class PB01B { //手机号码个数 @JacksonXmlProperty(localName = "PB01BS01") - private String pb01bs01; + public String pb01bs01; //手机号码信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PB01BH") - private List pb01bh =new ArrayList<>(); + public List pb01bh =new ArrayList<>(); public String getPb01bs01(){ return this.pb01bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01BH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01BH.java index df08df80..480a543f 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01BH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB01BH.java @@ -11,11 +11,11 @@ import java.util.List; public class PB01BH { //手机号码 @JacksonXmlProperty(localName = "PB01BQ01") - private String pb01bq01; + public String pb01bq01; //信息更新日期 @JacksonXmlProperty(localName = "PB01BR01") - private Date pb01br01; + public Date pb01br01; public String getPb01bq01(){ return this.pb01bq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB02.java index f04aac2a..e6b7094d 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB02.java @@ -11,27 +11,27 @@ import java.util.List; public class PB02 { //婚姻状况 @JacksonXmlProperty(localName = "PB020D01") - private String pb020d01; + public String pb020d01; //配偶姓名 @JacksonXmlProperty(localName = "PB020Q01") - private String pb020q01; + public String pb020q01; //配偶证件类型 @JacksonXmlProperty(localName = "PB020D02") - private String pb020d02; + public String pb020d02; //配偶证件号码 @JacksonXmlProperty(localName = "PB020I01") - private String pb020i01; + public String pb020i01; //配偶工作单位 @JacksonXmlProperty(localName = "PB020Q02") - private String pb020q02; + public String pb020q02; //配偶联系电话 @JacksonXmlProperty(localName = "PB020Q03") - private String pb020q03; + public String pb020q03; public String getPb020d01(){ return this.pb020d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB03.java index 81a5a661..6c4c964e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB03.java @@ -11,19 +11,19 @@ import java.util.List; public class PB03 { //居住状况 @JacksonXmlProperty(localName = "PB030D01") - private String pb030d01; + public String pb030d01; //居住地址 @JacksonXmlProperty(localName = "PB030Q01") - private String pb030q01; + public String pb030q01; //住宅电话 @JacksonXmlProperty(localName = "PB030Q02") - private String pb030q02; + public String pb030q02; //信息更新日期 @JacksonXmlProperty(localName = "PB030R01") - private Date pb030r01; + public Date pb030r01; public String getPb030d01(){ return this.pb030d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB04.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB04.java index 3c960801..d69b1346 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB04.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PB04.java @@ -11,47 +11,47 @@ import java.util.List; public class PB04 { //就业状况 @JacksonXmlProperty(localName = "PB040D01") - private String pb040d01; + public String pb040d01; //工作单位 @JacksonXmlProperty(localName = "PB040Q01") - private String pb040q01; + public String pb040q01; //单位性质 @JacksonXmlProperty(localName = "PB040D02") - private String pb040d02; + public String pb040d02; //行业 @JacksonXmlProperty(localName = "PB040D03") - private String pb040d03; + public String pb040d03; //单位地址 @JacksonXmlProperty(localName = "PB040Q02") - private String pb040q02; + public String pb040q02; //单位电话 @JacksonXmlProperty(localName = "PB040Q03") - private String pb040q03; + public String pb040q03; //职业 @JacksonXmlProperty(localName = "PB040D04") - private String pb040d04; + public String pb040d04; //职务 @JacksonXmlProperty(localName = "PB040D05") - private String pb040d05; + public String pb040d05; //职称 @JacksonXmlProperty(localName = "PB040D06") - private String pb040d06; + public String pb040d06; //进入本单位年份 @JacksonXmlProperty(localName = "PB040R01") - private String pb040r01; + public String pb040r01; //信息更新日期 @JacksonXmlProperty(localName = "PB040R02") - private Date pb040r02; + public Date pb040r02; public String getPb040d01(){ return this.pb040d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PBS.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PBS.java index 7d5f1e8c..fa8a3bc9 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PBS.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PBS.java @@ -12,7 +12,7 @@ public class PBS { //低保救助记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF06") - private List pf06 =new ArrayList<>(); + public List pf06 =new ArrayList<>(); public List getPf06(){ return this.pf06; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC01.java index dc02f270..41ec6ccb 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC01.java @@ -11,19 +11,19 @@ import java.util.List; public class PC01 { //数字解读 @JacksonXmlProperty(localName = "PC010Q01") - private String pc010q01; + public String pc010q01; //相对位置 @JacksonXmlProperty(localName = "PC010Q02") - private String pc010q02; + public String pc010q02; //分数说明条数 @JacksonXmlProperty(localName = "PC010S01") - private String pc010s01; + public String pc010s01; //分数说明 @JacksonXmlProperty(localName = "PC010D01") - private String pc010d01; + public String pc010d01; public String getPc010q01(){ return this.pc010q01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02.java index af395a82..7c364d82 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02.java @@ -11,43 +11,43 @@ import java.util.List; public class PC02 { //信贷交易提示信息段 @JacksonXmlProperty(localName = "PC02A") - private PC02A pc02a; + public PC02A pc02a; //被追偿汇总信息段 @JacksonXmlProperty(localName = "PC02B") - private PC02B pc02b; + public PC02B pc02b; //呆账汇总信息段 @JacksonXmlProperty(localName = "PC02C") - private PC02C pc02c; + public PC02C pc02c; //逾期（透支）汇总信息段 @JacksonXmlProperty(localName = "PC02D") - private PC02D pc02d; + public PC02D pc02d; //非循环贷账户汇总信息段 @JacksonXmlProperty(localName = "PC02E") - private PC02E pc02e; + public PC02E pc02e; //循环额度下分账户汇总信息段 @JacksonXmlProperty(localName = "PC02F") - private PC02F pc02f; + public PC02F pc02f; //循环贷账户汇总信息段 @JacksonXmlProperty(localName = "PC02G") - private PC02G pc02g; + public PC02G pc02g; //贷记卡账户汇总信息段 @JacksonXmlProperty(localName = "PC02H") - private PC02H pc02h; + public PC02H pc02h; //准贷记卡账户汇总信息段 @JacksonXmlProperty(localName = "PC02I") - private PC02I pc02i; + public PC02I pc02i; //相关还款责任汇总信息段 @JacksonXmlProperty(localName = "PC02K") - private PC02K pc02k; + public PC02K pc02k; public PC02A getPc02a(){ return this.pc02a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02A.java index 1a0a8102..57a3b5d1 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02A.java @@ -11,16 +11,16 @@ import java.util.List; public class PC02A { //账户数合计 @JacksonXmlProperty(localName = "PC02AS01") - private String pc02as01; + public String pc02as01; //业务类型数量 @JacksonXmlProperty(localName = "PC02AS02") - private String pc02as02; + public String pc02as02; //信贷交易提示信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PC02AH") - private List pc02ah =new ArrayList<>(); + public List pc02ah =new ArrayList<>(); public String getPc02as01(){ return this.pc02as01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02AH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02AH.java index 03e9ce4b..8c2f488c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02AH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02AH.java @@ -11,19 +11,19 @@ import java.util.List; public class PC02AH { //业务类型 @JacksonXmlProperty(localName = "PC02AD01") - private String pc02ad01; + public String pc02ad01; //业务大类 @JacksonXmlProperty(localName = "PC02AD02") - private String pc02ad02; + public String pc02ad02; //账户数 @JacksonXmlProperty(localName = "PC02AS03") - private String pc02as03; + public String pc02as03; //首笔业务发放月份 @JacksonXmlProperty(localName = "PC02AR01") - private String pc02ar01; + public String pc02ar01; public String getPc02ad01(){ return this.pc02ad01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02B.java index 4fe2033b..6168b5b1 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02B.java @@ -11,20 +11,20 @@ import java.util.List; public class PC02B { //账户数合计 @JacksonXmlProperty(localName = "PC02BS01") - private String pc02bs01; + public String pc02bs01; //余额合计 @JacksonXmlProperty(localName = "PC02BJ01") - private String pc02bj01; + public String pc02bj01; //业务类型数量 @JacksonXmlProperty(localName = "PC02BS02") - private String pc02bs02; + public String pc02bs02; //被追偿汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PC02BH") - private List pc02bh =new ArrayList<>(); + public List pc02bh =new ArrayList<>(); public String getPc02bs01(){ return this.pc02bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02BH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02BH.java index c51bea87..34de1973 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02BH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02BH.java @@ -11,15 +11,15 @@ import java.util.List; public class PC02BH { //业务类型 @JacksonXmlProperty(localName = "PC02BD01") - private String pc02bd01; + public String pc02bd01; //账户数 @JacksonXmlProperty(localName = "PC02BS03") - private String pc02bs03; + public String pc02bs03; //余额 @JacksonXmlProperty(localName = "PC02BJ02") - private String pc02bj02; + public String pc02bj02; public String getPc02bd01(){ return this.pc02bd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02C.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02C.java index 854d1985..ddcc00eb 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02C.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02C.java @@ -11,11 +11,11 @@ import java.util.List; public class PC02C { //账户数 @JacksonXmlProperty(localName = "PC02CS01") - private String pc02cs01; + public String pc02cs01; //余额 @JacksonXmlProperty(localName = "PC02CJ01") - private String pc02cj01; + public String pc02cj01; public String getPc02cs01(){ return this.pc02cs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02D.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02D.java index b51e067b..d40f3325 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02D.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02D.java @@ -11,12 +11,12 @@ import java.util.List; public class PC02D { //账户类型数量 @JacksonXmlProperty(localName = "PC02DS01") - private String pc02ds01; + public String pc02ds01; //逾期（透支）汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PC02DH") - private List pc02dh =new ArrayList<>(); + public List pc02dh =new ArrayList<>(); public String getPc02ds01(){ return this.pc02ds01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02DH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02DH.java index c8ef0ff2..be7cf41e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02DH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02DH.java @@ -11,23 +11,23 @@ import java.util.List; public class PC02DH { //账户类型 @JacksonXmlProperty(localName = "PC02DD01") - private String pc02dd01; + public String pc02dd01; //账户数 @JacksonXmlProperty(localName = "PC02DS02") - private String pc02ds02; + public String pc02ds02; //月份数 @JacksonXmlProperty(localName = "PC02DS03") - private String pc02ds03; + public String pc02ds03; //单月最高逾期（透支）总额 @JacksonXmlProperty(localName = "PC02DJ01") - private String pc02dj01; + public String pc02dj01; //最长逾期（透支）月数 @JacksonXmlProperty(localName = "PC02DS04") - private String pc02ds04; + public String pc02ds04; public String getPc02dd01(){ return this.pc02dd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02E.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02E.java index 8685d636..c6e9053c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02E.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02E.java @@ -11,23 +11,23 @@ import java.util.List; public class PC02E { //管理机构数 @JacksonXmlProperty(localName = "PC02ES01") - private String pc02es01; + public String pc02es01; //账户数 @JacksonXmlProperty(localName = "PC02ES02") - private String pc02es02; + public String pc02es02; //授信总额 @JacksonXmlProperty(localName = "PC02EJ01") - private String pc02ej01; + public String pc02ej01; //余额 @JacksonXmlProperty(localName = "PC02EJ02") - private String pc02ej02; + public String pc02ej02; //最近 6 个月平均应还款 @JacksonXmlProperty(localName = "PC02EJ03") - private String pc02ej03; + public String pc02ej03; public String getPc02es01(){ return this.pc02es01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02F.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02F.java index 53e600ca..22836258 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02F.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02F.java @@ -11,23 +11,23 @@ import java.util.List; public class PC02F { //管理机构数 @JacksonXmlProperty(localName = "PC02FS01") - private String pc02fs01; + public String pc02fs01; //账户数 @JacksonXmlProperty(localName = "PC02FS02") - private String pc02fs02; + public String pc02fs02; //授信总额 @JacksonXmlProperty(localName = "PC02FJ01") - private String pc02fj01; + public String pc02fj01; //余额 @JacksonXmlProperty(localName = "PC02FJ02") - private String pc02fj02; + public String pc02fj02; //最近 6 个月平均应还款 @JacksonXmlProperty(localName = "PC02FJ03") - private String pc02fj03; + public String pc02fj03; public String getPc02fs01(){ return this.pc02fs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02G.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02G.java index 4e663bca..ee6ce313 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02G.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02G.java @@ -11,23 +11,23 @@ import java.util.List; public class PC02G { //管理机构数 @JacksonXmlProperty(localName = "PC02GS01") - private String pc02gs01; + public String pc02gs01; //账户数 @JacksonXmlProperty(localName = "PC02GS02") - private String pc02gs02; + public String pc02gs02; //授信总额 @JacksonXmlProperty(localName = "PC02GJ01") - private String pc02gj01; + public String pc02gj01; //余额 @JacksonXmlProperty(localName = "PC02GJ02") - private String pc02gj02; + public String pc02gj02; //最近 6 个月平均应还款 @JacksonXmlProperty(localName = "PC02GJ03") - private String pc02gj03; + public String pc02gj03; public String getPc02gs01(){ return this.pc02gs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02H.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02H.java index 6e320d02..2f1af7f4 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02H.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02H.java @@ -11,31 +11,31 @@ import java.util.List; public class PC02H { //发卡机构数 @JacksonXmlProperty(localName = "PC02HS01") - private String pc02hs01; + public String pc02hs01; //账户数 @JacksonXmlProperty(localName = "PC02HS02") - private String pc02hs02; + public String pc02hs02; //授信总额 @JacksonXmlProperty(localName = "PC02HJ01") - private String pc02hj01; + public String pc02hj01; //单家行最高授信额 @JacksonXmlProperty(localName = "PC02HJ02") - private String pc02hj02; + public String pc02hj02; //单家行最低授信额 @JacksonXmlProperty(localName = "PC02HJ03") - private String pc02hj03; + public String pc02hj03; //已用额度 @JacksonXmlProperty(localName = "PC02HJ04") - private String pc02hj04; + public String pc02hj04; //最近 6 个月平均使用额度 @JacksonXmlProperty(localName = "PC02HJ05") - private String pc02hj05; + public String pc02hj05; public String getPc02hs01(){ return this.pc02hs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02I.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02I.java index 1b2c2353..75c2390a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02I.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02I.java @@ -11,31 +11,31 @@ import java.util.List; public class PC02I { //发卡机构数 @JacksonXmlProperty(localName = "PC02IS01") - private String pc02is01; + public String pc02is01; //账户数 @JacksonXmlProperty(localName = "PC02IS02") - private String pc02is02; + public String pc02is02; //授信总额 @JacksonXmlProperty(localName = "PC02IJ01") - private String pc02ij01; + public String pc02ij01; //单家行最高授信额 @JacksonXmlProperty(localName = "PC02IJ02") - private String pc02ij02; + public String pc02ij02; //单家行最低授信额 @JacksonXmlProperty(localName = "PC02IJ03") - private String pc02ij03; + public String pc02ij03; //透支余额 @JacksonXmlProperty(localName = "PC02IJ04") - private String pc02ij04; + public String pc02ij04; //最近 6 个月平均透支余额 @JacksonXmlProperty(localName = "PC02IJ05") - private String pc02ij05; + public String pc02ij05; public String getPc02is01(){ return this.pc02is01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02K.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02K.java index f657652e..2689520e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02K.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02K.java @@ -11,12 +11,12 @@ import java.util.List; public class PC02K { //相关还款责任个数 @JacksonXmlProperty(localName = "PC02KS01") - private String pc02ks01; + public String pc02ks01; //相关还款责任汇总信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PC02KH") - private List pc02kh =new ArrayList<>(); + public List pc02kh =new ArrayList<>(); public String getPc02ks01(){ return this.pc02ks01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02KH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02KH.java index a950e0c2..2db816a9 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02KH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC02KH.java @@ -11,23 +11,23 @@ import java.util.List; public class PC02KH { //借款人身份类别 @JacksonXmlProperty(localName = "PC02KD01") - private String pc02kd01; + public String pc02kd01; //还款责任类型 @JacksonXmlProperty(localName = "PC02KD02") - private String pc02kd02; + public String pc02kd02; //账户数 @JacksonXmlProperty(localName = "PC02KS02") - private String pc02ks02; + public String pc02ks02; //还款责任金额 @JacksonXmlProperty(localName = "PC02KJ01") - private String pc02kj01; + public String pc02kj01; //余额 @JacksonXmlProperty(localName = "PC02KJ02") - private String pc02kj02; + public String pc02kj02; public String getPc02kd01(){ return this.pc02kd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC03.java index bf72d340..0db584f6 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC03.java @@ -11,11 +11,11 @@ import java.util.List; public class PC03 { //后付费业务类型数量 @JacksonXmlProperty(localName = "PC030S01") - private String pc030s01; + public String pc030s01; //后付费业务欠费信息汇总信息 @JacksonXmlProperty(localName = "PC030H") - private PC030H pc030h; + public PC030H pc030h; public String getPc030s01(){ return this.pc030s01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC030H.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC030H.java index 5ae04941..01cee69f 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC030H.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC030H.java @@ -11,15 +11,15 @@ import java.util.List; public class PC030H { //后付费业务类型 @JacksonXmlProperty(localName = "PC030D01") - private String pc030d01; + public String pc030d01; //欠费账户数 @JacksonXmlProperty(localName = "PC030S02") - private String pc030s02; + public String pc030s02; //欠费金额 @JacksonXmlProperty(localName = "PC030J01") - private String pc030j01; + public String pc030j01; public String getPc030d01(){ return this.pc030d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC04.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC04.java index d9b06532..14034aec 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC04.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC04.java @@ -11,12 +11,12 @@ import java.util.List; public class PC04 { //公共信息类型数量 @JacksonXmlProperty(localName = "PC040S01") - private String pc040s01; + public String pc040s01; //公共信息概要信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PC040H") - private List pc040h =new ArrayList<>(); + public List pc040h =new ArrayList<>(); public String getPc040s01(){ return this.pc040s01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC040H.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC040H.java index f485068f..9b468b65 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC040H.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC040H.java @@ -11,15 +11,15 @@ import java.util.List; public class PC040H { //公共信息类型 @JacksonXmlProperty(localName = "PC040D01") - private String pc040d01; + public String pc040d01; //记录数 @JacksonXmlProperty(localName = "PC040S02") - private String pc040s02; + public String pc040s02; //涉及金额 @JacksonXmlProperty(localName = "PC040J01") - private String pc040j01; + public String pc040j01; public String getPc040d01(){ return this.pc040d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05.java index 5d78789a..204ad750 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05.java @@ -11,11 +11,11 @@ import java.util.List; public class PC05 { //上一次查询记录信息段 @JacksonXmlProperty(localName = "PC05A") - private PC05A pc05a; + public PC05A pc05a; //查询记录汇总信息段 @JacksonXmlProperty(localName = "PC05B") - private PC05B pc05b; + public PC05B pc05b; public PC05A getPc05a(){ return this.pc05a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05A.java index 06d2bd33..489f226b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05A.java @@ -11,19 +11,19 @@ import java.util.List; public class PC05A { //上一次查询日期 @JacksonXmlProperty(localName = "PC05AR01") - private Date pc05ar01; + public Date pc05ar01; //上一次查询机构机构类型 @JacksonXmlProperty(localName = "PC05AD01") - private String pc05ad01; + public String pc05ad01; //上一次查询机构代码 @JacksonXmlProperty(localName = "PC05AI01") - private String pc05ai01; + public String pc05ai01; //上一次查询原因 @JacksonXmlProperty(localName = "PC05AQ01") - private String pc05aq01; + public String pc05aq01; public Date getPc05ar01(){ return this.pc05ar01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05B.java index 6580afd3..a27a3cf7 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PC05B.java @@ -11,35 +11,35 @@ import java.util.List; public class PC05B { //最近 1 个月内的查询机构数（贷款审批） @JacksonXmlProperty(localName = "PC05BS01") - private String pc05bs01; + public String pc05bs01; //最近 1 个月内的查询机构数（信用卡审批） @JacksonXmlProperty(localName = "PC05BS02") - private String pc05bs02; + public String pc05bs02; //最近 1 个月内的查询次数（贷款审批） @JacksonXmlProperty(localName = "PC05BS03") - private String pc05bs03; + public String pc05bs03; //最近 1 个月内的查询次数（信用卡审批） @JacksonXmlProperty(localName = "PC05BS04") - private String pc05bs04; + public String pc05bs04; //最近 1 个月内的查询次数（本人查询） @JacksonXmlProperty(localName = "PC05BS05") - private String pc05bs05; + public String pc05bs05; //最近 2 年内的查询次数（贷后管理） @JacksonXmlProperty(localName = "PC05BS06") - private String pc05bs06; + public String pc05bs06; //最近 2 年内的查询次数（担保资格审查） @JacksonXmlProperty(localName = "PC05BS07") - private String pc05bs07; + public String pc05bs07; //最近 2 年内的查询次数（特约商户实名审查） @JacksonXmlProperty(localName = "PC05BS08") - private String pc05bs08; + public String pc05bs08; public String getPc05bs01(){ return this.pc05bs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCA.java index 9cb91566..cc68b190 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCA.java @@ -12,7 +12,7 @@ public class PCA { //授信协议信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD02") - private List pd02 =new ArrayList<>(); + public List pd02 =new ArrayList<>(); public List getPd02(){ return this.pd02; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCE.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCE.java index 39358d64..6a547447 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCE.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCE.java @@ -12,7 +12,7 @@ public class PCE { //强制执行记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF03") - private List pf03 =new ArrayList<>(); + public List pf03 =new ArrayList<>(); public List getPf03(){ return this.pf03; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCJ.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCJ.java index a6ae25d5..6dae8f66 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCJ.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCJ.java @@ -12,7 +12,7 @@ public class PCJ { //民事判决记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF02") - private List pf02 =new ArrayList<>(); + public List pf02 =new ArrayList<>(); public List getPf02(){ return this.pf02; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCO.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCO.java index 2b5ec6e9..46b60c5c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCO.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCO.java @@ -11,7 +11,7 @@ import java.util.List; public class PCO { //信贷交易信息概要信息单元 @JacksonXmlProperty(localName = "PC02") - private PC02 pc02; + public PC02 pc02; public PC02 getPc02(){ return this.pc02; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCR.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCR.java index fa26a430..52c93027 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCR.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PCR.java @@ -12,7 +12,7 @@ public class PCR { //相关还款责任信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD03") - private List pd03 =new ArrayList<>(); + public List pd03 =new ArrayList<>(); public List getPd03(){ return this.pd03; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01.java index c94fa32c..6767f4bb 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01.java @@ -11,39 +11,39 @@ import java.util.List; public class PD01 { //基本信息段 @JacksonXmlProperty(localName = "PD01A") - private PD01A pd01a; + public PD01A pd01a; //最新表现信息段 @JacksonXmlProperty(localName = "PD01B") - private PD01B pd01b; + public PD01B pd01b; //最近一次月度表现信息段 @JacksonXmlProperty(localName = "PD01C") - private PD01C pd01c; + public PD01C pd01c; //最近 24 个月还款记录信息段 @JacksonXmlProperty(localName = "PD01D") - private PD01D pd01d; + public PD01D pd01d; //最近 5 年内历史表现信息段 @JacksonXmlProperty(localName = "PD01E") - private PD01E pd01e; + public PD01E pd01e; //特殊交易信息段 @JacksonXmlProperty(localName = "PD01F") - private PD01F pd01f; + public PD01F pd01f; //特殊事件说明信息段 @JacksonXmlProperty(localName = "PD01G") - private PD01G pd01g; + public PD01G pd01g; //大额专项分期信息段 @JacksonXmlProperty(localName = "PD01H") - private PD01H pd01h; + public PD01H pd01h; //标注及声明信息段 @JacksonXmlProperty(localName = "PD01Z") - private PD01Z pd01z; + public PD01Z pd01z; public PD01A getPd01a(){ return this.pd01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01A.java index 11b58fc5..1d4df706 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01A.java @@ -11,83 +11,83 @@ import java.util.List; public class PD01A { //账户编号 @JacksonXmlProperty(localName = "PD01AI01") - private String pd01ai01; + public String pd01ai01; //账户类型 @JacksonXmlProperty(localName = "PD01AD01") - private String pd01ad01; + public String pd01ad01; //业务管理机构类型 @JacksonXmlProperty(localName = "PD01AD02") - private String pd01ad02; + public String pd01ad02; //业务管理机构代码 @JacksonXmlProperty(localName = "PD01AI02") - private String pd01ai02; + public String pd01ai02; //账户标识 @JacksonXmlProperty(localName = "PD01AI03") - private String pd01ai03; + public String pd01ai03; //授信协议编号 @JacksonXmlProperty(localName = "PD01AI04") - private String pd01ai04; + public String pd01ai04; //业务种类 @JacksonXmlProperty(localName = "PD01AD03") - private String pd01ad03; + public String pd01ad03; //开立日期 @JacksonXmlProperty(localName = "PD01AR01") - private Date pd01ar01; + public Date pd01ar01; //币种 @JacksonXmlProperty(localName = "PD01AD04") - private String pd01ad04; + public String pd01ad04; //借款金额 @JacksonXmlProperty(localName = "PD01AJ01") - private String pd01aj01; + public String pd01aj01; //账户授信额度 @JacksonXmlProperty(localName = "PD01AJ02") - private String pd01aj02; + public String pd01aj02; //共享授信额度 @JacksonXmlProperty(localName = "PD01AJ03") - private String pd01aj03; + public String pd01aj03; //到期日期 @JacksonXmlProperty(localName = "PD01AR02") - private Date pd01ar02; + public Date pd01ar02; //还款方式 @JacksonXmlProperty(localName = "PD01AD05") - private String pd01ad05; + public String pd01ad05; //还款频率 @JacksonXmlProperty(localName = "PD01AD06") - private String pd01ad06; + public String pd01ad06; //还款期数 @JacksonXmlProperty(localName = "PD01AS01") - private String pd01as01; + public String pd01as01; //担保方式 @JacksonXmlProperty(localName = "PD01AD07") - private String pd01ad07; + public String pd01ad07; //贷款发放形式 @JacksonXmlProperty(localName = "PD01AD08") - private String pd01ad08; + public String pd01ad08; //共同借款标志 @JacksonXmlProperty(localName = "PD01AD09") - private String pd01ad09; + public String pd01ad09; //债权转移时的还款状态 @JacksonXmlProperty(localName = "PD01AD10") - private String pd01ad10; + public String pd01ad10; public String getPd01ai01(){ return this.pd01ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01B.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01B.java index 853e631e..b01b45fb 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01B.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01B.java @@ -11,39 +11,39 @@ import java.util.List; public class PD01B { //账户状态 @JacksonXmlProperty(localName = "PD01BD01") - private String pd01bd01; + public String pd01bd01; //关闭日期 @JacksonXmlProperty(localName = "PD01BR01") - private Date pd01br01; + public Date pd01br01; //转出月份 @JacksonXmlProperty(localName = "PD01BR04") - private String pd01br04; + public String pd01br04; //余额 @JacksonXmlProperty(localName = "PD01BJ01") - private String pd01bj01; + public String pd01bj01; //最近一次还款日期 @JacksonXmlProperty(localName = "PD01BR02") - private Date pd01br02; + public Date pd01br02; //最近一次还款金额 @JacksonXmlProperty(localName = "PD01BJ02") - private String pd01bj02; + public String pd01bj02; //五级分类 @JacksonXmlProperty(localName = "PD01BD03") - private String pd01bd03; + public String pd01bd03; //还款状态 @JacksonXmlProperty(localName = "PD01BD04") - private String pd01bd04; + public String pd01bd04; //信息报告日期 @JacksonXmlProperty(localName = "PD01BR03") - private Date pd01br03; + public Date pd01br03; public String getPd01bd01(){ return this.pd01bd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01C.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01C.java index c4bbb5a9..ac07c1bf 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01C.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01C.java @@ -11,95 +11,95 @@ import java.util.List; public class PD01C { //月份 @JacksonXmlProperty(localName = "PD01CR01") - private String pd01cr01; + public String pd01cr01; //账户状态 @JacksonXmlProperty(localName = "PD01CD01") - private String pd01cd01; + public String pd01cd01; //余额 @JacksonXmlProperty(localName = "PD01CJ01") - private String pd01cj01; + public String pd01cj01; //已用额度 @JacksonXmlProperty(localName = "PD01CJ02") - private String pd01cj02; + public String pd01cj02; //未出单的大额专项分期余额 @JacksonXmlProperty(localName = "PD01CJ03") - private String pd01cj03; + public String pd01cj03; //五级分类 @JacksonXmlProperty(localName = "PD01CD02") - private String pd01cd02; + public String pd01cd02; //剩余还款期数 @JacksonXmlProperty(localName = "PD01CS01") - private String pd01cs01; + public String pd01cs01; //结算/应还款日 @JacksonXmlProperty(localName = "PD01CR02") - private Date pd01cr02; + public Date pd01cr02; //本月应还款 @JacksonXmlProperty(localName = "PD01CJ04") - private String pd01cj04; + public String pd01cj04; //本月实还款 @JacksonXmlProperty(localName = "PD01CJ05") - private String pd01cj05; + public String pd01cj05; //最近一次还款日期 @JacksonXmlProperty(localName = "PD01CR03") - private Date pd01cr03; + public Date pd01cr03; //当前逾期期数 @JacksonXmlProperty(localName = "PD01CS02") - private String pd01cs02; + public String pd01cs02; //当前逾期总额 @JacksonXmlProperty(localName = "PD01CJ06") - private String pd01cj06; + public String pd01cj06; //逾期 31—60 天未还本金 @JacksonXmlProperty(localName = "PD01CJ07") - private String pd01cj07; + public String pd01cj07; //逾期 61－90 天未还本金 @JacksonXmlProperty(localName = "PD01CJ08") - private String pd01cj08; + public String pd01cj08; //逾期 91－180 天未还本金 @JacksonXmlProperty(localName = "PD01CJ09") - private String pd01cj09; + public String pd01cj09; //逾期 180 天以上未还本金 @JacksonXmlProperty(localName = "PD01CJ10") - private String pd01cj10; + public String pd01cj10; //透支 180 天以上未付余额 @JacksonXmlProperty(localName = "PD01CJ11") - private String pd01cj11; + public String pd01cj11; //最近 6 个月平均使用额度 @JacksonXmlProperty(localName = "PD01CJ12") - private String pd01cj12; + public String pd01cj12; //最近 6 个月平均透支余额 @JacksonXmlProperty(localName = "PD01CJ13") - private String pd01cj13; + public String pd01cj13; //最大使用额度 @JacksonXmlProperty(localName = "PD01CJ14") - private String pd01cj14; + public String pd01cj14; //最大透支余额 @JacksonXmlProperty(localName = "PD01CJ15") - private String pd01cj15; + public String pd01cj15; //信息报告日期 @JacksonXmlProperty(localName = "PD01CR04") - private Date pd01cr04; + public Date pd01cr04; public String getPd01cr01(){ return this.pd01cr01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01D.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01D.java index a989e1d4..eb6a422c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01D.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01D.java @@ -11,16 +11,16 @@ import java.util.List; public class PD01D { //起始年月 @JacksonXmlProperty(localName = "PD01DR01") - private String pd01dr01; + public String pd01dr01; //截止年月 @JacksonXmlProperty(localName = "PD01DR02") - private String pd01dr02; + public String pd01dr02; //还款状态信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD01DH") - private List pd01dh =new ArrayList<>(); + public List pd01dh =new ArrayList<>(); public String getPd01dr01(){ return this.pd01dr01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01DH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01DH.java index c7d05c3f..27b6591b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01DH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01DH.java @@ -11,11 +11,11 @@ import java.util.List; public class PD01DH { //月份 @JacksonXmlProperty(localName = "PD01DR03") - private String pd01dr03; + public String pd01dr03; //还款状态 @JacksonXmlProperty(localName = "PD01DD01") - private String pd01dd01; + public String pd01dd01; public String getPd01dr03(){ return this.pd01dr03; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01E.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01E.java index 29bfa50d..798ed6fc 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01E.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01E.java @@ -11,20 +11,20 @@ import java.util.List; public class PD01E { //起始年月 @JacksonXmlProperty(localName = "PD01ER01") - private String pd01er01; + public String pd01er01; //截止年月 @JacksonXmlProperty(localName = "PD01ER02") - private String pd01er02; + public String pd01er02; //月数 @JacksonXmlProperty(localName = "PD01ES01") - private String pd01es01; + public String pd01es01; //历史表现信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD01EH") - private List pd01eh =new ArrayList<>(); + public List pd01eh =new ArrayList<>(); public String getPd01er01(){ return this.pd01er01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01EH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01EH.java index d235daf9..56578e52 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01EH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01EH.java @@ -11,15 +11,15 @@ import java.util.List; public class PD01EH { //月份 @JacksonXmlProperty(localName = "PD01ER03") - private String pd01er03; + public String pd01er03; //还款状态 @JacksonXmlProperty(localName = "PD01ED01") - private String pd01ed01; + public String pd01ed01; //逾期（透支）总额 @JacksonXmlProperty(localName = "PD01EJ01") - private String pd01ej01; + public String pd01ej01; public String getPd01er03(){ return this.pd01er03; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01F.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01F.java index 9aaec3f8..90488c42 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01F.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01F.java @@ -11,12 +11,12 @@ import java.util.List; public class PD01F { //特殊交易个数 @JacksonXmlProperty(localName = "PD01FS01") - private String pd01fs01; + public String pd01fs01; //特殊交易信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD01FH") - private List pd01fh =new ArrayList<>(); + public List pd01fh =new ArrayList<>(); public String getPd01fs01(){ return this.pd01fs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01FH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01FH.java index 10b3fdc5..10cc7e75 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01FH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01FH.java @@ -11,23 +11,23 @@ import java.util.List; public class PD01FH { //特殊交易类型 @JacksonXmlProperty(localName = "PD01FD01") - private String pd01fd01; + public String pd01fd01; //特殊交易发生日期 @JacksonXmlProperty(localName = "PD01FR01") - private Date pd01fr01; + public Date pd01fr01; //到期日期变更月数 @JacksonXmlProperty(localName = "PD01FS02") - private String pd01fs02; + public String pd01fs02; //特殊交易发生金额 @JacksonXmlProperty(localName = "PD01FJ01") - private String pd01fj01; + public String pd01fj01; //特殊交易明细记录 @JacksonXmlProperty(localName = "PD01FQ01") - private String pd01fq01; + public String pd01fq01; public String getPd01fd01(){ return this.pd01fd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01G.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01G.java index 4ac10765..fdd2d6f4 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01G.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01G.java @@ -11,12 +11,12 @@ import java.util.List; public class PD01G { //特殊事件说明个数 @JacksonXmlProperty(localName = "PD01GS01") - private String pd01gs01; + public String pd01gs01; //特殊事件说明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD01GH") - private List pd01gh =new ArrayList<>(); + public List pd01gh =new ArrayList<>(); public String getPd01gs01(){ return this.pd01gs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01GH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01GH.java index 7fb51d6a..57f3cc27 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01GH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01GH.java @@ -11,11 +11,11 @@ import java.util.List; public class PD01GH { //特殊事件发生月份 @JacksonXmlProperty(localName = "PD01GR01") - private String pd01gr01; + public String pd01gr01; //特殊事件类型 @JacksonXmlProperty(localName = "PD01GD01") - private String pd01gd01; + public String pd01gd01; public String getPd01gr01(){ return this.pd01gr01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01H.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01H.java index e0ab954b..37044e7a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01H.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01H.java @@ -11,12 +11,12 @@ import java.util.List; public class PD01H { //大额专项分期笔数 @JacksonXmlProperty(localName = "PD01HS01") - private String pd01hs01; + public String pd01hs01; //大额专项分期信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD01HH") - private List pd01hh =new ArrayList<>(); + public List pd01hh =new ArrayList<>(); public String getPd01hs01(){ return this.pd01hs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01HH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01HH.java index 21c0461f..8d7b21ff 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01HH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01HH.java @@ -11,19 +11,19 @@ import java.util.List; public class PD01HH { //大额专项分期额度 @JacksonXmlProperty(localName = "PD01HJ01") - private String pd01hj01; + public String pd01hj01; //分期额度生效日期 @JacksonXmlProperty(localName = "PD01HR01") - private Date pd01hr01; + public Date pd01hr01; //分期额度到期日期 @JacksonXmlProperty(localName = "PD01HR02") - private Date pd01hr02; + public Date pd01hr02; //已用分期金额 @JacksonXmlProperty(localName = "PD01HJ02") - private String pd01hj02; + public String pd01hj02; public String getPd01hj01(){ return this.pd01hj01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01Z.java index b32d3df1..19a8189f 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PD01Z { //标注及声明个数 @JacksonXmlProperty(localName = "PD01ZS01") - private String pd01zs01; + public String pd01zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD01ZH") - private List pd01zh =new ArrayList<>(); + public List pd01zh =new ArrayList<>(); public String getPd01zs01(){ return this.pd01zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01ZH.java index 44b81e6a..45963068 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD01ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PD01ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PD01ZD01") - private String pd01zd01; + public String pd01zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PD01ZQ01") - private String pd01zq01; + public String pd01zq01; //添加日期 @JacksonXmlProperty(localName = "PD01ZR01") - private Date pd01zr01; + public Date pd01zr01; public String getPd01zd01(){ return this.pd01zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02.java index 990a85d6..3fcbb830 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02.java @@ -11,11 +11,11 @@ import java.util.List; public class PD02 { //基本信息段 @JacksonXmlProperty(localName = "PD02A") - private PD02A pd02a; + public PD02A pd02a; //标注及声明信息段 @JacksonXmlProperty(localName = "PD02Z") - private PD02Z pd02z; + public PD02Z pd02z; public PD02A getPd02a(){ return this.pd02a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02A.java index 6c127e27..bb4d33db 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02A.java @@ -11,55 +11,55 @@ import java.util.List; public class PD02A { //授信协议编号 @JacksonXmlProperty(localName = "PD02AI01") - private String pd02ai01; + public String pd02ai01; //业务管理机构类型 @JacksonXmlProperty(localName = "PD02AD01") - private String pd02ad01; + public String pd02ad01; //业务管理机构 @JacksonXmlProperty(localName = "PD02AI02") - private String pd02ai02; + public String pd02ai02; //授信协议标识 @JacksonXmlProperty(localName = "PD02AI03") - private String pd02ai03; + public String pd02ai03; //授信额度用途 @JacksonXmlProperty(localName = "PD02AD02") - private String pd02ad02; + public String pd02ad02; //授信额度 @JacksonXmlProperty(localName = "PD02AJ01") - private String pd02aj01; + public String pd02aj01; //币种 @JacksonXmlProperty(localName = "PD02AD03") - private String pd02ad03; + public String pd02ad03; //生效日期 @JacksonXmlProperty(localName = "PD02AR01") - private Date pd02ar01; + public Date pd02ar01; //到期日期 @JacksonXmlProperty(localName = "PD02AR02") - private Date pd02ar02; + public Date pd02ar02; //授信协议状态 @JacksonXmlProperty(localName = "PD02AD04") - private String pd02ad04; + public String pd02ad04; //已用额度 @JacksonXmlProperty(localName = "PD02AJ04") - private String pd02aj04; + public String pd02aj04; //授信限额 @JacksonXmlProperty(localName = "PD02AJ03") - private String pd02aj03; + public String pd02aj03; //授信限额编号 @JacksonXmlProperty(localName = "PD02AI04") - private String pd02ai04; + public String pd02ai04; public String getPd02ai01(){ return this.pd02ai01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02Z.java index 07adfe1e..b6bb5196 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PD02Z { //标注及声明个数 @JacksonXmlProperty(localName = "PD02ZS01") - private String pd02zs01; + public String pd02zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD02ZH") - private List pd02zh =new ArrayList<>(); + public List pd02zh =new ArrayList<>(); public String getPd02zs01(){ return this.pd02zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02ZH.java index 518e64e8..f512fb24 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD02ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PD02ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PD02ZD01") - private String pd02zd01; + public String pd02zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PD02ZQ01") - private String pd02zq01; + public String pd02zq01; //添加日期 @JacksonXmlProperty(localName = "PD02ZR01") - private Date pd02zr01; + public Date pd02zr01; public String getPd02zd01(){ return this.pd02zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03.java index 034e2b05..d303997c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03.java @@ -11,11 +11,11 @@ import java.util.List; public class PD03 { //相关还款责任信息段 @JacksonXmlProperty(localName = "PD03A") - private PD03A pd03a; + public PD03A pd03a; //标注及声明信息段 @JacksonXmlProperty(localName = "PD03Z") - private PD03Z pd03z; + public PD03Z pd03z; public PD03A getPd03a(){ return this.pd03a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03A.java index 2f6784b9..171f3f2d 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03A.java @@ -11,67 +11,67 @@ import java.util.List; public class PD03A { //主借款人身份类别 @JacksonXmlProperty(localName = "PD03AD08") - private String pd03ad08; + public String pd03ad08; //业务管理机构类型 @JacksonXmlProperty(localName = "PD03AD01") - private String pd03ad01; + public String pd03ad01; //业务管理机构 @JacksonXmlProperty(localName = "PD03AQ01") - private String pd03aq01; + public String pd03aq01; //业务种类 @JacksonXmlProperty(localName = "PD03AD02") - private String pd03ad02; + public String pd03ad02; //开立日期 @JacksonXmlProperty(localName = "PD03AR01") - private Date pd03ar01; + public Date pd03ar01; //到期日期 @JacksonXmlProperty(localName = "PD03AR02") - private Date pd03ar02; + public Date pd03ar02; //相关还款责任人类型 @JacksonXmlProperty(localName = "PD03AD03") - private String pd03ad03; + public String pd03ad03; //保证合同编号 @JacksonXmlProperty(localName = "PD03AQ02") - private String pd03aq02; + public String pd03aq02; //相关还款责任金额 @JacksonXmlProperty(localName = "PD03AJ01") - private String pd03aj01; + public String pd03aj01; //币种 @JacksonXmlProperty(localName = "PD03AD04") - private String pd03ad04; + public String pd03ad04; //余额 @JacksonXmlProperty(localName = "PD03AJ02") - private String pd03aj02; + public String pd03aj02; //五级分类 @JacksonXmlProperty(localName = "PD03AD05") - private String pd03ad05; + public String pd03ad05; //账户类型 @JacksonXmlProperty(localName = "PD03AD06") - private String pd03ad06; + public String pd03ad06; //还款状态 @JacksonXmlProperty(localName = "PD03AD07") - private String pd03ad07; + public String pd03ad07; //逾期月数 @JacksonXmlProperty(localName = "PD03AS01") - private String pd03as01; + public String pd03as01; //信息报告日期 @JacksonXmlProperty(localName = "PD03AR03") - private Date pd03ar03; + public Date pd03ar03; public String getPd03ad08(){ return this.pd03ad08; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03Z.java index 02db1dd9..278b7b23 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PD03Z { //标注及声明个数 @JacksonXmlProperty(localName = "PD03ZS01") - private String pd03zs01; + public String pd03zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD03ZH") - private List pd03zh =new ArrayList<>(); + public List pd03zh =new ArrayList<>(); public String getPd03zs01(){ return this.pd03zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03ZH.java index 6532f7b4..b3252843 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PD03ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PD03ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PD03ZD01") - private String pd03zd01; + public String pd03zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PD03ZQ01") - private String pd03zq01; + public String pd03zq01; //添加日期 @JacksonXmlProperty(localName = "PD03ZR01") - private Date pd03zr01; + public Date pd03zr01; public String getPd03zd01(){ return this.pd03zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PDA.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PDA.java index 54b7d319..6fba8f87 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PDA.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PDA.java @@ -12,7 +12,7 @@ public class PDA { //借贷账户信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PD01") - private List pd01 =new ArrayList<>(); + public List pd01 =new ArrayList<>(); public List getPd01(){ return this.pd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01.java index befc0801..09139d76 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01.java @@ -11,11 +11,11 @@ import java.util.List; public class PE01 { //后付费业务信息段 @JacksonXmlProperty(localName = "PE01A") - private PE01A pe01a; + public PE01A pe01a; //标注及声明信息段 @JacksonXmlProperty(localName = "PE01Z") - private PE01Z pe01z; + public PE01Z pe01z; public PE01A getPe01a(){ return this.pe01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01A.java index 9e8ce383..fed304d9 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01A.java @@ -11,35 +11,35 @@ import java.util.List; public class PE01A { //后付费账户类型 @JacksonXmlProperty(localName = "PE01AD01") - private String pe01ad01; + public String pe01ad01; //机构名称 @JacksonXmlProperty(localName = "PE01AQ01") - private String pe01aq01; + public String pe01aq01; //业务类型 @JacksonXmlProperty(localName = "PE01AD02") - private String pe01ad02; + public String pe01ad02; //业务开通日期 @JacksonXmlProperty(localName = "PE01AR01") - private Date pe01ar01; + public Date pe01ar01; //当前缴费状态 @JacksonXmlProperty(localName = "PE01AD03") - private String pe01ad03; + public String pe01ad03; //当前欠费金额 @JacksonXmlProperty(localName = "PE01AJ01") - private String pe01aj01; + public String pe01aj01; //记账年月 @JacksonXmlProperty(localName = "PE01AR02") - private String pe01ar02; + public String pe01ar02; //最近 24 个月缴费记录 @JacksonXmlProperty(localName = "PE01AQ02") - private String pe01aq02; + public String pe01aq02; public String getPe01ad01(){ return this.pe01ad01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01Z.java index a888e738..9d16da4a 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PE01Z { //标注及声明个数 @JacksonXmlProperty(localName = "PE01ZS01") - private String pe01zs01; + public String pe01zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PE01ZH") - private List pe01zh =new ArrayList<>(); + public List pe01zh =new ArrayList<>(); public String getPe01zs01(){ return this.pe01zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01ZH.java index 326fceeb..d1bf93ed 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PE01ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PE01ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PE01ZD01") - private String pe01zd01; + public String pe01zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PE01ZQ01") - private String pe01zq01; + public String pe01zq01; //添加日期 @JacksonXmlProperty(localName = "PE01ZR01") - private Date pe01zr01; + public Date pe01zr01; public String getPe01zd01(){ return this.pe01zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01.java index 643e458c..958cfed8 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01.java @@ -11,11 +11,11 @@ import java.util.List; public class PF01 { //欠税记录信息段 @JacksonXmlProperty(localName = "PF01A") - private PF01A pf01a; + public PF01A pf01a; //标注及声明信息段 @JacksonXmlProperty(localName = "PF01Z") - private PF01Z pf01z; + public PF01Z pf01z; public PF01A getPf01a(){ return this.pf01a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01A.java index 2757a393..523f8355 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01A.java @@ -11,15 +11,15 @@ import java.util.List; public class PF01A { //主管税务机关 @JacksonXmlProperty(localName = "PF01AQ01") - private String pf01aq01; + public String pf01aq01; //欠税总额 @JacksonXmlProperty(localName = "PF01AJ01") - private String pf01aj01; + public String pf01aj01; //欠税统计日期 @JacksonXmlProperty(localName = "PF01AR01") - private Date pf01ar01; + public Date pf01ar01; public String getPf01aq01(){ return this.pf01aq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01Z.java index 01f26b27..b96c091b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PF01Z { //标注及声明个数 @JacksonXmlProperty(localName = "PF01ZS01") - private String pf01zs01; + public String pf01zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF01ZH") - private List pf01zh =new ArrayList<>(); + public List pf01zh =new ArrayList<>(); public String getPf01zs01(){ return this.pf01zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01ZH.java index d89b1473..77d2c5be 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF01ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PF01ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PF01ZD01") - private String pf01zd01; + public String pf01zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PF01ZQ01") - private String pf01zq01; + public String pf01zq01; //添加日期 @JacksonXmlProperty(localName = "PF01ZR01") - private Date pf01zr01; + public Date pf01zr01; public String getPf01zd01(){ return this.pf01zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02.java index 0b5638b9..86949ef2 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02.java @@ -11,11 +11,11 @@ import java.util.List; public class PF02 { //民事判决记录信息段 @JacksonXmlProperty(localName = "PF02A") - private PF02A pf02a; + public PF02A pf02a; //标注及声明信息段 @JacksonXmlProperty(localName = "PF02Z") - private PF02Z pf02z; + public PF02Z pf02z; public PF02A getPf02a(){ return this.pf02a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02A.java index 62d515a5..cb7c22b0 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02A.java @@ -11,35 +11,35 @@ import java.util.List; public class PF02A { //立案法院 @JacksonXmlProperty(localName = "PF02AQ01") - private String pf02aq01; + public String pf02aq01; //案由 @JacksonXmlProperty(localName = "PF02AQ02") - private String pf02aq02; + public String pf02aq02; //立案日期 @JacksonXmlProperty(localName = "PF02AR01") - private Date pf02ar01; + public Date pf02ar01; //结案方式 @JacksonXmlProperty(localName = "PF02AD01") - private String pf02ad01; + public String pf02ad01; //判决/调解结果 @JacksonXmlProperty(localName = "PF02AQ03") - private String pf02aq03; + public String pf02aq03; //判决/调解生效日期 @JacksonXmlProperty(localName = "PF02AR02") - private Date pf02ar02; + public Date pf02ar02; //诉讼标的 @JacksonXmlProperty(localName = "PF02AQ04") - private String pf02aq04; + public String pf02aq04; //诉讼标的金额 @JacksonXmlProperty(localName = "PF02AJ01") - private String pf02aj01; + public String pf02aj01; public String getPf02aq01(){ return this.pf02aq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02Z.java index 497b407c..ef8adce8 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PF02Z { //标注及声明个数 @JacksonXmlProperty(localName = "PF02ZS01") - private String pf02zs01; + public String pf02zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF02ZH") - private List pf02zh =new ArrayList<>(); + public List pf02zh =new ArrayList<>(); public String getPf02zs01(){ return this.pf02zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02ZH.java index 5ac59f87..a3edbc05 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF02ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PF02ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PF02ZD01") - private String pf02zd01; + public String pf02zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PF02ZQ01") - private String pf02zq01; + public String pf02zq01; //添加日期 @JacksonXmlProperty(localName = "PF02ZR01") - private Date pf02zr01; + public Date pf02zr01; public String getPf02zd01(){ return this.pf02zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03.java index 441bbd9d..3e7077e6 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03.java @@ -11,11 +11,11 @@ import java.util.List; public class PF03 { //强制执行记录信息段 @JacksonXmlProperty(localName = "PF03A") - private PF03A pf03a; + public PF03A pf03a; //标注及声明信息段 @JacksonXmlProperty(localName = "PF03Z") - private PF03Z pf03z; + public PF03Z pf03z; public PF03A getPf03a(){ return this.pf03a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03A.java index f0941b68..c25d4762 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03A.java @@ -11,43 +11,43 @@ import java.util.List; public class PF03A { //执行法院 @JacksonXmlProperty(localName = "PF03AQ01") - private String pf03aq01; + public String pf03aq01; //执行案由 @JacksonXmlProperty(localName = "PF03AQ02") - private String pf03aq02; + public String pf03aq02; //立案日期 @JacksonXmlProperty(localName = "PF03AR01") - private Date pf03ar01; + public Date pf03ar01; //结案方式 @JacksonXmlProperty(localName = "PF03AD01") - private String pf03ad01; + public String pf03ad01; //案件状态 @JacksonXmlProperty(localName = "PF03AQ03") - private String pf03aq03; + public String pf03aq03; //结案日期 @JacksonXmlProperty(localName = "PF03AR02") - private Date pf03ar02; + public Date pf03ar02; //申请执行标的 @JacksonXmlProperty(localName = "PF03AQ04") - private String pf03aq04; + public String pf03aq04; //申请执行标的金额 @JacksonXmlProperty(localName = "PF03AJ01") - private String pf03aj01; + public String pf03aj01; //已执行标的 @JacksonXmlProperty(localName = "PF03AQ05") - private String pf03aq05; + public String pf03aq05; //已执行标的金额 @JacksonXmlProperty(localName = "PF03AJ02") - private String pf03aj02; + public String pf03aj02; public String getPf03aq01(){ return this.pf03aq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03Z.java index 8045f82c..1dd8a195 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PF03Z { //标注及声明个数 @JacksonXmlProperty(localName = "PF03ZS01") - private String pf03zs01; + public String pf03zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF03ZH") - private List pf03zh =new ArrayList<>(); + public List pf03zh =new ArrayList<>(); public String getPf03zs01(){ return this.pf03zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03ZH.java index ec992481..e2a7bbcd 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF03ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PF03ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PF03ZD01") - private String pf03zd01; + public String pf03zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PF03ZQ01") - private String pf03zq01; + public String pf03zq01; //添加日期 @JacksonXmlProperty(localName = "PF03ZR01") - private Date pf03zr01; + public Date pf03zr01; public String getPf03zd01(){ return this.pf03zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04.java index 23352474..e46e881e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04.java @@ -11,11 +11,11 @@ import java.util.List; public class PF04 { //行政处罚记录信息段 @JacksonXmlProperty(localName = "PF04A") - private PF04A pf04a; + public PF04A pf04a; //标注及声明信息段 @JacksonXmlProperty(localName = "PF04Z") - private PF04Z pf04z; + public PF04Z pf04z; public PF04A getPf04a(){ return this.pf04a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04A.java index e3fae025..448108ed 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04A.java @@ -11,27 +11,27 @@ import java.util.List; public class PF04A { //处罚机构 @JacksonXmlProperty(localName = "PF04AQ01") - private String pf04aq01; + public String pf04aq01; //处罚内容 @JacksonXmlProperty(localName = "PF04AQ02") - private String pf04aq02; + public String pf04aq02; //处罚金额 @JacksonXmlProperty(localName = "PF04AJ01") - private String pf04aj01; + public String pf04aj01; //处罚生效日期 @JacksonXmlProperty(localName = "PF04AR01") - private String pf04ar01; + public String pf04ar01; //处罚截止日期 @JacksonXmlProperty(localName = "PF04AR02") - private String pf04ar02; + public String pf04ar02; //行政复议结果 @JacksonXmlProperty(localName = "PF04AQ03") - private String pf04aq03; + public String pf04aq03; public String getPf04aq01(){ return this.pf04aq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04Z.java index 5dc7e457..087db587 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PF04Z { //标注及声明个数 @JacksonXmlProperty(localName = "PF04ZS01") - private String pf04zs01; + public String pf04zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF04ZH") - private List pf04zh =new ArrayList<>(); + public List pf04zh =new ArrayList<>(); public String getPf04zs01(){ return this.pf04zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04ZH.java index 95ac3fb2..b3258cb7 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF04ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PF04ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PF04ZD01") - private String pf04zd01; + public String pf04zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PF04ZQ01") - private String pf04zq01; + public String pf04zq01; //添加日期 @JacksonXmlProperty(localName = "PF04ZR01") - private Date pf04zr01; + public Date pf04zr01; public String getPf04zd01(){ return this.pf04zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05.java index a1a7d47a..6c6d51eb 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05.java @@ -11,11 +11,11 @@ import java.util.List; public class PF05 { //住房公积金参缴记录信息段 @JacksonXmlProperty(localName = "PF05A") - private PF05A pf05a; + public PF05A pf05a; //标注及声明信息段 @JacksonXmlProperty(localName = "PF05Z") - private PF05Z pf05z; + public PF05Z pf05z; public PF05A getPf05a(){ return this.pf05a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05A.java index 2e1dd590..d8d0d5ed 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05A.java @@ -11,43 +11,43 @@ import java.util.List; public class PF05A { //参缴地 @JacksonXmlProperty(localName = "PF05AQ01") - private String pf05aq01; + public String pf05aq01; //参缴日期 @JacksonXmlProperty(localName = "PF05AR01") - private Date pf05ar01; + public Date pf05ar01; //缴费状态 @JacksonXmlProperty(localName = "PF05AD01") - private String pf05ad01; + public String pf05ad01; //初缴月份 @JacksonXmlProperty(localName = "PF05AR02") - private String pf05ar02; + public String pf05ar02; //缴至月份 @JacksonXmlProperty(localName = "PF05AR03") - private String pf05ar03; + public String pf05ar03; //单位缴存比例 @JacksonXmlProperty(localName = "PF05AQ02") - private String pf05aq02; + public String pf05aq02; //个人缴存比例 @JacksonXmlProperty(localName = "PF05AQ03") - private String pf05aq03; + public String pf05aq03; //月缴存额 @JacksonXmlProperty(localName = "PF05AJ01") - private String pf05aj01; + public String pf05aj01; //缴费单位 @JacksonXmlProperty(localName = "PF05AQ04") - private String pf05aq04; + public String pf05aq04; //信息更新日期 @JacksonXmlProperty(localName = "PF05AR04") - private Date pf05ar04; + public Date pf05ar04; public String getPf05aq01(){ return this.pf05aq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05Z.java index 5c39280e..4186e691 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PF05Z { //标注及声明个数 @JacksonXmlProperty(localName = "PF05ZS01") - private String pf05zs01; + public String pf05zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF05ZH") - private List pf05zh =new ArrayList<>(); + public List pf05zh =new ArrayList<>(); public String getPf05zs01(){ return this.pf05zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05ZH.java index 7e16e0be..63f7f75e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF05ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PF05ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PF05ZD01") - private String pf05zd01; + public String pf05zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PF05ZQ01") - private String pf05zq01; + public String pf05zq01; //添加日期 @JacksonXmlProperty(localName = "PF05ZR01") - private Date pf05zr01; + public Date pf05zr01; public String getPf05zd01(){ return this.pf05zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06.java index 29860eca..cafea858 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06.java @@ -11,11 +11,11 @@ import java.util.List; public class PF06 { //低保救助记录信息段 @JacksonXmlProperty(localName = "PF06A") - private PF06A pf06a; + public PF06A pf06a; //标注及声明信息段 @JacksonXmlProperty(localName = "PF06Z") - private PF06Z pf06z; + public PF06Z pf06z; public PF06A getPf06a(){ return this.pf06a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06A.java index ffe51ffb..ea90f1fa 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06A.java @@ -11,31 +11,31 @@ import java.util.List; public class PF06A { //人员类别 @JacksonXmlProperty(localName = "PF06AD01") - private String pf06ad01; + public String pf06ad01; //所在地 @JacksonXmlProperty(localName = "PF06AQ01") - private String pf06aq01; + public String pf06aq01; //工作单位 @JacksonXmlProperty(localName = "PF06AQ02") - private String pf06aq02; + public String pf06aq02; //家庭月收入 @JacksonXmlProperty(localName = "PF06AQ03") - private String pf06aq03; + public String pf06aq03; //申请日期 @JacksonXmlProperty(localName = "PF06AR01") - private Date pf06ar01; + public Date pf06ar01; //批准日期 @JacksonXmlProperty(localName = "PF06AR02") - private Date pf06ar02; + public Date pf06ar02; //信息更新日期 @JacksonXmlProperty(localName = "PF06AR03") - private Date pf06ar03; + public Date pf06ar03; public String getPf06ad01(){ return this.pf06ad01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06Z.java index 4862a8e3..619f3647 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PF06Z { //标注及声明个数 @JacksonXmlProperty(localName = "PF06ZS01") - private String pf06zs01; + public String pf06zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF06ZH") - private List pf06zh =new ArrayList<>(); + public List pf06zh =new ArrayList<>(); public String getPf06zs01(){ return this.pf06zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06ZH.java index 9623cd7a..f0a310c9 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF06ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PF06ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PF06ZD01") - private String pf06zd01; + public String pf06zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PF06ZQ01") - private String pf06zq01; + public String pf06zq01; //添加日期 @JacksonXmlProperty(localName = "PF06ZR01") - private Date pf06zr01; + public Date pf06zr01; public String getPf06zd01(){ return this.pf06zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07.java index b4b3d490..276b0fba 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07.java @@ -11,11 +11,11 @@ import java.util.List; public class PF07 { //执业资格记录信息段 @JacksonXmlProperty(localName = "PF07A") - private PF07A pf07a; + public PF07A pf07a; //标注及声明信息段 @JacksonXmlProperty(localName = "PF07Z") - private PF07Z pf07z; + public PF07Z pf07z; public PF07A getPf07a(){ return this.pf07a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07A.java index d790b202..e3071719 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07A.java @@ -11,31 +11,31 @@ import java.util.List; public class PF07A { //执业资格名称 @JacksonXmlProperty(localName = "PF07AQ01") - private String pf07aq01; + public String pf07aq01; //颁发机构 @JacksonXmlProperty(localName = "PF07AQ02") - private String pf07aq02; + public String pf07aq02; //等级 @JacksonXmlProperty(localName = "PF07AD01") - private String pf07ad01; + public String pf07ad01; //机构所在地 @JacksonXmlProperty(localName = "PF07AD02") - private String pf07ad02; + public String pf07ad02; //获得年月 @JacksonXmlProperty(localName = "PF07AR01") - private String pf07ar01; + public String pf07ar01; //到期年月 @JacksonXmlProperty(localName = "PF07AR02") - private String pf07ar02; + public String pf07ar02; //吊销年月 @JacksonXmlProperty(localName = "PF07AR03") - private String pf07ar03; + public String pf07ar03; public String getPf07aq01(){ return this.pf07aq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07Z.java index ca5fdb11..be7bdc32 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PF07Z { //标注及声明个数 @JacksonXmlProperty(localName = "PF07ZS01") - private String pf07zs01; + public String pf07zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF07ZH") - private List pf07zh =new ArrayList<>(); + public List pf07zh =new ArrayList<>(); public String getPf07zs01(){ return this.pf07zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07ZH.java index f3719198..686506c7 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF07ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PF07ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PF07ZD01") - private String pf07zd01; + public String pf07zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PF07ZQ01") - private String pf07zq01; + public String pf07zq01; //添加日期 @JacksonXmlProperty(localName = "PF07ZR01") - private Date pf07zr01; + public Date pf07zr01; public String getPf07zd01(){ return this.pf07zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08.java index a54cc92c..dc02681e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08.java @@ -11,11 +11,11 @@ import java.util.List; public class PF08 { //行政奖励记录信息段 @JacksonXmlProperty(localName = "PF08A") - private PF08A pf08a; + public PF08A pf08a; //标注及声明信息段 @JacksonXmlProperty(localName = "PF08Z") - private PF08Z pf08z; + public PF08Z pf08z; public PF08A getPf08a(){ return this.pf08a; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08A.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08A.java index 07a2bf17..ca1cdbb2 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08A.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08A.java @@ -11,19 +11,19 @@ import java.util.List; public class PF08A { //奖励机构 @JacksonXmlProperty(localName = "PF08AQ01") - private String pf08aq01; + public String pf08aq01; //奖励内容 @JacksonXmlProperty(localName = "PF08AQ02") - private String pf08aq02; + public String pf08aq02; //生效年月 @JacksonXmlProperty(localName = "PF08AR01") - private String pf08ar01; + public String pf08ar01; //截止年月 @JacksonXmlProperty(localName = "PF08AR02") - private String pf08ar02; + public String pf08ar02; public String getPf08aq01(){ return this.pf08aq01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08Z.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08Z.java index 2913ea28..6db4d11c 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08Z.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08Z.java @@ -11,12 +11,12 @@ import java.util.List; public class PF08Z { //标注及声明个数 @JacksonXmlProperty(localName = "PF08ZS01") - private String pf08zs01; + public String pf08zs01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF08ZH") - private List pf08zh =new ArrayList<>(); + public List pf08zh =new ArrayList<>(); public String getPf08zs01(){ return this.pf08zs01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08ZH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08ZH.java index f9c6f049..2a8bd929 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08ZH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PF08ZH.java @@ -11,15 +11,15 @@ import java.util.List; public class PF08ZH { //标注及声明类型 @JacksonXmlProperty(localName = "PF08ZD01") - private String pf08zd01; + public String pf08zd01; //标注或声明内容 @JacksonXmlProperty(localName = "PF08ZQ01") - private String pf08zq01; + public String pf08zq01; //添加日期 @JacksonXmlProperty(localName = "PF08ZR01") - private Date pf08zr01; + public Date pf08zr01; public String getPf08zd01(){ return this.pf08zd01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PG01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PG01.java index ca2716ed..76b089e6 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PG01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PG01.java @@ -11,20 +11,20 @@ import java.util.List; public class PG01 { //对象类型 @JacksonXmlProperty(localName = "PG010D01") - private String pg010d01; + public String pg010d01; //对象标识 @JacksonXmlProperty(localName = "PG010D02") - private String pg010d02; + public String pg010d02; //标注及声明类型个数 @JacksonXmlProperty(localName = "PG010S01") - private String pg010s01; + public String pg010s01; //标注及声明信息 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PG010H") - private List pg010h =new ArrayList<>(); + public List pg010h =new ArrayList<>(); public String getPg010d01(){ return this.pg010d01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PG010H.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PG010H.java index 6ec1bbf3..ea946d6b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PG010H.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PG010H.java @@ -11,15 +11,15 @@ import java.util.List; public class PG010H { //标注及声明类型 @JacksonXmlProperty(localName = "PG010D03") - private String pg010d03; + public String pg010d03; //标注或声明内容 @JacksonXmlProperty(localName = "PG010Q01") - private String pg010q01; + public String pg010q01; //添加日期 @JacksonXmlProperty(localName = "PG010R01") - private Date pg010r01; + public Date pg010r01; public String getPg010d03(){ return this.pg010d03; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PH01.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PH01.java index 03bde055..44179bcd 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PH01.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PH01.java @@ -11,19 +11,19 @@ import java.util.List; public class PH01 { //查询日期 @JacksonXmlProperty(localName = "PH010R01") - private Date ph010r01; + public Date ph010r01; //查询机构类型 @JacksonXmlProperty(localName = "PH010D01") - private String ph010d01; + public String ph010d01; //查询机构 @JacksonXmlProperty(localName = "PH010Q02") - private String ph010q02; + public String ph010q02; //查询原因 @JacksonXmlProperty(localName = "PH010Q03") - private String ph010q03; + public String ph010q03; public Date getPh010r01(){ return this.ph010r01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PHF.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PHF.java index 43dfbdc8..13a827e2 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PHF.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PHF.java @@ -12,7 +12,7 @@ public class PHF { //住房公积金参缴记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF05") - private List pf05 =new ArrayList<>(); + public List pf05 =new ArrayList<>(); public List getPf05(){ return this.pf05; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PIM.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PIM.java index 71d57079..cc6bdb3d 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PIM.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PIM.java @@ -11,7 +11,7 @@ import java.util.List; public class PIM { //身份信息单元 @JacksonXmlProperty(localName = "PB01") - private PB01 pb01; + public PB01 pb01; public PB01 getPb01(){ return this.pb01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PMM.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PMM.java index d59ea4bd..d3274768 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PMM.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PMM.java @@ -11,7 +11,7 @@ import java.util.List; public class PMM { //婚姻信息单元 @JacksonXmlProperty(localName = "PB02") - private PB02 pb02; + public PB02 pb02; public PB02 getPb02(){ return this.pb02; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PND.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PND.java index 109801f0..024241f0 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PND.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PND.java @@ -12,7 +12,7 @@ public class PND { //后付费业务信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PE01") - private List pe01 =new ArrayList<>(); + public List pe01 =new ArrayList<>(); public List getPe01(){ return this.pe01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PNO.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PNO.java index ab3dc230..95f2a887 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PNO.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PNO.java @@ -11,7 +11,7 @@ import java.util.List; public class PNO { //后付费业务欠费信息汇总信息单元 @JacksonXmlProperty(localName = "PC03") - private PC03 pc03; + public PC03 pc03; public PC03 getPc03(){ return this.pc03; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POM.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POM.java index f0a1bb29..35225a14 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POM.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POM.java @@ -12,7 +12,7 @@ public class POM { //职业信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PB04") - private List pb04 =new ArrayList<>(); + public List pb04 =new ArrayList<>(); public List getPb04(){ return this.pb04; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POQ.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POQ.java index 38129fae..2343ee2b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POQ.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POQ.java @@ -12,7 +12,7 @@ public class POQ { //查询记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PH01") - private List ph01 =new ArrayList<>(); + public List ph01 =new ArrayList<>(); public List getPh01(){ return this.ph01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POS.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POS.java index ef7522a7..82cb7b53 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POS.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POS.java @@ -12,7 +12,7 @@ public class POS { //标注及声明信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PG01") - private List pg01 =new ArrayList<>(); + public List pg01 =new ArrayList<>(); public List getPg01(){ return this.pg01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POT.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POT.java index e6189234..f4ec76be 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POT.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/POT.java @@ -12,7 +12,7 @@ public class POT { //欠税记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF01") - private List pf01 =new ArrayList<>(); + public List pf01 =new ArrayList<>(); public List getPf01(){ return this.pf01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PPO.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PPO.java index 0e078267..1789233b 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PPO.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PPO.java @@ -11,7 +11,7 @@ import java.util.List; public class PPO { //公共信息概要信息单元 @JacksonXmlProperty(localName = "PC04") - private PC04 pc04; + public PC04 pc04; public PC04 getPc04(){ return this.pc04; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PPQ.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PPQ.java index dee3f077..8b0c931e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PPQ.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PPQ.java @@ -12,7 +12,7 @@ public class PPQ { //执业资格记录信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PF07") - private List pf07 =new ArrayList<>(); + public List pf07 =new ArrayList<>(); public List getPf07(){ return this.pf07; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PQO.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PQO.java index ce89ac10..c4274348 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PQO.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PQO.java @@ -11,7 +11,7 @@ import java.util.List; public class PQO { //查询记录概要信息单元 @JacksonXmlProperty(localName = "PC05") - private PC05 pc05; + public PC05 pc05; public PC05 getPc05(){ return this.pc05; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PRH.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PRH.java index 199cb082..f7b962d5 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PRH.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PRH.java @@ -11,7 +11,7 @@ import java.util.List; public class PRH { //报告头信息单元 @JacksonXmlProperty(localName = "PA01") - private PA01 pa01; + public PA01 pa01; public PA01 getPa01(){ return this.pa01; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PRM.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PRM.java index c86a2841..d197622e 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PRM.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PRM.java @@ -12,7 +12,7 @@ public class PRM { //居住信息单元 @JacksonXmlElementWrapper(useWrapping = false) @JacksonXmlProperty(localName = "PB03") - private List pb03 =new ArrayList<>(); + public List pb03 =new ArrayList<>(); public List getPb03(){ return this.pb03; diff --git a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PSM.java b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PSM.java index e2c028f0..41e047e4 100644 --- a/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PSM.java +++ b/io.sc.creditreport.core/src/main/java/io/sc/creditreport/core/person/PSM.java @@ -11,7 +11,7 @@ import java.util.List; public class PSM { //评分信息单元 @JacksonXmlProperty(localName = "PC01") - private PC01 pc01; + public PC01 pc01; public PC01 getPc01(){ return this.pc01; diff --git a/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-function.json b/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-function.json index ded6cc7f..4129e14f 100644 --- a/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-function.json +++ b/io.sc.creditreport.core/src/main/resources/META-INF/platform/plugins/rule-engine-function.json @@ -1,45 +1,43 @@ [ - { + { + "id" : "4fae09d5-dab4-47bb-b3df-a2b3e091bc1f", + "name" : "parsePersonCreditReport", + "signature" : "UDF.parsePersonCreditReport(xml)", + "description" : "将 xml 解析成征信报告对象(个人)", + "enable" : true, + "mathXml" : "\n\n UDF.parsePersonCreditReport\n (\n \n xml\n \n )\n\n", + "body" : "static io.sc.creditreport.core.person.Document parsePersonCreditReport(String xml) throws Exception {\n return io.sc.creditreport.core.CreditReportParser.parsePersonCreditReport(xml);\n}" + }, { + "id" : "54c7f69f-abd6-4c67-b4ac-04775eace55c", + "name" : "GetRepayStatus", + "signature" : "UDF.GetRepayStatus(status)", + "description" : "将征信还款明细中每个月还款状态转换成对应的逾期情况", + "enable" : true, + "mathXml" : "\n UDF.GetRepayStatus\n (\n \n status\n \n )\n ", + "body" : "static int GetRepayStatus(String status){\n if(status==null||\"\".equals(status)\n ||\"*\".equals(status)\n ||\"N\".equals(status)\n ||\"C\".equals(status)\n ||\"M\".equals(status)\n ||\"A\".equals(status)\n ||\"#\".equals(status)\n ||\"/\".equals(status)){\n return 0;\n }else if(\"G\".equals(status)\n ||\"D\".equals(status)\n ||\"Z\".equals(status)\n ||\"B\".equals(status)){\n return 8;\n }else{\n return Integer.valueOf(status);\n }\n}" + }, { + "id" : "a1dd9166-89d5-49bf-8283-e5c3616e90a5", + "name" : "DateOverMonth", + "signature" : "UDF.DateOverMonth(start,end)", + "description" : "两个格式为YYYY-MM日期月份差,start 开始日期,end 结束日期", + "enable" : true, + "mathXml" : "\n UDF.DateOverMonth\n (\n \n start\n \n ,\n \n end\n \n )\n ", + "body" : "static int DateOverMonth(String start,String end) throws Exception {\n if(start == null || end == null){\n return 0;\n }\n java.text.SimpleDateFormat s = new java.text.SimpleDateFormat(\"yyyy/MM/dd\");\n java.text.SimpleDateFormat s1 = new java.text.SimpleDateFormat(\"yyyy/MM/dd\");\n java.util.Date startDate=s.parse(start);\n java.util.Date endDate=s1.parse(end);\n \n java.util.Calendar c_start = java.util.Calendar.getInstance();\n c_start.setTime(startDate);\n java.util.Calendar c_end = java.util.Calendar.getInstance();\n c_end.setTime(endDate);\n \n int result = (c_end.get(1) - c_start.get(1)) * 12 + (c_end.get(2) - c_start.get(2));\n return result;\n}" + }, { + "id" : "de854d82-2d64-4f68-b816-e79fd970b653", "name" : "parseCompanyCreditReport", "signature" : "UDF.parseCompanyCreditReport(xml)", "description" : "将 xml 解析成征信报告对象(企业)", "enable" : true, "mathXml" : "\n\n UDF.parseCompanyCreditReport\n (\n \n xml\n \n )\n\n", - "body" : "def static parseCompanyCreditReport(String xml){\n return io.sc.creditreport.core.CreditReportParser.parseCompanyCreditReport(xml);\n}" - }, - { - "name" : "parsePersonCreditReport", - "signature" : "UDF.parsePersonCreditReport(xml)", - "description" : "将 xml 解析成征信报告对象(个人)", + "body" : "static io.sc.creditreport.core.company.Document parseCompanyCreditReport(String xml) throws Exception {\n return io.sc.creditreport.core.CreditReportParser.parseCompanyCreditReport(xml);\n}" + }, { + "id" : "f2beb5ec-b3bd-4f86-be69-6ced460fd23f", + "name" : "AfterMonDate", + "signature" : "UDF.AfterMonDate(currDate, m)", + "description" : "查询指定日期的后“m”个月的日期(格式为yyyyMM)", "enable" : true, - "mathXml" : "\n\n UDF.parsePersonCreditReport\n (\n \n xml\n \n )\n\n", - "body" : "def static parsePersonCreditReport(String xml){\n return io.sc.creditreport.core.CreditReportParser.parsePersonCreditReport(xml);\n}" - }, - { - "id": "d9ebb918-7774-47dc-a65b-fa7563082259", - "name": "DateOverMonth", - "signature": "UDF.DateOverMonth(start,end)", - "description": "两个格式为YYYY-MM日期月份差,start 开始日期,end 结束日期", - "enable": true, - "mathXml": "\n UDF.DateOverMonth\n (\n \n start\n \n ,\n \n end\n \n )\n ", - "body": "def static DateOverMonth(String start,String end){\n if(start == null || end == null){\n return null;\n }\n java.text.SimpleDateFormat s = new java.text.SimpleDateFormat(\"yyyy/MM/dd\");\n java.text.SimpleDateFormat s1 = new java.text.SimpleDateFormat(\"yyyy/MM/dd\");\n java.util.Date startDate=s.parse(start);\n java.util.Date endDate=s1.parse(end);\n \n java.util.Calendar c_start = java.util.Calendar.getInstance();\n c_start.setTime(startDate);\n java.util.Calendar c_end = java.util.Calendar.getInstance();\n c_end.setTime(endDate);\n \n int result = (c_end.get(1) - c_start.get(1)) * 12 + (c_end.get(2) - c_start.get(2));\n return result;\n}" - }, - { - "id": "3d157fea-cb5a-4a21-beee-eee2f246e746", - "name": "GetRepayStatus", - "signature": "UDF.GetRepayStatus(status)", - "description": "将征信还款明细中每个月还款状态转换成对应的逾期情况", - "enable": true, - "mathXml": "\n UDF.GetRepayStatus\n (\n \n status\n \n )\n ", - "body": "def static GetRepayStatus(String status){\n if(status==null||\"\".equals(status)\n ||\"*\".equals(status)\n ||\"N\".equals(status)\n ||\"C\".equals(status)\n ||\"M\".equals(status)\n ||\"A\".equals(status)\n ||\"#\".equals(status)\n ||\"/\".equals(status)){\n return 0;\n }else if(\"G\".equals(status)\n ||\"D\".equals(status)\n ||\"Z\".equals(status)\n ||\"B\".equals(status)){\n return 8;\n }else{\n return Integer.valueOf(status);\n }\n}" - }, - { - "id": "683a4a77-329d-4f28-bda4-f9cc139b7dc5", - "name": "AfterMonDate", - "signature": "UDF.AfterMonDate(currDate, m)", - "description": "查询指定日期的后“m”个月的日期(格式为yyyyMM)", - "enable": true, - "mathXml": "\n UDF.AfterMonDate\n (\n \n currDate\n \n ,\n \n m\n \n )\n ", - "body": "def static AfterMonDate(String currDateStr, int m){\n\tjava.text.SimpleDateFormat s1 = new java.text.SimpleDateFormat(\"yyyy/MM\");\n String currDateStr1 = currDateStr.replaceAll(\"\\\\.\", \"/\");\n Date currDate=s1.parse(currDateStr1);\n Calendar c = Calendar.getInstance();\n c.setTime(currDate);\n c.set(2, c.get(2) + m);\n java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(\"yyyy-MM-dd\");\n String result = sdf.format(c.getTime());\n return result.replace(\"-\", \"\").substring(0,6);\n}" + "mathXml" : "\n UDF.AfterMonDate\n (\n \n currDate\n \n ,\n \n m\n \n )\n ", + "body" : "static String AfterMonDate(String currDateStr, int m) throws Exception {\n\tjava.text.SimpleDateFormat s1 = new java.text.SimpleDateFormat(\"yyyy/MM\");\n String currDateStr1 = currDateStr.replaceAll(\"\\\\.\", \"/\");\n Date currDate=s1.parse(currDateStr1);\n Calendar c = Calendar.getInstance();\n c.setTime(currDate);\n c.set(2, c.get(2) + m);\n java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(\"yyyy-MM-dd\");\n String result = sdf.format(c.getTime());\n return result.replace(\"-\", \"\").substring(0,6);\n}" } ] \ No newline at end of file diff --git a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages.properties b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages.properties index dacd3c24..77c0804c 100644 --- a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages.properties +++ b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages.properties @@ -1,4 +1,4 @@ -io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A +io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 io.sc.creditreport.core.company.EA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.company.EA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.company.EA01A.ea01ai01 = \u62A5\u544A\u7F16\u53F7 @@ -1180,7 +1180,7 @@ io.sc.creditreport.core.company.eg10b = \u4E8B\u4E1A\u5355\u4F4D\u6536\u5165\u65 io.sc.creditreport.core.company.ega = \u8D22\u52A1\u4FE1\u606F io.sc.creditreport.core.company.eha = \u8BC4\u7EA7\u4FE1\u606F io.sc.creditreport.core.company.eia = \u58F0\u660E\u53CA\u5F02\u8BAE\u6807\u6CE8\u4FE1\u606F -io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A +io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 io.sc.creditreport.core.person.PA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.person.PA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.person.PA01A.pa01ai01 = \u62A5\u544A\u7F16\u53F7 diff --git a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_tw_CN.properties b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_tw_CN.properties index dacd3c24..77c0804c 100644 --- a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_tw_CN.properties +++ b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_tw_CN.properties @@ -1,4 +1,4 @@ -io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A +io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 io.sc.creditreport.core.company.EA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.company.EA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.company.EA01A.ea01ai01 = \u62A5\u544A\u7F16\u53F7 @@ -1180,7 +1180,7 @@ io.sc.creditreport.core.company.eg10b = \u4E8B\u4E1A\u5355\u4F4D\u6536\u5165\u65 io.sc.creditreport.core.company.ega = \u8D22\u52A1\u4FE1\u606F io.sc.creditreport.core.company.eha = \u8BC4\u7EA7\u4FE1\u606F io.sc.creditreport.core.company.eia = \u58F0\u660E\u53CA\u5F02\u8BAE\u6807\u6CE8\u4FE1\u606F -io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A +io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 io.sc.creditreport.core.person.PA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.person.PA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.person.PA01A.pa01ai01 = \u62A5\u544A\u7F16\u53F7 diff --git a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_zh_CN.properties b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_zh_CN.properties index dacd3c24..77c0804c 100644 --- a/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_zh_CN.properties +++ b/io.sc.creditreport.core/src/main/resources/io/sc/creditreport/core/i18n/messages_zh_CN.properties @@ -1,4 +1,4 @@ -io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A +io.sc.creditreport.core.company.Document = \u4F01\u4E1A\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 io.sc.creditreport.core.company.EA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.company.EA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.company.EA01A.ea01ai01 = \u62A5\u544A\u7F16\u53F7 @@ -1180,7 +1180,7 @@ io.sc.creditreport.core.company.eg10b = \u4E8B\u4E1A\u5355\u4F4D\u6536\u5165\u65 io.sc.creditreport.core.company.ega = \u8D22\u52A1\u4FE1\u606F io.sc.creditreport.core.company.eha = \u8BC4\u7EA7\u4FE1\u606F io.sc.creditreport.core.company.eia = \u58F0\u660E\u53CA\u5F02\u8BAE\u6807\u6CE8\u4FE1\u606F -io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A +io.sc.creditreport.core.person.Document = \u4E2A\u4EBA\u4FE1\u7528\u62A5\u544A\u63A5\u53E3\u67E5\u8BE2 io.sc.creditreport.core.person.PA01 = \u62A5\u544A\u5934\u4FE1\u606F\u5355\u5143 io.sc.creditreport.core.person.PA01A = \u62A5\u544A\u6807\u8BC6\u4FE1\u606F\u6BB5 io.sc.creditreport.core.person.PA01A.pa01ai01 = \u62A5\u544A\u7F16\u53F7 diff --git a/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/ExecutorFactoryServiceImpl.java b/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/ExecutorFactoryServiceImpl.java index 91fb529a..8f2de523 100644 --- a/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/ExecutorFactoryServiceImpl.java +++ b/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/ExecutorFactoryServiceImpl.java @@ -4,6 +4,9 @@ import java.util.Map; import javax.annotation.PostConstruct; +import io.sc.engine.rule.client.enums.GeneratorType; +import io.sc.engine.rule.core.code.generator.GroovySourceCodeGenerator; +import io.sc.engine.rule.core.code.generator.JavaSourceCodeGenerator; import io.sc.platform.core.service.RuntimeService; import io.sc.platform.mvc.service.SystemParameterService; import org.slf4j.Logger; @@ -27,10 +30,12 @@ public class ExecutorFactoryServiceImpl implements ExecutorFactoryService{ private static final String CLIENT_EXECUTOR_MODE_KEY ="parameter.re.client.executorMode"; private static final String CLIENT_LOADER_MODE_KEY ="parameter.re.client.loaderMode"; private static final String CLIENT_REMOTE_API_URL_KEY ="parameter.re.client.remoteApiUrl"; + private static final String CLIENT_GENERATOR_TYPE_KEY ="parameter.re.client.generatorType"; private static final String SERVER_EXECUTOR_MODE_KEY ="parameter.re.server.executorMode"; private static final String SERVER_LOADER_MODE_KEY ="parameter.re.server.loaderMode"; private static final String SERVER_REMOTE_API_URL_KEY ="parameter.re.server.remoteApiUrl"; + private static final String SERVER_GENERATOR_TYPE_KEY ="parameter.re.server.generatorType"; @Autowired private RuntimeService runtimeService; @Autowired private SystemParameterService systemParameterService; @@ -40,10 +45,12 @@ public class ExecutorFactoryServiceImpl implements ExecutorFactoryService{ private ExecutorMode clientLastExecutorMode; //上一次保存的执行器执行模式(客户端) private LoaderMode clientLastLoaderMode; //上一次保存的加载器执行模式(客户端) private String clientLastRemoteApiUrl; //上一次保存的远程服务器 api url 地址(客户端) + private GeneratorType clientLastGeneratorType; //上一次保存的源代码生成器类型(客户端) private ExecutorMode serverLastExecutorMode; //上一次保存的执行器执行模式(服务器端) private LoaderMode serverLastLoaderMode; //上一次保存的加载器执行模式(服务器端) private String serverLastRemoteApiUrl; //上一次保存的远程服务器 api url 地址(服务器端) + private GeneratorType serverLastGeneratorType; //上一次保存的源代码生成器类型(服务器端) private Executor clientExecutor; //执行器(客户端) private Executor serverExecutor; //执行器(服务器端) @@ -64,34 +71,36 @@ public class ExecutorFactoryServiceImpl implements ExecutorFactoryService{ if(!runtimeService.isReady()) { return null; } - if(clientExecutor !=null) return clientExecutor; + //if(clientExecutor !=null) return clientExecutor; try { Map parameters =systemParameterService.getParameters(new String[] { CLIENT_EXECUTOR_MODE_KEY, CLIENT_LOADER_MODE_KEY, - CLIENT_REMOTE_API_URL_KEY + CLIENT_REMOTE_API_URL_KEY, + CLIENT_GENERATOR_TYPE_KEY }); ExecutorMode executorMode =ExecutorMode.parse(parameters.get(CLIENT_EXECUTOR_MODE_KEY)); LoaderMode loaderMode =LoaderMode.parse(parameters.get(CLIENT_LOADER_MODE_KEY)); String remoteApiUrl =parameters.get(CLIENT_REMOTE_API_URL_KEY); - + GeneratorType generatorType =GeneratorType.parse(parameters.get(CLIENT_GENERATOR_TYPE_KEY)); if( executorMode!=null && executorMode.equals(clientLastExecutorMode) && loaderMode!=null && loaderMode.equals(clientLastLoaderMode) && remoteApiUrl!=null && remoteApiUrl.equals(clientLastRemoteApiUrl) - + && generatorType!=null && generatorType.equals(clientLastGeneratorType) ) { return clientExecutor; }else { if(ExecutorMode.LOCAL.equals(executorMode) && LoaderMode.LOCAL.equals(loaderMode)) { - clientExecutor =new LocalExecutor(localLoader); + clientExecutor = new LocalExecutor(localLoader, generatorType); }else { - clientExecutor =new ExecutorBuilder().build(executorMode, loaderMode, remoteApiUrl); + clientExecutor = new ExecutorBuilder().build(executorMode, loaderMode, remoteApiUrl,generatorType); } clientLastExecutorMode =executorMode; clientLastLoaderMode =loaderMode; clientLastRemoteApiUrl =remoteApiUrl; + clientLastGeneratorType =generatorType; return clientExecutor; } } catch (Exception e) { @@ -105,34 +114,37 @@ public class ExecutorFactoryServiceImpl implements ExecutorFactoryService{ if(!runtimeService.isReady()) { return null; } - if(serverExecutor !=null) return serverExecutor; + //if(serverExecutor !=null) return serverExecutor; try { Map parameters =systemParameterService.getParameters(new String[] { SERVER_EXECUTOR_MODE_KEY, SERVER_LOADER_MODE_KEY, - SERVER_REMOTE_API_URL_KEY + SERVER_REMOTE_API_URL_KEY, + SERVER_GENERATOR_TYPE_KEY }); ExecutorMode executorMode =ExecutorMode.parse(parameters.get(SERVER_EXECUTOR_MODE_KEY)); LoaderMode loaderMode =LoaderMode.parse(parameters.get(SERVER_LOADER_MODE_KEY)); String remoteApiUrl =parameters.get(SERVER_REMOTE_API_URL_KEY); - + GeneratorType generatorType =GeneratorType.parse(parameters.get(SERVER_GENERATOR_TYPE_KEY)); if( - executorMode!=null && executorMode.equals(serverLastExecutorMode) - && loaderMode!=null && loaderMode.equals(serverLastLoaderMode) - && remoteApiUrl!=null && remoteApiUrl.equals(serverLastRemoteApiUrl) + executorMode!=null && executorMode.equals(serverLastExecutorMode) + && loaderMode!=null && loaderMode.equals(serverLastLoaderMode) + && remoteApiUrl!=null && remoteApiUrl.equals(serverLastRemoteApiUrl) + && generatorType!=null && generatorType.equals(serverLastGeneratorType) ) { return serverExecutor; }else { if(ExecutorMode.LOCAL.equals(executorMode) && LoaderMode.LOCAL.equals(loaderMode)) { - serverExecutor =new LocalExecutor(localLoader); + serverExecutor = new LocalExecutor(localLoader, generatorType); }else { - serverExecutor =new ExecutorBuilder().build(executorMode, loaderMode, remoteApiUrl); + serverExecutor = new ExecutorBuilder().build(executorMode, loaderMode, remoteApiUrl,generatorType); } serverLastExecutorMode =executorMode; serverLastLoaderMode =loaderMode; serverLastRemoteApiUrl =remoteApiUrl; + serverLastGeneratorType =generatorType; return serverExecutor; } } catch (Exception e) { @@ -148,16 +160,18 @@ public class ExecutorFactoryServiceImpl implements ExecutorFactoryService{ Map parameters =systemParameterService.getParameters(new String[] { CLIENT_EXECUTOR_MODE_KEY, CLIENT_LOADER_MODE_KEY, - CLIENT_REMOTE_API_URL_KEY + CLIENT_REMOTE_API_URL_KEY, + CLIENT_GENERATOR_TYPE_KEY }); ExecutorMode executorMode =ExecutorMode.parse(parameters.get(CLIENT_EXECUTOR_MODE_KEY)); LoaderMode loaderMode =LoaderMode.parse(parameters.get(CLIENT_LOADER_MODE_KEY)); String remoteApiUrl =parameters.get(CLIENT_REMOTE_API_URL_KEY); + GeneratorType generatorType =GeneratorType.parse(parameters.get(CLIENT_GENERATOR_TYPE_KEY)); if(ExecutorMode.LOCAL.equals(executorMode) && LoaderMode.LOCAL.equals(loaderMode)) { - return new LocalExecutor(localLoader); + return new LocalExecutor(localLoader, generatorType); }else { - return new ExecutorBuilder().build(executorMode, loaderMode, remoteApiUrl); + return new ExecutorBuilder().build(executorMode, loaderMode, remoteApiUrl,generatorType); } } @@ -168,16 +182,18 @@ public class ExecutorFactoryServiceImpl implements ExecutorFactoryService{ Map parameters =systemParameterService.getParameters(new String[] { SERVER_EXECUTOR_MODE_KEY, SERVER_LOADER_MODE_KEY, - SERVER_REMOTE_API_URL_KEY + SERVER_REMOTE_API_URL_KEY, + SERVER_GENERATOR_TYPE_KEY }); ExecutorMode executorMode =ExecutorMode.parse(parameters.get(SERVER_EXECUTOR_MODE_KEY)); LoaderMode loaderMode =LoaderMode.parse(parameters.get(SERVER_LOADER_MODE_KEY)); String remoteApiUrl =parameters.get(SERVER_REMOTE_API_URL_KEY); + GeneratorType generatorType =GeneratorType.parse(parameters.get(SERVER_GENERATOR_TYPE_KEY)); if(ExecutorMode.LOCAL.equals(executorMode) && LoaderMode.LOCAL.equals(loaderMode)) { - return new LocalExecutor(localLoader); + return new LocalExecutor(localLoader, generatorType); }else { - return new ExecutorBuilder().build(executorMode, loaderMode, remoteApiUrl); + return new ExecutorBuilder().build(executorMode, loaderMode, remoteApiUrl,generatorType); } } } diff --git a/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java b/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java index 04c566ba..80c831ca 100644 --- a/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java +++ b/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java @@ -53,12 +53,12 @@ public class LocalLoaderImpl implements LocalLoader{ if(resourceId!=null && !"".equals(resourceId.trim())){ if(log.isDebugEnabled()) {log.debug("load locale resource by id ......");} - Method method =executeUnitServiceBean.getClass().getMethod("findById", String.class); - return (ExecuteUnit)method.invoke(executeUnitServiceBean, resourceId); + Method method =executeUnitServiceBean.getClass().getMethod("findById", String.class, boolean.class); + return (ExecuteUnit)method.invoke(executeUnitServiceBean, resourceId,true); }else{ if(log.isDebugEnabled()) {log.debug("load local resource by code and version ......");} - Method method =executeUnitServiceBean.getClass().getMethod("findByCodeAndVersion", String.class, Integer.class); - return (ExecuteUnit)method.invoke(executeUnitServiceBean, resourceCode,version); + Method method =executeUnitServiceBean.getClass().getMethod("findByCodeAndVersion", String.class, Integer.class,boolean.class); + return (ExecuteUnit)method.invoke(executeUnitServiceBean, resourceCode,version,true); } } } diff --git a/io.sc.engine.rule.client.spring/src/main/resources/META-INF/platform/plugins/parameters.json b/io.sc.engine.rule.client.spring/src/main/resources/META-INF/platform/plugins/parameters.json index 9f33d4db..b6067e94 100644 --- a/io.sc.engine.rule.client.spring/src/main/resources/META-INF/platform/plugins/parameters.json +++ b/io.sc.engine.rule.client.spring/src/main/resources/META-INF/platform/plugins/parameters.json @@ -12,13 +12,25 @@ [ //模型引擎客户端 {"id":"parameter.re.client","order":1010}, + //模型引擎客户端/源代码生成器类型 + { + "id" :"parameter.re.client.generatorType", + "parentId" :"parameter.re.client", + "code" :"parameter.re.client.generatorType", + "defaultValue" :"Groovy", + "order" : 100, + "options" :{ + "Groovy" : "parameter.re.client.generatorType.Groovy", + "Java" : "parameter.re.client.generatorType.Java" + } + }, //模型引擎客户端/执行器执行模式 { "id" :"parameter.re.client.executorMode", "parentId" :"parameter.re.client", "code" :"parameter.re.client.executorMode", "defaultValue" :"Local", - "order" : 0, + "order" : 200, "options" :{ "Local" : "parameter.re.client.executorMode.Local", "Remote" : "parameter.re.client.executorMode.Remote" @@ -30,7 +42,7 @@ "parentId" :"parameter.re.client", "code" :"parameter.re.client.loaderMode", "defaultValue" :"Local", - "order" : 10, + "order" : 300, "options" :{ "Local" : "parameter.re.client.loaderMode.Local", "Remote" : "parameter.re.client.loaderMode.Remote" @@ -42,7 +54,7 @@ "parentId" :"parameter.re.client", "code" :"parameter.re.client.remoteApiUrl", "defaultValue" :"http://localhost:8080/api/re/resource", - "order" : 20 + "order" : 400 }, //模型引擎客户端/系统启动时自动编译模式 { @@ -50,7 +62,7 @@ "parentId" :"parameter.re.client", "code" :"parameter.re.client.autoCompile", "defaultValue" :"none", - "order" : 30, + "order" : 500, "options" :{ "none" : "parameter.re.client.autoCompile.none", /* 系统启动时不自动编译资源 */ "deployed" : "parameter.re.client.autoCompile.deployed", /* 系统启动时自动编译[已发布]的资源 */ diff --git a/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters.properties b/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters.properties index 81c412af..a6bdce1f 100644 --- a/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters.properties +++ b/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters.properties @@ -1,5 +1,9 @@ parameter.re.client=Rule Engine(Client) +parameter.re.client.sourceCodeGenerator=Source Code Generator +parameter.re.client.sourceCodeGenerator.Groovy=Groovy +parameter.re.client.sourceCodeGenerator.Java=Java + parameter.re.client.executorMode=Executor Mode parameter.re.client.executorMode.Local=Local parameter.re.client.executorMode.Remote=Remote diff --git a/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters_tw_CN.properties b/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters_tw_CN.properties new file mode 100644 index 00000000..359ed3e7 --- /dev/null +++ b/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters_tw_CN.properties @@ -0,0 +1,21 @@ +parameter.re.client=\u6C7A\u7B56\u5F15\u64CE(\u5BA2\u6236\u7AEF) + +parameter.re.client.sourceCodeGenerator=\u6E90\u4EE3\u78BC\u751F\u6210\u5668 +parameter.re.client.sourceCodeGenerator.Groovy=Groovy +parameter.re.client.sourceCodeGenerator.Java=Java + +parameter.re.client.executorMode=\u57F7\u884C\u5668\u57F7\u884C\u6A21\u5F0F +parameter.re.client.executorMode.Local=\u672C\u5730 +parameter.re.client.executorMode.Remote=\u9060\u7A0B + +parameter.re.client.loaderMode=\u8CC7\u6E90\u5B9A\u7FA9\u52A0\u8F09\u5668\u57F7\u884C\u6A21\u5F0F +parameter.re.client.loaderMode.Local=\u672C\u5730 +parameter.re.client.loaderMode.Remote=\u9060\u7A0B + +parameter.re.client.remoteApiUrl=\u9060\u7A0B\u6C7A\u7B56\u5F15\u64CE API URL \u5730\u5740 + +parameter.re.client.autoCompile=\u7CFB\u7D71\u555F\u52D5\u6642\u81EA\u52D5\u7DE8\u8B6F\u6A21\u5F0F +parameter.re.client.autoCompile.none=\u4E0D\u81EA\u52D5\u7DE8\u8B6F +parameter.re.client.autoCompile.deployed=\u81EA\u52D5\u7DE8\u8B6F[\u5DF2\u767C\u4F48]\u7684\u8CC7\u6E90 +parameter.re.client.autoCompile.last=\u81EA\u52D5\u7DE8\u8B6F[\u6700\u65B0\u7248\u672C]\u7684\u8CC7\u6E90 +parameter.re.client.autoCompile.deployed_and_last=\u81EA\u52D5\u7DE8\u8B6F[\u5DF2\u767C\u4F48\u548C\u6700\u65B0\u7248\u672C]\u7684\u8CC7\u6E90 diff --git a/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters_zh_CN.properties b/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters_zh_CN.properties index f19d301b..02aa1086 100644 --- a/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters_zh_CN.properties +++ b/io.sc.engine.rule.client.spring/src/main/resources/io/sc/engine/rule/client/spring/i18n/parameters_zh_CN.properties @@ -1,17 +1,21 @@ -parameter.re.client=\u51b3\u7b56\u5f15\u64ce(\u5ba2\u6237\u7aef) +parameter.re.client=\u51B3\u7B56\u5F15\u64CE(\u5BA2\u6237\u7AEF) -parameter.re.client.executorMode=\u6267\u884c\u5668\u6267\u884c\u6a21\u5f0f -parameter.re.client.executorMode.Local=\u672c\u5730 -parameter.re.client.executorMode.Remote=\u8fdc\u7a0b +parameter.re.client.generatorType=\u6E90\u4EE3\u7801\u751F\u6210\u5668 +parameter.re.client.generatorType.Groovy=Groovy +parameter.re.client.generatorType.Java=Java -parameter.re.client.loaderMode=\u8d44\u6e90\u5b9a\u4e49\u52a0\u8f7d\u5668\u6267\u884c\u6a21\u5f0f -parameter.re.client.loaderMode.Local=\u672c\u5730 -parameter.re.client.loaderMode.Remote=\u8fdc\u7a0b +parameter.re.client.executorMode=\u6267\u884C\u5668\u6267\u884C\u6A21\u5F0F +parameter.re.client.executorMode.Local=\u672C\u5730 +parameter.re.client.executorMode.Remote=\u8FDC\u7A0B -parameter.re.client.remoteApiUrl=\u8fdc\u7a0b\u51b3\u7b56\u5f15\u64ce API URL\u5730\u5740 +parameter.re.client.loaderMode=\u8D44\u6E90\u5B9A\u4E49\u52A0\u8F7D\u5668\u6267\u884C\u6A21\u5F0F +parameter.re.client.loaderMode.Local=\u672C\u5730 +parameter.re.client.loaderMode.Remote=\u8FDC\u7A0B -parameter.re.client.autoCompile=\u7cfb\u7edf\u542f\u52a8\u65f6\u81ea\u52a8\u7f16\u8bd1\u6a21\u5f0f -parameter.re.client.autoCompile.none=\u4e0d\u81ea\u52a8\u7f16\u8bd1 -parameter.re.client.autoCompile.deployed=\u81ea\u52a8\u7f16\u8bd1[\u5df2\u53d1\u5e03]\u7684\u8d44\u6e90 -parameter.re.client.autoCompile.last=\u81ea\u52a8\u7f16\u8bd1[\u6700\u65b0\u7248\u672c]\u7684\u8d44\u6e90 -parameter.re.client.autoCompile.deployed_and_last=\u81ea\u52a8\u7f16\u8bd1[\u5df2\u53d1\u5e03\u548c\u6700\u65b0\u7248\u672c]\u7684\u8d44\u6e90 +parameter.re.client.remoteApiUrl=\u8FDC\u7A0B\u51B3\u7B56\u5F15\u64CE API URL \u5730\u5740 + +parameter.re.client.autoCompile=\u7CFB\u7EDF\u542F\u52A8\u65F6\u81EA\u52A8\u7F16\u8BD1\u6A21\u5F0F +parameter.re.client.autoCompile.none=\u4E0D\u81EA\u52A8\u7F16\u8BD1 +parameter.re.client.autoCompile.deployed=\u81EA\u52A8\u7F16\u8BD1[\u5DF2\u53D1\u5E03]\u7684\u8D44\u6E90 +parameter.re.client.autoCompile.last=\u81EA\u52A8\u7F16\u8BD1[\u6700\u65B0\u7248\u672C]\u7684\u8D44\u6E90 +parameter.re.client.autoCompile.deployed_and_last=\u81EA\u52A8\u7F16\u8BD1[\u5DF2\u53D1\u5E03\u548C\u6700\u65B0\u7248\u672C]\u7684\u8D44\u6E90 diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/Executor.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/Executor.java index ed12390d..90f1796e 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/Executor.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/Executor.java @@ -1,5 +1,6 @@ package io.sc.engine.rule.client; +import io.sc.engine.rule.client.enums.GeneratorType; import io.sc.engine.rule.core.ExecuteResult; import java.util.Map; @@ -14,6 +15,7 @@ public interface Executor { * @return 资源定义加载器 */ public Loader getLoader(); + public GeneratorType getGeneratorType(); public void compileById(String resourceId) throws Exception; public void compileByCode(String resourceCode, Integer version) throws Exception; diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/ExecutorBuilder.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/ExecutorBuilder.java index 7c12ba06..e7d50140 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/ExecutorBuilder.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/ExecutorBuilder.java @@ -2,9 +2,12 @@ package io.sc.engine.rule.client; import io.sc.engine.rule.client.enums.ExecutorMode; import io.sc.engine.rule.client.enums.LoaderMode; +import io.sc.engine.rule.client.enums.GeneratorType; import io.sc.engine.rule.client.local.LocalExecutor; import io.sc.engine.rule.client.remote.RemoteExecutor; import io.sc.engine.rule.client.remote.RemoteLoader; +import io.sc.engine.rule.core.code.generator.GroovySourceCodeGenerator; +import io.sc.engine.rule.core.code.generator.JavaSourceCodeGenerator; /** * 执行器构建器 @@ -13,6 +16,7 @@ public class ExecutorBuilder { private ExecutorMode executorMode =ExecutorMode.LOCAL; private LoaderMode loaderMode =LoaderMode.REMOTE; private String url; + private GeneratorType generatorType; public ExecutorBuilder loader(LoaderMode loaderMode) { this.loaderMode =loaderMode; @@ -28,6 +32,11 @@ public class ExecutorBuilder { this.url =url; return this; } + + public ExecutorBuilder generatorType(GeneratorType generatorType){ + this.generatorType =generatorType; + return this; + } /** * 快捷构建执行器 @@ -36,10 +45,11 @@ public class ExecutorBuilder { * @param url 模型引擎服务器 url * @return 执行器 */ - public Executor build(ExecutorMode executorMode,LoaderMode loaderMode,String url) { + public Executor build(ExecutorMode executorMode, LoaderMode loaderMode, String url, GeneratorType generatorType) { this.executorMode =executorMode; this.loaderMode =loaderMode; this.url =url; + this.generatorType =generatorType; return build(); } @@ -65,13 +75,16 @@ public class ExecutorBuilder { //只支持以下两种方式: //1. 本地执行，远程加载模型定义 if(loaderMode==LoaderMode.REMOTE && executorMode==ExecutorMode.LOCAL) { - return new LocalExecutor(new RemoteLoader(url)); + return new LocalExecutor(new RemoteLoader(url),generatorType); } //2. 远程执行 if(executorMode==ExecutorMode.REMOTE) { return new RemoteExecutor(url); } + + //3. 源代码生成器 + return null; } diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/enums/GeneratorType.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/enums/GeneratorType.java new file mode 100644 index 00000000..0196447f --- /dev/null +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/enums/GeneratorType.java @@ -0,0 +1,15 @@ +package io.sc.engine.rule.client.enums; + +public enum GeneratorType { + GROOVY, + JAVA; + + public static GeneratorType parse(String str) { + if("GROOVY".equalsIgnoreCase(str)) { + return GeneratorType.GROOVY; + }else if("JAVA".equalsIgnoreCase(str)) { + return GeneratorType.JAVA; + } + return null; + } +} diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/local/LocalExecutor.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/local/LocalExecutor.java index c5781b3c..a3b58d6f 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/local/LocalExecutor.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/local/LocalExecutor.java @@ -2,9 +2,11 @@ package io.sc.engine.rule.client.local; import io.sc.engine.rule.client.Executor; import io.sc.engine.rule.client.Loader; +import io.sc.engine.rule.client.enums.GeneratorType; import io.sc.engine.rule.client.runtime.EngineRuntime; import io.sc.engine.rule.core.ExecuteResult; import io.sc.engine.rule.core.code.ExecuteUnit; +import io.sc.engine.rule.core.code.SourceCodeGenerator; import java.util.Map; @@ -14,11 +16,13 @@ import java.util.Map; */ public class LocalExecutor implements Executor { private Loader loader; + private GeneratorType generatorType; public LocalExecutor() {} - public LocalExecutor(Loader loader) { + public LocalExecutor(Loader loader,GeneratorType generatorType) { this.loader =loader; + this.generatorType =generatorType; } @Override @@ -26,63 +30,68 @@ public class LocalExecutor implements Executor { return loader; } + @Override + public GeneratorType getGeneratorType() { + return generatorType; + } + @Override public void compileById(String resourceId) throws Exception { ExecuteUnit executeUnit =loader.load(resourceId); - EngineRuntime.getInstance().compile(resourceId,executeUnit); + EngineRuntime.getInstance(generatorType).compile(resourceId,executeUnit); } @Override public void compileByCode(String resourceCode, Integer version) throws Exception { ExecuteUnit executeUnit =loader.load(resourceCode,version); - EngineRuntime.getInstance().compile(resourceCode,version,executeUnit); + EngineRuntime.getInstance(generatorType).compile(resourceCode,version,executeUnit); } @Override public ExecuteResult executeById(String resourceId, Map map) throws Exception { ExecuteUnit executeUnit =loader.load(resourceId); - return EngineRuntime.getInstance().execute(this,resourceId,executeUnit, map); + return EngineRuntime.getInstance(generatorType).execute(this,resourceId,executeUnit, map); } @Override public ExecuteResult executeById(String resourceId, String json) throws Exception { ExecuteUnit executeUnit =loader.load(resourceId); - return EngineRuntime.getInstance().execute(this,resourceId,executeUnit, json); + return EngineRuntime.getInstance(generatorType).execute(this,resourceId,executeUnit, json); } @Override public ExecuteResult executeById(String resourceId, String subModelCode, Map map) throws Exception { ExecuteUnit executeUnit =loader.load(resourceId); - return EngineRuntime.getInstance().execute(this,resourceId,executeUnit,subModelCode,map); + return EngineRuntime.getInstance(generatorType).execute(this,resourceId,executeUnit,subModelCode,map); } @Override public ExecuteResult executeById(String resourceId, String subModelCode, String json) throws Exception { ExecuteUnit executeUnit =loader.load(resourceId); - return EngineRuntime.getInstance().execute(this,resourceId,executeUnit,subModelCode,json); + return EngineRuntime.getInstance(generatorType).execute(this,resourceId,executeUnit,subModelCode,json); } @Override public ExecuteResult executeByCode(String resourceCode, Integer version, Map map) throws Exception { ExecuteUnit executeUnit =loader.load(resourceCode, version); - return EngineRuntime.getInstance().execute(this,resourceCode,version,executeUnit, map); + return EngineRuntime.getInstance(generatorType).execute(this,resourceCode,version,executeUnit, map); } @Override public ExecuteResult executeByCode(String resourceCode, Integer version, String json) throws Exception { ExecuteUnit executeUnit =loader.load(resourceCode, version); - return EngineRuntime.getInstance().execute(this,resourceCode,version,executeUnit, json); + return EngineRuntime.getInstance(generatorType).execute(this,resourceCode,version,executeUnit, json); } @Override public ExecuteResult executeByCode(String resourceCode, Integer version, String subModelCode, Map map) throws Exception { ExecuteUnit executeUnit =loader.load(resourceCode, version); - return EngineRuntime.getInstance().execute(this,resourceCode,version,executeUnit,subModelCode,map); + return EngineRuntime.getInstance(generatorType).execute(this,resourceCode,version,executeUnit,subModelCode,map); } @Override public ExecuteResult executeByCode(String resourceCode, Integer version, String subModelCode, String json) throws Exception { ExecuteUnit executeUnit =loader.load(resourceCode, version); - return EngineRuntime.getInstance().execute(this,resourceCode,version,executeUnit,subModelCode,json); + return EngineRuntime.getInstance(generatorType).execute(this,resourceCode,version,executeUnit,subModelCode,json); } } diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/remote/RemoteExecutor.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/remote/RemoteExecutor.java index da08a2aa..ed5dadfe 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/remote/RemoteExecutor.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/remote/RemoteExecutor.java @@ -2,7 +2,9 @@ package io.sc.engine.rule.client.remote; import io.sc.engine.rule.client.Executor; import io.sc.engine.rule.client.Loader; +import io.sc.engine.rule.client.enums.GeneratorType; import io.sc.engine.rule.core.ExecuteResult; +import io.sc.engine.rule.core.code.SourceCodeGenerator; import io.sc.engine.rule.core.util.HttpRequestUtil; import io.sc.platform.util.ObjectMapperUtil; @@ -26,6 +28,11 @@ public class RemoteExecutor implements Executor{ return loader; } + @Override + public GeneratorType getGeneratorType() { + return null; + } + @Override public void compileById(String resourceId) throws Exception { throw new RuntimeException("Remote Executor NOT Supported compile!"); diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/EngineRuntime.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/EngineRuntime.java index 6e710904..ff414e9d 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/EngineRuntime.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/EngineRuntime.java @@ -1,38 +1,37 @@ package io.sc.engine.rule.client.runtime; import io.sc.engine.rule.client.Executor; +import io.sc.engine.rule.client.enums.GeneratorType; import io.sc.engine.rule.client.runtime.impl.GroovyEngineRuntime; +import io.sc.engine.rule.client.runtime.impl.JavaEngineRuntime; import io.sc.engine.rule.core.ExecuteResult; import io.sc.engine.rule.core.code.ExecuteUnit; import java.util.Map; +import static io.sc.engine.rule.client.enums.GeneratorType.GROOVY; + public abstract class EngineRuntime { - public static final String GROOVY ="groovy"; - - public static EngineRuntime getInstance(String lang) { - if(GROOVY.equalsIgnoreCase(lang)) { - return GroovyEngineRuntime.getInstance(); - }else { - return null; + public static EngineRuntime getInstance(GeneratorType generatorType) { + switch (generatorType){ + case GROOVY: + return GroovyEngineRuntime.getInstance(); + default: + return JavaEngineRuntime.getInstance(); } } - - public static EngineRuntime getInstance() { - return getInstance(GROOVY); - } - public abstract void compile(String resourceId, ExecuteUnit wrapper) throws Exception; - public abstract void compile(String resourceCode, Integer version, ExecuteUnit wrapper) throws Exception; + public abstract void compile(String resourceId, ExecuteUnit executeUnit) throws Exception; + public abstract void compile(String resourceCode, Integer version, ExecuteUnit executeUnit) throws Exception; - public abstract ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit wrapper, String json) throws Exception; - public abstract ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit wrapper, Map map) throws Exception; - public abstract ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit wrapper, String subModelCode, String json) throws Exception; - public abstract ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit wrapper, String subModelCode, Map map) throws Exception; + public abstract ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String json) throws Exception; + public abstract ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, Map map) throws Exception; + public abstract ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String subModelCode, String json) throws Exception; + public abstract ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String subModelCode, Map map) throws Exception; - public abstract ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit wrapper, String json) throws Exception; - public abstract ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit wrapper, Map map) throws Exception; - public abstract ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit wrapper, String subModelCode, String json) throws Exception; - public abstract ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit wrapper, String subModelCode, Map map) throws Exception; + public abstract ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String json) throws Exception; + public abstract ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, Map map) throws Exception; + public abstract ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String subModelCode, String json) throws Exception; + public abstract ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String subModelCode, Map map) throws Exception; } diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/GroovyEngineRuntime.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/GroovyEngineRuntime.java index 304239ab..cae84e15 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/GroovyEngineRuntime.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/GroovyEngineRuntime.java @@ -42,7 +42,7 @@ public class GroovyEngineRuntime extends EngineRuntime{ resourceName =lib.getName(); } try { - service.validate(code.getSource()); + service.validate(code); } catch (Exception e) { log.error("Compile Error for " + resourceName + "(resourceId=" + resourceId + ")",e); throw e; @@ -50,134 +50,142 @@ public class GroovyEngineRuntime extends EngineRuntime{ } @Override - public void compile(String resourceCode, Integer version, ExecuteUnit wrapper) throws Exception { - SourceCode code = generator.generate(resourceCode, version, wrapper); + public void compile(String resourceCode, Integer version, ExecuteUnit executeUnit) throws Exception { + SourceCode code = generator.generate(resourceCode, version, executeUnit); String resourceName =null; - if("RESOURCE".equals(wrapper.getType())){ - ExecuteUnit4Resource _wrapper =(ExecuteUnit4Resource)wrapper; + if("RESOURCE".equals(executeUnit.getType())){ + ExecuteUnit4Resource _wrapper =(ExecuteUnit4Resource)executeUnit; Resource resource =_wrapper.getResource(); resourceName =resource.getName(); - }else if("LIB".equals(wrapper.getType())) { - ExecuteUnit4Lib _wrapper =(ExecuteUnit4Lib)wrapper; + }else if("LIB".equals(executeUnit.getType())) { + ExecuteUnit4Lib _wrapper =(ExecuteUnit4Lib)executeUnit; Lib lib =_wrapper.getLib(); resourceName =lib.getName(); } try { - service.validate(code.getSource()); + service.validate(code); } catch (Exception e) { log.error("Compile Error for " + resourceName + "(code=" + resourceCode + ",verion=" + version + ")",e); } } @Override - public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit wrapper, String json) throws Exception { + public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String json) throws Exception { SourceCode code =null; - if(StringUtils.hasText(wrapper.getSourceCode())){ + if(StringUtils.hasText(executeUnit.getSourceCode())){ code =new SourceCode(); - code.setSource(wrapper.getSourceCode()); + code.setSource(executeUnit.getSourceCode()); }else { - code = generator.generate(resourceId, wrapper); + code = generator.generate(resourceId, executeUnit); } if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} - ExecuteResult result =(ExecuteResult)service.eval(code.getSource(), "INPUT_PARAMETER", prepareParameter(executor,null,json)); + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,null,json)); + result.setExecuteUnit(executeUnit); return result; } @Override - public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit wrapper, Map map) throws Exception { + public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, Map map) throws Exception { SourceCode code =null; - if(StringUtils.hasText(wrapper.getSourceCode())){ + if(StringUtils.hasText(executeUnit.getSourceCode())){ code =new SourceCode(); - code.setSource(wrapper.getSourceCode()); + code.setSource(executeUnit.getSourceCode()); }else { - code = generator.generate(resourceId, wrapper); + code = generator.generate(resourceId, executeUnit); } if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} - ExecuteResult result =(ExecuteResult)service.eval(code.getSource(), "INPUT_PARAMETER", prepareParameter(executor,null,map)); + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,null,map)); + result.setExecuteUnit(executeUnit); return result; } @Override - public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit wrapper, String subModelCode, String json) throws Exception { + public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String subModelCode, String json) throws Exception { SourceCode code =null; - if(StringUtils.hasText(wrapper.getSourceCode())){ + if(StringUtils.hasText(executeUnit.getSourceCode())){ code =new SourceCode(); - code.setSource(wrapper.getSourceCode()); + code.setSource(executeUnit.getSourceCode()); }else { - code = generator.generate(resourceId, wrapper); + code = generator.generate(resourceId, executeUnit); } if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} - ExecuteResult result =(ExecuteResult)service.eval(code.getSource(), "INPUT_PARAMETER", prepareParameter(executor,subModelCode,json)); + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,subModelCode,json)); + result.setExecuteUnit(executeUnit); return result; } @Override - public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit wrapper, String subModelCode, Map map) throws Exception { + public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String subModelCode, Map map) throws Exception { SourceCode code =null; - if(StringUtils.hasText(wrapper.getSourceCode())){ + if(StringUtils.hasText(executeUnit.getSourceCode())){ code =new SourceCode(); - code.setSource(wrapper.getSourceCode()); + code.setSource(executeUnit.getSourceCode()); }else { - code = generator.generate(resourceId, wrapper); + code = generator.generate(resourceId, executeUnit); } if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} - ExecuteResult result =(ExecuteResult)service.eval(code.getSource(), "INPUT_PARAMETER", prepareParameter(executor,subModelCode,map)); + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,subModelCode,map)); + result.setExecuteUnit(executeUnit); return result; } @Override - public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit wrapper, String json) throws Exception { + public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String json) throws Exception { SourceCode code =null; - if(StringUtils.hasText(wrapper.getSourceCode())){ + if(StringUtils.hasText(executeUnit.getSourceCode())){ code =new SourceCode(); - code.setSource(wrapper.getSourceCode()); + code.setSource(executeUnit.getSourceCode()); }else { - code = generator.generate(resourceCode,version,wrapper); + code = generator.generate(resourceCode,version,executeUnit); } if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} - ExecuteResult result =(ExecuteResult)service.eval(code.getSource(), "INPUT_PARAMETER", prepareParameter(executor,null,json)); + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,null,json)); + result.setExecuteUnit(executeUnit); return result; } @Override - public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit wrapper, Map map) throws Exception { + public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, Map map) throws Exception { SourceCode code =null; - if(StringUtils.hasText(wrapper.getSourceCode())){ + if(StringUtils.hasText(executeUnit.getSourceCode())){ code =new SourceCode(); - code.setSource(wrapper.getSourceCode()); + code.setSource(executeUnit.getSourceCode()); }else { - code = generator.generate(resourceCode,version,wrapper); + code = generator.generate(resourceCode,version,executeUnit); } if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} - ExecuteResult result =(ExecuteResult)service.eval(code.getSource(), "INPUT_PARAMETER", prepareParameter(executor,null,map)); + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,null,map)); + result.setExecuteUnit(executeUnit); return result; } @Override - public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit wrapper, String subModelCode, String json) throws Exception { + public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String subModelCode, String json) throws Exception { SourceCode code =null; - if(StringUtils.hasText(wrapper.getSourceCode())){ + if(StringUtils.hasText(executeUnit.getSourceCode())){ code =new SourceCode(); - code.setSource(wrapper.getSourceCode()); + code.setSource(executeUnit.getSourceCode()); }else { - code = generator.generate(resourceCode,version,wrapper); + code = generator.generate(resourceCode,version,executeUnit); } if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} - ExecuteResult result =(ExecuteResult)service.eval(code.getSource(), "INPUT_PARAMETER", prepareParameter(executor,subModelCode,json)); + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,subModelCode,json)); + result.setExecuteUnit(executeUnit); return result; } @Override - public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit wrapper, String subModelCode, Map map) throws Exception { + public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String subModelCode, Map map) throws Exception { SourceCode code =null; - if(StringUtils.hasText(wrapper.getSourceCode())){ + if(StringUtils.hasText(executeUnit.getSourceCode())){ code =new SourceCode(); - code.setSource(wrapper.getSourceCode()); + code.setSource(executeUnit.getSourceCode()); }else { - code = generator.generate(resourceCode,version,wrapper); + code = generator.generate(resourceCode,version,executeUnit); } if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} - ExecuteResult result =(ExecuteResult)service.eval(code.getSource(), "INPUT_PARAMETER", prepareParameter(executor,subModelCode,map)); + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,subModelCode,map)); + result.setExecuteUnit(executeUnit); return result; } diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/JavaEngineRuntime.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/JavaEngineRuntime.java new file mode 100644 index 00000000..5bcc88c1 --- /dev/null +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/JavaEngineRuntime.java @@ -0,0 +1,215 @@ +package io.sc.engine.rule.client.runtime.impl; + +import io.sc.engine.rule.client.Executor; +import io.sc.engine.rule.client.runtime.EngineRuntime; +import io.sc.engine.rule.client.runtime.impl.java.JavaEngineService; +import io.sc.engine.rule.client.runtime.impl.java.JavaEngineServiceImpl; +import io.sc.engine.rule.core.ExecuteResult; +import io.sc.engine.rule.core.code.*; +import io.sc.engine.rule.core.code.generator.JavaSourceCodeGenerator; +import io.sc.engine.rule.core.po.lib.Lib; +import io.sc.engine.rule.core.po.resource.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +public class JavaEngineRuntime extends EngineRuntime { + private static final Logger log = LoggerFactory.getLogger(GroovyEngineRuntime.class); + private static JavaEngineRuntime instance =new JavaEngineRuntime(); + private JavaEngineService service =new JavaEngineServiceImpl(); + private SourceCodeGenerator generator =new JavaSourceCodeGenerator(); + + private JavaEngineRuntime() {} + + public static JavaEngineRuntime getInstance() { + return instance; + } + + @Override + public void compile(String resourceId, ExecuteUnit executeUnit) throws Exception { + SourceCode code = generator.generate(resourceId, executeUnit); + String resourceName =null; + if("RESOURCE".equals(executeUnit.getType())){ + ExecuteUnit4Resource _wrapper =(ExecuteUnit4Resource)executeUnit; + Resource resource =_wrapper.getResource(); + resourceName =resource.getName(); + }else if("LIB".equals(executeUnit.getType())) { + ExecuteUnit4Lib _wrapper =(ExecuteUnit4Lib)executeUnit; + Lib lib =_wrapper.getLib(); + resourceName =lib.getName(); + } + try { + service.validate(code); + } catch (Exception e) { + log.error("Compile Error for " + resourceName + "(resourceId=" + resourceId + ")",e); + throw e; + } + } + + @Override + public void compile(String resourceCode, Integer version, ExecuteUnit executeUnit) throws Exception { + SourceCode code = generator.generate(resourceCode, version, executeUnit); + String resourceName =null; + if("RESOURCE".equals(executeUnit.getType())){ + ExecuteUnit4Resource _wrapper =(ExecuteUnit4Resource)executeUnit; + Resource resource =_wrapper.getResource(); + resourceName =resource.getName(); + }else if("LIB".equals(executeUnit.getType())) { + ExecuteUnit4Lib _wrapper =(ExecuteUnit4Lib)executeUnit; + Lib lib =_wrapper.getLib(); + resourceName =lib.getName(); + } + try { + service.validate(code); + } catch (Exception e) { + log.error("Compile Error for " + resourceName + "(code=" + resourceCode + ",verion=" + version + ")",e); + } + } + + @Override + public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String json) throws Exception { + SourceCode code =null; + if(StringUtils.hasText(executeUnit.getSourceCode())){ + code =new SourceCode(); + code.setPackageName(executeUnit.getPackageName()); + code.setClassName(executeUnit.getClassName()); + code.setSource(executeUnit.getSourceCode()); + }else { + code = generator.generate(resourceId, executeUnit); + } + if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,null,json)); + result.setExecuteUnit(executeUnit); + return result; + } + + @Override + public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, Map map) throws Exception { + SourceCode code =null; + if(StringUtils.hasText(executeUnit.getSourceCode())){ + code =new SourceCode(); + code.setPackageName(executeUnit.getPackageName()); + code.setClassName(executeUnit.getClassName()); + code.setSource(executeUnit.getSourceCode()); + }else { + code = generator.generate(resourceId, executeUnit); + } + if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,null,map)); + result.setExecuteUnit(executeUnit); + return result; + } + + @Override + public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String subModelCode, String json) throws Exception { + SourceCode code =null; + if(StringUtils.hasText(executeUnit.getSourceCode())){ + code =new SourceCode(); + code.setPackageName(executeUnit.getPackageName()); + code.setClassName(executeUnit.getClassName()); + code.setSource(executeUnit.getSourceCode()); + }else { + code = generator.generate(resourceId, executeUnit); + } + if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,subModelCode,json)); + result.setExecuteUnit(executeUnit); + return result; + } + + @Override + public ExecuteResult execute(Executor executor, String resourceId, ExecuteUnit executeUnit, String subModelCode, Map map) throws Exception { + SourceCode code =null; + if(StringUtils.hasText(executeUnit.getSourceCode())){ + code =new SourceCode(); + code.setPackageName(executeUnit.getPackageName()); + code.setClassName(executeUnit.getClassName()); + code.setSource(executeUnit.getSourceCode()); + }else { + code = generator.generate(resourceId, executeUnit); + } + if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,subModelCode,map)); + result.setExecuteUnit(executeUnit); + return result; + } + + @Override + public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String json) throws Exception { + SourceCode code =null; + if(StringUtils.hasText(executeUnit.getSourceCode())){ + code =new SourceCode(); + code.setPackageName(executeUnit.getPackageName()); + code.setClassName(executeUnit.getClassName()); + code.setSource(executeUnit.getSourceCode()); + }else { + code = generator.generate(resourceCode,version,executeUnit); + } + if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,null,json)); + result.setExecuteUnit(executeUnit); + return result; + } + + @Override + public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, Map map) throws Exception { + SourceCode code =null; + if(StringUtils.hasText(executeUnit.getSourceCode())){ + code =new SourceCode(); + code.setPackageName(executeUnit.getPackageName()); + code.setClassName(executeUnit.getClassName()); + code.setSource(executeUnit.getSourceCode()); + }else { + code = generator.generate(resourceCode,version,executeUnit); + } + if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,null,map)); + result.setExecuteUnit(executeUnit); + return result; + } + + @Override + public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String subModelCode, String json) throws Exception { + SourceCode code =null; + if(StringUtils.hasText(executeUnit.getSourceCode())){ + code =new SourceCode(); + code.setPackageName(executeUnit.getPackageName()); + code.setClassName(executeUnit.getClassName()); + code.setSource(executeUnit.getSourceCode()); + }else { + code = generator.generate(resourceCode,version,executeUnit); + } + if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,subModelCode,json)); + result.setExecuteUnit(executeUnit); + return result; + } + + @Override + public ExecuteResult execute(Executor executor, String resourceCode, Integer version, ExecuteUnit executeUnit, String subModelCode, Map map) throws Exception { + SourceCode code =null; + if(StringUtils.hasText(executeUnit.getSourceCode())){ + code =new SourceCode(); + code.setPackageName(executeUnit.getPackageName()); + code.setClassName(executeUnit.getClassName()); + code.setSource(executeUnit.getSourceCode()); + }else { + code = generator.generate(resourceCode,version,executeUnit); + } + if(log.isDebugEnabled()) {log.debug("generated groovy source code:\n{}",code.getSource());} + ExecuteResult result =(ExecuteResult)service.eval(code, "INPUT_PARAMETER", prepareParameter(executor,subModelCode,map)); + result.setExecuteUnit(executeUnit); + return result; + } + + private Map prepareParameter(Executor executor,String subModelCode, Object argument){ + Map parameter =new HashMap(2); + parameter.put("executor", executor); + parameter.put("subModelCode", subModelCode); + parameter.put("argument", argument); + return parameter; + } +} diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptEngineService.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptEngineService.java index 353d699b..68988afa 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptEngineService.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptEngineService.java @@ -3,6 +3,7 @@ package io.sc.engine.rule.client.runtime.impl.groovy; import java.util.Map; import groovy.lang.Binding; +import io.sc.engine.rule.core.code.SourceCode; /** * Groovy 脚本执行引擎服务 @@ -10,81 +11,81 @@ import groovy.lang.Binding; public interface GroovyScriptEngineService { /** * 对脚本进行语法验证 - * @param script 需要验证的脚本内容 + * @param sourceCode 需要验证的源代码 * @return 是否验证通过 * @throws Exception 违例 */ - public boolean validate(String script) throws Exception; + public boolean validate(SourceCode sourceCode) throws Exception; /** * 执行脚本 - * @param script 脚本内容 + * @param sourceCode 需要验证的源代码 * @return 执行后的单值结果 * @throws Exception 违例 */ - public Object eval(String script) throws Exception; + public Object eval(SourceCode sourceCode) throws Exception; /** * 执行脚本 - * @param script 脚本内容 + * @param sourceCode 需要验证的源代码 * @param key 传入的单值参数名称 * @param value 传入的单值参数值 * @return 执行后的单值结果 * @throws Exception 违例 */ - public Object eval(String script, String key, Object value) throws Exception; + public Object eval(SourceCode sourceCode, String key, Object value) throws Exception; /** * 执行脚本 - * @param script 脚本内容 + * @param sourceCode 需要验证的源代码 * @param context 传入参数集合 * @return 执行后的单值结果 * @throws Exception 违例 */ - public Object eval(String script, Map context) throws Exception; + public Object eval(SourceCode sourceCode, Map context) throws Exception; /** * 执行脚本 - * @param script 脚本内容 + * @param sourceCode 需要验证的源代码 * @param binding 传入参数 groovy binding 对象 * @return 执行后的单值结果 * @throws Exception 违例 */ - public Object eval(String script, Binding binding) throws Exception; + public Object eval(SourceCode sourceCode, Binding binding) throws Exception; /** * 执行脚本 - * @param script 脚本内容 + * @param sourceCode 需要验证的源代码 * @return 执行后的多值结果 * @throws Exception 违例 */ - public Map execute(String script) throws Exception; + public Map execute(SourceCode sourceCode) throws Exception; /** * 执行脚本 - * @param script 脚本内容 + * @param sourceCode 需要验证的源代码 * @param key 传入的单值参数名称 * @param value 传入的单值参数值 * @return 执行后的多值结果 * @throws Exception 违例 */ - public Map execute(String script, String key, Object value) throws Exception; + public Map execute(SourceCode sourceCode, String key, Object value) throws Exception; /** * 执行脚本 - * @param script 脚本内容 + * @param sourceCode 需要验证的源代码 * @param context 传入参数集合 * @return 执行后的多值结果 * @throws Exception 违例 */ - public Map execute(String script, Map context) throws Exception; + public Map execute(SourceCode sourceCode, Map context) throws Exception; /** * 执行脚本 - * @param script 脚本内容 + * @param sourceCode 需要验证的源代码 * @param binding 传入参数 groovy binding 对象 * @return 执行后的多值结果 * @throws Exception 违例 */ - public Map execute(String script, Binding binding) throws Exception; + public Map execute(SourceCode sourceCode, Binding binding) throws Exception; } diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptEngineServiceImpl.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptEngineServiceImpl.java index de1dab26..6d47c7dd 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptEngineServiceImpl.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptEngineServiceImpl.java @@ -3,52 +3,53 @@ package io.sc.engine.rule.client.runtime.impl.groovy; import java.util.Map; import groovy.lang.Binding; +import io.sc.engine.rule.core.code.SourceCode; public class GroovyScriptEngineServiceImpl implements GroovyScriptEngineService{ private GroovyScriptExecutor engine =new GroovyScriptExecutor(); - + @Override - public boolean validate(String script) throws Exception { - return engine.validate(script); + public boolean validate(SourceCode sourceCode) throws Exception { + return engine.validate(sourceCode.getSource()); } @Override - public Object eval(String script) throws Exception { - return engine.eval(script); + public Object eval(SourceCode sourceCode) throws Exception { + return engine.eval(sourceCode.getSource()); } @Override - public Object eval(String script, String key, Object value) throws Exception { - return engine.eval(script,key,value); + public Object eval(SourceCode sourceCode, String key, Object value) throws Exception { + return engine.eval(sourceCode.getSource(),key,value); } @Override - public Object eval(String script, Map context) throws Exception { - return engine.eval(script,context); + public Object eval(SourceCode sourceCode, Map context) throws Exception { + return engine.eval(sourceCode.getSource(),context); } @Override - public Object eval(String script, Binding binding) throws Exception { - return engine.eval(script,binding); + public Object eval(SourceCode sourceCode, Binding binding) throws Exception { + return engine.eval(sourceCode.getSource(),binding); } @Override - public Map execute(String script) throws Exception { - return engine.execute(script); + public Map execute(SourceCode sourceCode) throws Exception { + return engine.execute(sourceCode.getSource()); } @Override - public Map execute(String script, String key, Object value) throws Exception { - return engine.execute(script,key,value); + public Map execute(SourceCode sourceCode, String key, Object value) throws Exception { + return engine.execute(sourceCode.getSource(),key,value); } @Override - public Map execute(String script, Map context) throws Exception { - return engine.execute(script,context); + public Map execute(SourceCode sourceCode, Map context) throws Exception { + return engine.execute(sourceCode.getSource(),context); } @Override - public Map execute(String script, Binding binding) throws Exception { - return engine.execute(script,binding); + public Map execute(SourceCode sourceCode, Binding binding) throws Exception { + return engine.execute(sourceCode.getSource(),binding); } } diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptExecutor.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptExecutor.java index a3741265..99ee0555 100644 --- a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptExecutor.java +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/groovy/GroovyScriptExecutor.java @@ -192,7 +192,7 @@ public class GroovyScriptExecutor { * @return 编译后的脚本对象 * @throws Exception 违例 */ - private CompiledScript getCompiledScript(String script) throws Exception{ + public CompiledScript getCompiledScript(String script) throws Exception{ if(script!=null && !"".equals(script.trim())){ return compilableEngine.compile(script); } diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/java/JavaEngineService.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/java/JavaEngineService.java new file mode 100644 index 00000000..99943890 --- /dev/null +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/java/JavaEngineService.java @@ -0,0 +1,46 @@ +package io.sc.engine.rule.client.runtime.impl.java; + +import groovy.lang.Binding; +import io.sc.engine.rule.core.code.SourceCode; + +import java.util.Map; + +/** + * Java 执行引擎服务 + */ +public interface JavaEngineService { + /** + * 对脚本进行语法验证 + * @param sourceCode 需要验证的源代码 + * @return 是否验证通过 + * @throws Exception 违例 + */ + public boolean validate(SourceCode sourceCode) throws Exception; + + /** + * 执行脚本 + * @param sourceCode 需要验证的源代码 + * @return 执行后的单值结果 + * @throws Exception 违例 + */ + public Object eval(SourceCode sourceCode) throws Exception; + + /** + * 执行脚本 + * @param sourceCode 需要验证的源代码 + * @param key 传入的单值参数名称 + * @param value 传入的单值参数值 + * @return 执行后的单值结果 + * @throws Exception 违例 + */ + public Object eval(SourceCode sourceCode, String key, Object value) throws Exception; + + /** + * 执行脚本 + * @param sourceCode 需要验证的源代码 + * @param context 传入参数集合 + * @return 执行后的单值结果 + * @throws Exception 违例 + */ + public Object eval(SourceCode sourceCode, Map context) throws Exception; +} diff --git a/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/java/JavaEngineServiceImpl.java b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/java/JavaEngineServiceImpl.java new file mode 100644 index 00000000..842ce952 --- /dev/null +++ b/io.sc.engine.rule.client/src/main/java/io/sc/engine/rule/client/runtime/impl/java/JavaEngineServiceImpl.java @@ -0,0 +1,62 @@ +package io.sc.engine.rule.client.runtime.impl.java; + +import io.sc.engine.rule.core.code.SourceCode; +import io.sc.platform.core.DirectoryManager; +import io.sc.platform.util.FileUtil; +import io.sc.platform.util.compiler.file.FileJavaCompiler; +import io.sc.platform.util.compiler.memory.JavaCompileException; +import io.sc.platform.util.compiler.memory.MemoryJavaCompiler; + +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class JavaEngineServiceImpl implements JavaEngineService { + private static final String targetDir =DirectoryManager.getInstance().getByName("dir.engine.rule.compiler"); + private Map classLoaderMap =new ConcurrentHashMap<>(); + + @Override + public boolean validate(SourceCode sourceCode) throws Exception { + MemoryJavaCompiler engine = new MemoryJavaCompiler(); + engine.compile(sourceCode.getQualifiedClassName(), sourceCode.getSource()); + return true; + } + + @Override + public Object eval(SourceCode sourceCode) throws Exception { + return getMethod(sourceCode).invoke(null,new HashMap()); + } + + @Override + public Object eval(SourceCode sourceCode, String key, Object value) throws Exception { + return getMethod(sourceCode).invoke(null,value); + } + + @Override + public Object eval(SourceCode sourceCode, Map context) throws Exception { + return getMethod(sourceCode).invoke(null,context); + } + + private Method getMethod(SourceCode sourceCode) throws Exception { + URLClassLoader classLoader =classLoaderMap.get(sourceCode.getSource()); + if(classLoader==null){ + classLoader =compile(sourceCode); + classLoaderMap.put(sourceCode.getSource(),classLoader); + } + Class clazz =classLoader.loadClass(sourceCode.getQualifiedClassName()); + return clazz.getDeclaredMethod("execute",Map.class); + } + + private URLClassLoader compile(SourceCode sourceCode) throws JavaCompileException, IOException { + String outputDir =targetDir + "/" + sourceCode.getClassName() + "/"; + FileUtil.deldirs(outputDir); + FileJavaCompiler fileJavaCompiler =new FileJavaCompiler(); + fileJavaCompiler.compile(sourceCode.getQualifiedClassName(),sourceCode.getSource(),outputDir); + return new URLClassLoader(new URL[]{ new URL("file",null,outputDir) }); + } +} diff --git a/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/directories.json b/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/directories.json new file mode 100644 index 00000000..db91dfec --- /dev/null +++ b/io.sc.engine.rule.client/src/main/resources/META-INF/platform/plugins/directories.json @@ -0,0 +1,3 @@ +[ + {"name":"dir.engine.rule.compiler","path":"/work/engine/rule/compiler","autoCreate":true} +] diff --git a/io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/client/test/Test.java b/io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/client/test/Test.java index 172ddce2..1450823a 100644 --- a/io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/client/test/Test.java +++ b/io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/client/test/Test.java @@ -2,9 +2,9 @@ package io.sc.engine.rule.client.test; import io.sc.engine.rule.client.Executor; import io.sc.engine.rule.client.ExecutorBuilder; -import io.sc.engine.rule.client.ExecutorFactory; import io.sc.engine.rule.client.enums.ExecutorMode; import io.sc.engine.rule.client.enums.LoaderMode; +import io.sc.engine.rule.client.enums.GeneratorType; import io.sc.engine.rule.core.ExecuteResult; import io.sc.engine.rule.core.ParameterResult; import io.sc.platform.util.TimeMonitor; @@ -14,22 +14,22 @@ import java.util.List; import java.util.Map; public class Test { - private static final ExecutorMode executorMode =ExecutorMode.LOCAL; //执行器模式 + private static final ExecutorMode executorMode =ExecutorMode.REMOTE; //执行器模式 private static final LoaderMode loaderMode =LoaderMode.REMOTE; //模型定义加载器模式 + private static final GeneratorType generatorType =GeneratorType.JAVA; private static final String MODEL_API_URL ="http://localhost:8080"; //远程模型引擎 API URL 地址 - private static final String MODEL_CODE ="M1734933657323"; //需要执行的模型代码 - private static final Integer MODEL_VERSION =1; //需要执行的模型版本 + private static final String MODEL_CODE ="M1734935254414"; //需要执行的模型代码 + private static final Integer MODEL_VERSION =null; //需要执行的模型版本 private static final int COUNT =1; //需要执行的次数 private static TimeMonitor tracer =new TimeMonitor(); //创建一个时间跟踪器，用于跟踪执行时间，在生产环境中不要这样做 public static void main(String[] args) throws Exception{ //创建执行器(本地执行，远程获取模型定义) - Executor executor =new ExecutorBuilder().build(executorMode, loaderMode, MODEL_API_URL); + Executor executor =new ExecutorBuilder().build(executorMode, loaderMode, MODEL_API_URL, generatorType); //准备模型参数 Map data =new HashMap(); - data.put("P1734933744702", 0.03);//资产负债率(上期),小数 - data.put("P1734933770426", 0.04);//资产负债率(本期),小数 + data.put("P1734935434896", 1);//资产负债率(上期),小数 //调用模型 tracer.info("starting executeByCode ..."); diff --git a/io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/client/test/Test2.java b/io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/client/test/Test2.java new file mode 100644 index 00000000..b42a1258 --- /dev/null +++ b/io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/client/test/Test2.java @@ -0,0 +1,50 @@ +package io.sc.engine.rule.client.test; + +import io.sc.platform.util.FileUtil; +import io.sc.platform.util.ObjectMapperUtil; +import io.sc.platform.util.compiler.file.FileJavaCompiler; + +import java.io.File; +import java.io.FileInputStream; +import java.lang.reflect.Method; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class Test2 { + private static final String outputDir ="/Users/wangshaoping/Desktop/class"; + private static final String[] scriptUrls =new String[]{ + "/Users/wangshaoping/wspsc/workspace/wangshaoping/v8/platform/io.sc.engine.rule.client/src/test/java/io/sc/engine/rule/generated/M1734935254414_V1.java" + }; + + public static void main(String[] args) throws Exception { + for(int i=0;i data(){ + Map result =new HashMap<>(); + Map argument =new HashMap<>(); + argument.put("P1734935434896","1"); + result.put("subModelCode","XX"); + result.put("argument",argument); + return result; + } +} diff --git a/io.sc.engine.rule.client/src/test/resources/logback-test.xml b/io.sc.engine.rule.client/src/test/resources/logback-test.xml index 26d4512f..671b01e1 100644 --- a/io.sc.engine.rule.client/src/test/resources/logback-test.xml +++ b/io.sc.engine.rule.client/src/test/resources/logback-test.xml @@ -6,7 +6,7 @@ - + diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/ExecuteResult.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/ExecuteResult.java index 8c8384cb..29c67dea 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/ExecuteResult.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/ExecuteResult.java @@ -1,11 +1,13 @@ package io.sc.engine.rule.core; +import io.sc.engine.rule.core.code.ExecuteUnit; import io.sc.engine.rule.core.enums.ParameterType; import java.util.ArrayList; import java.util.List; public class ExecuteResult { + private ExecuteUnit executeUnit; private ValidateResult validateResult; private List data =new ArrayList(); @@ -57,6 +59,12 @@ public class ExecuteResult { return null; } + public ExecuteUnit getExecuteUnit() { + return executeUnit; + } + public void setExecuteUnit(ExecuteUnit executeUnit) { + this.executeUnit = executeUnit; + } public ValidateResult getValidateResult() { return validateResult; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/ParameterResult.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/ParameterResult.java index 943d1a8b..6a6c188b 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/ParameterResult.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/ParameterResult.java @@ -1,6 +1,7 @@ package io.sc.engine.rule.core; import io.sc.engine.rule.core.enums.ParameterType; +import io.sc.engine.rule.core.util.ValueTypeUtil; import java.math.BigDecimal; import java.math.RoundingMode; @@ -53,7 +54,7 @@ public class ParameterResult { this.valueScale =valueScale; this.valueRoundingMode =valueRoundingMode; this.value =value; - if(BigDecimal.class.getName().equals(valueType)) { + if(ValueTypeUtil.isDecimal(valueType)){ if(value!=null && !"".equals(value.trim())) { BigDecimal _value =new BigDecimal(value); if(valueScale!=null && valueRoundingMode!=null) { diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit.java index 20ad5b76..2bcd8b4a 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit.java @@ -20,8 +20,13 @@ public abstract class ExecuteUnit { protected List functions; //自定义函数 public abstract String getType(); + public abstract String getClassName(); public abstract void optimize(); + public String getPackageName(){ + return "io.sc.engine.rule.generated"; + } + public String getSourceCode() { return sourceCode; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit4Lib.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit4Lib.java index fc26bafe..32ec64a5 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit4Lib.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit4Lib.java @@ -12,6 +12,11 @@ public class ExecuteUnit4Lib extends ExecuteUnit { return "LIB"; } + @Override + public String getClassName() { + return lib.getCode() + "_V" + lib.getVersion(); + } + @Override public void optimize() { diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit4Resource.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit4Resource.java index e1a62f65..ca5c7cab 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit4Resource.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/ExecuteUnit4Resource.java @@ -2,22 +2,34 @@ package io.sc.engine.rule.core.code; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import io.sc.engine.rule.core.enums.DictionaryType; +import io.sc.engine.rule.core.enums.EnumDictionaryItemValueType; +import io.sc.engine.rule.core.enums.ParameterType; +import io.sc.engine.rule.core.po.dictionary.Dictionary; +import io.sc.engine.rule.core.po.dictionary.EnumDictionary; +import io.sc.engine.rule.core.po.dictionary.EnumItem; +import io.sc.engine.rule.core.po.function.Function; import io.sc.engine.rule.core.po.lib.Indicator; import io.sc.engine.rule.core.po.lib.IndicatorLib; import io.sc.engine.rule.core.po.lib.IndicatorProcessor; import io.sc.engine.rule.core.po.lib.Lib; import io.sc.engine.rule.core.po.model.Model; import io.sc.engine.rule.core.po.model.Parameter; +import io.sc.engine.rule.core.po.model.ParameterInOptionItem; +import io.sc.engine.rule.core.po.model.ParameterProcessor; +import io.sc.engine.rule.core.po.model.parameter.InOptionParameter; import io.sc.engine.rule.core.po.model.parameter.IndicatorParameter; import io.sc.engine.rule.core.po.resource.ModelResource; import io.sc.engine.rule.core.po.resource.Resource; import io.sc.engine.rule.core.util.PlaceHolder; import io.sc.platform.util.ObjectMapperUtil; +import org.springframework.util.StringUtils; import java.util.*; @JsonPropertyOrder({"type","resource","libs","dictionaries","functions"}) -public class ExecuteUnit4Resource extends ExecuteUnit{ +public class ExecuteUnit4Resource extends ExecuteUnit { protected Resource resource; //资源 protected List libs; //指标库 @@ -26,6 +38,11 @@ public class ExecuteUnit4Resource extends ExecuteUnit{ return "RESOURCE"; } + @Override + public String getClassName() { + return resource.getCode() + "_V" + resource.getVersion(); + } + public Resource getResource() { return resource; } @@ -42,8 +59,85 @@ public class ExecuteUnit4Resource extends ExecuteUnit{ this.libs = libs; } + static class NameAndValue { + private String name; + private String value; + } + + public void replaceParameterPropertiesEnum() throws JsonProcessingException { + if(resource instanceof ModelResource) { + ModelResource modelResource = (ModelResource) resource; + Model model = modelResource.getModel(); + List parameters = model.getAllParameters(); + if (parameters == null || parameters.isEmpty()) { + return; + } + for(Parameter parameter : parameters){ + if(!StringUtils.hasText(parameter.getProperties())) { continue; } + List nameAndValues =ObjectMapperUtil.json().readValue(parameter.getProperties(), new TypeReference>() {}); + if(nameAndValues==null || nameAndValues.isEmpty()) { continue; } + for(NameAndValue nameAndValue : nameAndValues){ + PlaceHolder placeHolder =PlaceHolder.extract(nameAndValue.value); + Set enumRefs =placeHolder.getEnumRefs(); + if(enumRefs==null || enumRefs.isEmpty()) { continue; } + for(String enumRef : enumRefs){ + String enumValue =findEnumValue(enumRef); + if(!StringUtils.hasText(enumValue)){ continue; } + nameAndValue.value =nameAndValue.value.replace("#{" + enumRef.replace(".","}.#{") + "}",enumValue); + } + } + parameter.setProperties(ObjectMapperUtil.json().writeValueAsString(nameAndValues)); + + // 处理选项参数的选项 + if(ParameterType.IN_OPTION.equals(parameter.getType())){ + InOptionParameter inOptionParameter =(InOptionParameter)parameter; + List items =inOptionParameter.getOptions(); + if(items==null || items.isEmpty()) { continue; } + for(ParameterInOptionItem item : items){ + PlaceHolder placeHolder =PlaceHolder.extract(item.getConfig()); + Set enumRefs =placeHolder.getEnumRefs(); + if(enumRefs==null || enumRefs.isEmpty()) { continue; } + for(String enumRef : enumRefs){ + String enumValue =findEnumValue(enumRef); + if(!StringUtils.hasText(enumValue)){ continue; } + item.setConfig(item.getConfig().replace("#{" + enumRef.replace(".","}.#{") + "}",enumValue)); + } + } + } + } + } + } + + private String findEnumValue(String enumName) { + if(!StringUtils.hasText(enumName)){ return null; } + String[] splits =enumName.split("\\."); + if(splits==null || splits.length!=2) { return null; } + if(dictionaries==null || dictionaries.isEmpty()) { return null; } + for(Dictionary dictionary : dictionaries){ + if(DictionaryType.ENUM.equals(dictionary.getType())){ + EnumDictionary enumDictionary =(EnumDictionary)dictionary; + String enumVarName =enumDictionary.getCode() + "_V" + enumDictionary.getVersion(); + if(enumVarName.equals(splits[0])){ + List items =enumDictionary.getItems(); + if(items==null || items.isEmpty()) { return null; } + for(EnumItem item : items){ + if(item.getCode().equals(splits[1])){ + if(EnumDictionaryItemValueType.STRING.equals(item.getValueType())) { + return "\"" + item.getValue() + "\""; + }else{ + return item.getValue(); + } + } + } + } + } + } + return null; + } + public void optimize(){ optimizeLibs(); + optimizeFunctions(); } private void optimizeLibs(){ @@ -80,6 +174,33 @@ public class ExecuteUnit4Resource extends ExecuteUnit{ } } + private void optimizeFunctions() { +// Set functionNames =new HashSet<>(); +// ModelResource modelResource =(ModelResource) resource; +// Model model =modelResource.getModel(); +// List parameters =model.getAllParameters(); +// if(parameters==null || parameters.isEmpty()){ +// return; +// } +// for(Parameter parameter : parameters){ +// List processors =parameter.getProcessors(); +// if(processors==null || processors.isEmpty()) { continue; } +// for(ParameterProcessor processor : processors){ +// PlaceHolder placeHolder =processor.extractPlaceHolder(); +// functionNames.addAll(placeHolder.getEnumRefs()); +// } +// } +// +// List neededFunctions =new ArrayList<>(); +// for(Function function : this.functions){ +// String name =function.getName(); +// if(functionNames.contains(name)){ +// neededFunctions.add(function); +// } +// } +// this.setFunctions(neededFunctions); + } + private IndicatorLib findLib(String code, Integer version){ if(libs==null && libs.isEmpty()){ return null; } for(Lib lib : libs) { diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/SourceCode.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/SourceCode.java index bfa81625..5a8b3f86 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/SourceCode.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/SourceCode.java @@ -8,6 +8,10 @@ public class SourceCode { private String source; //类源代码 public SourceCode() {} + + public SourceCode(String source) { + this.source =source; + } public SourceCode(String packageName,String className,String source) { this.packageName =packageName; diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/SourceCodeGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/SourceCodeGenerator.java index 81def6c3..a6dde23b 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/SourceCodeGenerator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/SourceCodeGenerator.java @@ -2,6 +2,8 @@ package io.sc.engine.rule.core.code; public interface SourceCodeGenerator { + public String getPackageName(ExecuteUnit executeUnit); + public String getClassName(ExecuteUnit executeUnit); public SourceCode generate(ExecuteUnit executeUnit) throws Exception; public SourceCode generate(String resourceId,ExecuteUnit executeUnit) throws Exception; public SourceCode generate(String resourceCode,Integer version,ExecuteUnit executeUnit) throws Exception; diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/ExecuteUnit4LibGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovyExecuteUnit4LibGenerator.java similarity index 93% rename from io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/ExecuteUnit4LibGenerator.java rename to io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovyExecuteUnit4LibGenerator.java index 0f772519..89de4889 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/ExecuteUnit4LibGenerator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovyExecuteUnit4LibGenerator.java @@ -13,11 +13,11 @@ import io.sc.engine.rule.core.util.IdReplacer; import java.util.HashMap; import java.util.Map; -public class ExecuteUnit4LibGenerator extends ExecuteUnitGenerator { +public class GroovyExecuteUnit4LibGenerator extends ExecuteUnitGenerator { private static final String template_location = "/io/sc/engine/rule/core/code/template/impl/lib.tpl"; private ExecuteUnit4Lib executeUnit; - public ExecuteUnit4LibGenerator(ExecuteUnit4Lib executeUnit) { + public GroovyExecuteUnit4LibGenerator(ExecuteUnit4Lib executeUnit) { this.executeUnit =executeUnit; } @@ -38,6 +38,7 @@ public class ExecuteUnit4LibGenerator extends ExecuteUnitGenerator { //engine.addSharedStaticMethod(ExpressionReplacer.class); // + engine.addSharedObject("generatorType","Groovy"); engine.addSharedObject("DictionaryGenerator",new DictionaryGenerator()); engine.addSharedObject("ParameterGenerator",new ParameterGenerator()); engine.addSharedObject("IndicatorGenerator",new IndicatorGenerator()); diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/ExecuteUnit4ResourceGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovyExecuteUnit4ResourceGenerator.java similarity index 93% rename from io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/ExecuteUnit4ResourceGenerator.java rename to io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovyExecuteUnit4ResourceGenerator.java index ee5ce0f6..7d0e150a 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/ExecuteUnit4ResourceGenerator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovyExecuteUnit4ResourceGenerator.java @@ -14,11 +14,11 @@ import io.sc.engine.rule.core.util.IdReplacer; import java.util.HashMap; import java.util.Map; -public class ExecuteUnit4ResourceGenerator extends ExecuteUnitGenerator { +public class GroovyExecuteUnit4ResourceGenerator extends ExecuteUnitGenerator { private static final String template_location = "/io/sc/engine/rule/core/code/template/impl/resource.tpl"; private ExecuteUnit4Resource executeUnit; - public ExecuteUnit4ResourceGenerator(ExecuteUnit4Resource executeUnit) { + public GroovyExecuteUnit4ResourceGenerator(ExecuteUnit4Resource executeUnit) { this.executeUnit =executeUnit; Resource resource =executeUnit.getResource(); if(resource instanceof ModelResource){ @@ -44,6 +44,7 @@ public class ExecuteUnit4ResourceGenerator extends ExecuteUnitGenerator { //engine.addSharedStaticMethod(ExpressionReplacer.class); // + engine.addSharedObject("generatorType","Groovy"); engine.addSharedObject("DictionaryGenerator",new DictionaryGenerator()); engine.addSharedObject("ParameterGenerator",new ParameterGenerator()); engine.addSharedObject("IndicatorGenerator",new IndicatorGenerator()); diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovySourceCodeGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovySourceCodeGenerator.java index 35b72409..9f8436cc 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovySourceCodeGenerator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/GroovySourceCodeGenerator.java @@ -3,13 +3,37 @@ package io.sc.engine.rule.core.code.generator; import io.sc.engine.rule.core.code.*; public class GroovySourceCodeGenerator implements SourceCodeGenerator { + @Override + public String getPackageName(ExecuteUnit executeUnit) { + if(executeUnit instanceof ExecuteUnit4Resource){ + ExecuteUnitGenerator generator =new GroovyExecuteUnit4ResourceGenerator((ExecuteUnit4Resource)executeUnit); + return generator.getPackageName(); + }else if(executeUnit instanceof ExecuteUnit4Lib){ + ExecuteUnitGenerator generator =new GroovyExecuteUnit4LibGenerator((ExecuteUnit4Lib)executeUnit); + return generator.getPackageName(); + } + return null; + } + + @Override + public String getClassName(ExecuteUnit executeUnit) { + if(executeUnit instanceof ExecuteUnit4Resource){ + ExecuteUnitGenerator generator =new GroovyExecuteUnit4ResourceGenerator((ExecuteUnit4Resource)executeUnit); + return generator.getClassName(); + }else if(executeUnit instanceof ExecuteUnit4Lib){ + ExecuteUnitGenerator generator =new GroovyExecuteUnit4LibGenerator((ExecuteUnit4Lib)executeUnit); + return generator.getClassName(); + } + return null; + } + @Override public SourceCode generate(ExecuteUnit executeUnit) throws Exception { if(executeUnit instanceof ExecuteUnit4Resource){ - ExecuteUnitGenerator generator =new ExecuteUnit4ResourceGenerator((ExecuteUnit4Resource)executeUnit); + ExecuteUnitGenerator generator =new GroovyExecuteUnit4ResourceGenerator((ExecuteUnit4Resource)executeUnit); return generator.generateSourceCode(); }else if(executeUnit instanceof ExecuteUnit4Lib){ - ExecuteUnitGenerator generator =new ExecuteUnit4LibGenerator((ExecuteUnit4Lib)executeUnit); + ExecuteUnitGenerator generator =new GroovyExecuteUnit4LibGenerator((ExecuteUnit4Lib)executeUnit); return generator.generateSourceCode(); } return null; diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaExecuteUnit4LibGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaExecuteUnit4LibGenerator.java new file mode 100644 index 00000000..3996655d --- /dev/null +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaExecuteUnit4LibGenerator.java @@ -0,0 +1,67 @@ +package io.sc.engine.rule.core.code.generator; + + +import com.jfinal.template.Engine; +import com.jfinal.template.Template; +import io.sc.engine.rule.core.code.ExecuteUnit4Lib; +import io.sc.engine.rule.core.code.generator.impl.DictionaryGenerator; +import io.sc.engine.rule.core.code.generator.impl.IndicatorGenerator; +import io.sc.engine.rule.core.code.generator.impl.ParameterGenerator; +import io.sc.engine.rule.core.code.generator.impl.processor.*; +import io.sc.engine.rule.core.util.IdReplacer; + +import java.util.HashMap; +import java.util.Map; + +public class JavaExecuteUnit4LibGenerator extends ExecuteUnitGenerator { + private static final String template_location = "/io/sc/engine/rule/core/code/java/template/impl/lib.tpl"; + private ExecuteUnit4Lib executeUnit; + + public JavaExecuteUnit4LibGenerator(ExecuteUnit4Lib executeUnit) { + this.executeUnit =executeUnit; + } + + @Override + public String getClassName() { + return IdReplacer.className(executeUnit.getLib().getCode(),executeUnit.getLib().getVersion()); + } + + @Override + public String generate() throws Exception { + Engine engine = new Engine(Engine.MAIN_ENGINE_NAME); + engine.setDevMode(true); + engine.setToClassPathSourceFactory(); + engine.setStaticFieldExpression(true); + engine.setStaticMethodExpression(true); + + engine.addSharedStaticMethod(IdReplacer.class); + //engine.addSharedStaticMethod(ExpressionReplacer.class); + + // + engine.addSharedObject("generatorType","Java"); + engine.addSharedObject("DictionaryGenerator",new DictionaryGenerator()); + engine.addSharedObject("ParameterGenerator",new ParameterGenerator()); + engine.addSharedObject("IndicatorGenerator",new IndicatorGenerator()); + + engine.addSharedObject("Arithmetic",new Arithmetic()); + engine.addSharedObject("ConditionRange",new ConditionRange()); + engine.addSharedObject("DecisionTable",new DecisionTable()); + engine.addSharedObject("DecisionTable2C",new DecisionTable2C()); + engine.addSharedObject("DecisionTree",new DecisionTree()); + engine.addSharedObject("ExecutionFlow",new ExecutionFlow()); + engine.addSharedObject("MathFormula",new MathFormula()); + engine.addSharedObject("NumberRange",new NumberRange()); + engine.addSharedObject("ObjectProperty",new ObjectProperty()); + engine.addSharedObject("OptionValue",new OptionValue()); + engine.addSharedObject("SqlFieldMapping",new SqlFieldMapping()); + engine.addSharedObject("HttpRequest",new HttpRequest()); + engine.addSharedObject("Ternary",new Ternary()); + engine.addSharedObject("WhenThen",new WhenThen()); + + Map data =new HashMap<>(); + data.put("packageName",this.getPackageName()); + data.put("executeUnit",executeUnit); + Template template =engine.getTemplate(template_location); + return template.renderToString(data).trim(); + } +} diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaExecuteUnit4ResourceGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaExecuteUnit4ResourceGenerator.java new file mode 100644 index 00000000..bc22713a --- /dev/null +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaExecuteUnit4ResourceGenerator.java @@ -0,0 +1,76 @@ +package io.sc.engine.rule.core.code.generator; + +import com.jfinal.template.Engine; +import com.jfinal.template.Template; +import io.sc.engine.rule.core.code.ExecuteUnit4Resource; +import io.sc.engine.rule.core.code.generator.impl.DictionaryGenerator; +import io.sc.engine.rule.core.code.generator.impl.IndicatorGenerator; +import io.sc.engine.rule.core.code.generator.impl.ParameterGenerator; +import io.sc.engine.rule.core.code.generator.impl.processor.*; +import io.sc.engine.rule.core.po.resource.ModelResource; +import io.sc.engine.rule.core.po.resource.Resource; +import io.sc.engine.rule.core.util.IdReplacer; + +import java.util.HashMap; +import java.util.Map; + +public class JavaExecuteUnit4ResourceGenerator extends ExecuteUnitGenerator { + private static final String template_location = "/io/sc/engine/rule/core/code/java/template/impl/resource.tpl"; + private ExecuteUnit4Resource executeUnit; + + public JavaExecuteUnit4ResourceGenerator(ExecuteUnit4Resource executeUnit) { + this.executeUnit =executeUnit; + Resource resource =executeUnit.getResource(); + if(resource instanceof ModelResource){ + ((ModelResource)resource).getModel().buildFullName(); + } + + } + + @Override + public String getClassName() { + return IdReplacer.className(executeUnit.getResource().getCode(),executeUnit.getResource().getVersion()); + } + + @Override + public String generate() throws Exception { + Engine engine = new Engine(Engine.MAIN_ENGINE_NAME); + engine.setDevMode(true); + engine.setToClassPathSourceFactory(); + engine.setStaticFieldExpression(true); + engine.setStaticMethodExpression(true); + + engine.addSharedStaticMethod(IdReplacer.class); + //engine.addSharedStaticMethod(ExpressionReplacer.class); + + // + engine.addSharedObject("generatorType","Java"); + engine.addSharedObject("DictionaryGenerator",new DictionaryGenerator()); + engine.addSharedObject("ParameterGenerator",new ParameterGenerator()); + engine.addSharedObject("IndicatorGenerator",new IndicatorGenerator()); + + engine.addSharedObject("Arithmetic",new Arithmetic()); + engine.addSharedObject("ConditionRange",new ConditionRange()); + engine.addSharedObject("DecisionTable",new DecisionTable()); + engine.addSharedObject("DecisionTable2C",new DecisionTable2C()); + engine.addSharedObject("DecisionTree",new DecisionTree()); + engine.addSharedObject("ExecutionFlow",new ExecutionFlow()); + engine.addSharedObject("MathFormula",new MathFormula()); + engine.addSharedObject("NumberRange",new NumberRange()); + engine.addSharedObject("ObjectProperty",new ObjectProperty()); + engine.addSharedObject("OptionValue",new OptionValue()); + engine.addSharedObject("SqlFieldMapping",new SqlFieldMapping()); + engine.addSharedObject("HttpRequest",new HttpRequest()); + engine.addSharedObject("Ternary",new Ternary()); + engine.addSharedObject("WhenThen",new WhenThen()); + engine.addSharedObject("ScoreCard",new ScoreCard()); + engine.addSharedObject("SingleRule",new SingleRule()); + engine.addSharedObject("RuleSet",new RuleSet()); + + Map data =new HashMap<>(); + data.put("packageName",this.getPackageName()); + data.put("executeUnit",executeUnit); + Template template =engine.getTemplate(template_location); + return template.renderToString(data).trim(); + } +} diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaSourceCodeGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaSourceCodeGenerator.java new file mode 100644 index 00000000..48085906 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/JavaSourceCodeGenerator.java @@ -0,0 +1,51 @@ +package io.sc.engine.rule.core.code.generator; + +import io.sc.engine.rule.core.code.*; + +public class JavaSourceCodeGenerator implements SourceCodeGenerator { + @Override + public String getPackageName(ExecuteUnit executeUnit) { + if(executeUnit instanceof ExecuteUnit4Resource){ + ExecuteUnitGenerator generator =new JavaExecuteUnit4ResourceGenerator((ExecuteUnit4Resource)executeUnit); + return generator.getPackageName(); + }else if(executeUnit instanceof ExecuteUnit4Lib){ + ExecuteUnitGenerator generator =new JavaExecuteUnit4LibGenerator((ExecuteUnit4Lib)executeUnit); + return generator.getPackageName(); + } + return null; + } + + @Override + public String getClassName(ExecuteUnit executeUnit) { + if(executeUnit instanceof ExecuteUnit4Resource){ + ExecuteUnitGenerator generator =new JavaExecuteUnit4ResourceGenerator((ExecuteUnit4Resource)executeUnit); + return generator.getClassName(); + }else if(executeUnit instanceof ExecuteUnit4Lib){ + ExecuteUnitGenerator generator =new JavaExecuteUnit4LibGenerator((ExecuteUnit4Lib)executeUnit); + return generator.getClassName(); + } + return null; + } + + @Override + public SourceCode generate(ExecuteUnit executeUnit) throws Exception { + if(executeUnit instanceof ExecuteUnit4Resource){ + ExecuteUnitGenerator generator =new JavaExecuteUnit4ResourceGenerator((ExecuteUnit4Resource)executeUnit); + return generator.generateSourceCode(); + }else if(executeUnit instanceof ExecuteUnit4Lib){ + ExecuteUnitGenerator generator =new JavaExecuteUnit4LibGenerator((ExecuteUnit4Lib)executeUnit); + return generator.generateSourceCode(); + } + return null; + } + + @Override + public SourceCode generate(String resourceId, ExecuteUnit executeUnit) throws Exception { + return generate(executeUnit); + } + + @Override + public SourceCode generate(String resourceCode, Integer version, ExecuteUnit executeUnit) throws Exception { + return generate(executeUnit); + } +} diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/DictionaryGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/DictionaryGenerator.java index 5f35fb9c..79ce5521 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/DictionaryGenerator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/DictionaryGenerator.java @@ -52,11 +52,17 @@ public class DictionaryGenerator { if(StringUtils.hasText(defaultValue)) { // 有默认值 if (valueTypeIsList != null && valueTypeIsList) { //列表 variables.put("className", IdReplacer.className(valueType, valueTypeVersion)); - String tpl = "List<${className}> ${fieldName} =ObjectMapperUtil.json().readValue(\"\"\"${defaultValue}\"\"\",new TypeReference>(){}); //${name}"; + String tpl = "List<${className}> ${fieldName} =ObjectMapperUtil.json().readValue(\"${defaultValue}\",new TypeReference>(){}); //${name}"; sb.append(StringUtil.format(tpl, variables)).append("\n"); } else { //非列表 if (ValueTypeUtil.isBase(valueType)) { // 基本类型 - if (ValueTypeUtil.isString(valueType)) { // 字符串 + if (ValueTypeUtil.isLong(valueType)) { // 长整数 + String tpl ="Long ${fieldName} =Long.valueOf(${defaultValue}); //${name}"; + sb.append(StringUtil.format(tpl,variables)).append("\n"); + }else if(ValueTypeUtil.isDecimal(valueType)){ // 小数 + String tpl ="Double ${fieldName} =new Double(${defaultValue}); //${name}"; + sb.append(StringUtil.format(tpl,variables)).append("\n"); + }else if (ValueTypeUtil.isString(valueType)) { // 字符串 String tpl ="String ${fieldName} =\"\"\"${defaultValue}\"\"\"; //${name}"; sb.append(StringUtil.format(tpl,variables)).append("\n"); } else { // 非字符串 @@ -66,7 +72,7 @@ public class DictionaryGenerator { } } else { // 非基本类型 variables.put("className", IdReplacer.className(valueType, valueTypeVersion)); - String tpl = "${className} ${fieldName} =ObjectMapperUtil.json().readValue(\"\"\"${defaultValue}\"\"\",${className}.class); //${name}"; + String tpl = "${className} ${fieldName} =ObjectMapperUtil.json().readValue(\"${defaultValue}\",${className}.class); //${name}"; sb.append(StringUtil.format(tpl, variables)).append("\n"); } } @@ -78,8 +84,16 @@ public class DictionaryGenerator { }else { variables.put("className", IdReplacer.className(valueType, valueTypeVersion)); if (ValueTypeUtil.isBase(valueType)) { // 基本类型 - String tpl = "${className} ${fieldName}; //${name}"; - sb.append(StringUtil.format(tpl, variables)).append("\n"); + if (ValueTypeUtil.isLong(valueType)) { // 长整数 + String tpl = "Long ${fieldName}; //${name}"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + }else if(ValueTypeUtil.isDecimal(valueType)){ // 小数 + String tpl = "Double ${fieldName}; //${name}"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + }else { + String tpl = "${className} ${fieldName}; //${name}"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + } } else { if (ValueTypeUtil.isMap(valueType)) { String tpl = "${className} ${fieldName} =new java.util.HashMap(); //${name}"; @@ -101,11 +115,11 @@ public class DictionaryGenerator { for(EnumItem item : enumDictionary.getItems()){ if(EnumDictionaryItemValueType.STRING.equals(item.getValueType())) { - sb.append("public static final String ").append(item.getCode()).append(" =").append("'").append(item.getValue()).append("';"); + sb.append("static final String ").append(item.getCode()).append(" =\"").append(item.getValue()).append("\";"); }else if(EnumDictionaryItemValueType.INTEGER.equals(item.getValueType())){ - sb.append("public static final Long ").append(item.getCode()).append(" =").append(item.getValue()).append(";"); + sb.append("static final Long ").append(item.getCode()).append(" =Long.valueOf(").append(item.getValue()).append(");"); }else if(EnumDictionaryItemValueType.DECIMAL.equals(item.getValueType())){ - sb.append("public static final BigDecimal ").append(item.getCode()).append(" =").append(item.getValue()).append(";"); + sb.append("static final Double ").append(item.getCode()).append(" =new Double(").append(item.getValue()).append(");"); } sb.append(" //").append(item.getName()).append("\n"); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/IndicatorGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/IndicatorGenerator.java index 60200a4f..20e511eb 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/IndicatorGenerator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/IndicatorGenerator.java @@ -95,20 +95,14 @@ public class IndicatorGenerator { variables.put("fieldName",IdReplacer.fieldName(code)); variables.put("className",IdReplacer.className(valueType,valueTypeVersion)); if (indicator.getValueTypeIsList()) { - sb.append(StringUtil.format("if (map.get('${code}')!=null) {\n",variables)); - String tpl ="\targ.${fieldName} =ObjectMapperUtil.json().readValue(map.get('${code}'),new TypeReference>(){}); //${name}"; - sb.append(StringUtil.format(tpl,variables)).append("\n"); - sb.append("}").append("\n"); + sb.append(StringUtil.format("if (map.get(\"${code}\")!=null) {",variables)); + String tpl =" arg.${fieldName} =ObjectMapperUtil.json().readValue(map.get(\"${code}\"),new TypeReference>(){}); } //${name}\n"; + sb.append(StringUtil.format(tpl,variables)); } else { - sb.append(StringUtil.format("if (map.get('${code}')!=null) {\n",variables)); - String tpl ="\targ.${fieldName} =TypeConvertor.getValue(map.get('${code}'),${className}.class); //${name}"; - sb.append(StringUtil.format(tpl,variables)).append("\n"); - sb.append("}").append("\n"); + sb.append(StringUtil.format("if (map.get(\"${code}\")!=null) {",variables)); + String tpl =" arg.${fieldName} =TypeConvertor.getValue(map.get(\"${code}\"),${className}.class); } //${name}\n"; + sb.append(StringUtil.format(tpl,variables)); } -// if (!ValueTypeUtil.isBase(valueType)) { -// String tpl ="if(arg.${fieldName}!=null) { arg.${fieldName}.init(); }"; -// sb.append(StringUtil.format(tpl,variables)).append("\n"); -// } } return sb.toString(); } @@ -127,7 +121,8 @@ public class IndicatorGenerator { variables.put("fieldName",IdReplacer.fieldName(code)); variables.put("name",name); if (!ValueTypeUtil.isBase(valueType)) { - String tpl ="if(arg.${fieldName}!=null) { arg.${fieldName}.init(); } //${name}"; + //String tpl ="if(arg.${fieldName}!=null) { arg.${fieldName}.init(); } //${name}"; + String tpl ="if(arg.${fieldName}!=null) { } //${name}"; sb.append(StringUtil.format(tpl,variables)).append("\n"); } } @@ -148,21 +143,21 @@ public class IndicatorGenerator { variables.put("code",code); variables.put("name",name); variables.put("fieldName",IdReplacer.fieldName(code)); - variables.put("tip",StringUtils.hasText(validator.getTip())?"'''" + validator.getTip() + "'''" :"null"); + variables.put("tip",StringUtils.hasText(validator.getTip())?"\"" + validator.getTip() + "\"" :"null"); if(validator instanceof EmptyIndicatorValidator){ - String tpl ="FieldValidator.empty('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.empty(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof NotEmptyIndicatorValidator){ - String tpl ="FieldValidator.notEmpty('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.notEmpty(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof TrueIndicatorValidator){ - String tpl ="FieldValidator.trueValue('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.trueValue(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof FalseIndicatorValidator){ - String tpl ="FieldValidator.falseValue('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.falseValue(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof EmailIndicatorValidator){ - String tpl ="FieldValidator.mail('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.mail(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof IntegerRangeIndicatorValidator){ IntegerRangeIndicatorValidator integerRangeIndicatorValidator =(IntegerRangeIndicatorValidator)validator; @@ -170,7 +165,7 @@ public class IndicatorGenerator { variables.put("min",StringUtils.hasText(integerRangeIndicatorValidator.getMinValue())?integerRangeIndicatorValidator.getMinValue():"null"); variables.put("max",StringUtils.hasText(integerRangeIndicatorValidator.getMaxValue())?integerRangeIndicatorValidator.getMaxValue():"null"); variables.put("maxInclude",integerRangeIndicatorValidator.getMaxInclude()); - String tpl ="FieldValidator.integerRange('${code}','${name}',this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; + String tpl ="FieldValidator.integerRange(\"${code}\",\"${name}\",this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof DecimalRangeIndicatorValidator){ DecimalRangeIndicatorValidator decimalRangeIndicatorValidator =(DecimalRangeIndicatorValidator)validator; @@ -178,7 +173,7 @@ public class IndicatorGenerator { variables.put("min",StringUtils.hasText(decimalRangeIndicatorValidator.getMinValue())?decimalRangeIndicatorValidator.getMinValue():"null"); variables.put("max",StringUtils.hasText(decimalRangeIndicatorValidator.getMaxValue())?decimalRangeIndicatorValidator.getMaxValue():"null"); variables.put("maxInclude",decimalRangeIndicatorValidator.getMaxInclude()); - String tpl ="FieldValidator.decimalRange('${code}','${name}',this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; + String tpl ="FieldValidator.decimalRange(\"${code}\",\"${name}\",this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof LengthRangeIndicatorValidator){ LengthRangeIndicatorValidator lengthRangeIndicatorValidator =(LengthRangeIndicatorValidator)validator; @@ -186,7 +181,7 @@ public class IndicatorGenerator { variables.put("min",StringUtils.hasText(lengthRangeIndicatorValidator.getMinValue())?lengthRangeIndicatorValidator.getMinValue():"null"); variables.put("max",StringUtils.hasText(lengthRangeIndicatorValidator.getMaxValue())?lengthRangeIndicatorValidator.getMaxValue():"null"); variables.put("maxInclude",lengthRangeIndicatorValidator.getMaxInclude()); - String tpl ="FieldValidator.lengthRange('${code}','${name}',this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; + String tpl ="FieldValidator.lengthRange(\"${code}\",\"${name}\",this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof DateRangeIndicatorValidator){ DateRangeIndicatorValidator dateRangeIndicatorValidator =(DateRangeIndicatorValidator)validator; @@ -194,18 +189,18 @@ public class IndicatorGenerator { variables.put("min",StringUtils.hasText(dateRangeIndicatorValidator.getMinValue())?"DateUtil.parseDate(\"" + dateRangeIndicatorValidator.getMinValue() + "\",DateUtil.yyyy_MM_dd_HH_mm_ss)":"null"); variables.put("max",StringUtils.hasText(dateRangeIndicatorValidator.getMaxValue())?"DateUtil.parseDate(\"" + dateRangeIndicatorValidator.getMaxValue() + "\",DateUtil.yyyy_MM_dd_HH_mm_ss)":"null"); variables.put("maxInclude",dateRangeIndicatorValidator.getMaxInclude()); - String tpl ="FieldValidator.dateRange('${code}','${name}',this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; + String tpl ="FieldValidator.dateRange(\"${code}\",\"${name}\",this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof PatternIndicatorValidator){ PatternIndicatorValidator patternIndicatorValidator =(PatternIndicatorValidator)validator; variables.put("pattern",StringUtils.hasText(patternIndicatorValidator.getPattern())?patternIndicatorValidator.getPattern():"null"); - String tpl ="FieldValidator.dateRange('${code}','${name}',this.${fieldName},'${pattern}',${tip},result);"; + String tpl ="FieldValidator.dateRange(\"${code}\",\"${name}\",this.${fieldName},\"${pattern}\",${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof ExpressionIndicatorValidator){ ExpressionIndicatorValidator expressionIndicatorValidator =(ExpressionIndicatorValidator)validator; String condition =GroovyExpressionReplacer.groovy(expressionIndicatorValidator.getExpression(),null).replace("arg.","this."); sb.append("if(!(").append(condition).append(")){"); - String tpl ="result.error('${code}','${name}',${tip});"; + String tpl ="result.error(\"${code}\",\"${name}\",${tip});"; sb.append(StringUtil.format(tpl,variables)); sb.append("}").append("\n"); } @@ -236,13 +231,13 @@ public class IndicatorGenerator { if(IndicatorType.INDICATOR.equals(indicator.getType())){ if(ValueTypeUtil.isDecimal(indicator.getValueType())){ - String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',${valueScale},RoundingMode.${valueRoundingMode},this.${fieldName}==null?null:this.${fieldName}.setScale(${valueScale},RoundingMode.${valueRoundingMode}).toString()));"; + String tpl ="result.addParameterResult(new ParameterResult(\"${code}\",\"${name}\",ParameterType.${type},\"${valueType}\",${valueScale},RoundingMode.${valueRoundingMode},this.${fieldName}==null?null:this.${fieldName}.setScale(${valueScale},RoundingMode.${valueRoundingMode}).toString()));"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(ValueTypeUtil.isBase(indicator.getValueType())){ - String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',null,null,this.${fieldName}==null?null:this.${fieldName}.toString()));"; + String tpl ="result.addParameterResult(new ParameterResult(\"${code}\",\"${name}\",ParameterType.${type},\"${valueType}\",null,null,this.${fieldName}==null?null:this.${fieldName}.toString()));"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else{ - String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',null,null,this.${fieldName}==null?null:ObjectMapperUtil.json().writeValueAsString(this.${fieldName})));"; + String tpl ="result.addParameterResult(new ParameterResult(\"${code}\",\"${name}\",ParameterType.${type},\"${valueType}\",null,null,this.${fieldName}==null?null:ObjectMapperUtil.json().writeValueAsString(this.${fieldName})));"; sb.append(StringUtil.format(tpl,variables)).append("\n"); } } @@ -262,7 +257,7 @@ public class IndicatorGenerator { variables.put("name",name); variables.put("fieldName",IdReplacer.fieldName(code)); - String tpl ="map.put('${code}',this.${fieldName}); //${name}"; + String tpl ="map.put(\"${code}\",this.${fieldName}); //${name}"; sb.append(StringUtil.format(tpl,variables)).append("\n"); } return sb.toString(); @@ -278,10 +273,18 @@ public class IndicatorGenerator { variables.put("code",code); variables.put("valueType",valueType); if(ValueTypeUtil.isBase(valueType)){ - String tpl ="if(result.exists('${code}')){ this.${code}=TypeConvertor.getValue(result.getValueByParameterCode('${code}'),${valueType}.class); }"; - sb.append(StringUtil.format(tpl,variables)).append("\n"); + if(ValueTypeUtil.isLong(valueType)){ + String tpl = "if(result.exists(\"${code}\")){ this.${code}=TypeConvertor.getValue(result.getValueByParameterCode(\"${code}\"),Long.class); }"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + }else if(ValueTypeUtil.isDecimal(valueType)){ + String tpl = "if(result.exists(\"${code}\")){ this.${code}=TypeConvertor.getValue(result.getValueByParameterCode(\"${code}\"),Double.class); }"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + }else { + String tpl = "if(result.exists(\"${code}\")){ this.${code}=TypeConvertor.getValue(result.getValueByParameterCode(\"${code}\"),${valueType}.class); }"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + } }else{ - String tpl ="if(result.exists('${code}')){ this.${code}=result.getValueByParameterCode('${code}'); }"; + String tpl ="if(result.exists(\"${code}\")){ this.${code}=result.getValueByParameterCode(\"${code}\"); }"; sb.append(StringUtil.format(tpl,variables)).append("\n"); } } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/ParameterGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/ParameterGenerator.java index 68b3d6a0..7e6cf5f8 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/ParameterGenerator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/ParameterGenerator.java @@ -32,18 +32,24 @@ public class ParameterGenerator { Map variables =new HashMap<>(); variables.put("name",name); variables.put("fieldName",IdReplacer.fieldName(code)); - variables.put("defaultValue",defaultValue); + variables.put("defaultValue",IdReplacer.string(defaultValue)); if(StringUtils.hasText(defaultValue)) { // 有默认值 if (valueTypeIsList != null && valueTypeIsList) { //列表 variables.put("className", IdReplacer.className(valueType, valueTypeVersion)); - String tpl = "List<${className}> ${fieldName} =ObjectMapperUtil.json().readValue(\"\"\"${defaultValue}\"\"\",new TypeReference>(){}); //${name}"; + String tpl = "List<${className}> ${fieldName} =ObjectMapperUtil.json().readValue(\"${defaultValue}\",new TypeReference>(){}); //${name}"; sb.append(StringUtil.format(tpl, variables)).append("\n"); } else { //非列表 if (ValueTypeUtil.isBase(valueType)) { // 基本类型 if (ValueTypeUtil.isString(valueType)) { // 字符串 String tpl ="String ${fieldName} =\"\"\"${defaultValue}\"\"\"; //${name}"; sb.append(StringUtil.format(tpl,variables)).append("\n"); + }else if(ValueTypeUtil.isLong(valueType)){ + String tpl ="Long ${fieldName} =new Long(${defaultValue});"; //${name}"; + sb.append(StringUtil.format(tpl,variables)).append("\n"); + }else if(ValueTypeUtil.isDecimal(valueType)){ + String tpl ="Double ${fieldName} =new Double(${defaultValue});"; //${name}"; + sb.append(StringUtil.format(tpl,variables)).append("\n"); } else { // 非字符串 variables.put("className", IdReplacer.className(valueType, valueTypeVersion)); String tpl = "${className} ${fieldName} =${defaultValue}; //${name}"; @@ -63,8 +69,16 @@ public class ParameterGenerator { }else { variables.put("className", IdReplacer.className(valueType, valueTypeVersion)); if (ValueTypeUtil.isBase(valueType)) { // 基本类型 - String tpl = "${className} ${fieldName}; //${name}"; - sb.append(StringUtil.format(tpl, variables)).append("\n"); + if(ValueTypeUtil.isLong(valueType)){ + String tpl ="Long ${fieldName};"; //${name}"; + sb.append(StringUtil.format(tpl,variables)).append("\n"); + }else if(ValueTypeUtil.isDecimal(valueType)){ + String tpl ="Double ${fieldName};"; //${name}"; + sb.append(StringUtil.format(tpl,variables)).append("\n"); + }else { + String tpl = "${className} ${fieldName}; //${name}"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + } } else { if (ValueTypeUtil.isMap(valueType)) { String tpl = "${className} ${fieldName} =new java.util.HashMap(); //${name}"; @@ -100,20 +114,25 @@ public class ParameterGenerator { variables.put("fieldName",IdReplacer.fieldName(code)); variables.put("className",IdReplacer.className(valueType,valueTypeVersion)); if (parameter.getValueTypeIsList()) { - sb.append(StringUtil.format("if (map.get('${code}')!=null) {\n",variables)); - String tpl ="\targ.${fieldName} =ObjectMapperUtil.json().readValue(map.get('${code}'),new TypeReference>(){}); //${name}"; - sb.append(StringUtil.format(tpl,variables)).append("\n"); - sb.append("}").append("\n"); + sb.append(StringUtil.format("if (map.get(\"${code}\")!=null) {",variables)); + String tpl =" arg.${fieldName} =ObjectMapperUtil.json().readValue(map.get(\"${code}\"),new TypeReference>(){}); } //${name}\n"; + sb.append(StringUtil.format(tpl,variables)); } else { - sb.append(StringUtil.format("if (map.get('${code}')!=null) {\n",variables)); + sb.append(StringUtil.format("if (map.get(\"${code}\")!=null) {",variables)); if (ValueTypeUtil.isBase(valueType)) { - String tpl = "\targ.${fieldName} =TypeConvertor.getValue(map.get('${code}'),${className}.class); //${name}"; - sb.append(StringUtil.format(tpl, variables)).append("\n"); - sb.append("}").append("\n"); + if(ValueTypeUtil.isLong(valueType)){ + String tpl = " arg.${fieldName} =TypeConvertor.getValue(map.get(\"${code}\"),Long.class); } //${name}\n"; + sb.append(StringUtil.format(tpl, variables)); + }else if(ValueTypeUtil.isDecimal(valueType)){ + String tpl = " arg.${fieldName} =TypeConvertor.getValue(map.get(\"${code}\"),Double.class); } //${name}\n"; + sb.append(StringUtil.format(tpl, variables)); + }else { + String tpl = " arg.${fieldName} =TypeConvertor.getValue(map.get(\"${code}\"),${className}.class); } //${name}\n"; + sb.append(StringUtil.format(tpl, variables)); + } }else{ - String tpl = "\targ.${fieldName} =ObjectMapperUtil.json().readValue(map.get('${code}'),${className}.class); //${name}"; - sb.append(StringUtil.format(tpl, variables)).append("\n"); - sb.append("}").append("\n"); + String tpl = " arg.${fieldName} =ObjectMapperUtil.json().readValue(map.get(\"${code}\").toString(),${className}.class); } //${name}\n"; + sb.append(StringUtil.format(tpl, variables)); } } // if (!ValueTypeUtil.isBase(valueType)) { @@ -159,21 +178,21 @@ public class ParameterGenerator { variables.put("code",code); variables.put("name",name); variables.put("fieldName",IdReplacer.fieldName(code)); - variables.put("tip",StringUtils.hasText(validator.getTip())?"'''" + validator.getTip() + "'''" :"null"); + variables.put("tip",StringUtils.hasText(validator.getTip())?"\"" + validator.getTip().replace("\"","\\\"") + "\"" :"null"); if(validator instanceof EmptyParameterValidator){ - String tpl ="FieldValidator.empty('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.empty(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof NotEmptyParameterValidator){ - String tpl ="FieldValidator.notEmpty('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.notEmpty(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof TrueParameterValidator){ - String tpl ="FieldValidator.trueValue('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.trueValue(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof FalseParameterValidator){ - String tpl ="FieldValidator.falseValue('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.falseValue(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof EmailParameterValidator){ - String tpl ="FieldValidator.mail('${code}','${name}',this.${fieldName},${tip},result);"; + String tpl ="FieldValidator.mail(\"${code}\",\"${name}\",this.${fieldName},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof IntegerRangeParameterValidator){ IntegerRangeParameterValidator integerRangeParameterValidator =(IntegerRangeParameterValidator)validator; @@ -181,7 +200,7 @@ public class ParameterGenerator { variables.put("min",StringUtils.hasText(integerRangeParameterValidator.getMinValue())?integerRangeParameterValidator.getMinValue():"null"); variables.put("max",StringUtils.hasText(integerRangeParameterValidator.getMaxValue())?integerRangeParameterValidator.getMaxValue():"null"); variables.put("maxInclude",integerRangeParameterValidator.getMaxInclude()); - String tpl ="FieldValidator.numberRange('${code}','${name}',this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; + String tpl ="FieldValidator.numberRange(\"${code}\",\"${name}\",this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof DecimalRangeParameterValidator){ DecimalRangeParameterValidator decimalRangeParameterValidator =(DecimalRangeParameterValidator)validator; @@ -189,7 +208,7 @@ public class ParameterGenerator { variables.put("min",StringUtils.hasText(decimalRangeParameterValidator.getMinValue())?decimalRangeParameterValidator.getMinValue():"null"); variables.put("max",StringUtils.hasText(decimalRangeParameterValidator.getMaxValue())?decimalRangeParameterValidator.getMaxValue():"null"); variables.put("maxInclude",decimalRangeParameterValidator.getMaxInclude()); - String tpl ="FieldValidator.numberRange('${code}','${name}',this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; + String tpl ="FieldValidator.numberRange(\"${code}\",\"${name}\",this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof LengthRangeParameterValidator){ LengthRangeParameterValidator lengthRangeParameterValidator =(LengthRangeParameterValidator)validator; @@ -197,7 +216,7 @@ public class ParameterGenerator { variables.put("min",StringUtils.hasText(lengthRangeParameterValidator.getMinValue())?lengthRangeParameterValidator.getMinValue():"null"); variables.put("max",StringUtils.hasText(lengthRangeParameterValidator.getMaxValue())?lengthRangeParameterValidator.getMaxValue():"null"); variables.put("maxInclude",lengthRangeParameterValidator.getMaxInclude()); - String tpl ="FieldValidator.lengthRange('${code}','${name}',this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; + String tpl ="FieldValidator.lengthRange(\"${code}\",\"${name}\",this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof DateRangeParameterValidator){ DateRangeParameterValidator dateRangeParameterValidator =(DateRangeParameterValidator)validator; @@ -205,18 +224,18 @@ public class ParameterGenerator { variables.put("min",StringUtils.hasText(dateRangeParameterValidator.getMinValue())?"DateUtil.parseDate(\"" + dateRangeParameterValidator.getMinValue() + "\",DateUtil.yyyy_MM_dd_HH_mm_ss)":"null"); variables.put("max",StringUtils.hasText(dateRangeParameterValidator.getMaxValue())?"DateUtil.parseDate(\"" + dateRangeParameterValidator.getMaxValue() + "\",DateUtil.yyyy_MM_dd_HH_mm_ss)":"null"); variables.put("maxInclude",dateRangeParameterValidator.getMaxInclude()); - String tpl ="FieldValidator.dateRange('${code}','${name}',this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; + String tpl ="FieldValidator.dateRange(\"${code}\",\"${name}\",this.${fieldName},${minInclude},${min},${max},${maxInclude},${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof PatternParameterValidator){ PatternParameterValidator patternParameterValidator =(PatternParameterValidator)validator; variables.put("pattern",StringUtils.hasText(patternParameterValidator.getPattern())?patternParameterValidator.getPattern().replace("\\","\\\\"):"null"); - String tpl ="FieldValidator.pattern('${code}','${name}',this.${fieldName},'''${pattern}''',${tip},result);"; + String tpl ="FieldValidator.pattern(\"${code}\",\"${name}\",this.${fieldName},\"${pattern}\",${tip},result);"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(validator instanceof ExpressionParameterValidator){ ExpressionParameterValidator expressionParameterValidator =(ExpressionParameterValidator)validator; String condition =GroovyExpressionReplacer.groovy(expressionParameterValidator.getExpression(),null).replace("arg.","this."); sb.append("if(!(").append(condition).append(")){"); - String tpl ="result.error('${code}','${name}',${tip});"; + String tpl ="result.error(\"${code}\",\"${name}\",${tip});"; sb.append(StringUtil.format(tpl,variables)); sb.append("}").append("\n"); } @@ -247,13 +266,14 @@ public class ParameterGenerator { if(ParameterType.INDICATOR.equals(parameter.getType()) || ParameterType.OUT.equals(parameter.getType()) || ParameterType.INTERMEDIATE.equals(parameter.getType())){ if(ValueTypeUtil.isDecimal(parameter.getValueType())){ - String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',${valueScale},RoundingMode.${valueRoundingMode},this.${fieldName}==null?null:this.${fieldName}.setScale(${valueScale},RoundingMode.${valueRoundingMode}).toString()));"; + String tpl ="result.addParameterResult(new ParameterResult(\"${code}\",\"${name}\",ParameterType.${type},\"java.lang.Double\",${valueScale},RoundingMode.${valueRoundingMode},this.${fieldName}==null?null:this.${fieldName}.toString()));"; + //String tpl ="result.addParameterResult(new ParameterResult(\"${code}\",\"${name}\",ParameterType.${type},\"java.lang.Double\",null,null,this.${fieldName}==null?null:this.${fieldName}.toString()));"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(ValueTypeUtil.isBase(parameter.getValueType())){ - String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',null,null,this.${fieldName}==null?null:this.${fieldName}.toString()));"; + String tpl ="result.addParameterResult(new ParameterResult(\"${code}\",\"${name}\",ParameterType.${type},\"${valueType}\",null,null,this.${fieldName}==null?null:this.${fieldName}.toString()));"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else{ - String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',null,null,this.${fieldName}==null?null:ObjectMapperUtil.json().writeValueAsString(this.${fieldName})));"; + String tpl ="result.addParameterResult(new ParameterResult(\"${code}\",\"${name}\",ParameterType.${type},\"${valueType}\",null,null,this.${fieldName}==null?null:ObjectMapperUtil.json().writeValueAsString(this.${fieldName})));"; sb.append(StringUtil.format(tpl,variables)).append("\n"); } } @@ -273,7 +293,7 @@ public class ParameterGenerator { variables.put("name",name); variables.put("fieldName",IdReplacer.fieldName(code)); - String tpl ="map.put('${code}',this.${fieldName}); //${name}"; + String tpl ="map.put(\"${code}\",this.${fieldName}); //${name}"; sb.append(StringUtil.format(tpl,variables)).append("\n"); } return sb.toString(); @@ -285,14 +305,28 @@ public class ParameterGenerator { for(Parameter parameter : parameters){ String code =parameter.getCode(); String valueType = parameter.getValueType(); + Boolean valueTypeIsList =parameter.getValueTypeIsList(); Map variables =new HashMap<>(); variables.put("code",code); variables.put("valueType",valueType); - if(ValueTypeUtil.isBase(valueType)){ - String tpl ="if(result.exists('${code}')){ this.${code}=TypeConvertor.getValue(result.getValueByParameterCode('${code}'),${valueType}.class); }"; + variables.put("valueTypeClass",IdReplacer.className(valueType, parameter.getValueTypeVersion())); + if(valueTypeIsList != null && valueTypeIsList){ + String tpl ="if(result.exists(\"${code}\")){ this.${code}=ObjectMapperUtil.json().readValue(result.getValueByParameterCode(\"${code}\"),new TypeReference>(){}); }"; sb.append(StringUtil.format(tpl,variables)).append("\n"); + }else if(ValueTypeUtil.isBase(valueType)){ + if(ValueTypeUtil.isLong(valueType)){ + String tpl = "if(result.exists(\"${code}\")){ this.${code}=TypeConvertor.getValue(result.getValueByParameterCode(\"${code}\"),Long.class); }"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + }else if(ValueTypeUtil.isDecimal(valueType)){ + String tpl = "if(result.exists(\"${code}\")){ this.${code}=TypeConvertor.getValue(result.getValueByParameterCode(\"${code}\"),Double.class); }"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + }else { + String tpl = "if(result.exists(\"${code}\")){ this.${code}=TypeConvertor.getValue(result.getValueByParameterCode(\"${code}\"),${valueType}.class); }"; + sb.append(StringUtil.format(tpl, variables)).append("\n"); + } }else{ - String tpl ="if(result.exists('${code}')){ this.${code}=result.getValueByParameterCode('${code}'); }"; + String tpl ="if(result.exists(\"${code}\")){ this.${code}=ObjectMapperUtil.json().readValue(result.getValueByParameterCode(\"${code}\"),${valueTypeClass}.class); }"; + //String tpl ="if(result.exists(\"${code}\")){ this.${code}=result.getValueByParameterCode(\"${code}\"); }"; sb.append(StringUtil.format(tpl,variables)).append("\n"); } } @@ -310,7 +344,10 @@ public class ParameterGenerator { String fieldName =IdReplacer.fieldName(parameter.getCode()); sb.append("if(this.").append(fieldName).append("==null){ this.").append(fieldName); sb.append(" ="); + sb.append("("); + sb.append("(").append(IdReplacer.className(indicatorParameter.getLibCode(),indicatorParameter.getLibVersion())).append(")"); sb.append("libs.get(\"").append(IdReplacer.varName(indicatorParameter.getLibCode(),indicatorParameter.getLibVersion())).append("\")"); + sb.append(")"); sb.append(".").append(IdReplacer.fieldName(indicatorParameter.getIndicatorCode())); sb.append("; }").append("\n"); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/Arithmetic.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/Arithmetic.java index c7868f2a..4dd8671a 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/Arithmetic.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/Arithmetic.java @@ -5,6 +5,7 @@ import io.sc.engine.rule.core.po.lib.processor.ArithmeticIndicatorProcessor; import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.po.model.processor.ArithmeticParameterProcessor; import io.sc.engine.rule.core.util.GroovyExpressionReplacer; +import io.sc.engine.rule.core.util.ValueTypeUtil; import org.springframework.util.StringUtils; public class Arithmetic { @@ -28,6 +29,6 @@ public class Arithmetic { private String groovy(String code, String valueType,String arthmetic) { if(!StringUtils.hasText(arthmetic)){ return null; } - return GroovyExpressionReplacer.groovy(arthmetic,valueType); + return GroovyExpressionReplacer.groovy(arthmetic, valueType); } } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ConditionRange.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ConditionRange.java index fec184ea..73f0260c 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ConditionRange.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ConditionRange.java @@ -7,6 +7,7 @@ import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.po.model.processor.ConditionRangeParameterProcessor; import io.sc.engine.rule.core.util.GroovyExpressionReplacer; import io.sc.engine.rule.core.util.IdReplacer; +import io.sc.engine.rule.core.util.ValueTypeUtil; import io.sc.platform.util.CollectionUtil; import io.sc.platform.util.ObjectMapperUtil; import org.springframework.util.StringUtils; @@ -69,7 +70,13 @@ public class ConditionRange { if(!StringUtils.hasText(conditionRange.value)){ sb.append("\t").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(code)).append(" =null;\n"); }else { - sb.append("\t").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(code)).append(" =").append(GroovyExpressionReplacer.groovy(conditionRange.value,valueType)).append(";\n"); + if(ValueTypeUtil.isLong(valueType)){ + sb.append("\t").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(code)).append(" =Long.valueOf(").append(GroovyExpressionReplacer.groovy(conditionRange.value, valueType)).append(");\n"); + }else if(ValueTypeUtil.isDecimal(valueType)){ + sb.append("\t").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(code)).append(" =new Double(").append(GroovyExpressionReplacer.groovy(conditionRange.value, valueType)).append(");\n"); + }else { + sb.append("\t").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(code)).append(" =").append(GroovyExpressionReplacer.groovy(conditionRange.value, valueType)).append(";\n"); + } } sb.append("}"); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/DecisionTree.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/DecisionTree.java index 0d91cad5..d786d968 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/DecisionTree.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/DecisionTree.java @@ -80,10 +80,11 @@ public class DecisionTree { */ private String generateConditionGroovyCode(Map methodNameCache,Parameter parameter,ConditionNode conditionNode,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//条件判断").append("\n"); + sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//条件判断").append("\n"); List branches =conditionNode.getOuts(); //获取条件的所有出口边 if(branches!=null && branches.size()>0) { List outs =orderEdges(branches); //对出口边进行排序，有条件的放前面，无条件的放后面 + boolean isElse =false; for(int i=0;i methodNameCache,Parameter parameter,ExpressionNode expressionNode,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//表达式").append("\n"); + sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//表达式").append("\n"); String expression =expressionNode.getExpression(); String commands =expressionNode.getCommands(); if(commands!=null && !commands.isEmpty()) { @@ -150,9 +155,9 @@ public class DecisionTree { */ private String generateResourceAbstractGroovyCode(Map methodNameCache,Parameter parameter,ResourceAbstractNode expressionNode,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//资源").append("\n"); + sb.append("private static ").append(parameter.getValueType()).append(" ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//资源").append("\n"); String code =GroovyExpressionReplacer.groovy(expressionNode.getCode(),String.class.getName()); - String version =GroovyExpressionReplacer.groovy(expressionNode.getVersion(),Long.class.getName()); + String version =GroovyExpressionReplacer.groovy(expressionNode.getVersion(),Integer.class.getName()); if(version==null || version.trim().isEmpty()) { version ="null"; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java index 72f62008..c977c087 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ExecutionFlow.java @@ -101,7 +101,7 @@ public class ExecutionFlow { */ private String generateConditionGroovyCode(Map methodNameCache,Parameter parameter,ConditionNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//条件判断").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//条件判断").append("\n"); List branches =node.getOuts(); //获取条件的所有出口边 if(branches!=null && branches.size()>0) { List outs =orderEdges(branches); //对出口边进行排序，有条件的放前面，无条件的放后面 @@ -148,7 +148,7 @@ public class ExecutionFlow { */ private String generateParallelGroovyCode(Map methodNameCache,Parameter parameter,ParallelNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//并发网关").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//并发网关").append("\n"); List outs =node.getOuts(); //获取条件的所有出口边 if(outs!=null && outs.size()>0) { for(int i=0;i methodNameCache,Parameter parameter,CommandSetNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//指令集").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//指令集").append("\n"); String commands =node.getCommands(); if(commands!=null && !commands.isEmpty()) { sb.append("\t").append(GroovyExpressionReplacer.groovy(commands,null)).append("\n"); @@ -212,13 +212,13 @@ public class ExecutionFlow { */ private String generateResourceAbstractGroovyCode(Map methodNameCache,Parameter parameter,ResourceAbstractNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//资源").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//资源").append("\n"); String code =node.getCode(); String version =node.getVersion(); if(version==null || version.trim().equals("")) { version ="null"; } - sb.append("\t").append("ResourceResult result =executor.executeByCode(\"").append(code).append("\",").append(version).append(",arg.toMap())").append(";\n"); + sb.append("\t").append("ExecuteResult result =executor.executeByCode(\"").append(code).append("\",").append(version).append(",arg.toMap())").append(";\n"); sb.append("\t").append("arg.mergeResult(result);").append("\n"); //继续调用后续方法 List edges =node.getOuts(); //获取条件的所有出口边 @@ -251,7 +251,7 @@ public class ExecutionFlow { */ private String generateConfigurableResourceAbstractGroovyCode(Map methodNameCache,Parameter parameter,ConfigurableResourceAbstractNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//可配置资源").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//可配置资源").append("\n"); String code =node.getCode(); String version =node.getVersion(); String inputCommands =node.getInputCommands(); @@ -265,7 +265,7 @@ public class ExecutionFlow { sb.append("\t").append(StringUtil.tabs(GroovyExpressionReplacer.groovy(inputCommands,null),1)).append("\n"); sb.append("\n"); sb.append("\t//调用资源\n"); - sb.append("\t").append("ResourceResult result =executor.executeByCode(\"").append(code).append("\",").append(version).append(",map);").append("\n"); + sb.append("\t").append("ExecuteResult result =executor.executeByCode(\"").append(code).append("\",").append(version).append(",map);").append("\n"); sb.append("\n"); sb.append("\t//处理资源调用完毕后的输出值\n"); sb.append("\t").append(GroovyExpressionReplacer.groovy(outputCommands,null).replace("\n", "\n\t\t")).append("\n"); @@ -300,7 +300,7 @@ public class ExecutionFlow { */ private String generateModelAbstractGroovyCode(Map methodNameCache,Parameter parameter,SubModelAbstractNode node,String methodName) { StringBuilder sb =new StringBuilder(); - sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append("){//模型").append("\n"); + sb.append("private static void ").append(methodName).append("(Executor executor,Argument ").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(") throws Exception {//模型").append("\n"); String code =node.getCode(); sb.append("\t").append("").append(code).append("(executor,arg);\n"); //继续调用后续方法 diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/MathFormula.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/MathFormula.java index 7fb8eb40..40d70205 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/MathFormula.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/MathFormula.java @@ -72,7 +72,7 @@ public class MathFormula { }else if("msup".equalsIgnoreCase(tagName)){ sb.append("pow("); }else if("mfrac".equalsIgnoreCase(tagName)){ - sb.append("div("); + sb.append("divide("); } } else if(xmlEvent.isCharacters()){ Characters characters = xmlEvent.asCharacters(); diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/OptionValue.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/OptionValue.java index c4c1b19b..9908d0e8 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/OptionValue.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/OptionValue.java @@ -29,7 +29,7 @@ public class OptionValue { if(i==0){ sb.append("if("); }else{ - sb.append("else if("); + sb.append("\n").append("else if("); } sb.append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(inOptionParameter.getCode())); sb.append("=="); @@ -38,12 +38,12 @@ public class OptionValue { }else{ sb.append(GroovyExpressionReplacer.groovy(item.getInputValue())); } - sb.append("){").append("\n"); - sb.append("\t").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(parameter.getCode())); - sb.append("="); + sb.append("){ "); + sb.append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(parameter.getCode())); + sb.append(" =TypeConvertor.getValue("); sb.append(GroovyExpressionReplacer.groovy(item.getValue(),parameter.getValueType())); - sb.append("\n"); - sb.append("}"); + sb.append(",").append(parameter.getValueType()).append(".class);"); + sb.append(" }"); } return sb.toString(); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/RuleSet.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/RuleSet.java index d0698c38..e53850ca 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/RuleSet.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/RuleSet.java @@ -52,10 +52,10 @@ public class RuleSet { sb.append("\t").append("temp.addRule("); sb.append("true,"); sb.append(rule.level).append(","); - sb.append("'''" + rule.code + "''',"); - sb.append("'''" + rule.name + "''',"); + sb.append("\"" + rule.code + "\","); + sb.append("\"" + rule.name + "\","); if(rule.category!=null && !"".equals(rule.category)) { - sb.append("'''" + rule.category + "''',"); + sb.append("\"" + rule.category + "\","); }else { sb.append("null,"); } @@ -66,10 +66,10 @@ public class RuleSet { sb.append("\t").append("temp.addRule("); sb.append("false,"); sb.append(rule.level).append(","); - sb.append("'''" + rule.code + "''',"); - sb.append("'''" + rule.name + "''',"); + sb.append("\"" + rule.code + "\","); + sb.append("\"" + rule.name + "\","); if(rule.category!=null && !"".equals(rule.category)) { - sb.append("'''" + rule.category + "''',"); + sb.append("\"" + rule.category + "\","); }else { sb.append("null,"); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ScoreCard.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ScoreCard.java index b6d4851a..b522d6fb 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ScoreCard.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/ScoreCard.java @@ -27,7 +27,7 @@ public class ScoreCard { return null; } StringBuilder sb =new StringBuilder(); - sb.append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(parameter.getCode())).append(" =0;"); + sb.append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(parameter.getCode())).append(" =0L;"); sb.append("//初始化结果值").append("\n"); sb.append("\n"); for(ScoreCardItem item : scoreCardItems){ diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/SingleRule.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/SingleRule.java index 8c2d3703..5d5f6927 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/SingleRule.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/SingleRule.java @@ -51,7 +51,7 @@ public class SingleRule { sb.append("true,"); sb.append(rule.level).append(","); if(rule.category!=null && !"".equals(rule.category)) { - sb.append("'''" + rule.category + "''',"); + sb.append("\"" + rule.category + "\","); }else { sb.append("null,"); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/SqlFieldMapping.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/SqlFieldMapping.java index 3775d60d..0d36b82a 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/SqlFieldMapping.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/SqlFieldMapping.java @@ -1,12 +1,12 @@ package io.sc.engine.rule.core.code.generator.impl.processor; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.core.type.TypeReference; import io.sc.engine.rule.core.po.lib.Indicator; +import io.sc.engine.rule.core.po.lib.IndicatorLib; import io.sc.engine.rule.core.po.lib.processor.SqlIndicatorProcessor; +import io.sc.engine.rule.core.po.model.Model; import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.po.model.processor.SqlParameterProcessor; -import io.sc.engine.rule.core.util.ExpressionReplacer; import io.sc.engine.rule.core.util.GroovyExpressionReplacer; import io.sc.engine.rule.core.util.IdReplacer; import io.sc.platform.util.CollectionUtil; @@ -25,27 +25,27 @@ public class SqlFieldMapping { return ObjectMapperUtil.json().readValue(json, new TypeReference>(){}); } - public String groovy(Parameter parameter,SqlParameterProcessor processor) throws Exception{ + public String groovy(Parameter parameter, SqlParameterProcessor processor, Model model) throws Exception{ if(parameter==null || processor==null){ return null; } try { List sqlFieldMappings =parse(processor.getSqlFieldMapping()); - return groovy(parameter.getCode(),parameter.getValueType(),processor.getSqlDatasourceName(),processor.getSql(),sqlFieldMappings); + return groovyParameter(parameter.getCode(),parameter.getValueType(),processor.getSqlDatasourceName(),processor.getSql(),sqlFieldMappings,model); }catch(Exception e) { throw new RuntimeException("There was a Error when generate " + parameter.getName()+ "'s SqlFieldMapping groovy source code.", e); } } - public String groovy(Indicator indicator,SqlIndicatorProcessor processor) throws Exception{ + public String groovy(Indicator indicator, SqlIndicatorProcessor processor, IndicatorLib lib) throws Exception{ if(indicator==null || processor==null){ return null; } try { List sqlFieldMappings =parse(processor.getSqlFieldMapping()); - return groovy(indicator.getCode(),indicator.getValueType(),processor.getSqlDatasourceName(),processor.getSql(),sqlFieldMappings); + return groovyIndicator(indicator.getCode(),indicator.getValueType(),processor.getSqlDatasourceName(),processor.getSql(),sqlFieldMappings,lib); }catch(Exception e) { throw new RuntimeException("There was a Error when generate " + indicator.getName()+ "'s SqlFieldMapping groovy source code.", e); } } - private String groovy(String code, String valueType,String sqlDatasourceName,String sql,List sqlFieldMappings){ + private String groovyParameter(String code, String valueType,String sqlDatasourceName,String sql,List sqlFieldMappings,Model model){ if(!StringUtils.hasText(sql) || !CollectionUtil.hasElements(sqlFieldMappings)){ return null; } @@ -55,22 +55,70 @@ public class SqlFieldMapping { }else{ sb.append("javax.sql.DataSource ds =io.sc.engine.rule.client.spring.util.EngineSpringApplicationContextUtil.getDefaultDataSource();").append("\n"); } - sb.append(StringUtil.format("String sql =${0};", GroovyExpressionReplacer.groovy(sql,String.class.getName()))).append("\n"); - sb.append("ESql.withInstance(ds){ db->").append("\n"); - sb.append("\t").append("db.query(sql) { rs ->").append("\n"); - sb.append("\t\t").append("if (rs.next()) {").append("\n"); + String sqlString =GroovyExpressionReplacer.groovy(IdReplacer.string(sql),String.class.getName()); + sb.append(StringUtil.format("String sql =${0};", sqlString)).append("\n"); + sb.append("try(").append("\n"); + sb.append(" Connection connection =ds.getConnection();").append("\n"); + sb.append(" PreparedStatement ps =connection.prepareStatement(sql);").append("\n"); + sb.append(" ResultSet rs =ps.executeQuery();").append("\n"); + sb.append("){").append("\n"); + sb.append(" if (rs.next()) {").append("\n"); + List parameters =model.getAllParameters(); for(SqlFieldMapping sqlFieldMapping : sqlFieldMappings) { - sb.append("\t\t\t"); + sb.append(" "); sb.append(PlaceHolderExpressionUtil.replace(sqlFieldMapping.parameter, "arg.","")); sb.append(" ="); - sb.append("rs.getObject(\"").append(sqlFieldMapping.getField()).append("\");").append("\n"); + for(Parameter parameter : parameters){ + if(("${" + parameter.getCode() + "}").equals(sqlFieldMapping.parameter)){ + sb.append(getValueExpression(sqlFieldMapping.getField(), parameter.getValueType())); + break; + } + } } - sb.append("\t\t}").append("\n"); - sb.append("\t}").append("\n"); + sb.append(" }").append("\n"); sb.append("}").append("\n"); return sb.toString(); } + private String groovyIndicator(String code, String valueType,String sqlDatasourceName,String sql,List sqlFieldMappings,IndicatorLib lib){ + if(!StringUtils.hasText(sql) || !CollectionUtil.hasElements(sqlFieldMappings)){ + return null; + } + StringBuilder sb =new StringBuilder(); + if(StringUtils.hasText(sqlDatasourceName)){ + sb.append(StringUtil.format("javax.sql.DataSource ds =io.sc.engine.rule.client.spring.util.EngineSpringApplicationContextUtil.getDataSource('${0}');",sqlDatasourceName)).append("\n"); + }else{ + sb.append("javax.sql.DataSource ds =io.sc.engine.rule.client.spring.util.EngineSpringApplicationContextUtil.getDefaultDataSource();").append("\n"); + } + String sqlString =GroovyExpressionReplacer.groovy(IdReplacer.string(sql),String.class.getName()); + sb.append(StringUtil.format("String sql =${0};", sqlString)).append("\n"); + sb.append("try(").append("\n"); + sb.append(" Connection connection =ds.getConnection();").append("\n"); + sb.append(" PreparedStatement ps =connection.prepareStatement(sql);").append("\n"); + sb.append(" ResultSet rs =ps.executeQuery();").append("\n"); + sb.append("){").append("\n"); + sb.append(" if (rs.next()) {").append("\n"); + List indicators =lib.getIndicators(); + for(SqlFieldMapping sqlFieldMapping : sqlFieldMappings) { + sb.append(" "); + sb.append(PlaceHolderExpressionUtil.replace(sqlFieldMapping.parameter, "arg.","")); + sb.append(" ="); + for(Indicator indicator : indicators){ + if(("${" + indicator.getCode() + "}").equals(sqlFieldMapping.parameter)){ + sb.append(getValueExpression(sqlFieldMapping.getField(), indicator.getValueType())); + break; + } + } + } + sb.append(" }").append("\n"); + sb.append("}").append("\n"); + return sb.toString(); + } + + private String getValueExpression(String sqlFieldName,String valueType){ + return StringUtil.format("TypeConvertor.getValue(rs.getString(\"${0}\"),${1}.class);\n",sqlFieldName,valueType); + } + public String getParameter() { return parameter; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/WhenThen.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/WhenThen.java index 66374245..61ea00c9 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/WhenThen.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/processor/WhenThen.java @@ -6,6 +6,7 @@ import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.po.model.processor.WhenThenParameterProcessor; import io.sc.engine.rule.core.util.GroovyExpressionReplacer; import io.sc.engine.rule.core.util.IdReplacer; +import io.sc.engine.rule.core.util.ValueTypeUtil; import io.sc.platform.util.StringUtil; import org.springframework.util.StringUtils; @@ -32,11 +33,15 @@ public class WhenThen { if(!StringUtils.hasText(when) || !StringUtils.hasText(then)){ return null; } + if(ValueTypeUtil.isDecimal(valueType)){ + valueType ="java.lang.Double"; + }else if(ValueTypeUtil.isLong(valueType)){ + valueType ="java.lang.Long"; + } StringBuilder sb =new StringBuilder(); sb.append("if (").append(GroovyExpressionReplacer.groovy(when)).append(") {").append("\n"); sb.append("\t").append(GroovyExpressionReplacer.ARGUMENT_NAME).append(".").append(IdReplacer.fieldName(code)); - sb.append(" = "); - sb.append(GroovyExpressionReplacer.groovy(then,valueType)).append(";").append("\n"); + sb.append(" = TypeConvertor.getValue(").append(GroovyExpressionReplacer.groovy(then,valueType)).append(",").append(valueType).append(".class);").append("\n"); String debug =StringUtil.format("if(log.isDebugEnabled()){log.debug(\" WhenThen 运算结果 : {}\",${0});}",GroovyExpressionReplacer.ARGUMENT_NAME + "." + IdReplacer.fieldName(code)); sb.append("\t").append(debug).append("\n"); if(isShorted!=null && isShorted){ diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/function/ArithmeticFunction.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/function/ArithmeticFunction.java index 7f4308fd..194b1635 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/function/ArithmeticFunction.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/function/ArithmeticFunction.java @@ -88,12 +88,12 @@ public class ArithmeticFunction { * @param numbers 其他参数列表 * @return 和 */ - public static BigDecimal sum(T... numbers) { - BigDecimal sum =new BigDecimal(0); + public static Double sum(T... numbers) { + Double sum =Double.valueOf(0); if(numbers!=null) { for(Number number : numbers) { if(number!=null) { - sum =sum.add(new BigDecimal(number.doubleValue())); + sum =sum + number.doubleValue(); } } } @@ -104,75 +104,75 @@ public class ArithmeticFunction { return targetMin + ((value-sourceMin)/(sourceMax-sourceMin))*(targetMax-targetMin); } - public static BigDecimal multiply(Number x,Number y) { + public static Double multiply(Number x,Number y) { return multiply(x,y,8,RoundingMode.HALF_UP); } - public static BigDecimal multiply(Number x, Number y,int scale) { + public static Double multiply(Number x, Number y,int scale) { return multiply(x,y,scale,RoundingMode.HALF_UP); } - public static BigDecimal multiply(Number x, Number y, int scale, RoundingMode roundingMode) { + public static Double multiply(Number x, Number y, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); BigDecimal yy =new BigDecimal(x.toString()); - return xx.multiply(yy,new MathContext(scale,roundingMode)); + return xx.multiply(yy,new MathContext(scale,roundingMode)).doubleValue(); } - public static BigDecimal divide(Number x,Number y) { + public static Double divide(Number x,Number y) { return divide(x,y,8,RoundingMode.HALF_UP); } - public static BigDecimal divide(Number x, Number y,int scale) { + public static Double divide(Number x, Number y,int scale) { return divide(x,y,scale,RoundingMode.HALF_UP); } - public static BigDecimal divide(Number x, Number y, int scale, RoundingMode roundingMode) { + public static Double divide(Number x, Number y, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); BigDecimal yy =new BigDecimal(x.toString()); - return xx.divide(yy,scale,roundingMode); + return xx.divide(yy,scale,roundingMode).doubleValue(); } - public static BigDecimal pow(Number x, Number y) { + public static Double pow(Number x, Number y) { return pow(x,y,8,RoundingMode.HALF_UP); } - public static BigDecimal pow(Number x, Number y, int scale) { + public static Double pow(Number x, Number y, int scale) { return pow(x,y,scale,RoundingMode.HALF_UP); } - public static BigDecimal pow(Number x, Number y, int scale, RoundingMode roundingMode) { + public static Double pow(Number x, Number y, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); if(Long.class.isAssignableFrom(y.getClass())){ Long yy =Long.parseLong(y.toString()); - return BigDecimalMath.pow(xx,yy,new MathContext(scale,roundingMode)); + return BigDecimalMath.pow(xx,yy,new MathContext(scale,roundingMode)).doubleValue(); }else { BigDecimal yy = new BigDecimal(y.toString()); - return BigDecimalMath.pow(xx,yy,new MathContext(scale,roundingMode)); + return BigDecimalMath.pow(xx,yy,new MathContext(scale,roundingMode)).doubleValue(); } } - public static BigDecimal exp(Number x) { + public static Double exp(Number x) { return exp(x,8,RoundingMode.HALF_UP); } - public static BigDecimal exp(Number x, int scale) { + public static Double exp(Number x, int scale) { return exp(x,scale,RoundingMode.HALF_UP); } - public static BigDecimal exp(Number x, int scale, RoundingMode roundingMode) { + public static Double exp(Number x, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); - return BigDecimalMath.exp(xx,new MathContext(scale,roundingMode)); + return BigDecimalMath.exp(xx,new MathContext(scale,roundingMode)).doubleValue(); } - public static BigDecimal log(Number x, Number y) { + public static Double log(Number x, Number y) { return log(x,y,8,RoundingMode.HALF_UP); } - public static BigDecimal log(Number x, Number y, int scale) { + public static Double log(Number x, Number y, int scale) { return log(x,y,scale,RoundingMode.HALF_UP); } - public static BigDecimal log(Number x, Number y, int scale, RoundingMode roundingMode) { + public static Double log(Number x, Number y, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); BigDecimal yy =new BigDecimal(y.toString()); BigDecimal numerator =BigDecimalMath.log(yy,new MathContext(scale + 6,roundingMode)); @@ -180,57 +180,57 @@ public class ArithmeticFunction { return divide(numerator,denominator,scale,roundingMode); } - public static BigDecimal lg(Number x) { + public static Double lg(Number x) { return lg(x,8,RoundingMode.HALF_UP); } - public static BigDecimal lg(Number x, int scale) { + public static Double lg(Number x, int scale) { return lg(x,scale,RoundingMode.HALF_UP); } - public static BigDecimal lg(Number x, int scale, RoundingMode roundingMode) { + public static Double lg(Number x, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); - return BigDecimalMath.log10(xx,new MathContext(scale,roundingMode)); + return BigDecimalMath.log10(xx,new MathContext(scale,roundingMode)).doubleValue(); } - public static BigDecimal ln(Number x) { + public static Double ln(Number x) { return ln(x,8,RoundingMode.HALF_UP); } - public static BigDecimal ln(Number x, int scale) { + public static Double ln(Number x, int scale) { return ln(x,scale,RoundingMode.HALF_UP); } - public static BigDecimal ln(Number x, int scale, RoundingMode roundingMode) { + public static Double ln(Number x, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); - return BigDecimalMath.log(xx,new MathContext(scale,roundingMode)); + return BigDecimalMath.log(xx,new MathContext(scale,roundingMode)).doubleValue(); } - public static BigDecimal square(Number x) { + public static Double square(Number x) { return square(x,8,RoundingMode.HALF_UP); } - public static BigDecimal square(Number x, int scale) { + public static Double square(Number x, int scale) { return square(x,scale,RoundingMode.HALF_UP); } - public static BigDecimal square(Number x, int scale, RoundingMode roundingMode) { + public static Double square(Number x, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); - return BigDecimalMath.pow(xx,2,new MathContext(scale,roundingMode)); + return BigDecimalMath.pow(xx,2,new MathContext(scale,roundingMode)).doubleValue(); } - public static BigDecimal root(Number x,Number y) { + public static Double root(Number x,Number y) { return root(x,y,8,RoundingMode.HALF_UP); } - public static BigDecimal root(Number x, Number y,int scale) { + public static Double root(Number x, Number y,int scale) { return root(x,y,scale,RoundingMode.HALF_UP); } - public static BigDecimal root(Number x, Number y, int scale, RoundingMode roundingMode) { + public static Double root(Number x, Number y, int scale, RoundingMode roundingMode) { BigDecimal xx =new BigDecimal(x.toString()); BigDecimal yy =new BigDecimal(x.toString()); - return BigDecimalMath.root(xx,yy,new MathContext(scale,roundingMode)); + return BigDecimalMath.root(xx,yy,new MathContext(scale,roundingMode)).doubleValue(); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/GroovyExpressionReplacer.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/GroovyExpressionReplacer.java index 5de3d205..10205f5f 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/GroovyExpressionReplacer.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/GroovyExpressionReplacer.java @@ -1,18 +1,18 @@ package io.sc.engine.rule.core.util; import io.sc.platform.util.PlaceHolderExpressionUtil; +import io.sc.platform.util.StringUtil; import io.sc.platform.util.support.StringLengthDescComparator; import org.springframework.util.StringUtils; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; public class GroovyExpressionReplacer { public static final String ARGUMENT_NAME ="arg"; private static final Pattern EXPRESSION_REG_PATTERN =Pattern.compile("`(.+?)`"); + private static final Pattern VARIABLES_REG_PATTERN =Pattern.compile("\\$\\{(.+?)\\}"); /** * 将表达式转换为 groovy 可执行的脚本代码 @@ -46,6 +46,7 @@ public class GroovyExpressionReplacer { if(!StringUtils.hasText(content)){ return null; } + //content =content.replace("\"","\\\""); if(ValueTypeUtil.isString(valueType)){ // 在替换时, 需要先替换长度较长的, 避免替换错误 Map sortedCache =new TreeMap<>(new StringLengthDescComparator()); @@ -56,6 +57,7 @@ public class GroovyExpressionReplacer { String replaced = "${" + PlaceHolderExpressionUtil.replace(matcher.group(1),"arg.","") + "}"; sortedCache.put("<%" + index + "%>",replaced); content =content.replace(matcher.group(),"<%" + index + "%>"); + index++; } // 再处理 xxx content =PlaceHolderExpressionUtil.replace(content,"${arg.","}"); @@ -65,10 +67,41 @@ public class GroovyExpressionReplacer { for(String key : sortedCache.keySet()){ content =content.replace(key,sortedCache.get(key)); } - return "\"\"\"" + content + "\"\"\""; + + matcher =VARIABLES_REG_PATTERN.matcher(content); + Set variables =new HashSet<>(); + while(matcher.find()){ + variables.add(matcher.group(1)); + } + if(!variables.isEmpty()) { + int i =0; + for(String var : variables){ + content =content.replace("${" + var + "}","{" + i + "}"); + i++; + } + StringBuilder sb =new StringBuilder(); + sb.append("StringUtil.format(\""); + sb.append(content); + sb.append("\","); + sb.append(String.join(",",variables)); + sb.append(")"); + return sb.toString(); + }else{ + return "\"" + content + "\""; + } }else{ content =PlaceHolderEnumExpressionUtil.replace(content,"",""); - return PlaceHolderExpressionUtil.replace(content,"arg.",""); + if(StringUtils.hasText(valueType)) { + if(ValueTypeUtil.isLong(valueType)) { + return "TypeConvertor.getValue(" + PlaceHolderExpressionUtil.replace(content, "arg.", "") + ", Long.class)"; + }else if(ValueTypeUtil.isDecimal(valueType)){ + return "TypeConvertor.getValue(" + PlaceHolderExpressionUtil.replace(content, "arg.", "") + ", Double.class)"; + }else{ + return "TypeConvertor.getValue(" + PlaceHolderExpressionUtil.replace(content, "arg.", "") + "," + valueType + ".class)"; + } + }else{ + return PlaceHolderExpressionUtil.replace(content, "arg.", ""); + } } } } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/IdReplacer.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/IdReplacer.java index a6e54db8..83fff01e 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/IdReplacer.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/IdReplacer.java @@ -4,6 +4,10 @@ import io.sc.platform.util.StringUtil; import org.springframework.util.StringUtils; import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * 代码替换器 @@ -16,7 +20,7 @@ public class IdReplacer { public static final String FIELD_NAME_PREFIX ="_"; public static final String METHOD_NAME_PREFIX ="_"; public static final String VAR_NAME_PREFIX ="_"; - + private static final String[] 关键字 =new String[] { "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const", @@ -30,6 +34,7 @@ public class IdReplacer { "transient", "try", "void", "volatile", "while" }; private static String[] 标志符 =new String[] {"null","true","false"}; + private static final Pattern ARRAY_REG_PATTERN =Pattern.compile("arg\\.[a-zA-Z0-9_]+?\\[(.+?)\\]"); public static boolean isKeywords(String word){ return Arrays.binarySearch(关键字, word)>-1 || Arrays.binarySearch(标志符, word)>-1; @@ -169,4 +174,27 @@ public class IdReplacer { } return StringUtil.repeat("\t",count) + StringUtil.tabs(block,count); } + + public static String string(String content) { + if(!StringUtils.hasText(content)){ + return content; + } + content =content.replace("\"","\\\""); + content =content.replace("\n","\\n"); + content =content.replace("\r","\\r"); + return content; + } + + public static String array(String content){ + if(!StringUtils.hasText(content)){ + return content; + } + String result =content; + Matcher matcher =ARRAY_REG_PATTERN.matcher(content); + Set variables =new HashSet<>(); + while(matcher.find()){ + result =result.replace("[" + matcher.group(1) + "]",".get(" + matcher.group(1) + ")"); + } + return result; + } } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/PlaceHolderEnumExpressionUtil.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/PlaceHolderEnumExpressionUtil.java index 7b72a452..fb4d7caf 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/PlaceHolderEnumExpressionUtil.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/PlaceHolderEnumExpressionUtil.java @@ -186,7 +186,11 @@ public class PlaceHolderEnumExpressionUtil { if(parts==null || parts.isEmpty()){ continue; } - result.add(parts.get(0).getName()); + if(parts.size()==1) { + result.add(parts.get(0).getName()); + }else if(parts.size()>=2){ + result.add(parts.get(0).getName() + "." + parts.get(1).getName()); + } } return result; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ValueTypeUtil.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ValueTypeUtil.java index c085e21d..f690776d 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ValueTypeUtil.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/util/ValueTypeUtil.java @@ -46,9 +46,13 @@ public class ValueTypeUtil { return String.class.getName().equals(type); } + public static boolean isLong(Class type) { return isLong(type.getName());} + + public static boolean isLong(String type) { return Long.class.getName().equals(type);} + public static boolean isDecimal(Class type) { return isDecimal(type.getName());} - public static boolean isDecimal(String type) { return BigDecimal.class.getName().equals(type);} + public static boolean isDecimal(String type) { return BigDecimal.class.getName().equals(type) || Double.class.getName().equals(type);} public static boolean isEnum(Class type){ return type.isEnum(); diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/argument_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/argument_render.tpl new file mode 100644 index 00000000..24894780 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/argument_render.tpl @@ -0,0 +1,52 @@ +#define renderArgument(model) + @JsonIgnoreProperties(ignoreUnknown=true) + static class Argument { + #(tabs(ParameterGenerator.generateFields(model.getAllParameters()),2)) + + Argument() throws Exception {} + + public static Argument convertArgument(Map map) throws Exception { + if(map!=null){ + Argument arg =new Argument(); + #(tabs(ParameterGenerator.generateConvertorFromMap(model.getAllParameters()),4)) + return arg; + } + return null; + } + + public static Argument convertArgument(String json) throws Exception { + if(json!=null && !"".equals(json.trim())){ + Argument arg =ObjectMapperUtil.json().readValue(json, Argument.class); + #(tabs(ParameterGenerator.generateConvertorFromJson(model.getAllParameters()),4)) + return arg; + } + return null; + } + + public void validate(ValidateResult result) throws Exception { + #(tabs(ParameterGenerator.generateValidator(model.getAllParameters()),3)) + } + + public void mergeParameterValueFromIndicatorLib(Map libs) throws Exception { + #(tabs(ParameterGenerator.generateMergeParameterValueFromIndicatorLib(model.getAllParameters()),3)) + } + + public ExecuteResult toResult() throws Exception { + ExecuteResult result =new ExecuteResult(); + #(tabs(ParameterGenerator.generateToResult(model.getAllParameters()),3)) + return result; + } + + public Map toMap() throws Exception { + Map map =new HashMap(); + #(tabs(ParameterGenerator.generateToMap(model.getAllParameters()),3)) + return map; + } + + public void mergeResult(ExecuteResult result) throws Exception { + if(result!=null){ + #(tabs(ParameterGenerator.generateMergeResult(model.getAllParameters()),4)) + } + } + } +#end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/dictionary_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/dictionary_render.tpl new file mode 100644 index 00000000..57a2300c --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/dictionary_render.tpl @@ -0,0 +1,14 @@ +#define renderDictionary(dictionary) + /** + * #(dictionary.name) + */ + @JsonIgnoreProperties(ignoreUnknown=true) + static class #(className(dictionary.code,dictionary.version)) { + #(tabs(DictionaryGenerator.generateFields(dictionary),2)) + #if("ENUM"!=dictionary.type.toString()) + public void init(){ + #(tabs(DictionaryGenerator.generateFieldInits(dictionary),3)) + } + #end + } +#end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/functions_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/functions_render.tpl new file mode 100644 index 00000000..cd644469 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/functions_render.tpl @@ -0,0 +1,7 @@ +#define renderFunction(function) + + /** + * #(function.description) + */ + #(tabs(function.body,2)) +#end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/impl/lib.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/impl/lib.tpl new file mode 100644 index 00000000..2cfc147b --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/impl/lib.tpl @@ -0,0 +1,175 @@ +#set(dictionaries =executeUnit.dictionaries) +#set(lib =executeUnit.lib) + +####################################### +### 模版函数 +####################################### +#include("/io/sc/engine/rule/core/code/java/template/package_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/import_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/functions_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/dictionary_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/lib_render.tpl") + +#@renderPackage(packageName) + +#@renderImport() + +//****************************************************************************** +// 自定义函数 +//****************************************************************************** +class UDF { +#for(function : executeUnit.functions) + #@renderFunction(function) +#end +} + +//****************************************************************************** +// 执行主体类 +//****************************************************************************** +/** + * type: #(executeUnit.type) + * code: #(lib.code), + * name: #(lib.name), + * version: #(lib.version) + */ +class #(className(lib.code,lib.version)) { + private static final Logger log =LoggerFactory.getLogger(#(className(lib.code,lib.version)).class); + + /** + * 执行方法(Map作为输入参数,该 Map 封装了调用模型的参数) + * @param map 输入参数封装器 + * @return 执行结果 + */ + public static ExecuteResult execute(Map map) throws Exception { + return execute(map["executor"],map["subModelCode"],map["argument"]); + } + + public static ExecuteResult execute(Executor executor,String subModelCode,Object data) throws Exception { + if(log.isDebugEnabled()){log.debug("开始执行指标库 : #(className(lib.code,lib.version))");} + if(data instanceof Map){ + if(log.isDebugEnabled()){log.debug("显示输入参数(Map)=================================================\n{}",ObjectMapperUtil.json().writeValueAsString(data));} + }else if(data instanceof String){ + if(log.isDebugEnabled()){log.debug("显示输入参数(Json字符串)=================================================\n{}",data);} + } + if(log.isDebugEnabled()){log.debug("初始化指标库参数");} + Argument arg =Argument.convertArgument(data); + + if(log.isDebugEnabled()){log.debug("开始检查指标库输入参数数据合法性");} + ValidateResult validateResult =new ValidateResult(); + arg.validate(validateResult); + if(validateResult.hasError()){ + if(log.isDebugEnabled()){log.debug("\t检查结果: 失败!");} + ExecuteResult result =new ExecuteResult(); + result.setValidateResult(validateResult); + return result; + } + if(log.isDebugEnabled()){log.debug("\t检查结果: 成功!");} + + #for(indicator : lib.indicators) + #if("INDICATOR"==indicator.type.toString()) + #(methodName(indicator.code))(executor,arg);//#(indicator.name),#(indicator.type) + #end + #end + + //返回结果 + ExecuteResult result =arg.toResult(); + if(log.isDebugEnabled()){log.debug("指标库调用成功,返回结果:\n{}",ObjectMapperUtil.json().writeValueAsString(result));} + return result; + } + +#for(indicator : lib.indicators) + #if("INDICATOR"==indicator.type.toString()) + #set(parameter=indicator) + + public static void #(methodName(indicator.code))(Executor executor,Argument arg) { + #for(processor : indicator.processors) + if(log.isDebugEnabled()){log.debug(" {}","#(parameter.name)(#(parameter.type))");} + #switch (processor.type.toString()) + #case ("ARITHMETIC") + //算数运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/arithmetic.tpl") + if(log.isDebugEnabled()){log.debug(" 算数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("CONDITION_RANGE") + //条件分段函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/conditionRange.tpl") + if(log.isDebugEnabled()){log.debug(" 条件分段函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("GROOVY_SCRIPT") + //Groovy 脚本 + #include("/io/sc/engine/rule/core/code/java/template/processor/groovy_script.tpl") + #case ("HTTP_REQUEST") + //Http 请求 + #include("/io/sc/engine/rule/core/code/java/template/processor/http_request.tpl") + #case ("MATH_FORMULA") + //数学公式 + #include("/io/sc/engine/rule/core/code/java/template/processor/math_formula.tpl") + if(log.isDebugEnabled()){log.debug(" 数学公式运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("NUMBER_RANGE") + //数值分段函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/numberRange.tpl") + if(log.isDebugEnabled()){log.debug(" 数值分段函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("OBJECT_PROPERTIES") + //对象属性赋值函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/object_properties.tpl") + if(log.isDebugEnabled()){log.debug(" 对象属性函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("SQL") + //SQL 运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/sql.tpl") + #case ("TERNARY") + //三元运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/ternary.tpl") + if(log.isDebugEnabled()){log.debug(" 三元运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("WHEN_THEN") + //WhenThen 运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/when_then.tpl") + if(log.isDebugEnabled()){log.debug(" WhenThen 运算结果 : {}",arg.#(fieldName(parameter.code)));} + #end + #end + } + #end +#end +} + +@JsonIgnoreProperties(ignoreUnknown=true) +class Argument { + #(tabs(IndicatorGenerator.generateFields(lib.indicators),1)) + public static Argument convertArgument(Map map) throws Exception { + if(map!=null){ + Argument arg =new Argument(); + #(tabs(IndicatorGenerator.generateConvertorFromMap(lib.indicators,"arg"),3)) + return arg; + } + return null; + } + + public static Argument convertArgument(String json) throws Exception { + if(json!=null && !"".equals(json.trim())){ + Argument arg =ObjectMapperUtil.json().readValue(json, Argument.class); + #(tabs(IndicatorGenerator.generateConvertorFromJson(lib.indicators),3)) + return arg; + } + } + + public void validate(ValidateResult result) throws Exception { + #(tabs(IndicatorGenerator.generateValidator(lib.indicators),2)) + } + + public ExecuteResult toResult() throws Exception { + ExecuteResult result =new ExecuteResult(); + #(tabs(IndicatorGenerator.generateToResult(lib.indicators),2)) + return result; + } +} + +//****************************************************************************** +// 元数据定义类 +//****************************************************************************** +#for(dictionary : dictionaries) +#@renderDictionary(dictionary) +#end + +#if(generatorType=="Groovy") +//****************************************************************************** +// 执行并返回结果 +//****************************************************************************** +#(className(lib.code,lib.version)).execute(INPUT_PARAMETER); +#end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/impl/resource.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/impl/resource.tpl new file mode 100644 index 00000000..6b1c99f9 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/impl/resource.tpl @@ -0,0 +1,195 @@ +#set(resource = executeUnit.resource) +#set(dictionaries =executeUnit.dictionaries) +#set(libs =executeUnit.libs) +#set(model = resource.model) + +####################################### +### 模版函数 +####################################### +#include("/io/sc/engine/rule/core/code/java/template/package_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/import_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/functions_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/parameter_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/model_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/argument_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/dictionary_render.tpl") +#include("/io/sc/engine/rule/core/code/java/template/lib_render.tpl") + +#@renderPackage(packageName) + +#@renderImport() + +//****************************************************************************** +// 执行主体类 +//****************************************************************************** +/** + * type: #(executeUnit.type) + * code: #(resource.code), + * name: #(resource.name), + * version: #(resource.version) + */ +public class #(className(resource.code,resource.version)) { + private static final Logger log =LoggerFactory.getLogger(#(className(resource.code,resource.version)).class); + + /** + * 执行方法(Map作为输入参数,该 Map 封装了调用模型的参数) + * @param map 输入参数封装器 + * @return 执行结果 + */ + public static ExecuteResult execute(Map map) throws Exception{ + return execute((Executor)map.get("executor"),(String)map.get("subModelCode"),map.get("argument")); + } + + /** + * 执行方法 + * @param executor 执行器对象 + * @param subModelCode 子模型代码 + * @param data 输入参数 + * @return 执行结果 + */ + public static ExecuteResult execute(Executor executor,String subModelCode,Object data) throws Exception{ + if(log.isDebugEnabled()){log.debug("开始执行: #(resource.name)");} + boolean isInputMap =false; + if(data instanceof Map){ + isInputMap =true; + if(log.isDebugEnabled()){log.debug("显示输入参数(Map)=================================================\n{}",ObjectMapperUtil.json().writeValueAsString(data));} + }else if(data instanceof String){ + if(log.isDebugEnabled()){log.debug("显示输入参数(Json字符串)=================================================\n{}",data);} + } + + //初始化指标库 +#for(lib : libs) + if(log.isDebugEnabled()){log.debug("初始化指标库 : #(lib.name)_V#(lib.version)");} + + #(className(lib.code,lib.version)) #(varName(lib.code,lib.version)) =new #(className(lib.code,lib.version))(); + if(isInputMap){ + #(varName(lib.code,lib.version)).convertArgument((Map)data); + }else{ + #(varName(lib.code,lib.version)).convertArgument(data.toString()); + } +#end + + //初始化模型参数 + if(log.isDebugEnabled()){log.debug("从 {} 初始化模型参数",String.class==data.getClass()?"Json":"Map");} + Argument arg =null; + if(isInputMap){ + arg =Argument.convertArgument((Map)data); + }else{ + arg =Argument.convertArgument(data.toString()); + } + + //输入参数合法性检查 + ValidateResult validateResult =new ValidateResult(); + + //输入参数合法性检查(指标库) +#for(lib : libs) + if(log.isDebugEnabled()){log.debug("开始检查输入参数数据合法性(指标库: #(lib.name)_V#(lib.version))");} + #(varName(lib.code,lib.version)).validate(validateResult); + if(validateResult.hasError()){ + if(log.isDebugEnabled()){log.debug("\t检查结果: 失败!");} + ExecuteResult result =new ExecuteResult(); + result.setValidateResult(validateResult); + return result; + } + if(log.isDebugEnabled()){log.debug("\t检查结果: 成功!");} +#end + + //输入参数合法性检查(模型) + if(log.isDebugEnabled()){log.debug("开始检查模型输入参数数据合法性");} + arg.validate(validateResult); + if(validateResult.hasError()){ + if(log.isDebugEnabled()){log.debug("\t检查结果: 失败!");} + ExecuteResult result =new ExecuteResult(); + result.setValidateResult(validateResult); + return result; + } + if(log.isDebugEnabled()){log.debug("\t检查结果: 成功!");} + + //执行指标库 +#for(lib : executeUnit.getLibs()) + if(log.isDebugEnabled()){log.debug("开始执行指标库: #(lib.name)_V#(lib.version)");} + #(varName(lib.code,lib.version)).execute(); +#end + + //合并指标库指标 + if(log.isDebugEnabled()){log.debug("开始合并指标库指标");} + Map indicatorLibs =new HashMap(); +#for(lib : executeUnit.getLibs()) + indicatorLibs.put("#(varName(lib.code,lib.version))",#(varName(lib.code,lib.version))); +#end + arg.mergeParameterValueFromIndicatorLib(indicatorLibs); + if(log.isDebugEnabled()){log.debug("显示合并后输入参数:\n{}",ObjectMapperUtil.json().writeValueAsString(arg));} + + //执行模型 + if(subModelCode!=null && !"".equals(subModelCode.trim())){ + subModelCode =IdReplacer.methodName(subModelCode.trim()); + #(className(resource.code,resource.version)).class.getDeclaredMethod(subModelCode,Executor.class, Argument.class).invoke(null,executor,arg);//调用子模型 + }else{ + #(methodName(model.code))(executor,arg);//调用顶级模型(#(model.name)) + } + + //返回结果 + ExecuteResult result =arg.toResult(); + if(log.isDebugEnabled()){log.debug("模型调用成功,返回结果:\n{}",ObjectMapperUtil.json().writeValueAsString(result));} + return result; + } + + #@renderModel(model) + + ### 决策树函数 + #for(parameter : model.allParameters) + #if("INTERMEDIATE"==parameter.type.toString() || "OUT"==parameter.type.toString()) + #for(processor : parameter.processors) + #if("DECISION_TREE"==processor.type.toString()) + //决策树函数: #(parameter.name)(#(parameter.type)) + #(DecisionTree.groovy(parameter,processor)) + #end + #end + #end + #end + ### 执行流函数 + #for(parameter : model.allParameters) + #if("INTERMEDIATE"==parameter.type.toString() || "OUT"==parameter.type.toString()) + #for(processor : parameter.processors) + #if("EXECUTION_FLOW"==processor.type.toString()) + //执行流函数: #(parameter.name)(#(parameter.type)) + #(tabs(ExecutionFlow.groovy(parameter,processor),1)) + #end + #end + #end + #end + + //****************************************************************************** + // 自定义函数 + //****************************************************************************** + static class UDF { + #for(function : executeUnit.functions) + #@renderFunction(function) + #end + } + + //****************************************************************************** + // 模型参数定义类 + //****************************************************************************** + #@renderArgument(model) + + //****************************************************************************** + // 元数据定义类 + //****************************************************************************** + #for(dictionary : dictionaries) + #@renderDictionary(dictionary) + #end + + //****************************************************************************** + // 指标库定义类 + //****************************************************************************** + #for(lib : libs ) + #@renderLib(lib) + #end +} +#if(generatorType=="Groovy") +//****************************************************************************** +// 执行并返回结果 +//****************************************************************************** +#(className(resource.code,resource.version)).execute(INPUT_PARAMETER); +#end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/import_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/import_render.tpl new file mode 100644 index 00000000..bc9e088e --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/import_render.tpl @@ -0,0 +1,103 @@ +#define renderImport() +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.core.type.TypeReference; +import groovy.transform.Canonical; +import io.sc.engine.rule.client.Executor; +import io.sc.engine.rule.core.ResourceAbstract; +import io.sc.engine.rule.core.RuleSetResult; +import io.sc.engine.rule.core.SingleRuleResult; +import io.sc.engine.rule.core.FieldValidator; +import io.sc.engine.rule.core.ParameterResult; +import io.sc.engine.rule.core.ExecuteResult; +import io.sc.engine.rule.core.ValidateResult; +import io.sc.engine.rule.core.enums.ParameterType; +import io.sc.engine.rule.core.enums.RuntimeInputParameterType; +import io.sc.engine.rule.core.function.JpmmlEvaluator; +import io.sc.engine.rule.core.util.IdReplacer; +import io.sc.engine.rule.core.util.ESql; +import io.sc.platform.util.DateUtil; +import io.sc.platform.util.ObjectMapperUtil; +import io.sc.platform.util.StringUtil; +import io.sc.platform.util.TypeConvertor; +import java.math.*; +import java.util.*; +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import static io.sc.engine.rule.core.function.ArithmeticFunction.multiply; +import static io.sc.engine.rule.core.function.ArithmeticFunction.divide; +import static io.sc.engine.rule.core.function.ArithmeticFunction.exp; +import static io.sc.engine.rule.core.function.ArithmeticFunction.pow; +import static io.sc.engine.rule.core.function.ArithmeticFunction.lg; +import static io.sc.engine.rule.core.function.ArithmeticFunction.ln; +import static io.sc.engine.rule.core.function.ArithmeticFunction.log; +import static io.sc.engine.rule.core.function.ArithmeticFunction.max; +import static io.sc.engine.rule.core.function.ArithmeticFunction.min; +import static io.sc.engine.rule.core.function.ArithmeticFunction.mod; +import static io.sc.engine.rule.core.function.ArithmeticFunction.randomInt; +import static io.sc.engine.rule.core.function.ArithmeticFunction.square; +import static io.sc.engine.rule.core.function.ArithmeticFunction.root; +import static io.sc.engine.rule.core.function.ArithmeticFunction.sum; +import static io.sc.engine.rule.core.function.ArithmeticFunction.transformSequencing; +import static io.sc.engine.rule.core.function.DateFunction.now; +import static io.sc.engine.rule.core.function.DateFunction.yyyyMMdd; +import static io.sc.engine.rule.core.function.DateFunction.yyyy_MM_dd; +import static io.sc.engine.rule.core.function.NormalDistributionFunction.G; +import static io.sc.engine.rule.core.function.NormalDistributionFunction.iG; +import static io.sc.engine.rule.core.function.SpecialValueFunction.infinite; +import static io.sc.engine.rule.core.function.SpecialValueFunction.isInfinite; +import static io.sc.engine.rule.core.function.SpecialValueFunction.isNan; +import static io.sc.engine.rule.core.function.SpecialValueFunction.isNil; +import static io.sc.engine.rule.core.function.SpecialValueFunction.isZero; +import static io.sc.engine.rule.core.function.SpecialValueFunction.nan; +import static io.sc.engine.rule.core.function.SpecialValueFunction.nil; +import static io.sc.engine.rule.core.function.SpecialValueFunction.zero; +import static io.sc.engine.rule.core.function.StringFunction.contains; +import static io.sc.engine.rule.core.function.StringFunction.endsWith; +import static io.sc.engine.rule.core.function.StringFunction.join; +import static io.sc.engine.rule.core.function.StringFunction.length; +import static io.sc.engine.rule.core.function.StringFunction.lowerCase; +import static io.sc.engine.rule.core.function.StringFunction.replace; +import static io.sc.engine.rule.core.function.StringFunction.startsWith; +import static io.sc.engine.rule.core.function.StringFunction.substring; +import static io.sc.engine.rule.core.function.StringFunction.trim; +import static io.sc.engine.rule.core.function.StringFunction.upperCase; +import static io.sc.platform.util.CollectionUtil.hasElements; +import static io.sc.platform.util.DateUtil.yearsBetween; +import static io.sc.platform.util.DateUtil.monthsBetween; +import static io.sc.platform.util.DateUtil.weeksBetween; +import static io.sc.platform.util.DateUtil.daysBetween; +import static io.sc.platform.util.DateUtil.hoursBetween; +import static io.sc.platform.util.DateUtil.minutesBetween; +import static io.sc.platform.util.DateUtil.secondsBetween; +import static io.sc.platform.util.NumberUtil.comma; +import static io.sc.platform.util.NumberUtil.decimal; +import static io.sc.platform.util.NumberUtil.money; +import static io.sc.platform.util.NumberUtil.percent; +import static java.lang.Math.E; +import static java.lang.Math.IEEEremainder; +import static java.lang.Math.PI; +import static java.lang.Math.abs; +import static java.lang.Math.acos; +import static java.lang.Math.asin; +import static java.lang.Math.atan; +import static java.lang.Math.atan2; +import static java.lang.Math.cbrt; +import static java.lang.Math.ceil; +import static java.lang.Math.cos; +import static java.lang.Math.cosh; +import static java.lang.Math.floor; +import static java.lang.Math.random; +import static java.lang.Math.rint; +import static java.lang.Math.round; +import static java.lang.Math.sin; +import static java.lang.Math.sinh; +import static java.lang.Math.sqrt; +import static java.lang.Math.tan; +import static java.lang.Math.tanh; +import static java.lang.Math.toDegrees; +import static java.lang.Math.toRadians; +#end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/lib_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/lib_render.tpl new file mode 100644 index 00000000..9f2f3f1e --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/lib_render.tpl @@ -0,0 +1,80 @@ +#define renderLib(lib) + @JsonIgnoreProperties(ignoreUnknown=true) + static class #(className(lib.code,lib.version)) { + #(tabs(IndicatorGenerator.generateFields(lib.indicators),2)) + + //通过输入参数构建指标库对象 + public void convertArgument(Map map) throws Exception { + #(className(lib.code,lib.version)) arg =this; + #(tabs(IndicatorGenerator.generateConvertorFromMap(lib.indicators,"this"),3)) + } + + public void convertArgument(String json) throws Exception { + #(className(lib.code,lib.version)) arg =this; + #(tabs(IndicatorGenerator.generateConvertorFromJson(lib.indicators),3)) + } + + public void execute() throws Exception { + #for(indicator : lib.indicators) + #if(indicator.type.toString()=="INDICATOR" && indicator.processors!=null && indicator.processors.size()>0) + #(methodName(indicator.code))();//#(indicator.name),#(indicator.type) + #end + #end + } + + public void validate(ValidateResult result) throws Exception { + #(tabs(IndicatorGenerator.generateValidator(lib.indicators),3)) + } + + #for(indicator : lib.indicators) + #if(indicator.type.toString()=="INDICATOR" && indicator.processors!=null && indicator.processors.size()>0) + #set(parameter=indicator) + public void #(methodName(indicator.code))() throws Exception { + #(className(lib.code,lib.version)) arg =this; + #for(processor : indicator.processors) + if(log.isDebugEnabled()){log.debug(" {}","#(parameter.name)(#(parameter.type))");} + #switch (processor.type.toString()) + #case ("ARITHMETIC") + //算数运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/arithmetic.tpl") + if(log.isDebugEnabled()){log.debug(" 算数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("CONDITION_RANGE") + //条件分段函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/conditionRange.tpl") + if(log.isDebugEnabled()){log.debug(" 条件分段函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("GROOVY_SCRIPT") + //Groovy 脚本 + #include("/io/sc/engine/rule/core/code/java/template/processor/groovy_script.tpl") + #case ("HTTP_REQUEST") + //Http 请求 + #include("/io/sc/engine/rule/core/code/java/template/processor/http_request.tpl") + #case ("MATH_FORMULA") + //数学公式 + #include("/io/sc/engine/rule/core/code/java/template/processor/math_formula.tpl") + if(log.isDebugEnabled()){log.debug(" 数学公式运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("NUMBER_RANGE") + //数值分段函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/numberRange.tpl") + if(log.isDebugEnabled()){log.debug(" 数值分段函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("OBJECT_PROPERTIES") + //对象属性赋值函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/object_properties.tpl") + if(log.isDebugEnabled()){log.debug(" 对象属性函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("SQL") + //SQL 运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/sql.tpl") + #case ("TERNARY") + //三元运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/ternary.tpl") + if(log.isDebugEnabled()){log.debug(" 三元运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("WHEN_THEN") + //WhenThen 运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/when_then.tpl") + if(log.isDebugEnabled()){log.debug(" WhenThen 运算结果 : {}",arg.#(fieldName(parameter.code)));} + #end + #end + } + #end + #end + } +#end diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/model_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/model_render.tpl new file mode 100644 index 00000000..bd0af67d --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/model_render.tpl @@ -0,0 +1,30 @@ +#define renderModel(model) + //#(model.fullName.contains("/")?"子":"主")模型(#(model.fullName)) + private static void #(methodName(model.code))(Executor executor,Argument arg) throws Exception { + if(log.isDebugEnabled()){log.debug("开始调用模型: {}({})","#(model.fullName)","#(model.executeMode)");} + + #if(!model.enable) + if(log.isDebugEnabled()){log.debug("开始调用模型: enable==false");} + #end + #if(model.executeMode.toString()=="DOWN_UP") + //调用子模型 + #for(subModel : model.children) + #(methodName(subModel.code))(executor,arg);//#(subModel.name) + #end + #end + + //计算中间值和结果值 + #for(parameter : model.parameters) + #if(parameter.type.toString()=="INTERMEDIATE" || parameter.type.toString()=="OUT") + #(methodName(parameter.code))(executor,arg);//#(parameter.type), #(parameter.name) + #end + #end + } + + ### 递归调用生成子模式代码 + #for(subModel : model.children) + #@renderModel(subModel) + #end + + #@renderParameter(model) +#end diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/package_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/package_render.tpl new file mode 100644 index 00000000..c50ae80f --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/package_render.tpl @@ -0,0 +1,3 @@ +#define renderPackage(packageName) +package #(packageName); +#end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/parameter_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/parameter_render.tpl new file mode 100644 index 00000000..971248a3 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/parameter_render.tpl @@ -0,0 +1,103 @@ +#define renderParameter(model) +#for(parameter : model.parameters) + #if(("INTERMEDIATE"==parameter.type.toString() || "OUT"==parameter.type.toString()) && ("io.sc.engine.rule.core.SingleRuleResult"==parameter.valueType || "io.sc.engine.rule.core.RuleSetResult"==parameter.valueType)) + //参数处理器, #(parameter.name)(#(parameter.type)) + private static void #(methodName(parameter.code))(Executor executor,Argument arg) throws Exception { + if(log.isDebugEnabled()){log.debug(" {}","#(parameter.name)(#(parameter.type))");} + #for(processor : parameter.processors) + #if(processor.enable) + #switch (processor.type.toString()) + #case ("SINGLE_RULE") + //单规则 + #include("/io/sc/engine/rule/core/code/java/template/processor/single_rule.tpl") + if(log.isDebugEnabled()){log.debug(" 单规则运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("RULE_SET") + //规则集 + #include("/io/sc/engine/rule/core/code/java/template/processor/rule_set.tpl") + if(log.isDebugEnabled()){log.debug(" 规则集运算结果 : {}",arg.#(fieldName(parameter.code)));} + #end + #end + #end + } + #else if("INTERMEDIATE"==parameter.type.toString() || "OUT"==parameter.type.toString()) + //参数处理器, #(parameter.name)(#(parameter.type)) + private static void #(methodName(parameter.code))(Executor executor,Argument arg) throws Exception { + if(log.isDebugEnabled()){log.debug(" {}","#(parameter.name)(#(parameter.type))");} + #for(processor : parameter.processors) + #if(processor.enable) + #switch (processor.type.toString()) + #case ("ARITHMETIC") + //算数运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/arithmetic.tpl") + if(log.isDebugEnabled()){log.debug(" 算数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("CONDITION_RANGE") + //条件分段函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/conditionRange.tpl") + if(log.isDebugEnabled()){log.debug(" 条件分段函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("DECISION_TABLE") + //决策表 + #include("/io/sc/engine/rule/core/code/java/template/processor/decision_table.tpl") + if(log.isDebugEnabled()){log.debug(" 决策表运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("DECISION_TABLE_2C") + //简单决策表 + #include("/io/sc/engine/rule/core/code/java/template/processor/decision_table_2c.tpl") + if(log.isDebugEnabled()){log.debug(" 简单决策表运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("DECISION_TREE") + //决策树（此处只是入口,真正的决策树计算逻辑在后面通过一系列方法完成） + #include("/io/sc/engine/rule/core/code/java/template/processor/decision_tree.tpl") + if(log.isDebugEnabled()){log.debug(" 决策树运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("EXECUTION_FLOW") + //执行流（此处只是入口,真正的执行流计算逻辑在后面通过一系列方法完成） + #include("/io/sc/engine/rule/core/code/java/template/processor/execution_flow.tpl") + if(log.isDebugEnabled()){log.debug(" 执行流运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("GROOVY_SCRIPT") + //Groovy 脚本 + #include("/io/sc/engine/rule/core/code/java/template/processor/groovy_script.tpl") + #case ("HTTP_REQUEST") + //Http 请求 + #include("/io/sc/engine/rule/core/code/java/template/processor/http_request.tpl") + #case ("MATH_FORMULA") + //数学公式 + #include("/io/sc/engine/rule/core/code/java/template/processor/math_formula.tpl") + if(log.isDebugEnabled()){log.debug(" 数学公式运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("NUMBER_RANGE") + //数值分段函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/numberRange.tpl") + if(log.isDebugEnabled()){log.debug(" 数值分段函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("OBJECT_PROPERTIES") + //对象属性赋值函数 + #include("/io/sc/engine/rule/core/code/java/template/processor/object_properties.tpl") + if(log.isDebugEnabled()){log.debug(" 对象属性函数运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("OPTION_VALUE") + //选项值运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/option_value.tpl") + if(log.isDebugEnabled()){log.debug(" 选项运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("PMML") + //PMML + #include("/io/sc/engine/rule/core/code/java/template/processor/pmml.tpl") + #case ("RULE") + #case ("SCORE_CARD") + //评分卡 + #include("/io/sc/engine/rule/core/code/java/template/processor/score_card.tpl") + #case ("SINGLE_RULE") + #case ("SQL") + //SQL 运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/sql.tpl") + #case ("TERNARY") + //三元运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/ternary.tpl") + if(log.isDebugEnabled()){log.debug(" 三元运算结果 : {}",arg.#(fieldName(parameter.code)));} + #case ("WHEN_THEN") + //WhenThen 运算 + #include("/io/sc/engine/rule/core/code/java/template/processor/when_then.tpl") + if(log.isDebugEnabled()){log.debug(" WhenThen 运算结果 : {}",arg.#(fieldName(parameter.code)));} + #end + #end + #end + + if(log.isDebugEnabled()){log.debug(" 参数结果值 : {}",arg.#(fieldName(parameter.code)));} + } + +#end +#end +#end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/arithmetic.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/arithmetic.tpl new file mode 100644 index 00000000..76ad3cbf --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/arithmetic.tpl @@ -0,0 +1 @@ +arg.#(fieldName(parameter.code)) =#(Arithmetic.groovy(parameter,processor)); \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/conditionRange.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/conditionRange.tpl new file mode 100644 index 00000000..df3f6ba8 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/conditionRange.tpl @@ -0,0 +1 @@ +#(tabs(ConditionRange.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_table.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_table.tpl new file mode 100644 index 00000000..0aac00c9 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_table.tpl @@ -0,0 +1 @@ +#(tabs(DecisionTable.groovy(parameter,processor,model.allParameters),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_table_2c.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_table_2c.tpl new file mode 100644 index 00000000..eaec55ec --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_table_2c.tpl @@ -0,0 +1 @@ +#(tabs(DecisionTable2C.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_tree.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_tree.tpl new file mode 100644 index 00000000..adc08687 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/decision_tree.tpl @@ -0,0 +1 @@ +arg.#(fieldName(parameter.code)) =Tree_#(fieldName(parameter.code))_#(DecisionTree.parse(processor.decisionTree).id)(executor,arg); \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/execution_flow.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/execution_flow.tpl new file mode 100644 index 00000000..c987cb11 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/execution_flow.tpl @@ -0,0 +1 @@ +Flow_#(fieldName(parameter.code))_#(ExecutionFlow.parse(processor.executionFlow).id)(executor,arg); \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/groovy_script.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/groovy_script.tpl new file mode 100644 index 00000000..d7e20cf6 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/groovy_script.tpl @@ -0,0 +1 @@ +#(tabs(array(io.sc.engine.rule.core.util.GroovyExpressionReplacer::groovy(processor.groovyScript)),3)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/http_request.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/http_request.tpl new file mode 100644 index 00000000..2c139ef3 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/http_request.tpl @@ -0,0 +1 @@ +#(tabs(HttpRequest.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/math_formula.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/math_formula.tpl new file mode 100644 index 00000000..287307a4 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/math_formula.tpl @@ -0,0 +1 @@ +arg.#(fieldName(parameter.code)) =#(MathFormula.groovy(parameter,processor)); \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/numberRange.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/numberRange.tpl new file mode 100644 index 00000000..44e2df37 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/numberRange.tpl @@ -0,0 +1 @@ +#(tabs(NumberRange.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/object_properties.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/object_properties.tpl new file mode 100644 index 00000000..5f5907f5 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/object_properties.tpl @@ -0,0 +1 @@ +#(tabs(ObjectProperty.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/option_value.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/option_value.tpl new file mode 100644 index 00000000..fa0592b6 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/option_value.tpl @@ -0,0 +1 @@ +#(tabs(OptionValue.groovy(parameter,processor,model),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/pmml.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/pmml.tpl new file mode 100644 index 00000000..8e8fc91d --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/pmml.tpl @@ -0,0 +1,4 @@ +arg.#(fieldName(parameter.code)) =JpmmlEvaluator.evaluate( + "#(parameter.id)_#(processor.id)", + "#(tabs(string(processor.pmml),3))" + ,arg.toMap()); diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/rule_set.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/rule_set.tpl new file mode 100644 index 00000000..f7e97293 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/rule_set.tpl @@ -0,0 +1 @@ +#(tabs(RuleSet.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/score_card.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/score_card.tpl new file mode 100644 index 00000000..5564e645 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/score_card.tpl @@ -0,0 +1 @@ +#(tabs(ScoreCard.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/single_rule.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/single_rule.tpl new file mode 100644 index 00000000..6d3b5d94 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/single_rule.tpl @@ -0,0 +1 @@ +#(tabs(SingleRule.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/sql.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/sql.tpl new file mode 100644 index 00000000..c2fe3f62 --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/sql.tpl @@ -0,0 +1 @@ +#(tabs(SqlFieldMapping.groovy(parameter,processor,model),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/ternary.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/ternary.tpl new file mode 100644 index 00000000..d3ba932d --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/ternary.tpl @@ -0,0 +1 @@ +#(tabs(Ternary.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/when_then.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/when_then.tpl new file mode 100644 index 00000000..67c2fcad --- /dev/null +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/java/template/processor/when_then.tpl @@ -0,0 +1 @@ +#(tabs(WhenThen.groovy(parameter,processor),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/dictionary_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/dictionary_render.tpl index a05f3d0b..40520af4 100644 --- a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/dictionary_render.tpl +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/dictionary_render.tpl @@ -5,9 +5,10 @@ @JsonIgnoreProperties(ignoreUnknown=true) class #(className(dictionary.code,dictionary.version)) { #(tabs(DictionaryGenerator.generateFields(dictionary),1)) - + #if("ENUM"!=dictionary.type.toString()) public void init(){ #(tabs(DictionaryGenerator.generateFieldInits(dictionary),2)) } + #end } #end \ No newline at end of file diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/impl/lib.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/impl/lib.tpl index 8f633187..a69b608d 100644 --- a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/impl/lib.tpl +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/impl/lib.tpl @@ -40,11 +40,11 @@ class #(className(lib.code,lib.version)) { * @param map 输入参数封装器 * @return 执行结果 */ - public static ResourceResult execute(Map map) throws Exception { + public static ExecuteResult execute(Map map) throws Exception { return execute(map["executor"],map["subModelCode"],map["argument"]); } - public static ResourceResult execute(Executor executor,String subModelCode,Object data) throws Exception { + public static ExecuteResult execute(Executor executor,String subModelCode,Object data) throws Exception { if(log.isDebugEnabled()){log.debug("开始执行指标库 : #(className(lib.code,lib.version))");} if(data instanceof Map){ if(log.isDebugEnabled()){log.debug("显示输入参数(Map)=================================================\n{}",ObjectMapperUtil.json().writeValueAsString(data));} @@ -59,7 +59,7 @@ class #(className(lib.code,lib.version)) { arg.validate(validateResult); if(validateResult.hasError()){ if(log.isDebugEnabled()){log.debug("\t检查结果: 失败!");} - ResourceResult result =new ResourceResult(); + ExecuteResult result =new ExecuteResult(); result.setValidateResult(validateResult); return result; } @@ -72,7 +72,7 @@ class #(className(lib.code,lib.version)) { #end //返回结果 - ResourceResult result =arg.toResult(); + ExecuteResult result =arg.toResult(); if(log.isDebugEnabled()){log.debug("指标库调用成功,返回结果:\n{}",ObjectMapperUtil.json().writeValueAsString(result));} return result; } @@ -153,8 +153,8 @@ class Argument { #(tabs(IndicatorGenerator.generateValidator(lib.indicators),2)) } - public ResourceResult toResult(){ - ResourceResult result =new ResourceResult(); + public ExecuteResult toResult(){ + ExecuteResult result =new ExecuteResult(); #(tabs(IndicatorGenerator.generateToResult(lib.indicators),2)) return result; } diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/import_render.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/import_render.tpl index d18ca428..cf15d49d 100644 --- a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/import_render.tpl +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/import_render.tpl @@ -20,6 +20,11 @@ import io.sc.platform.util.ObjectMapperUtil; import io.sc.platform.util.StringUtil; import io.sc.platform.util.TypeConvertor; import java.math.*; +import java.util.*; +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.util.Map; import java.util.Random; import org.slf4j.Logger; diff --git a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/processor/sql.tpl b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/processor/sql.tpl index 784203e7..c2fe3f62 100644 --- a/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/processor/sql.tpl +++ b/io.sc.engine.rule.core/src/main/resources/io/sc/engine/rule/core/code/template/processor/sql.tpl @@ -1 +1 @@ -#(tabs(SqlFieldMapping.groovy(parameter,processor),2)) \ No newline at end of file +#(tabs(SqlFieldMapping.groovy(parameter,processor,model),2)) \ No newline at end of file diff --git a/io.sc.engine.rule.frontend/src/i18n/messages.json b/io.sc.engine.rule.frontend/src/i18n/messages.json index 3b758de4..42cbb817 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages.json @@ -102,6 +102,7 @@ "re.option.grid.entity.inputValue": "Input Value", "re.option.grid.entity.value": "Value", "re.option.grid.entity.title": "Title", + "re.option.grid.entity.config": "Configure", "re.addition.grid.title": "Addition Items", "re.addition.grid.entity.code": "Code", diff --git a/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json b/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json index 0f80b077..fa0d7d26 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages_tw_CN.json @@ -102,6 +102,7 @@ "re.option.grid.entity.inputValue": "輸入值", "re.option.grid.entity.value": "計算值", "re.option.grid.entity.title": "顯示文本", + "re.option.grid.entity.config": "配置", "re.addition.grid.title": "補錄項", "re.addition.grid.entity.code": "代碼", diff --git a/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json b/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json index f81898af..7307fdef 100644 --- a/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.engine.rule.frontend/src/i18n/messages_zh_CN.json @@ -103,6 +103,7 @@ "re.option.grid.entity.inputValue": "输入值", "re.option.grid.entity.value": "计算值", "re.option.grid.entity.title": "显示文本", + "re.option.grid.entity.config": "配置", "re.addition.grid.title": "补录项", "re.addition.grid.entity.code": "代码", diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue index 70fd7c0b..068b8ae4 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue @@ -52,7 +52,15 @@ { width: 100, name: 'inputValue', label: $t('re.option.grid.entity.inputValue') }, { width: 100, name: 'value', label: $t('re.option.grid.entity.value') }, { width: 400, name: 'title', label: $t('re.option.grid.entity.title') }, - { width: '100%', name: 'description', label: $t('description') }, + { width: 200, name: 'description', label: $t('description') }, + { + width: 400, + name: 'config', + label: $t('re.option.grid.entity.config'), + format: (value: any, row: any) => { + return PlaceHolder.replace(value); + }, + }, ]" :editor="{ dialog: { @@ -83,6 +91,18 @@ label: $t('description'), type: 'w-text', }, + { + name: 'config', + label: $t('re.option.grid.entity.config'), + type: 'w-code-mirror', + toolbar: false, + lang: 'java', + rows: 4, + lineWrap: true, + lineBreak: false, + placeholder: true, + autoCompletion: autoCompletionManager.autoCompletion(), + }, ], }, }" @@ -96,16 +116,24 @@ { name: 'value', label: $t('re.option.grid.entity.value') }, { name: 'title', label: $t('re.option.grid.entity.title') }, { name: 'description', label: $t('description') }, + { name: 'config', label: $t('re.option.grid.entity.config') }, ...CorporationAuditorEntityManager.getViewerFields(), ], }, }" + @after-editor-open=" + (args: any) => { + autoCompletionManager.load(Environment.apiContextPath('/api/re/common/parameterAndValueType/findByParameterId/' + parameter.id)); + } + " >