From 1bd4203a391832f1f1217e08753b4ed570db3f3d Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期三, 10 四月 2024 11:58:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Bin/lib/thrid/bsf-2.3.0.jar | 0 Bin/lib/service/VciServiceMain.jar | 0 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java | 11 +++ Bin/lib/client/jgoodies-looks-2.5.3.jar | 0 Bin/lib/thrid/commons-dbcp-1.1.jar | 0 Bin/lib/client/uitheme-1.3.1.jar | 0 Bin/lib/thrid/XmlSchema-1.1.jar | 0 Bin/lib/thrid/jbpm-4.3.2.jar | 0 Bin/lib/thrid/livetribe-jsr223.jar | 0 Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar | 0 Bin/lib/service/UIService.jar | 0 Bin/lib/thrid/ojdbc8.jar | 0 Bin/lib/client/jgraph.jar | 0 Source/ProjectWeb/src/actions/AddAction.js | 4 + Bin/lib/client/plt-clientbase.jar | 0 Bin/lib/thrid/portalcustom.jar | 0 Bin/lib/common/plt-slice.jar | 0 Bin/lib/thrid/poi-3.9-20121203.jar | 0 Bin/lib/thrid/inforbroker-core-5.1.0.jar | 0 Bin/lib/thrid/jta-1.1.jar | 0 Bin/lib/client/poi-ooxml-3.9-20121203.jar | 0 Bin/lib/service/WFService.jar | 0 Bin/lib/thrid/jcommon-1.0.17.jar | 0 Bin/lib/common/junit-4.8.jar | 0 Bin/lib/thrid/commons-codec-1.3.jar | 0 Bin/lib/thrid/antlr-2.7.6.jar | 0 Bin/lib/common/icegridgui.jar | 0 Bin/lib/common/plt-common.jar | 0 Bin/lib/thrid/xmlsec-1.3.0.jar | 0 Bin/lib/service/CacheService.jar | 0 Bin/lib/thrid/jms-1.1.jar | 0 Bin/lib/thrid/jedis-2.9.0.jar | 0 Bin/lib/client/swixml.jar | 0 Bin/lib/client/poi-scratchpad-3.9-20121203.jar | 0 Bin/lib/thrid/commons-pool2-2.6.2.jar | 0 Bin/lib/thrid/javassist-3.12.0.GA.jar | 0 Bin/lib/common/dom4j-1.6.1.jar | 0 Bin/lib/thrid/rsyntax.jar | 0 Bin/lib/client/poi-3.9-20121203.jar | 0 Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar | 0 Bin/lib/thrid/jdsl.jar | 0 Bin/lib/client/flatlaf-2.3.jar | 0 Bin/lib/thrid/slf4j-jdk14-1.7.14.jar | 0 Bin/lib/thrid/logkit-1.2.jar | 0 Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar | 0 Bin/lib/thrid/xml-apis.jar | 0 Bin/lib/thrid/axis.jar | 0 Bin/lib/client/icegridgui.jar | 0 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java | 12 ++++ Bin/lib/client/nativeskin.jar | 0 Source/ProjectWeb/src/actions/BaseAction.js | 52 +++++++++++++++++ Bin/lib/thrid/xstream-1.3.1.jar | 0 Bin/lib/thrid/avalon-framework-4.1.5.jar | 0 Bin/lib/thrid/bsh.jar | 0 Bin/lib/thrid/commons-discovery-0.2.jar | 0 Bin/lib/common/log4j-api-2.12.4.jar | 0 Bin/lib/thrid/plugin.jar | 0 Bin/lib/client/plt-client.jar | 0 Bin/lib/thrid/activation.jar | 0 Bin/lib/thrid/commons-io-2.0.1.jar | 0 Bin/lib/thrid/picocontainer-1.2.jar | 0 Bin/lib/thrid/commons-fileupload-1.2.2.jar | 0 Bin/lib/thrid/ognl-2.6.11.jar | 0 Bin/lib/common/commons-lang3-3.1.jar | 0 Bin/lib/thrid/guava-20.0.jar | 0 Bin/lib/thrid/juel-engine.jar | 0 Bin/lib/thrid/commons-net-1.4.1.jar | 0 Bin/lib/thrid/jfreechart-1.0.14.jar | 0 Bin/lib/thrid/juel.jar | 0 Bin/lib/common/fastjson-1.2.83.jar | 0 Bin/lib/common/log4j-core-2.12.4.jar | 0 Bin/lib/thrid/jaxen-1.1-beta-9.jar | 0 Bin/lib/service/OQService.jar | 0 Bin/lib/thrid/poi-ooxml-3.9-20121203.jar | 0 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 4 Bin/lib/thrid/jcalendar-1.3.3.jar | 0 Bin/lib/thrid/commons-httpclient-3.0.jar | 0 Bin/lib/thrid/axis-ant.jar | 0 Bin/lib/client/swingx-1.6.1.jar | 0 Bin/lib/thrid/commons-collections-3.1.jar | 0 Bin/lib/client/skinlf.jar | 0 Bin/lib/service/BOFService.jar | 0 Bin/lib/thrid/jee-management-1.1.jar | 0 Bin/lib/thrid/IKAnalyzer2012FF_u1.jar | 0 Bin/lib/thrid/hibernate3.jar | 0 Bin/lib/thrid/quartz-all-1.8.6.jar | 0 Bin/lib/thrid/slf4j-api-1.7.14.jar | 0 Bin/lib/thrid/jdom-1.0.jar | 0 Bin/lib/service/WFPlugins.jar | 0 Bin/lib/thrid/jaxrpc.jar | 0 Bin/lib/thrid/juel-impl.jar | 0 Bin/lib/thrid/saaj.jar | 0 Bin/lib/thrid/proxool-0.8.3.jar | 0 Bin/lib/service/VolumeService.jar | 0 Bin/lib/client/pinyin4j-2.5.0.jar | 0 Bin/lib/client/protege35.jar | 0 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 2 Bin/lib/client/jgoodies-common-1.8.1.jar | 0 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 49 +++++++++------- Bin/lib/thrid/c3p0-0.9.1.jar | 0 Bin/lib/service/FrameService.jar | 0 Bin/lib/service/ServiceBase.jar | 0 Bin/lib/service/OMDService.jar | 0 Bin/lib/common/freemarker.jar | 0 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 1 Bin/lib/common/mail.jar | 0 Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar | 0 Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar | 0 Bin/lib/thrid/sapjco.jar | 0 Bin/lib/thrid/commons-logging-1.0.4.jar | 0 Bin/lib/thrid/xmlbeans-2.3.0.jar | 0 Bin/lib/client/jgraphx-3.1.0.0.jar | 0 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 11 ++- 113 files changed, 115 insertions(+), 31 deletions(-) diff --git a/Bin/lib/client/flatlaf-2.3.jar b/Bin/lib/client/flatlaf-2.3.jar new file mode 100644 index 0000000..9f292d2 --- /dev/null +++ b/Bin/lib/client/flatlaf-2.3.jar Binary files differ diff --git a/Bin/lib/client/icegridgui.jar b/Bin/lib/client/icegridgui.jar new file mode 100644 index 0000000..d9ede54 --- /dev/null +++ b/Bin/lib/client/icegridgui.jar Binary files differ diff --git a/Bin/lib/client/jgoodies-common-1.8.1.jar b/Bin/lib/client/jgoodies-common-1.8.1.jar new file mode 100644 index 0000000..f6a256e --- /dev/null +++ b/Bin/lib/client/jgoodies-common-1.8.1.jar Binary files differ diff --git a/Bin/lib/client/jgoodies-looks-2.5.3.jar b/Bin/lib/client/jgoodies-looks-2.5.3.jar new file mode 100644 index 0000000..3339053 --- /dev/null +++ b/Bin/lib/client/jgoodies-looks-2.5.3.jar Binary files differ diff --git a/Bin/lib/client/jgraph.jar b/Bin/lib/client/jgraph.jar new file mode 100644 index 0000000..9af266c --- /dev/null +++ b/Bin/lib/client/jgraph.jar Binary files differ diff --git a/Bin/lib/client/jgraphx-3.1.0.0.jar b/Bin/lib/client/jgraphx-3.1.0.0.jar new file mode 100644 index 0000000..6637aac --- /dev/null +++ b/Bin/lib/client/jgraphx-3.1.0.0.jar Binary files differ diff --git a/Bin/lib/client/nativeskin.jar b/Bin/lib/client/nativeskin.jar new file mode 100644 index 0000000..acacc56 --- /dev/null +++ b/Bin/lib/client/nativeskin.jar Binary files differ diff --git a/Bin/lib/client/pinyin4j-2.5.0.jar b/Bin/lib/client/pinyin4j-2.5.0.jar new file mode 100644 index 0000000..e8ede13 --- /dev/null +++ b/Bin/lib/client/pinyin4j-2.5.0.jar Binary files differ diff --git a/Bin/lib/client/plt-client.jar b/Bin/lib/client/plt-client.jar new file mode 100644 index 0000000..d4286a6 --- /dev/null +++ b/Bin/lib/client/plt-client.jar Binary files differ diff --git a/Bin/lib/client/plt-clientbase.jar b/Bin/lib/client/plt-clientbase.jar new file mode 100644 index 0000000..50330af --- /dev/null +++ b/Bin/lib/client/plt-clientbase.jar Binary files differ diff --git a/Bin/lib/client/poi-3.9-20121203.jar b/Bin/lib/client/poi-3.9-20121203.jar new file mode 100644 index 0000000..0f46288 --- /dev/null +++ b/Bin/lib/client/poi-3.9-20121203.jar Binary files differ diff --git a/Bin/lib/client/poi-ooxml-3.9-20121203.jar b/Bin/lib/client/poi-ooxml-3.9-20121203.jar new file mode 100644 index 0000000..8792d46 --- /dev/null +++ b/Bin/lib/client/poi-ooxml-3.9-20121203.jar Binary files differ diff --git a/Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar b/Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar new file mode 100644 index 0000000..eda4ef4 --- /dev/null +++ b/Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar Binary files differ diff --git a/Bin/lib/client/poi-scratchpad-3.9-20121203.jar b/Bin/lib/client/poi-scratchpad-3.9-20121203.jar new file mode 100644 index 0000000..1520855 --- /dev/null +++ b/Bin/lib/client/poi-scratchpad-3.9-20121203.jar Binary files differ diff --git a/Bin/lib/client/protege35.jar b/Bin/lib/client/protege35.jar new file mode 100644 index 0000000..8e99a2e --- /dev/null +++ b/Bin/lib/client/protege35.jar Binary files differ diff --git a/Bin/lib/client/skinlf.jar b/Bin/lib/client/skinlf.jar new file mode 100644 index 0000000..9bdb00f --- /dev/null +++ b/Bin/lib/client/skinlf.jar Binary files differ diff --git a/Bin/lib/client/swingx-1.6.1.jar b/Bin/lib/client/swingx-1.6.1.jar new file mode 100644 index 0000000..b0bcc87 --- /dev/null +++ b/Bin/lib/client/swingx-1.6.1.jar Binary files differ diff --git a/Bin/lib/client/swixml.jar b/Bin/lib/client/swixml.jar new file mode 100644 index 0000000..2f0fa2b --- /dev/null +++ b/Bin/lib/client/swixml.jar Binary files differ diff --git a/Bin/lib/client/uitheme-1.3.1.jar b/Bin/lib/client/uitheme-1.3.1.jar new file mode 100644 index 0000000..caacb71 --- /dev/null +++ b/Bin/lib/client/uitheme-1.3.1.jar Binary files differ diff --git a/Bin/lib/common/commons-lang3-3.1.jar b/Bin/lib/common/commons-lang3-3.1.jar new file mode 100644 index 0000000..a85e539 --- /dev/null +++ b/Bin/lib/common/commons-lang3-3.1.jar Binary files differ diff --git a/Bin/lib/common/dom4j-1.6.1.jar b/Bin/lib/common/dom4j-1.6.1.jar new file mode 100644 index 0000000..c8c4dbb --- /dev/null +++ b/Bin/lib/common/dom4j-1.6.1.jar Binary files differ diff --git a/Bin/lib/common/fastjson-1.2.83.jar b/Bin/lib/common/fastjson-1.2.83.jar new file mode 100644 index 0000000..fd843ae --- /dev/null +++ b/Bin/lib/common/fastjson-1.2.83.jar Binary files differ diff --git a/Bin/lib/common/freemarker.jar b/Bin/lib/common/freemarker.jar new file mode 100644 index 0000000..b13671d --- /dev/null +++ b/Bin/lib/common/freemarker.jar Binary files differ diff --git a/Bin/lib/common/icegridgui.jar b/Bin/lib/common/icegridgui.jar new file mode 100644 index 0000000..d9ede54 --- /dev/null +++ b/Bin/lib/common/icegridgui.jar Binary files differ diff --git a/Bin/lib/common/junit-4.8.jar b/Bin/lib/common/junit-4.8.jar new file mode 100644 index 0000000..efdaa58 --- /dev/null +++ b/Bin/lib/common/junit-4.8.jar Binary files differ diff --git a/Bin/lib/common/log4j-api-2.12.4.jar b/Bin/lib/common/log4j-api-2.12.4.jar new file mode 100644 index 0000000..d427c18 --- /dev/null +++ b/Bin/lib/common/log4j-api-2.12.4.jar Binary files differ diff --git a/Bin/lib/common/log4j-core-2.12.4.jar b/Bin/lib/common/log4j-core-2.12.4.jar new file mode 100644 index 0000000..53b1e9a --- /dev/null +++ b/Bin/lib/common/log4j-core-2.12.4.jar Binary files differ diff --git a/Bin/lib/common/mail.jar b/Bin/lib/common/mail.jar new file mode 100644 index 0000000..463a64b --- /dev/null +++ b/Bin/lib/common/mail.jar Binary files differ diff --git a/Bin/lib/common/plt-common.jar b/Bin/lib/common/plt-common.jar new file mode 100644 index 0000000..4a83711 --- /dev/null +++ b/Bin/lib/common/plt-common.jar Binary files differ diff --git a/Bin/lib/common/plt-slice.jar b/Bin/lib/common/plt-slice.jar new file mode 100644 index 0000000..96264cf --- /dev/null +++ b/Bin/lib/common/plt-slice.jar Binary files differ diff --git a/Bin/lib/service/BOFService.jar b/Bin/lib/service/BOFService.jar new file mode 100644 index 0000000..02856bd --- /dev/null +++ b/Bin/lib/service/BOFService.jar Binary files differ diff --git a/Bin/lib/service/CacheService.jar b/Bin/lib/service/CacheService.jar new file mode 100644 index 0000000..28856b3 --- /dev/null +++ b/Bin/lib/service/CacheService.jar Binary files differ diff --git a/Bin/lib/service/FrameService.jar b/Bin/lib/service/FrameService.jar new file mode 100644 index 0000000..e8bf9a2 --- /dev/null +++ b/Bin/lib/service/FrameService.jar Binary files differ diff --git a/Bin/lib/service/OMDService.jar b/Bin/lib/service/OMDService.jar new file mode 100644 index 0000000..a4a1419 --- /dev/null +++ b/Bin/lib/service/OMDService.jar Binary files differ diff --git a/Bin/lib/service/OQService.jar b/Bin/lib/service/OQService.jar new file mode 100644 index 0000000..64cc1fe --- /dev/null +++ b/Bin/lib/service/OQService.jar Binary files differ diff --git a/Bin/lib/service/ServiceBase.jar b/Bin/lib/service/ServiceBase.jar new file mode 100644 index 0000000..9b3cc0d --- /dev/null +++ b/Bin/lib/service/ServiceBase.jar Binary files differ diff --git a/Bin/lib/service/UIService.jar b/Bin/lib/service/UIService.jar new file mode 100644 index 0000000..3bdfbb9 --- /dev/null +++ b/Bin/lib/service/UIService.jar Binary files differ diff --git a/Bin/lib/service/VciServiceMain.jar b/Bin/lib/service/VciServiceMain.jar new file mode 100644 index 0000000..e4bd80e --- /dev/null +++ b/Bin/lib/service/VciServiceMain.jar Binary files differ diff --git a/Bin/lib/service/VolumeService.jar b/Bin/lib/service/VolumeService.jar new file mode 100644 index 0000000..ab4afc4 --- /dev/null +++ b/Bin/lib/service/VolumeService.jar Binary files differ diff --git a/Bin/lib/service/WFPlugins.jar b/Bin/lib/service/WFPlugins.jar new file mode 100644 index 0000000..8042853 --- /dev/null +++ b/Bin/lib/service/WFPlugins.jar Binary files differ diff --git a/Bin/lib/service/WFService.jar b/Bin/lib/service/WFService.jar new file mode 100644 index 0000000..25dbf09 --- /dev/null +++ b/Bin/lib/service/WFService.jar Binary files differ diff --git a/Bin/lib/thrid/IKAnalyzer2012FF_u1.jar b/Bin/lib/thrid/IKAnalyzer2012FF_u1.jar new file mode 100644 index 0000000..9ec77c8 --- /dev/null +++ b/Bin/lib/thrid/IKAnalyzer2012FF_u1.jar Binary files differ diff --git a/Bin/lib/thrid/XmlSchema-1.1.jar b/Bin/lib/thrid/XmlSchema-1.1.jar new file mode 100644 index 0000000..a52c562 --- /dev/null +++ b/Bin/lib/thrid/XmlSchema-1.1.jar Binary files differ diff --git a/Bin/lib/thrid/activation.jar b/Bin/lib/thrid/activation.jar new file mode 100644 index 0000000..df8003b --- /dev/null +++ b/Bin/lib/thrid/activation.jar Binary files differ diff --git a/Bin/lib/thrid/antlr-2.7.6.jar b/Bin/lib/thrid/antlr-2.7.6.jar new file mode 100644 index 0000000..3702b64 --- /dev/null +++ b/Bin/lib/thrid/antlr-2.7.6.jar Binary files differ diff --git a/Bin/lib/thrid/avalon-framework-4.1.5.jar b/Bin/lib/thrid/avalon-framework-4.1.5.jar new file mode 100644 index 0000000..a24b1c7 --- /dev/null +++ b/Bin/lib/thrid/avalon-framework-4.1.5.jar Binary files differ diff --git a/Bin/lib/thrid/axis-ant.jar b/Bin/lib/thrid/axis-ant.jar new file mode 100644 index 0000000..17527ff --- /dev/null +++ b/Bin/lib/thrid/axis-ant.jar Binary files differ diff --git a/Bin/lib/thrid/axis.jar b/Bin/lib/thrid/axis.jar new file mode 100644 index 0000000..20b09a5 --- /dev/null +++ b/Bin/lib/thrid/axis.jar Binary files differ diff --git a/Bin/lib/thrid/bsf-2.3.0.jar b/Bin/lib/thrid/bsf-2.3.0.jar new file mode 100644 index 0000000..caa4dea --- /dev/null +++ b/Bin/lib/thrid/bsf-2.3.0.jar Binary files differ diff --git a/Bin/lib/thrid/bsh.jar b/Bin/lib/thrid/bsh.jar new file mode 100644 index 0000000..e326510 --- /dev/null +++ b/Bin/lib/thrid/bsh.jar Binary files differ diff --git a/Bin/lib/thrid/c3p0-0.9.1.jar b/Bin/lib/thrid/c3p0-0.9.1.jar new file mode 100644 index 0000000..693667a --- /dev/null +++ b/Bin/lib/thrid/c3p0-0.9.1.jar Binary files differ diff --git a/Bin/lib/thrid/commons-codec-1.3.jar b/Bin/lib/thrid/commons-codec-1.3.jar new file mode 100644 index 0000000..957b675 --- /dev/null +++ b/Bin/lib/thrid/commons-codec-1.3.jar Binary files differ diff --git a/Bin/lib/thrid/commons-collections-3.1.jar b/Bin/lib/thrid/commons-collections-3.1.jar new file mode 100644 index 0000000..41e230f --- /dev/null +++ b/Bin/lib/thrid/commons-collections-3.1.jar Binary files differ diff --git a/Bin/lib/thrid/commons-dbcp-1.1.jar b/Bin/lib/thrid/commons-dbcp-1.1.jar new file mode 100644 index 0000000..c3c4d1f --- /dev/null +++ b/Bin/lib/thrid/commons-dbcp-1.1.jar Binary files differ diff --git a/Bin/lib/thrid/commons-discovery-0.2.jar b/Bin/lib/thrid/commons-discovery-0.2.jar new file mode 100644 index 0000000..b885548 --- /dev/null +++ b/Bin/lib/thrid/commons-discovery-0.2.jar Binary files differ diff --git a/Bin/lib/thrid/commons-fileupload-1.2.2.jar b/Bin/lib/thrid/commons-fileupload-1.2.2.jar new file mode 100644 index 0000000..131f192 --- /dev/null +++ b/Bin/lib/thrid/commons-fileupload-1.2.2.jar Binary files differ diff --git a/Bin/lib/thrid/commons-httpclient-3.0.jar b/Bin/lib/thrid/commons-httpclient-3.0.jar new file mode 100644 index 0000000..54a9300 --- /dev/null +++ b/Bin/lib/thrid/commons-httpclient-3.0.jar Binary files differ diff --git a/Bin/lib/thrid/commons-io-2.0.1.jar b/Bin/lib/thrid/commons-io-2.0.1.jar new file mode 100644 index 0000000..5b64b7d --- /dev/null +++ b/Bin/lib/thrid/commons-io-2.0.1.jar Binary files differ diff --git a/Bin/lib/thrid/commons-logging-1.0.4.jar b/Bin/lib/thrid/commons-logging-1.0.4.jar new file mode 100644 index 0000000..b73a80f --- /dev/null +++ b/Bin/lib/thrid/commons-logging-1.0.4.jar Binary files differ diff --git a/Bin/lib/thrid/commons-net-1.4.1.jar b/Bin/lib/thrid/commons-net-1.4.1.jar new file mode 100644 index 0000000..9666a92 --- /dev/null +++ b/Bin/lib/thrid/commons-net-1.4.1.jar Binary files differ diff --git a/Bin/lib/thrid/commons-pool2-2.6.2.jar b/Bin/lib/thrid/commons-pool2-2.6.2.jar new file mode 100644 index 0000000..4233f08 --- /dev/null +++ b/Bin/lib/thrid/commons-pool2-2.6.2.jar Binary files differ diff --git a/Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar b/Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar new file mode 100644 index 0000000..0d6d374 --- /dev/null +++ b/Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar Binary files differ diff --git a/Bin/lib/thrid/guava-20.0.jar b/Bin/lib/thrid/guava-20.0.jar new file mode 100644 index 0000000..632772f --- /dev/null +++ b/Bin/lib/thrid/guava-20.0.jar Binary files differ diff --git a/Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar b/Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar new file mode 100644 index 0000000..1e9f71b --- /dev/null +++ b/Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar Binary files differ diff --git a/Bin/lib/thrid/hibernate3.jar b/Bin/lib/thrid/hibernate3.jar new file mode 100644 index 0000000..73df7b1 --- /dev/null +++ b/Bin/lib/thrid/hibernate3.jar Binary files differ diff --git a/Bin/lib/thrid/inforbroker-core-5.1.0.jar b/Bin/lib/thrid/inforbroker-core-5.1.0.jar new file mode 100644 index 0000000..352b2a5 --- /dev/null +++ b/Bin/lib/thrid/inforbroker-core-5.1.0.jar Binary files differ diff --git a/Bin/lib/thrid/javassist-3.12.0.GA.jar b/Bin/lib/thrid/javassist-3.12.0.GA.jar new file mode 100644 index 0000000..8f692f4 --- /dev/null +++ b/Bin/lib/thrid/javassist-3.12.0.GA.jar Binary files differ diff --git a/Bin/lib/thrid/jaxen-1.1-beta-9.jar b/Bin/lib/thrid/jaxen-1.1-beta-9.jar new file mode 100644 index 0000000..e290706 --- /dev/null +++ b/Bin/lib/thrid/jaxen-1.1-beta-9.jar Binary files differ diff --git a/Bin/lib/thrid/jaxrpc.jar b/Bin/lib/thrid/jaxrpc.jar new file mode 100644 index 0000000..a2c13d9 --- /dev/null +++ b/Bin/lib/thrid/jaxrpc.jar Binary files differ diff --git a/Bin/lib/thrid/jbpm-4.3.2.jar b/Bin/lib/thrid/jbpm-4.3.2.jar new file mode 100644 index 0000000..21ccd58 --- /dev/null +++ b/Bin/lib/thrid/jbpm-4.3.2.jar Binary files differ diff --git a/Bin/lib/thrid/jcalendar-1.3.3.jar b/Bin/lib/thrid/jcalendar-1.3.3.jar new file mode 100644 index 0000000..2e13b77 --- /dev/null +++ b/Bin/lib/thrid/jcalendar-1.3.3.jar Binary files differ diff --git a/Bin/lib/thrid/jcommon-1.0.17.jar b/Bin/lib/thrid/jcommon-1.0.17.jar new file mode 100644 index 0000000..f1bd165 --- /dev/null +++ b/Bin/lib/thrid/jcommon-1.0.17.jar Binary files differ diff --git a/Bin/lib/thrid/jdom-1.0.jar b/Bin/lib/thrid/jdom-1.0.jar new file mode 100644 index 0000000..30d3977 --- /dev/null +++ b/Bin/lib/thrid/jdom-1.0.jar Binary files differ diff --git a/Bin/lib/thrid/jdsl.jar b/Bin/lib/thrid/jdsl.jar new file mode 100644 index 0000000..c225421 --- /dev/null +++ b/Bin/lib/thrid/jdsl.jar Binary files differ diff --git a/Bin/lib/thrid/jedis-2.9.0.jar b/Bin/lib/thrid/jedis-2.9.0.jar new file mode 100644 index 0000000..f4d27d3 --- /dev/null +++ b/Bin/lib/thrid/jedis-2.9.0.jar Binary files differ diff --git a/Bin/lib/thrid/jee-management-1.1.jar b/Bin/lib/thrid/jee-management-1.1.jar new file mode 100644 index 0000000..1911f08 --- /dev/null +++ b/Bin/lib/thrid/jee-management-1.1.jar Binary files differ diff --git a/Bin/lib/thrid/jfreechart-1.0.14.jar b/Bin/lib/thrid/jfreechart-1.0.14.jar new file mode 100644 index 0000000..0e4d020 --- /dev/null +++ b/Bin/lib/thrid/jfreechart-1.0.14.jar Binary files differ diff --git a/Bin/lib/thrid/jms-1.1.jar b/Bin/lib/thrid/jms-1.1.jar new file mode 100644 index 0000000..dad227f --- /dev/null +++ b/Bin/lib/thrid/jms-1.1.jar Binary files differ diff --git a/Bin/lib/thrid/jta-1.1.jar b/Bin/lib/thrid/jta-1.1.jar new file mode 100644 index 0000000..6d225b7 --- /dev/null +++ b/Bin/lib/thrid/jta-1.1.jar Binary files differ diff --git a/Bin/lib/thrid/juel-engine.jar b/Bin/lib/thrid/juel-engine.jar new file mode 100644 index 0000000..d1de8a7 --- /dev/null +++ b/Bin/lib/thrid/juel-engine.jar Binary files differ diff --git a/Bin/lib/thrid/juel-impl.jar b/Bin/lib/thrid/juel-impl.jar new file mode 100644 index 0000000..53c3522 --- /dev/null +++ b/Bin/lib/thrid/juel-impl.jar Binary files differ diff --git a/Bin/lib/thrid/juel.jar b/Bin/lib/thrid/juel.jar new file mode 100644 index 0000000..6fda56c --- /dev/null +++ b/Bin/lib/thrid/juel.jar Binary files differ diff --git a/Bin/lib/thrid/livetribe-jsr223.jar b/Bin/lib/thrid/livetribe-jsr223.jar new file mode 100644 index 0000000..8d38ba1 --- /dev/null +++ b/Bin/lib/thrid/livetribe-jsr223.jar Binary files differ diff --git a/Bin/lib/thrid/logkit-1.2.jar b/Bin/lib/thrid/logkit-1.2.jar new file mode 100644 index 0000000..67d4866 --- /dev/null +++ b/Bin/lib/thrid/logkit-1.2.jar Binary files differ diff --git a/Bin/lib/thrid/ognl-2.6.11.jar b/Bin/lib/thrid/ognl-2.6.11.jar new file mode 100644 index 0000000..19cd379 --- /dev/null +++ b/Bin/lib/thrid/ognl-2.6.11.jar Binary files differ diff --git a/Bin/lib/thrid/ojdbc8.jar b/Bin/lib/thrid/ojdbc8.jar new file mode 100644 index 0000000..bf41243 --- /dev/null +++ b/Bin/lib/thrid/ojdbc8.jar Binary files differ diff --git a/Bin/lib/thrid/picocontainer-1.2.jar b/Bin/lib/thrid/picocontainer-1.2.jar new file mode 100644 index 0000000..fbb1c92 --- /dev/null +++ b/Bin/lib/thrid/picocontainer-1.2.jar Binary files differ diff --git a/Bin/lib/thrid/plugin.jar b/Bin/lib/thrid/plugin.jar new file mode 100644 index 0000000..52a401b --- /dev/null +++ b/Bin/lib/thrid/plugin.jar Binary files differ diff --git a/Bin/lib/thrid/poi-3.9-20121203.jar b/Bin/lib/thrid/poi-3.9-20121203.jar new file mode 100644 index 0000000..0f46288 --- /dev/null +++ b/Bin/lib/thrid/poi-3.9-20121203.jar Binary files differ diff --git a/Bin/lib/thrid/poi-ooxml-3.9-20121203.jar b/Bin/lib/thrid/poi-ooxml-3.9-20121203.jar new file mode 100644 index 0000000..8792d46 --- /dev/null +++ b/Bin/lib/thrid/poi-ooxml-3.9-20121203.jar Binary files differ diff --git a/Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar b/Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar new file mode 100644 index 0000000..eda4ef4 --- /dev/null +++ b/Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar Binary files differ diff --git a/Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar b/Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar new file mode 100644 index 0000000..1520855 --- /dev/null +++ b/Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar Binary files differ diff --git a/Bin/lib/thrid/portalcustom.jar b/Bin/lib/thrid/portalcustom.jar new file mode 100644 index 0000000..2c0af22 --- /dev/null +++ b/Bin/lib/thrid/portalcustom.jar Binary files differ diff --git a/Bin/lib/thrid/proxool-0.8.3.jar b/Bin/lib/thrid/proxool-0.8.3.jar new file mode 100644 index 0000000..c4f700c --- /dev/null +++ b/Bin/lib/thrid/proxool-0.8.3.jar Binary files differ diff --git a/Bin/lib/thrid/quartz-all-1.8.6.jar b/Bin/lib/thrid/quartz-all-1.8.6.jar new file mode 100644 index 0000000..86901d1 --- /dev/null +++ b/Bin/lib/thrid/quartz-all-1.8.6.jar Binary files differ diff --git a/Bin/lib/thrid/rsyntax.jar b/Bin/lib/thrid/rsyntax.jar new file mode 100644 index 0000000..6903d1a --- /dev/null +++ b/Bin/lib/thrid/rsyntax.jar Binary files differ diff --git a/Bin/lib/thrid/saaj.jar b/Bin/lib/thrid/saaj.jar new file mode 100644 index 0000000..4ea696e --- /dev/null +++ b/Bin/lib/thrid/saaj.jar Binary files differ diff --git a/Bin/lib/thrid/sapjco.jar b/Bin/lib/thrid/sapjco.jar new file mode 100644 index 0000000..e18912e --- /dev/null +++ b/Bin/lib/thrid/sapjco.jar Binary files differ diff --git a/Bin/lib/thrid/slf4j-api-1.7.14.jar b/Bin/lib/thrid/slf4j-api-1.7.14.jar new file mode 100644 index 0000000..d5d64c4 --- /dev/null +++ b/Bin/lib/thrid/slf4j-api-1.7.14.jar Binary files differ diff --git a/Bin/lib/thrid/slf4j-jdk14-1.7.14.jar b/Bin/lib/thrid/slf4j-jdk14-1.7.14.jar new file mode 100644 index 0000000..720f7fd --- /dev/null +++ b/Bin/lib/thrid/slf4j-jdk14-1.7.14.jar Binary files differ diff --git a/Bin/lib/thrid/xml-apis.jar b/Bin/lib/thrid/xml-apis.jar new file mode 100644 index 0000000..d42c0ea --- /dev/null +++ b/Bin/lib/thrid/xml-apis.jar Binary files differ diff --git a/Bin/lib/thrid/xmlbeans-2.3.0.jar b/Bin/lib/thrid/xmlbeans-2.3.0.jar new file mode 100644 index 0000000..ccd8163 --- /dev/null +++ b/Bin/lib/thrid/xmlbeans-2.3.0.jar Binary files differ diff --git a/Bin/lib/thrid/xmlsec-1.3.0.jar b/Bin/lib/thrid/xmlsec-1.3.0.jar new file mode 100644 index 0000000..6b69b80 --- /dev/null +++ b/Bin/lib/thrid/xmlsec-1.3.0.jar Binary files differ diff --git a/Bin/lib/thrid/xstream-1.3.1.jar b/Bin/lib/thrid/xstream-1.3.1.jar new file mode 100644 index 0000000..4ef4219 --- /dev/null +++ b/Bin/lib/thrid/xstream-1.3.1.jar Binary files differ diff --git a/Source/ProjectWeb/src/actions/AddAction.js b/Source/ProjectWeb/src/actions/AddAction.js new file mode 100644 index 0000000..8d0e0e8 --- /dev/null +++ b/Source/ProjectWeb/src/actions/AddAction.js @@ -0,0 +1,4 @@ +/** + * 鎸夐挳澶勭悊 涓氬姟绫诲瀷鏂板 + */ +import BaseAction from './BaseAction'; diff --git a/Source/ProjectWeb/src/actions/BaseAction.js b/Source/ProjectWeb/src/actions/BaseAction.js new file mode 100644 index 0000000..a0005bc --- /dev/null +++ b/Source/ProjectWeb/src/actions/BaseAction.js @@ -0,0 +1,52 @@ +import {validatenull} from "@/util/validate"; +import {findArray} from "@/util/util"; + +/** + * 鎸夐挳鐨勫熀纭�鏈嶅姟 + */ + +/** + * 鏇挎崲鏂囨湰涓殑${xxx} + * @param text 鏂囨湰 + * @param dataStore 閫夋嫨鐨勬暟鎹� + * @param sourceData 鏉ユ簮鏁版嵁 + * @returns 鏇挎崲鍚庣殑鍊�,瀛楃涓� + */ +export const replaceFreeMarker = (text,dataStore,sourceData) => { + //鏇挎崲琛ㄨ揪寮� + if (!sourceData) { + sourceData = {}; + } + if (!dataStore) { + dataStore = []; + } + let replaceData = dataStore.length > 0 ? dataStore[0] : {}; + if (text && text.indexOf("${") > -1 && text.indexOf("}")) { + //js鍙兘浣跨敤${xxx}杩欑鐨勬柟寮� + let reg = "root.${"; + while (text.indexOf(reg) > -1) { + let temp = text.substring(0, text.indexOf(reg)); + let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}")); + let end = text.substring(text.indexOf("}") + 1); + field = replaceData[field] || sourceData[field] || ''; + text = temp + field + end; + } + reg = "sourceData.${"; + while (text.indexOf(reg) > -1) { + let temp = text.substring(0, text.indexOf(reg)); + let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}")); + let end = text.substring(text.indexOf("}") + 1); + field = replaceData[field] || sourceData[field] || ''; + text = temp + field + end; + } + reg = "${"; + while (text.indexOf(reg) > -1) { + let temp = text.substring(0, text.indexOf(reg)); + let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}")); + let end = text.substring(text.indexOf("}") + 1); + field = replaceData[field] || sourceData[field] || ''; + text = temp + field + end; + } + } + return text; +}; diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java index 6bf5598..7b28e76 100644 --- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java +++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java @@ -260,7 +260,7 @@ MenuVO functionVO = new MenuVO(); functionVO.setId(menu.id); functionVO.setSource(menu.image); - if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){ + if(StringUtils.isBlank(menu.resourceB)){ continue; } functionVO.setPath(menu.resourceB); @@ -299,7 +299,7 @@ MenuVO functionVO = new MenuVO(); functionVO.setId(menu.id); functionVO.setSource(menu.image); - if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){ + if(StringUtils.isBlank(menu.resourceB) ){ continue; } functionVO.setPath(menu.resourceB); diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java index 4b37f1d..3099962 100644 --- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java +++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java @@ -13,8 +13,7 @@ import com.vci.web.constant.CacheKeyConstant; import com.vci.web.pageModel.*; import com.vci.web.service.*; -import com.vci.web.util.PlatformClientUtil; -import com.vci.web.util.WebUtil; +import com.vci.web.util.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -140,9 +139,11 @@ vo.setCreator(btmItem.creator); vo.setLastModifier(btmItem.modifier); try { - vo.setCreateTime(VciDateUtil.str2Date(String.valueOf(btmItem.createTime),VciDateUtil.DateTimeFormat)); - vo.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(btmItem.modifyTime),VciDateUtil.DateTimeFormat)); - vo.setTs(VciDateUtil.str2Date(String.valueOf(btmItem.ts),VciDateUtil.DateTimeMillFormat)); + // btmItem.createTime鎷垮埌鐨勬槸鏃堕棿鎴筹紝浣嗘槸杩欏効瑕佺殑鏄緥濡�2017-12-27 09:32:20.034杩欐牱鐨勬牸寮忥紝鎵�浠ヤ笉璋冪敤杩欎釜鏂规硶锛屾敼璋冪敤鍏朵粬鏂规硶 + //vo.setCreateTime(VciDateUtil.str2Date(String.valueOf(btmItem.createTime),VciDateUtil.DateTimeFormat)); + vo.setCreateTime(Func.parse(btmItem.createTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat))); + vo.setLastModifyTime( Func.parse(btmItem.modifyTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat))); + vo.setTs(Func.parse(btmItem.ts, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat))); } catch (Exception e) { e.printStackTrace(); } diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java index 5e6e69a..7741d25 100644 --- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java +++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java @@ -327,6 +327,7 @@ * 鏍戣妭鐐圭殑鍒嗛殧绗︿笉涓�鏍� */ private static final String TREE_NODE_ID_SEP = "@vcitreesep@"; + /** * 鑾峰彇鏍戝舰鏁版嵁 * @@ -429,7 +430,6 @@ if (StringUtils.isNotBlank(queryTemplate)) { thisChildren = boService.queryCBOByScheme(queryTemplate, treeQuery.getConditionMap(), replaceMap, null, queryFieldList); } else { - thisChildren = boService.queryCBO(treeQuery.getParentBtmName(), treeQuery.getConditionMap(), null, queryFieldList); } return cbo2Trees(thisChildren, valueField, textField, parentFieldName, treeQuery.isShowCheckBox(), null); diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java index 55b4ed4..cb1e6e2 100644 --- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java +++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java @@ -2,12 +2,16 @@ import com.alibaba.fastjson.JSONObject; import com.vci.base.common.utility.ObjectUtility; +import com.vci.client.common.providers.ServiceProvider; import com.vci.corba.common.VCIError; +import com.vci.corba.omd.qtm.QTInfo; +import com.vci.corba.query.ObjectQueryService; +import com.vci.corba.query.ObjectQueryServicePrx; import com.vci.frameworkcore.compatibility.SmUserQueryServiceI; import com.vci.mw.client.InvocationUtility; import com.vci.starter.web.annotation.Column; import com.vci.starter.web.constant.QueryOptionConstant; -import com.vci.starter.web.constant.VciSystemVarConstants; +import com.vci.corba.query.data.BtmRefQueryOption; import com.vci.starter.web.enumpck.BooleanEnum; import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.DataGrid; @@ -19,10 +23,11 @@ import com.vci.web.pageModel.*; import com.vci.web.properties.WebProperties; import com.vci.web.service.*; +import com.vci.web.util.Func; import com.vci.web.util.PlatformClientUtil; import com.vci.web.util.WebUtil; import org.apache.commons.lang3.StringUtils; -import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.poi.ss.formula.functions.T; import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.omg.CORBA.IntHolder; @@ -34,10 +39,8 @@ import plm.bs.bom.clientobject.ClientBusinessObject; import plm.bs.bom.clientobject.ClientLinkObject; import plm.bs.bom.common.*; -import plm.corba.qt.BtmRefQueryOption; import plm.corba.qt.KV; import plm.corba.qt.QTServiceOperations; -import plm.corba.qt.QTWrapper; import plm.oq.objectQuery.common.*; import java.lang.reflect.Field; @@ -140,7 +143,6 @@ }); } } - /** * 鍒濆鍖栦笟鍔$被鍨� @@ -465,7 +467,6 @@ return checkDataExsitByColumn(btmName,columnName,Arrays.asList(columnValues.split(","))); } - /** * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇笟鍔$被鍨嬩笅鐨勬暟鎹� * @param btmType 涓氬姟绫诲瀷鐨勫悕绉帮紝浼氳嚜鍔ㄥ彉鎴愬皬鍐� @@ -567,7 +568,7 @@ clauseList.add("*"); } setRightValueToQueryTemplate(qt,conditionMap);//璁剧疆瀵嗙骇鏌ヨ锛屽拰鏁版嵁鏉冮檺鎺у埗 - List<BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>(); + List<com.vci.corba.query.data.BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>(); List<String> enumAttrName = new ArrayList<String>(); List<String> thisQueryAttr = new ArrayList<String>(); if(clauseList!=null && clauseList.size()>0){ @@ -614,24 +615,27 @@ //璁剧疆鍒嗛〉淇℃伅鍜屾帓搴� setPageAndOrderToQT(qt,ph); try { - QTServiceOperations qtService = platformClientUtil.getQueryService(); + // QTServiceOperations qtService = platformClientUtil.getQueryService(); + ObjectQueryServicePrx qtService = ServiceProvider.getOQService(); if(qtService == null){ logger.error("娌℃湁鎵惧埌鏌ヨ鏈嶅姟"); throw new VciBaseException(msgCodePrefix+"qtServerNull", new String[]{}); } IntHolder count = new IntHolder(); - BusinessObject[] bos = null; + ObjectQueryService.FindBTMObjectsV3Result bos = null; String invo = JSONObject.toJSONString(InvocationUtility.getInvocation()); try{ - bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0])); + //bos = qtService.findBTMObjectsV3(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0])); + bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0])); }catch (VCIError e){ - bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0])); + //bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0])); + bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0])); } - - if (bos != null && bos.length > 0) { - for (BusinessObject bo : bos) { + if (bos != null && bos.count > 0) { + for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) { ClientBusinessObject cbo = new ClientBusinessObject(); - cbo.setBusinessObject(bo); + BusinessObject businessObject = Func.copyProperties(bo, BusinessObject.class); + cbo.setBusinessObject(businessObject); queryEnumText(cbo,enumAttrName); allCbos.add(cbo); } @@ -639,8 +643,8 @@ } queryLcStatus(allCbos); } catch (VCIError e) { -// logger.error(e.error_code,e); -// throw WebUtil.getVciBaseException(e); + //logger.error(e.error_code,e); + throw WebUtil.getVciBaseException(e); } return allCbos; } @@ -942,14 +946,15 @@ QueryTemplate qt = null; try{ VciBaseUtil.alertNotNull(name,"鏌ヨ妯℃澘鐨勫悕绉�"); - QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name); + // QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name); + QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(name); qt = Tool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), name); //鍥犱负涔嬪墠骞冲彴鐨凾ool.replaceQTValues 娌℃湁澶勭悊 ${xxx}銆傦紝 涓轰簡蹇界暐澶у皬鍐欙紝鎴戜滑杩欓噷鍗曠嫭澶勭悊 weidy@2021-3-10 //鎴戜滑杞崲涓哄皬鍐� Condition condition = qt.getCondition(); Map<String,String> replaceLowMap = new HashMap<>(); if(condition !=null && condition.getCIMap()!=null){ - Map<String, String> systemVarValueMap = VciSystemVarConstants.getSystemVarValueMap(); + // Map<String, String> systemVarValueMap = VciSystemVarConstants.getSystemVarValueMap(); if(!CollectionUtils.isEmpty(replaceMap)){ replaceMap.forEach((key,value)->{ replaceLowMap.put(key.toLowerCase(),value); @@ -963,7 +968,7 @@ if(StringUtils.isNotBlank(value)){ if(value.contains("#")){ //绯荤粺鍙橀噺.鏀寔涓�涓� - lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),"")); + //lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),"")); }else if(value.contains("${")){ //鏈�${xxxx}鐨勬柟寮� if(!CollectionUtils.isEmpty(replaceLowMap)) { @@ -981,8 +986,8 @@ }); } }catch(VCIError e){ -// logger.error(e.error_code,e); -// throw WebUtil.getVciBaseException(e); + //logger.error(e.error_code,e); + //throw WebUtil.getVciBaseException(e); } catch (DocumentException e) { logger.error("鏌ヨ妯℃澘杞崲",e); throw new VciBaseException(this.msgCodePrefix + "qtError", new Object[]{name}); diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java index 4a67660..b54c65b 100644 --- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java +++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java @@ -127,7 +127,6 @@ @Autowired private OsDDLExportWordFieldProperties wordFieldProperties; - /** * 瀵煎叆涓氬姟绫诲瀷鍜岄摼鎺ョ被鍨嬶紝鍖呭惈灞炴�э紝鏋氫妇锛岀姸鎬侊紝鐢熷懡鍛ㄦ湡锛岀増鏈鍒欑瓑鍏ㄥ鍐呭 * diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java index 6b86fbe..605868d 100644 --- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java +++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java @@ -631,4 +631,16 @@ return NumberUtil.toInt(format(new Date(), "HH")); } + /** + * 鏃堕棿鎴宠浆鎹负Date + * @return + */ + public static Date parseByLong(Long dateLong, ConcurrentDateFormat format){ + try { + return format.parse(format.format(new Date(dateLong))); + } catch (ParseException e) { + throw Exceptions.unchecked(e); + } + } + } diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java index ffb3a4e..86007ae 100644 --- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java +++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java @@ -1727,6 +1727,17 @@ } /** + * 灏嗘椂闂存埑杞崲涓篋ate鏃堕棿 + * + * @param dateLong 鏃堕棿鎴� + * @param format ConcurrentDateFormat + * @return 鏃堕棿 + */ + public static Date parse(Long dateLong, ConcurrentDateFormat format) { + return DateUtil.parseByLong(dateLong, format); + } + + /** * 鏃ユ湡鏃堕棿鏍煎紡鍖� * * @param temporal 鏃堕棿 -- Gitblit v1.9.3