Skip to content

C
config-server-api
Commit c563ea75 by zhaoxiaolei
Options

调用PLM

parent 416d8ce9
Showing with 140 additions and 284 deletions
.idea/compiler.xml
......@@ -7,16 +7,16 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="ui-tech-system" />
<module name="config-server-api" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="ui-tech-system" target="1.8" />
<module name="config-server-api" target="1.8" />
</bytecodeTargetLevel>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="ui-tech-system" options="-parameters" />
<module name="config-server-api" options="-parameters" />
</option>
</component>
</project>
\ No newline at end of file
.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0.xml deleted 100644 → 0
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0">
<CLASSES>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-runtime/1.0.0/kotlin-runtime-1.0.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-runtime/1.0.0/kotlin-runtime-1.0.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-runtime/1.0.0/kotlin-runtime-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0.xml deleted 100644 → 0
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0">
<CLASSES>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-stdlib/1.0.0/kotlin-stdlib-1.0.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-stdlib/1.0.0/kotlin-stdlib-1.0.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-stdlib/1.0.0/kotlin-stdlib-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_test_1_0_0.xml deleted 100644 → 0
<component name="libraryTable">
<library name="Maven: org.jetbrains.kotlin:kotlin-test:1.0.0">
<CLASSES>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-test/1.0.0/kotlin-test-1.0.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-test/1.0.0/kotlin-test-1.0.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/soft/repo/org/jetbrains/kotlin/kotlin-test/1.0.0/kotlin-test-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/modules.xml
......@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/ui-tech-system.iml" filepath="$PROJECT_DIR$/ui-tech-system.iml" />
<module fileurl="file://$PROJECT_DIR$/config-server-api.iml" filepath="$PROJECT_DIR$/config-server-api.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="95149f33-49e7-46ff-a7c0-797d2a322064" name="Default Changelist" comment="" />
<list default="true" id="95149f33-49e7-46ff-a7c0-797d2a322064" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_1_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_test_1_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/cn/com/uitech/authorization/controller/IntegrateController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/com/uitech/authorization/controller/IntegrateController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/cn/com/uitech/authorization/pojo/dto/SaveTableInputDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/com/uitech/authorization/pojo/dto/SaveTableInputDto.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/cn/com/uitech/authorization/service/IntegrateService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/com/uitech/authorization/service/IntegrateService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/mapper/SuperBomPriceCalculateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/SuperBomPriceCalculateMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ui-tech-system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/config-server-api.iml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/classes/" />
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -30,35 +45,10 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/controller/IntegrateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2218">
<caret line="294" selection-start-line="294" selection-end-line="294" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#initializationData#0;class#IntegrateController#0" />
<element signature="method#preVerify#0;class#IntegrateController#0" />
<element signature="method#preVerify#1;class#IntegrateController#0" />
<element signature="e#15089#15097#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/IntegrateService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="539">
<caret line="43" column="11" selection-start-line="43" selection-start-column="11" selection-end-line="43" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="360" selection-start-line="360" selection-end-line="360" />
<state relative-caret-position="204">
<caret line="359" column="53" selection-start-line="359" selection-start-column="53" selection-end-line="359" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#getSuperBomInfoByConfigId#0;class#IntegrateServiceImpl#0" />
......@@ -70,17 +60,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/application-lcrx.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="50" column="43" lean-forward="true" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
<state relative-caret-position="190">
<caret line="49" column="85" lean-forward="true" selection-start-line="49" selection-start-column="85" selection-end-line="49" selection-end-column="85" />
</state>
</provider>
</entry>
......@@ -97,7 +78,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>ResourceNameConstant</find>
<find>PlmCategoryEnum</find>
<find>cn.com.uitech.config.entity.ODValue</find>
<find>RedisConfig</find>
......@@ -127,6 +107,7 @@
<find>jetbrains</find>
<find>applySkuCode</find>
<find>GetConfigBySUKINFO</find>
<find>ui-tech</find>
</findStrings>
<replaceStrings>
<replace />
......@@ -147,7 +128,6 @@
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/entity/ConfigurableBomLog.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/SaveSuperCharacterInputDto.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/SaveSuperCharacterValueInputDto.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/SaveTableInputDto.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/SaveSuperBomInputDto.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/entity/Characteristic.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/GetSkuInputInfo.java" />
......@@ -183,15 +163,16 @@
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/SuperCharacterPriceInfoService.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/mapper/SuperBomSkuInfoMapper.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/SuperBomSkuInfoMapper.xml" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/IntegrateService.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/mapper/CharacteristicMapper.java" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/CharacteristicMapper.xml" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/ToPLMDto.java" />
<option value="$PROJECT_DIR$/src/main/resources/application-lcrx.yml" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/application.yml" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/controller/IntegrateController.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/SaveTableInputDto.java" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/IntegrateService.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/application-lcrx.yml" />
</list>
</option>
</component>
......@@ -213,16 +194,16 @@
<expand>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="ui-tech-system" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="config-server-api" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="ui-tech-system" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="config-server-api" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="ui-tech-system" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="config-server-api" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
</path>
</expand>
......@@ -241,86 +222,33 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="config-server-api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="config-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="config-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="uitech" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="uitech" type="462c0819:PsiDirectoryNode" />
<item name="authorization" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="uitech" type="462c0819:PsiDirectoryNode" />
<item name="authorization" type="462c0819:PsiDirectoryNode" />
<item name="pojo" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="uitech" type="462c0819:PsiDirectoryNode" />
<item name="authorization" type="462c0819:PsiDirectoryNode" />
<item name="pojo" type="462c0819:PsiDirectoryNode" />
<item name="dto" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="config-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ui-tech-system" type="b2602c69:ProjectViewProjectNode" />
<item name="confg-server-api" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mapper" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -329,7 +257,7 @@
</component>
<component name="PropertiesComponent">
<property name="ExpandSpringBootSpringBootSettingsPanel" value="false" />
<property name="MyBatisLogPluginindexNum" value="1524" />
<property name="MyBatisLogPluginindexNum" value="1572" />
<property name="MyBatisLogPluginparameters" value="Parameters:" />
<property name="MyBatisLogPluginpreparing" value="Preparing:" />
<property name="MyBatisLogPluginrunning" value="true" />
......@@ -340,11 +268,11 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mapper" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="vcs.Git" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
</component>
<component name="RecentsManager">
<key name="CreateClassDialog.RecentsKey">
......@@ -383,7 +311,7 @@
</component>
<component name="RunManager">
<configuration name="AuthServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="ui-tech-system" />
<module name="config-server-api" />
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.com.uitech.AuthServerApplication" />
<method v="2">
<option name="Make" enabled="true" />
......@@ -409,12 +337,13 @@
<workItem from="1637376536498" duration="14530000" />
<workItem from="1637546931769" duration="3032000" />
<workItem from="1637562237057" duration="73215000" />
<workItem from="1638151404141" duration="39616000" />
<workItem from="1638151404141" duration="41880000" />
<workItem from="1638263540234" duration="1509000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="236283000" />
<option name="totallyTimeSpent" value="240056000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -427,9 +356,8 @@
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1508" height="908" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1524138" />
<window_info content_ui="combo" id="Project" order="0" weight="0.22689655" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
......@@ -440,14 +368,14 @@
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32860824" />
<window_info anchor="bottom" id="Run" order="2" weight="0.30283505" />
<window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.49793103" visible="true" weight="0.20231959" />
<window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.49724138" visible="true" weight="0.50386596" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.3298969" />
<window_info anchor="bottom" id="Spring" order="7" weight="0.3298969" />
<window_info anchor="bottom" id="Terminal" order="8" weight="0.32860824" />
<window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50206894" side_tool="true" weight="0.28608248" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5027586" side_tool="true" weight="0.3969072" />
<window_info anchor="bottom" id="Messages" order="11" weight="0.26159793" />
<window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.32860824" />
<window_info anchor="bottom" id="Database Changes" order="13" />
......@@ -517,41 +445,16 @@
<properties />
<option name="timeStamp" value="22" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java</url>
<line>368</line>
<properties />
<option name="timeStamp" value="24" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20.jar!/io/swagger/annotations/ApiOperation.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="188">
<caret line="27" column="11" selection-start-line="27" selection-start-column="11" selection-end-line="27" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/mapper/CharacteristicValueMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="426">
<caret line="104" column="52" selection-start-line="104" selection-start-column="52" selection-end-line="104" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/SuperTableInfoMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="71" column="38" lean-forward="true" selection-start-line="71" selection-start-column="38" selection-end-line="71" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/entity/SuperBomSkuConfigInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="377">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/SuperTableInfoItemMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="516">
......@@ -753,14 +656,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="280" column="31" selection-start-line="280" selection-start-column="31" selection-end-line="280" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/controller/BrandController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
......@@ -806,13 +701,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/IntegrateService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="539">
<caret line="43" column="11" selection-start-line="43" selection-start-column="11" selection-end-line="43" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/CtoConstrainServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
......@@ -834,13 +722,6 @@
</state>
</provider>
</entry>
<entry file="jar://D:/soft/repo/org/springframework/spring-web/5.1.7.RELEASE/spring-web-5.1.7.RELEASE.jar!/org/springframework/web/client/RestTemplate.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-750">
<caret line="361" column="41" selection-start-line="361" selection-start-column="33" selection-end-line="361" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="jar://D:/soft/repo/org/apache/tomcat/embed/tomcat-embed-core/9.0.19/tomcat-embed-core-9.0.19.jar!/org/apache/catalina/core/StandardHostValve.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
......@@ -848,13 +729,6 @@
</state>
</provider>
</entry>
<entry file="jar://D:/soft/repo/org/springframework/spring-core/5.1.7.RELEASE/spring-core-5.1.7.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="104" selection-start-line="104" selection-end-line="104" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/ComponentCargoDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
......@@ -869,35 +743,31 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application-lcrx.yml">
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="50" column="43" lean-forward="true" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
<state relative-caret-position="46">
<caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/pojo/dto/SaveTableInputDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
<state relative-caret-position="380">
<caret line="30" column="23" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java">
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/IntegrateService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="360" selection-start-line="360" selection-end-line="360" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#getSuperBomInfoByConfigId#0;class#IntegrateServiceImpl#0" />
</folding>
<state relative-caret-position="188">
<caret line="17" column="56" selection-start-line="17" selection-start-column="56" selection-end-line="17" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/controller/IntegrateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2218">
<caret line="294" selection-start-line="294" selection-end-line="294" />
<state relative-caret-position="115">
<caret line="248" selection-start-line="248" selection-end-line="248" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#initializationData#0;class#IntegrateController#0" />
......@@ -908,5 +778,66 @@
</state>
</provider>
</entry>
<entry file="jar://D:/soft/repo/org/springframework/spring-core/5.1.7.RELEASE/spring-core-5.1.7.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="104" selection-start-line="104" selection-end-line="104" />
</state>
</provider>
</entry>
<entry file="jar://D:/soft/repo/org/springframework/spring-tx/5.1.7.RELEASE/spring-tx-5.1.7.RELEASE.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="175" selection-start-line="175" selection-end-line="175" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config-server-api.iml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="8" column="20" lean-forward="true" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="34" selection-start-line="34" selection-end-line="34" />
</state>
</provider>
</entry>
<entry file="jar://D:/soft/repo/org/springframework/spring-web/5.1.7.RELEASE/spring-web-5.1.7.RELEASE.jar!/org/springframework/web/client/RestTemplate.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="356" selection-start-line="356" selection-end-line="356" />
</state>
</provider>
</entry>
<entry file="jar://D:/soft/repo/org/springframework/spring-web/5.1.7.RELEASE/spring-web-5.1.7.RELEASE.jar!/org/springframework/http/HttpEntity.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="33" column="36" selection-start-line="33" selection-start-column="36" selection-end-line="33" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/application-lcrx.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="49" column="85" lean-forward="true" selection-start-line="49" selection-start-column="85" selection-end-line="49" selection-end-column="85" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="359" column="53" selection-start-line="359" selection-start-column="53" selection-end-line="359" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#getSuperBomInfoByConfigId#0;class#IntegrateServiceImpl#0" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
ui-tech-system.iml → config-server-api.iml
......@@ -212,8 +212,5 @@
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-runtime:1.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.jetbrains.kotlin:kotlin-test:1.0.0" level="project" />
</component>
</module>
\ No newline at end of file
pom.xml
......@@ -32,7 +32,6 @@
<feign.httpVersion>10.1.0</feign.httpVersion>
<collections.version>3.2.2</collections.version>
<security-oauth2-autoconfigure.version>2.1.0.RELEASE</security-oauth2-autoconfigure.version>
<kotlin.version>1.0.0</kotlin.version>
</properties>
......@@ -244,17 +243,6 @@
<artifactId>spring-cloud-context</artifactId>
<version>2.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
......@@ -273,27 +261,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
......
src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java
......@@ -345,38 +345,38 @@ public class IntegrateServiceImpl implements IntegrateService {
Map<String, Object> o1 = (Map<String, Object>) item.get(0);
Map<String, Object> attributes = (Map<String, Object>) o1.get("attributes");
String nonce = (String) attributes.get("nonce");
HttpHeaders headers = getHttpHeaderPlm(nonce);
//封装调用plm接口的数据
ToPLMDto toPLMDto = new ToPLMDto();
toPLMDto.setConfigId(superBomSkuInfo.getConfigId());
toPLMDto.setSpecial(false);
toPLMDto.setSuperNumber(superBomSkuInfo.getSuperBomCode());
toPLMDto.setSuperNumber(superBomSkuInfo.getSuperBomName());
toPLMDto.setH3cSuperNumber(superBomSkuInfo.getH3cPn());
toPLMDto.setGovernmentId(superBomSkuInfo.getPoliticalMiningId());
toPLMDto.setModel(superBomSkuInfo.getPatern());
toPLMDto.setSpecialDescription(superBomSkuInfo.getDescription());
List<ToPLMDto.OptionChoiceMap> maps = new ArrayList<>();
ToPLMDto.OptionChoiceMap map = new ToPLMDto.OptionChoiceMap();
List<SuperBomSkuConfigInfo> characteristicList = superBomSkuInfo.getCharacteristicList();
if (!CollectionUtils.isEmpty(characteristicList)) {
for (SuperBomSkuConfigInfo superBomSkuConfigInfo : characteristicList) {
ToPLMDto.OptionChoiceMap map = new ToPLMDto.OptionChoiceMap();
map.setSpecial(false);
map.setOption(superBomSkuConfigInfo.getCharacteristicCode());
map.setChoice(superBomSkuConfigInfo.getCharacteristicValueCode());
map.setOption(superBomSkuConfigInfo.getCharacteristicName());
map.setChoice(superBomSkuConfigInfo.getCharacteristicValueName());
map.setSpecialDescription(superBomSkuInfo.getDescription());
maps.add(map);
}
}
toPLMDto.setOptionChoiceMaps(maps);
HttpEntity<Object> requestEntity = new HttpEntity<>(toPLMDto, headers);
ResponseEntity<String> responseEntity = restTemplate.exchange(plmUrl, HttpMethod.POST, requestEntity, String.class);
JSONObject object = JSONObject.parseObject(responseEntity.getBody());
HttpHeaders headers = getHttpHeaderPlm(nonce);
HttpEntity<Object> requestEntity = new HttpEntity<>(JSON.toJSON(toPLMDto), headers);
Object o2 = restTemplate.exchange(plmUrl, HttpMethod.POST, requestEntity, Object.class);
/*JSONObject object = JSONObject.parseObject(responseEntity.toString());
object.get("data");
dto.setConfigId("ConfigId");
dto.setProductSmallType("产品小型号");
dto.setProductType("产品型号");
dto.setSkuCode("SkuCode");
dto.setSncode("69码");
dto.setSncode("69码");*/
return dto;
}
......@@ -583,7 +583,6 @@ public class IntegrateServiceImpl implements IntegrateService {
headers.add("Content-Type", "application/json");
headers.add("Authorization", headerAuthorization);
headers.add("CSRF_NONCE", headerTokenMsg);
return headers;
}
......
target/classes/mapper/SuperBomPriceCalculateMapper.xml
......@@ -59,6 +59,7 @@
c.characteristic_value_code character_value_code,
d.price_type,
e.actual_price,
e.cv_price_id,
e.leve0_price,
e.leve1_price,
e.leve2_price,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment