Merge branch 'develop_comac' of https://gitee.com/shuzisaidao/electromagnetic-data into develop_comac
This commit is contained in:
commit
9a8dd4552d
|
|
@ -1,283 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="BranchesTreeState">
|
||||
<expand>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
</expand>
|
||||
<select>
|
||||
<path>
|
||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
||||
<item name="BRANCH:develop" type="e8cecc67:BranchNodeDescriptor" />
|
||||
</path>
|
||||
</select>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="d75a3a91-5d58-44f3-9ee5-41347d560b6a" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/bootstrap/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/src/main/resources/application.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/EDDataService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/indicator/EDDataRequest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/infrastructure/repository/src/main/resources/sqlmapper/IndicatorCardMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappers.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/EDDataMappersImpl.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="mavenHome" value="$PROJECT_DIR$/../../../tool/apache-maven-3.6.3" />
|
||||
<option name="userSettingsFile" value="D:\tool\apache-maven-3.6.3\conf\settings.xml" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="2nkGOViBwqGJnnvZpyAdfpUDQFK" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="DatabaseDriversLRU" value="mysql" />
|
||||
<property name="RequestMappingsPanelOrder0" value="0" />
|
||||
<property name="RequestMappingsPanelOrder1" value="1" />
|
||||
<property name="RequestMappingsPanelWidth0" value="75" />
|
||||
<property name="RequestMappingsPanelWidth1" value="75" />
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="last_directory_selection" value="$PROJECT_DIR$/facade/src/main/java/com/electromagnetic/industry/software/data/manage" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="node.js.detected.package.eslint" value="true" />
|
||||
<property name="node.js.detected.package.tslint" value="true" />
|
||||
<property name="node.js.path.for.package.eslint" value="project" />
|
||||
<property name="node.js.path.for.package.tslint" value="project" />
|
||||
<property name="node.js.selected.package.eslint" value="(autodetect)" />
|
||||
<property name="node.js.selected.package.tslint" value="(autodetect)" />
|
||||
<property name="project.structure.last.edited" value="Modules" />
|
||||
<property name="project.structure.proportion" value="0.0" />
|
||||
<property name="project.structure.side.proportion" value="0.0" />
|
||||
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
|
||||
<recent name="com.electromagnetic.industry.software.data.manage.service.mappers" />
|
||||
</key>
|
||||
<key name="CopyClassDialog.RECENTS_KEY">
|
||||
<recent name="com.electromagnetic.industry.software.data.manage.repository.dao" />
|
||||
<recent name="com.electromagnetic.industry.software.data.manage.repository.impl" />
|
||||
<recent name="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository" />
|
||||
<recent name="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.impl" />
|
||||
<recent name="com.electromagnetic.industry.software.data.manage.service.mappers" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="D:\projects\electromagnetic-data\bootstrap\src\main\java\com\electromagnetic\industry\software\data\manage\controller" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
||||
<module name="bootstrap" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="com.electromagnetic.industry.software.data.manage.bootstrap.Application" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
</component>
|
||||
<component name="SvnConfiguration">
|
||||
<configuration />
|
||||
</component>
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="d75a3a91-5d58-44f3-9ee5-41347d560b6a" name="Default Changelist" comment="" />
|
||||
<created>1729509628475</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1729509628475</updated>
|
||||
<workItem from="1729509635355" duration="58000" />
|
||||
<workItem from="1729509704543" duration="2381000" />
|
||||
<workItem from="1729591265278" duration="1289000" />
|
||||
<workItem from="1729592594884" duration="1677000" />
|
||||
<workItem from="1729594541674" duration="744000" />
|
||||
<workItem from="1730086166510" duration="12260000" />
|
||||
<workItem from="1730110058862" duration="3127000" />
|
||||
<workItem from="1730170375131" duration="5193000" />
|
||||
<workItem from="1730253753807" duration="548000" />
|
||||
<workItem from="1730254338199" duration="1566000" />
|
||||
<workItem from="1730255932838" duration="2029000" />
|
||||
<workItem from="1731287388986" duration="3225000" />
|
||||
<workItem from="1731309429571" duration="7862000" />
|
||||
<workItem from="1731394779722" duration="5659000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="2" />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
<option name="COLUMN_ORDER">
|
||||
<list>
|
||||
<option value="0" />
|
||||
<option value="2" />
|
||||
<option value="3" />
|
||||
<option value="1" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="619" y="353" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1730104485895">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="619" y="353" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730104485895" />
|
||||
<state x="1003" y="579" width="602" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1730099349210">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="1003" y="579" width="602" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730099349210" />
|
||||
<state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1729592809847">
|
||||
<screen x="0" y="0" width="1280" height="672" />
|
||||
</state>
|
||||
<state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1280.672@0.0.1280.672" timestamp="1729592809847" />
|
||||
<state width="385" height="466" key="DebuggerActiveHint" timestamp="1731400555757">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="385" height="466" key="DebuggerActiveHint/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400555757" />
|
||||
<state x="842" y="190" key="FileChooserDialogImpl" timestamp="1730254963238">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="842" y="190" key="FileChooserDialogImpl/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730254963238" />
|
||||
<state x="421" y="91" key="FileChooserDialogImpl/0.0.1280.672@0.0.1280.672" timestamp="1729594896548" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.0.bottom" timestamp="1731400543848">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.0.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543848" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.0.bottom/0.0.1280.672@0.0.1280.672" timestamp="1729595008609" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.0.center" timestamp="1731400543848">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.0.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543848" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.0.center/0.0.1280.672@0.0.1280.672" timestamp="1729595008608" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.0.left" timestamp="1731400543848">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.0.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543848" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.0.left/0.0.1280.672@0.0.1280.672" timestamp="1729595008608" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.0.right" timestamp="1731400543848">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.0.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543848" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.0.right/0.0.1280.672@0.0.1280.672" timestamp="1729595008609" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.1.bottom" timestamp="1731400548127">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.1.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400548127" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.1.bottom/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.1.center" timestamp="1731400548127">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.1.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400548127" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.1.center/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.1.left" timestamp="1731400548127">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.1.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400548127" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.1.left/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.1.right" timestamp="1731400548127">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.1.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400548127" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.1.right/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.2.bottom" timestamp="1731400543700">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.2.bottom/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543700" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.2.bottom/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.2.center" timestamp="1731400543700">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.2.center/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543700" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.2.center/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.2.left" timestamp="1731400543700">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.2.left/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543700" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.2.left/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
|
||||
<state width="1920" height="366" key="GridCell.Tab.2.right" timestamp="1731400543700">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state width="1920" height="366" key="GridCell.Tab.2.right/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731400543700" />
|
||||
<state width="1237" height="200" key="GridCell.Tab.2.right/0.0.1280.672@0.0.1280.672" timestamp="1729592564959" />
|
||||
<state x="339" y="296" key="SettingsEditor" timestamp="1730166699747">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="339" y="296" key="SettingsEditor/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1730166699747" />
|
||||
<state x="142" y="0" key="SettingsEditor/0.0.1280.672@0.0.1280.672" timestamp="1729594936823" />
|
||||
<state x="439" y="114" key="chooseDestDirectoryDialog" timestamp="1729594820137">
|
||||
<screen x="0" y="0" width="1280" height="672" />
|
||||
</state>
|
||||
<state x="439" y="114" key="chooseDestDirectoryDialog/0.0.1280.672@0.0.1280.672" timestamp="1729594820137" />
|
||||
<state x="36" y="80" width="1584" height="1217" key="dock-window-1" timestamp="1731398039896">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="36" y="80" width="1584" height="1217" key="dock-window-1/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731398039896" />
|
||||
<state x="695" y="51" width="1858" height="1238" key="find.popup" timestamp="1731399177756">
|
||||
<screen x="0" y="0" width="2560" height="1400" />
|
||||
</state>
|
||||
<state x="695" y="51" width="1858" height="1238" key="find.popup/-1080.0.1080.1860/0.0.2560.1400@0.0.2560.1400" timestamp="1731399177756" />
|
||||
<state x="338" y="39" width="929" height="594" key="find.popup/0.0.1280.672@0.0.1280.672" timestamp="1729595280874" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/bootstrap/src/main/java/com/electromagnetic/industry/software/data/manage/controller/EDDataController.java</url>
|
||||
<line>29</line>
|
||||
<option name="timeStamp" value="2" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java</url>
|
||||
<line>50</line>
|
||||
<option name="timeStamp" value="4" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/EDDataFacadeImpl.java</url>
|
||||
<line>66</line>
|
||||
<option name="timeStamp" value="7" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
<facet type="web" name="Web">
|
||||
<configuration>
|
||||
<webroots />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jcl:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
<orderEntry type="module" module-name="electromagnetic-framework" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-jre" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
|
||||
<orderEntry type="module" module-name="facade" />
|
||||
<orderEntry type="module" module-name="service" />
|
||||
<orderEntry type="module" module-name="domain" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.4.1.Final" level="project" />
|
||||
<orderEntry type="module" module-name="common" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.3.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.3.RELEASE" level="project" />
|
||||
<orderEntry type="module" module-name="repository" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
|
||||
<orderEntry type="module" module-name="wraper" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.31" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.31" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.31" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.14.RELEASE" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -31,7 +31,7 @@ public class EDDataController {
|
|||
@RequestMapping(value = "/getFileInfoList",method = RequestMethod.POST)
|
||||
public ElectromagneticResult<?> getFileInfoList(@RequestBody EDDataRequest request){
|
||||
//return ElectromagneticResultUtil.success("获取文件信息列表");
|
||||
return edDataFacade.getFileInfoList(request);
|
||||
return edDataFacade.getDataInfoList(request);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
#required
|
||||
spring.application.name=electromagnetic-data
|
||||
# security
|
||||
run.mode=NORMAL
|
||||
com.alipay.env=shared
|
||||
#log
|
||||
logging.path=./logs
|
||||
loggerPath=electromagnetic-data
|
||||
logging.level.com.aliyun.fsi.insurance=${LOG_LEVEL:INFO}
|
||||
#日志配置
|
||||
logging.config=classpath:${LOG_CONFIG:log4j2-spring.xml}
|
||||
|
||||
|
||||
spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource
|
||||
#spring.datasource.url=jdbc:mysql://${DATASOURCE_URL:obproxy-0c63.ops.cloud.cic.inter}:3306/${DATASOURCE_HOST:dataplatform_ptst}?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
|
||||
#spring.datasource.username=${DATASOURCE_NAME:dataplatform@ProjectTest_tenant5#testdb}
|
||||
#spring.datasource.password=${DATASOURCE_PASSWORD:Y7G6v4_3ijn77K_Kbl_U85}
|
||||
spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
|
||||
spring.datasource.username=comac
|
||||
spring.datasource.password=2024*Comac
|
||||
|
||||
|
||||
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
|
||||
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
|
||||
mybatis.mapper-locations=classpath:sqlmapper/*.xml
|
||||
pagehelper.helperDialect=mysql
|
||||
pagehelper.reasonable=false
|
||||
server.port=8888
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
log4j.rootLogger=DEBUG, stdout
|
||||
# Console output...
|
||||
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
|
||||
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.stdout.layout.ConversionPattern=%5p [%t] - %m%n
|
||||
|
|
@ -1,205 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration>
|
||||
<properties>
|
||||
<property name="LOG_LEVEL" value="INFO"/>
|
||||
<property name="APP_NAME" value="electromagnetic-data"/>
|
||||
<property name="LOG_HOME" value="./logs/${APP_NAME}"/>
|
||||
<property name="LOG_LAYOUT" value="%d{yyyy-MM-dd HH:mm:ss.SSS},%t,%r,%-5p,%X{SOFA-TraceId},%X{SOFA-SpanId},%c{2},%m%n%throwable"/>
|
||||
<property name="SIMPLE_LAYOUT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%"/>
|
||||
</properties>
|
||||
|
||||
<Appenders>
|
||||
<Console name="STDOUT-APPENDER" target="SYSTEM_OUT">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
</Console>
|
||||
<Console name="STDERR-APPENDER" target="SYSTEM_ERR">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
</Console>
|
||||
|
||||
<!-- 错误节点日志 -->
|
||||
<RollingFile name="ERROR-APPENDER" fileName="${LOG_HOME}/common-error.log"
|
||||
filePattern="${LOG_HOME}/common-error-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<Filters>
|
||||
<ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
|
||||
</Filters>
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<!-- 业务日常节点日志-->
|
||||
<RollingFile name="COMMON-APPENDER" fileName="${LOG_HOME}/common-default.log"
|
||||
filePattern="${LOG_HOME}/common-default-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
<!-- 业务日常节点日志-->
|
||||
<RollingFile name="DOMAIN-CALL-APPENDER" fileName="${LOG_HOME}/domain-call.log"
|
||||
filePattern="${LOG_HOME}/domain-call-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${SIMPLE_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
<!-- 消息监听日志 -->
|
||||
<RollingFile name="MSG-LISTEN-APPENDER" fileName="${LOG_HOME}/msg-listen.log"
|
||||
filePattern="${LOG_HOME}/msg-listen-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<!-- 异步任务日志 -->
|
||||
<RollingFile name="TASK-SCHEDULER-APPENDER" fileName="${LOG_HOME}/task-scheduler.log"
|
||||
filePattern="${LOG_HOME}/task-scheduler-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<!-- SOFA日常节点日志 -->
|
||||
<RollingFile name="SOFA-DEFAULT-APPENDER" fileName="${LOG_HOME}/sofa-default.log"
|
||||
filePattern="${LOG_HOME}/sofa-default-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<!-- 调用外部系统日志 -->
|
||||
<RollingFile name="INTEGRATION-APPENDER" fileName="${LOG_HOME}/integration.log"
|
||||
filePattern="${LOG_HOME}/integration-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<RollingFile name="COMMON-MONITOR-APPENDER" fileName="${LOG_HOME}/common-monitor.log"
|
||||
filePattern="${LOG_HOME}/common-monitor-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
</Appenders>
|
||||
|
||||
<Loggers>
|
||||
<AsyncRoot includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
</AsyncRoot>
|
||||
|
||||
<AsyncLogger name="com.alipay.sofa" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="SOFA-DEFAULT-APPENDER"/>
|
||||
</AsyncLogger>
|
||||
<AsyncLogger name="com.aliyun.fsi.insurance" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
</AsyncLogger>
|
||||
|
||||
<Logger name="INTEGRATION" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="INTEGRATION-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="SERIOUS-ALERT" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="DOMAIN-ERROR" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="DOMAIN-DIGEST" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="DOMAIN-CALL" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="DOMAIN-CALL-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="DOMAIN-SERVICE" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="TASK-SCHEDULER" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="TASK-SCHEDULER-APPENDER"/>
|
||||
</Logger>
|
||||
|
||||
<Logger name="MSG-LISTEN" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="MSG-LISTEN-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="AbstractMessageListenerXFlush" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="MSG-LISTEN-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="COMMON-MONITOR" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-MONITOR-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</Logger>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
|
|
@ -1,217 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration>
|
||||
<properties>
|
||||
<property name="LOG_LEVEL" value="DEBUG"/>
|
||||
<property name="APP_NAME" value="electromagnetic-data"/>
|
||||
<property name="LOG_HOME" value="./logs/${APP_NAME}"/>
|
||||
<property name="LOG_LAYOUT" value="%d{yyyy-MM-dd HH:mm:ss.SSS},%t,%r,%-5p,%X{SOFA-TraceId},%X{SOFA-SpanId},%c{2},%m%n%throwable"/>
|
||||
<property name="SIMPLE_LAYOUT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%"/>
|
||||
</properties>
|
||||
|
||||
<Appenders>
|
||||
<Console name="STDOUT-APPENDER" target="SYSTEM_OUT">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
</Console>
|
||||
<Console name="STDERR-APPENDER" target="SYSTEM_ERR">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
</Console>
|
||||
|
||||
<!-- 错误节点日志 -->
|
||||
<RollingFile name="ERROR-APPENDER" fileName="${LOG_HOME}/common-error.log"
|
||||
filePattern="${LOG_HOME}/common-error-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<Filters>
|
||||
<ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
|
||||
</Filters>
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<!-- 业务日常节点日志-->
|
||||
<RollingFile name="COMMON-APPENDER" fileName="${LOG_HOME}/common-default.log"
|
||||
filePattern="${LOG_HOME}/common-default-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
<!-- 业务日常节点日志-->
|
||||
<RollingFile name="DOMAIN-CALL-APPENDER" fileName="${LOG_HOME}/domain-call.log"
|
||||
filePattern="${LOG_HOME}/domain-call-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${SIMPLE_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
<!-- 消息监听日志 -->
|
||||
<RollingFile name="MSG-LISTEN-APPENDER" fileName="${LOG_HOME}/msg-listen.log"
|
||||
filePattern="${LOG_HOME}/msg-listen-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<!-- 异步任务日志 -->
|
||||
<RollingFile name="TASK-SCHEDULER-APPENDER" fileName="${LOG_HOME}/task-scheduler.log"
|
||||
filePattern="${LOG_HOME}/task-scheduler-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<!-- SOFA日常节点日志 -->
|
||||
<RollingFile name="SOFA-DEFAULT-APPENDER" fileName="${LOG_HOME}/sofa-default.log"
|
||||
filePattern="${LOG_HOME}/sofa-default-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<!-- 调用外部系统日志 -->
|
||||
<RollingFile name="INTEGRATION-APPENDER" fileName="${LOG_HOME}/integration.log"
|
||||
filePattern="${LOG_HOME}/integration-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
|
||||
<RollingFile name="COMMON-MONITOR-APPENDER" fileName="${LOG_HOME}/common-monitor.log"
|
||||
filePattern="${LOG_HOME}/common-monitor-%d{yyyy-MM-dd}_%i.log" append="true">
|
||||
<PatternLayout pattern="${LOG_LAYOUT}" charset="UTF-8"/>
|
||||
<Policies>
|
||||
<SizeBasedTriggeringPolicy size="500MB"/>
|
||||
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
|
||||
</Policies>
|
||||
<DefaultRolloverStrategy max="300">
|
||||
<Delete basePath="${LOG_HOME}" maxDepth="1">
|
||||
<IfLastModified age="15d"/>
|
||||
<IfFileName glob="${LOG_HOME}*.log"/>
|
||||
</Delete>
|
||||
</DefaultRolloverStrategy>
|
||||
</RollingFile>
|
||||
</Appenders>
|
||||
|
||||
<Loggers>
|
||||
<AsyncRoot includeLocation="true" level="INFO">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</AsyncRoot>
|
||||
|
||||
<AsyncLogger name="com.alipay.sofa" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="SOFA-DEFAULT-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</AsyncLogger>
|
||||
<AsyncLogger name="com.aliyun.fsi.insurance" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</AsyncLogger>
|
||||
|
||||
<Logger name="INTEGRATION" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="INTEGRATION-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="SERIOUS-ALERT" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
<AppenderRef ref="STDERR-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="DOMAIN-CALL" additivity="false" includeLocation="true" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="DOMAIN-CALL-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="DOMAIN-ERROR" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
<AppenderRef ref="STDERR-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="DOMAIN-DIGEST" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="DOMAIN-SERVICE" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</Logger>
|
||||
|
||||
<Logger name="TASK-SCHEDULER" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="TASK-SCHEDULER-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</Logger>
|
||||
|
||||
<Logger name="MSG-LISTEN" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="MSG-LISTEN-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="AbstractMessageListenerXFlush" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="MSG-LISTEN-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</Logger>
|
||||
<Logger name="COMMON-MONITOR" includeLocation="true" additivity="false" level="${LOG_LEVEL}">
|
||||
<AppenderRef ref="ERROR-APPENDER"/>
|
||||
<AppenderRef ref="COMMON-MONITOR-APPENDER"/>
|
||||
<AppenderRef ref="STDOUT-APPENDER"/>
|
||||
</Logger>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="facade" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="module" module-name="electromagnetic-framework" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-jre" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
/**
|
||||
* Copyright (c) 2004-2024 All Rights Reserved.
|
||||
*/
|
||||
package com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分页综合返回
|
||||
* @author
|
||||
* @version $Id: IndicatorCardPage.java, v 0.1 2024-08-14 17:30
|
||||
*/
|
||||
@Data
|
||||
public class EDDataPage implements Serializable {
|
||||
private static final long serialVersionUID = -6207631048120337133L;
|
||||
/**
|
||||
* 电磁数据-文件数据列表
|
||||
*/
|
||||
private PageInfo<EDDataInfo> edDataInfo;
|
||||
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@ public interface EDDataRepository {
|
|||
* @param parames
|
||||
* @return
|
||||
*/
|
||||
Boolean getFileInfoList(EDDataParams parames);
|
||||
PageInfo<EDDataInfo> getDataInfoList(EDDataParams parames);
|
||||
|
||||
/**
|
||||
* 上传
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in
|
|||
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
|
||||
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResult;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
|
||||
|
|
@ -13,7 +15,7 @@ public interface EDDataService {
|
|||
|
||||
/**
|
||||
* 创建文件夹
|
||||
* @param parames
|
||||
* @param edDataInfo
|
||||
* @return
|
||||
*/
|
||||
Boolean createFolder(EDDataInfo edDataInfo);
|
||||
|
|
@ -23,7 +25,7 @@ public interface EDDataService {
|
|||
* @param parames
|
||||
* @return
|
||||
*/
|
||||
Boolean getFileInfoList(EDDataParams parames);
|
||||
EDDataPage getDataInfoList(EDDataParams parames);
|
||||
|
||||
/**
|
||||
* 上传
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@ package com.electromagnetic.industry.software.data.manage.domain.boardservice.in
|
|||
|
||||
import com.electromagnetic.industry.software.data.manage.common.ElectromagneticErrorEnum;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.EffectFlagEnum;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.IndicatorCardHomeDisplayEnum;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.enums.IndicatorCardStatusEnum;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.repository.EDDataRepository;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
|
||||
|
|
@ -53,10 +55,13 @@ public class EDDataServiceImpl implements EDDataService {
|
|||
* @param parames
|
||||
* @return
|
||||
*/
|
||||
public Boolean getFileInfoList(EDDataParams parames)
|
||||
public EDDataPage getDataInfoList(EDDataParams parames)
|
||||
{
|
||||
edDataRepository.getFileInfoList(parames);
|
||||
return Boolean.TRUE;
|
||||
EDDataPage edDataPage=new EDDataPage();
|
||||
//数据查询
|
||||
PageInfo<EDDataInfo> pageInfo = edDataRepository.getDataInfoList(parames);
|
||||
edDataPage.setEdDataInfo(pageInfo);
|
||||
return edDataPage;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-jre" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$/../electromagnetic-framework">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../electromagnetic-framework/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/../electromagnetic-framework/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-jre" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="electromagnetic-framework" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-jre" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -1,8 +1,12 @@
|
|||
package com.electromagnetic.industry.software.data.manage.facade;
|
||||
|
||||
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResult;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface EDDataFacade {
|
||||
|
||||
/**
|
||||
|
|
@ -18,21 +22,20 @@ public interface EDDataFacade {
|
|||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public ElectromagneticResult<Boolean> getFileInfoList(EDDataRequest request);
|
||||
ElectromagneticResult<EDDataPageResponse> getDataInfoList(EDDataRequest request);
|
||||
|
||||
/**
|
||||
* 上传
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public ElectromagneticResult<Boolean> upload(EDDataRequest request);
|
||||
ElectromagneticResult<Boolean> upload(EDDataRequest request);
|
||||
|
||||
/**
|
||||
* 下载
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public ElectromagneticResult<Boolean> download(EDDataRequest request);
|
||||
|
||||
ElectromagneticResult<Boolean> download(EDDataRequest request);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
package com.electromagnetic.industry.software.data.manage.request.indicator;
|
||||
|
||||
import electromagnetic.data.framework.share.model.BaseRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class EDDataRequest extends BaseRequest {
|
||||
private static final long serialVersionUID = 8717292719122744818L;
|
||||
|
||||
/**
|
||||
* 当前页
|
||||
|
|
@ -23,6 +24,10 @@ public class EDDataRequest extends BaseRequest {
|
|||
* 文件夹名称
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 文件夹名称
|
||||
*/
|
||||
private String fileName;
|
||||
/**
|
||||
* 关键词
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
/**
|
||||
* Copyright (c) 2004-2024 All Rights Reserved.
|
||||
*/
|
||||
package com.electromagnetic.industry.software.data.manage.response.indicator;
|
||||
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author
|
||||
* @version $Id: IndicatorCardpageResponse.java, v 0.1 2024-08-14 17:36
|
||||
*/
|
||||
@Data
|
||||
public class EDDataPageResponse implements Serializable {
|
||||
private static final long serialVersionUID = 3464355768912308150L;
|
||||
/**
|
||||
* 指电磁数据-文件信息数据
|
||||
*/
|
||||
private PageInfo<EDDataResponse> edDataPage;
|
||||
}
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
/**
|
||||
* Copyright (c) 2004-2024 All Rights Reserved.
|
||||
*/
|
||||
package com.electromagnetic.industry.software.data.manage.response.indicator;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 指标卡Response
|
||||
* @author
|
||||
* @version $Id: IndicatorCardResponse.java, v 0.1 2024-08-14 11:23
|
||||
*/
|
||||
@Data
|
||||
public class EDDataResponse implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -4835122199589863011L;
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Long id;
|
||||
/**
|
||||
* 目录编码
|
||||
*/
|
||||
private String categoryId;
|
||||
/**
|
||||
* 数据编码
|
||||
*/
|
||||
private String dataId;
|
||||
/**
|
||||
* 数据可视化码
|
||||
*/
|
||||
private String dataNo;
|
||||
/**
|
||||
* 数据名称
|
||||
*/
|
||||
private String dataName;
|
||||
/**
|
||||
* 数据类型:folder文件夹;file文件
|
||||
*/
|
||||
private String dataType;
|
||||
/**
|
||||
* 文件类型
|
||||
*/
|
||||
private String fileType;
|
||||
/**
|
||||
* 当前版本
|
||||
*/
|
||||
private String version;
|
||||
/**
|
||||
* 富文本内容
|
||||
*/
|
||||
private String content;
|
||||
/**
|
||||
* 文件地址JSON
|
||||
*/
|
||||
private String implantJson;
|
||||
/**
|
||||
* 状态:publish:发布,occupy:占用
|
||||
*/
|
||||
private String dataStatus;
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private String creator;
|
||||
/**
|
||||
* 创建人姓名
|
||||
*/
|
||||
private String creatorName;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date gmtCreate;
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
private String modifier;
|
||||
/**
|
||||
* 更新人姓名
|
||||
*/
|
||||
private String modifierName;
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
private Date gmtModified;
|
||||
/**
|
||||
* 是否有效:0-无效 1-有效
|
||||
*/
|
||||
private Integer effectFlag;
|
||||
}
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="domain" />
|
||||
<orderEntry type="module" module-name="facade" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="module" module-name="electromagnetic-framework" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-jre" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.3.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.3.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!--
|
||||
|
||||
Copyright 2015-2016 the original author or authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
-->
|
||||
<!DOCTYPE configuration
|
||||
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-config.dtd">
|
||||
<configuration>
|
||||
<settings>
|
||||
<setting name="logPrefix" value="mybatis.sql."/>
|
||||
<setting name="logImpl" value="STDOUT_LOGGING"/>
|
||||
</settings>
|
||||
|
||||
</configuration>
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
|
||||
<orderEntry type="module" module-name="domain" />
|
||||
<orderEntry type="module" module-name="facade" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="module" module-name="electromagnetic-framework" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-jre" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.3.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-tx:5.0.3.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.github.jsonzou:jmockdata:4.3.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.alibaba:druid:1.1.10" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -5,6 +5,7 @@ import com.electromagnetic.industry.software.data.manage.domain.boardservice.ind
|
|||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
|
@ -14,7 +15,7 @@ public interface EDDataMapper {
|
|||
|
||||
/**
|
||||
* 创建文件夹
|
||||
* @param parames
|
||||
* @param edDataInfo
|
||||
* @return
|
||||
*/
|
||||
Boolean createFolder(EDDataInfo edDataInfo);
|
||||
|
|
@ -24,7 +25,7 @@ public interface EDDataMapper {
|
|||
* @param parames
|
||||
* @return
|
||||
*/
|
||||
Boolean getFileInfoList(EDDataParams parames);
|
||||
List<EDDataInfo> getDataInfoList(EDDataParams parames);
|
||||
|
||||
/**
|
||||
* 上传
|
||||
|
|
@ -40,6 +41,4 @@ public interface EDDataMapper {
|
|||
*/
|
||||
Boolean download(EDDataParams parames);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -45,9 +45,11 @@ public class EDDataRepositoryImpl implements EDDataRepository {
|
|||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Boolean getFileInfoList(EDDataParams parames)
|
||||
public PageInfo<EDDataInfo> getDataInfoList(EDDataParams parames)
|
||||
{
|
||||
return edDataMapper.getFileInfoList(parames);
|
||||
PageHelper.startPage(parames.getPageIndex(), parames.getPageSize());
|
||||
List<EDDataInfo> edDataInfoList=edDataMapper.getDataInfoList(parames);
|
||||
return new PageInfo<>(edDataInfoList);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -22,6 +22,36 @@
|
|||
#{modifierName,jdbcType=VARCHAR},now(),1
|
||||
)
|
||||
</insert>
|
||||
<select id="getDataInfoList" resultMap="EDDataMapper" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams">
|
||||
SELECT
|
||||
data.id,
|
||||
data.category_id,
|
||||
data.data_id,
|
||||
data.data_no,
|
||||
data.data_name,
|
||||
data.data_type,
|
||||
data.file_type,
|
||||
data.version,
|
||||
data.content,
|
||||
data.implant_json,
|
||||
data.data_status,
|
||||
data.creator, card.creator_name, card.gmt_create, card.modifier,
|
||||
data.modifier_name,card.gmt_modified,card.effect_flag
|
||||
FROM
|
||||
ed_data_info data
|
||||
<where>
|
||||
data.effect_flag = 1
|
||||
<if test="parentId!=null and parentId!=''">
|
||||
and data.category_id='${parentId}'
|
||||
</if>
|
||||
<if test="keyWord!=null and keyWord!=''">
|
||||
and data.data_name LIKE '%${keyWord}%'
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY data.id
|
||||
order by data.gmt_modified asc
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,225 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.EDDataMapper">
|
||||
<insert id="createFolder" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo">
|
||||
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
|
||||
SELECT LAST_INSERT_ID()
|
||||
</selectKey>
|
||||
insert into ed_data_info (id, category_id,
|
||||
data_id, data_no, data_name,
|
||||
data_type, file_type,
|
||||
version,content, implant_json, data_status,
|
||||
creator, creator_name, gmt_create,
|
||||
modifier, modifier_name, gmt_modified,
|
||||
effect_flag
|
||||
)
|
||||
values (#{id,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR},
|
||||
#{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR},
|
||||
#{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},
|
||||
#{version,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR},
|
||||
#{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
|
||||
#{modifierName,jdbcType=VARCHAR},now(),1
|
||||
)
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
|
||||
<!--
|
||||
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.IndicatorCardMapper">
|
||||
<resultMap id="BaseResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
|
||||
<result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
|
||||
<result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
|
||||
<result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
|
||||
<result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
|
||||
<result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
|
||||
<result column="access_control" jdbcType="VARCHAR" property="accessControl" />
|
||||
<result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
|
||||
<result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
|
||||
<result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
|
||||
<result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
|
||||
<result column="creator" jdbcType="VARCHAR" property="creator" />
|
||||
<result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
|
||||
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
|
||||
<result column="modifier" jdbcType="VARCHAR" property="modifier" />
|
||||
<result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
|
||||
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
|
||||
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="IndicatorCardMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCardExtend">
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="indicator_card_no" jdbcType="VARCHAR" property="indicatorCardNo" />
|
||||
<result column="indicator_card_name" jdbcType="VARCHAR" property="indicatorCardName" />
|
||||
<result column="indicator_card_type" jdbcType="VARCHAR" property="indicatorCardType" />
|
||||
<result column="dataservice_no" jdbcType="VARCHAR" property="dataserviceNo" />
|
||||
<result column="dataservice_name" jdbcType="VARCHAR" property="dataserviceName" />
|
||||
<result column="indicator_card_order" jdbcType="INTEGER" property="indicatorCardOrder" />
|
||||
<result column="access_control" jdbcType="VARCHAR" property="accessControl" />
|
||||
<result column="home_display" jdbcType="VARCHAR" property="homeDisplay" />
|
||||
<result column="warning_flag" jdbcType="VARCHAR" property="warningFlag" />
|
||||
<result column="template_nos" jdbcType="VARCHAR" property="templateNos" />
|
||||
<result column="home" jdbcType="VARCHAR" property="home" />
|
||||
<result column="warning" jdbcType="VARCHAR" property="warning" />
|
||||
<result column="card_status" jdbcType="VARCHAR" property="cardStatus" />
|
||||
<result column="creator" jdbcType="VARCHAR" property="creator" />
|
||||
<result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
|
||||
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
|
||||
<result column="modifier" jdbcType="VARCHAR" property="modifier" />
|
||||
<result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
|
||||
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
|
||||
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
|
||||
<result column="renew_type" jdbcType="VARCHAR" property="renewType" />
|
||||
<result column="warning_indicator" jdbcType="VARCHAR" property="warningIndicator" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
id, indicator_card_no, indicator_card_name, indicator_card_type, dataservice_no,
|
||||
dataservice_name, indicator_card_order, access_control,home_display, warning_flag,
|
||||
template_nos,card_status, creator, creator_name, gmt_create, modifier, modifier_name, gmt_modified,
|
||||
effect_flag
|
||||
</sql>
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from dataplatform_wisdom_indicator_card
|
||||
where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and card_status='Enable' and effect_flag = 1
|
||||
</select>
|
||||
<select id="getIndicatorCardOrder"
|
||||
parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams"
|
||||
resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from dataplatform_wisdom_indicator_card
|
||||
where effect_flag = 1
|
||||
order by indicator_card_order desc
|
||||
limit 1
|
||||
</select>
|
||||
<select id="getIndicatorCardListConfig" resultMap="IndicatorCardMap" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.IndicatorCardParams">
|
||||
SELECT
|
||||
card.id,
|
||||
card.indicator_card_no,
|
||||
card.indicator_card_name,
|
||||
card.indicator_card_type,
|
||||
card.dataservice_no,
|
||||
card.dataservice_name,
|
||||
card.indicator_card_order,
|
||||
card.access_control,
|
||||
card.home_display,
|
||||
card.warning_flag,
|
||||
card.template_nos,
|
||||
card.card_status,
|
||||
card.creator, card.creator_name, card.gmt_create, card.modifier,
|
||||
card.modifier_name,card.gmt_modified,card.effect_flag,indictor.renew_type,indictor.warning_indicator,
|
||||
( SELECT config_status FROM dataplatform_wisdom_user_resource_config WHERE resource_no = card.indicator_card_no AND config_type = 'indicatorCard' and member_code=#{userId,jdbcType=VARCHAR} limit 1) AS home,
|
||||
( SELECT config_status FROM dataplatform_wisdom_indicator_org_config WHERE indicator_no = indictor.indicator_no AND config_type = 'warning' and org_code=#{orgCode,jdbcType=VARCHAR} limit 1) AS warning
|
||||
FROM
|
||||
dataplatform_wisdom_indicator_card card LEFT JOIN dataplatform_wisdom_user_resource_config config on config.resource_no=card.indicator_card_no
|
||||
and config.member_code = #{userId,jdbcType=VARCHAR} and config.config_type = 'indicatorCard'
|
||||
left JOIN dataplatform_wisdom_indicator indictor on indictor.indicator_card_no=card.indicator_card_no
|
||||
and indictor.indicator_type='host'
|
||||
<where>
|
||||
card.effect_flag = 1
|
||||
<if test="indicatorCardType!=null and indicatorCardType!='' and indicatorCardType!='ALL'">
|
||||
and card.indicator_card_type='${indicatorCardType}'
|
||||
</if>
|
||||
<if test="accessControl!=null and accessControl!=''">
|
||||
and card.access_control LIKE '%${accessControl}%'
|
||||
</if>
|
||||
<if test="indicatorName!=null and indicatorName!=''">
|
||||
and indictor.indicator_name LIKE '%${indicatorName}%'
|
||||
</if>
|
||||
<if test="cardStatus!=null and cardStatus!=''">
|
||||
and card.card_status='${cardStatus}'
|
||||
</if>
|
||||
<if test="homeType!=null and homeType!=''">
|
||||
and ( config.resource_no is null or ( config.member_code=#{userId,jdbcType=VARCHAR} and config.config_status='display'))
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY card.id
|
||||
order by card.indicator_card_order asc
|
||||
</select>
|
||||
<insert id="insert" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
|
||||
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
|
||||
SELECT LAST_INSERT_ID()
|
||||
</selectKey>
|
||||
insert into dataplatform_wisdom_indicator_card (indicator_card_no, indicator_card_name,
|
||||
indicator_card_type, dataservice_no, dataservice_name,
|
||||
indicator_card_order, access_control,
|
||||
home_display,warning_flag, template_nos, creator,
|
||||
creator_name, gmt_create, modifier,
|
||||
modifier_name, gmt_modified, effect_flag
|
||||
)
|
||||
values (#{indicatorCardNo,jdbcType=VARCHAR}, #{indicatorCardName,jdbcType=VARCHAR},
|
||||
#{indicatorCardType,jdbcType=VARCHAR}, #{dataserviceNo,jdbcType=VARCHAR}, #{dataserviceName,jdbcType=VARCHAR},
|
||||
#{indicatorCardOrder,jdbcType=VARCHAR}, #{accessControl,jdbcType=VARCHAR},
|
||||
#{homeDisplay,jdbcType=VARCHAR},#{warningFlag,jdbcType=VARCHAR}, #{templateNos,jdbcType=VARCHAR}, #{creator,jdbcType=VARCHAR},
|
||||
#{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR},
|
||||
#{modifierName,jdbcType=VARCHAR},now(),1
|
||||
)
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
|
||||
update dataplatform_wisdom_indicator_card
|
||||
<set>
|
||||
<if test="indicatorCardName != null">
|
||||
indicator_card_name = #{indicatorCardName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="indicatorCardType != null">
|
||||
indicator_card_type = #{indicatorCardType,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="dataserviceNo != null">
|
||||
dataservice_no = #{dataserviceNo,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="dataserviceName != null">
|
||||
dataservice_name = #{dataserviceName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="indicatorCardOrder != null">
|
||||
indicator_card_order = #{indicatorCardOrder,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="accessControl != null">
|
||||
access_control = #{accessControl,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="homeDisplay != null">
|
||||
home_display = #{homeDisplay,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="warningFlag != null">
|
||||
warning_flag = #{warningFlag,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="templateNos != null">
|
||||
template_nos = #{templateNos,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="modifier != null">
|
||||
modifier = #{modifier,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="modifierName != null">
|
||||
modifier_name = #{modifierName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
gmt_modified = now()
|
||||
</set>
|
||||
where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
|
||||
</update>
|
||||
|
||||
<update id="updateStatusOrEffect" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.IndicatorCard">
|
||||
update dataplatform_wisdom_indicator_card
|
||||
<set>
|
||||
<if test="cardStatus != null">
|
||||
card_status = #{cardStatus,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="effectFlag != null">
|
||||
effect_flag = #{effectFlag,jdbcType=VARCHAR},
|
||||
</if>
|
||||
gmt_modified = now()
|
||||
</set>
|
||||
where indicator_card_no = #{indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
|
||||
</update>
|
||||
|
||||
<update id="updateIndicatorCardOrder" parameterType="java.util.List">
|
||||
<foreach collection="list" separator=";" item="item">
|
||||
update dataplatform_wisdom_indicator_card
|
||||
set indicator_card_order = #{item.indicatorCardOrder,jdbcType=INTEGER}
|
||||
where indicator_card_no = #{item.indicatorCardNo,jdbcType=VARCHAR} and effect_flag = 1
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
-->
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.electromagnetic.industry.software.data.manage.repository.dao.UserMapper">
|
||||
<resultMap id="UserResultMap" type="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User">
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="user_id" jdbcType="VARCHAR" property="userId" />
|
||||
<result column="user_name" jdbcType="VARCHAR" property="userName" />
|
||||
<result column="work_number" jdbcType="VARCHAR" property="workNumber" />
|
||||
<result column="mobile" jdbcType="VARCHAR" property="mobile" />
|
||||
<result column="user_dept" jdbcType="VARCHAR" property="userDept" />
|
||||
<result column="user_title" jdbcType="VARCHAR" property="userTitle" />
|
||||
<result column="user_pwd" jdbcType="VARCHAR" property="userPwd" />
|
||||
<result column="join_time" jdbcType="TIMESTAMP" property="joinTime" />
|
||||
<result column="is_published" jdbcType="TINYINT" property="isPublished" />
|
||||
<result column="salt" jdbcType="VARCHAR" property="salt" />
|
||||
<result column="user_status" jdbcType="VARCHAR" property="userStatus" />
|
||||
<result column="internship_end_date" jdbcType="DATE" property="internshipEndDate"/>
|
||||
<result column="creator" jdbcType="VARCHAR" property="creator" />
|
||||
<result column="creator_name" jdbcType="VARCHAR" property="creatorName" />
|
||||
<result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
|
||||
<result column="modifier" jdbcType="VARCHAR" property="modifier" />
|
||||
<result column="modifier_name" jdbcType="VARCHAR" property="modifierName" />
|
||||
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
|
||||
<result column="effect_flag" jdbcType="TINYINT" property="effectFlag" />
|
||||
</resultMap>
|
||||
|
||||
<insert id="insert" parameterType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User">
|
||||
insert into ed_users(
|
||||
<if test="userId != null and userId !='' ">user_id,</if>
|
||||
<if test="userName != null and userName !='' ">user_name,</if>
|
||||
<if test="workNumber != null and workNumber !='' ">work_number,</if>
|
||||
<if test="mobile != null and mobile !='' ">mobile,</if>
|
||||
<if test="userDept != null and userDept !='' ">user_dept,</if>
|
||||
<if test="userTitle != null and userTitle !='' ">user_title,</if>
|
||||
<if test="userPwd != null and userPwd !='' ">user_pwd,</if>
|
||||
<if test="joinTime != null">join_time,</if>
|
||||
<if test="isPublished != null">is_published,</if>
|
||||
<if test="salt != null and salt !='' ">salt,</if>
|
||||
<if test="userStatus != null and userStatus !='' ">user_status,</if>
|
||||
<if test="internshipEndDate != null">internship_end_date,</if>
|
||||
<if test="creator != null and creator !='' ">creator,</if>
|
||||
<if test="creatorName != null and creatorName !='' ">creator_name,</if>
|
||||
gmt_create,
|
||||
effect_flag)
|
||||
values (
|
||||
<if test="userId != null and userId !='' ">#{userId},</if>
|
||||
<if test="userName != null and userName !='' ">#{userName},</if>
|
||||
<if test="workNumber != null and workNumber !='' ">#{workNumber},</if>
|
||||
<if test="mobile != null and mobile !='' ">#{mobile},</if>
|
||||
<if test="userDept != null and userDept !='' ">#{userDept},</if>
|
||||
<if test="userTitle != null and userTitle !='' ">#{userTitle},</if>
|
||||
<if test="userPwd != null and userPwd !='' ">#{userPwd},</if>
|
||||
<if test="joinTime != null">#{joinTime},</if>
|
||||
<if test="isPublished != null">#{isPublished},</if>
|
||||
<if test="salt != null and salt !='' ">#{salt},</if>
|
||||
<if test="userStatus != null and userStatus !='' ">#{userStatus},</if>
|
||||
<if test="internshipEndDate != null">#{internshipEndDate},</if>
|
||||
<if test="creator != null and creator !='' ">#{creator},</if>
|
||||
<if test="creatorName != null and creatorName !='' ">#{creatorName},</if>
|
||||
now(),
|
||||
1
|
||||
)
|
||||
</insert>
|
||||
</mapper>
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
|
||||
<orderEntry type="module" module-name="facade" />
|
||||
<orderEntry type="module" module-name="domain" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.4.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
|
||||
<orderEntry type="module" module-name="electromagnetic-framework" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:guava:28.2-jre" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.10.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -1,11 +1,14 @@
|
|||
package com.electromagnetic.industry.software.data.manage.service.facade;
|
||||
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.service.EDDataService;
|
||||
import com.electromagnetic.industry.software.data.manage.facade.EDDataFacade;
|
||||
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
|
||||
import com.electromagnetic.industry.software.data.manage.service.mappers.EDDataMappers;
|
||||
import com.electromagnetic.industry.software.data.manage.service.mappers.IndicatorCardMappers;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResult;
|
||||
import electromagnetic.data.framework.share.model.ElectromagneticResultUtil;
|
||||
import electromagnetic.data.framework.share.id.IdWorker;
|
||||
|
|
@ -75,11 +78,14 @@ public class EDDataFacadeImpl implements EDDataFacade {
|
|||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public ElectromagneticResult<Boolean> getFileInfoList(EDDataRequest request)
|
||||
public ElectromagneticResult<EDDataPageResponse> getDataInfoList(EDDataRequest request)
|
||||
{
|
||||
EDDataParams parames= EDDataMappers.INSTANCE.getEDDataParames(request);
|
||||
edDataService.getFileInfoList(parames);
|
||||
return ElectromagneticResultUtil.success(Boolean.TRUE);
|
||||
//获取中支指标配置列表
|
||||
EDDataPage edDataPage = edDataService.getDataInfoList(parames);
|
||||
//模型转换
|
||||
EDDataPageResponse edDataPageResponse = EDDataMappers.INSTANCE.getEDDataInfoToModel(edDataPage);
|
||||
return ElectromagneticResultUtil.success(edDataPageResponse);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -5,8 +5,10 @@ package com.electromagnetic.industry.software.data.manage.service.mappers;
|
|||
|
||||
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataPage;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
|
||||
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
|
||||
import com.electromagnetic.industry.software.data.manage.response.indicator.EDDataPageResponse;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.factory.Mappers;
|
||||
|
||||
|
|
@ -31,5 +33,11 @@ public interface EDDataMappers {
|
|||
* @return
|
||||
*/
|
||||
EDDataInfo getEDDataInfo(EDDataRequest request);
|
||||
/**
|
||||
* 指标卡扩展模型返回
|
||||
* @param edDataPage
|
||||
* @return
|
||||
*/
|
||||
EDDataPageResponse getEDDataInfoToModel(EDDataPage edDataPage);
|
||||
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
package com.electromagnetic.industry.software.data.manage.service.mappers;
|
||||
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.model.EDDataInfo;
|
||||
import com.electromagnetic.industry.software.data.manage.domain.boardservice.indicator.parames.EDDataParams;
|
||||
import com.electromagnetic.industry.software.data.manage.request.indicator.EDDataRequest;
|
||||
import javax.annotation.Generated;
|
||||
|
||||
@Generated(
|
||||
value = "org.mapstruct.ap.MappingProcessor",
|
||||
date = "2024-11-12T16:08:00+0800",
|
||||
comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_432 (Temurin)"
|
||||
)
|
||||
public class EDDataMappersImpl implements EDDataMappers {
|
||||
|
||||
@Override
|
||||
public EDDataParams getEDDataParames(EDDataRequest request) {
|
||||
if ( request == null ) {
|
||||
return null;
|
||||
}
|
||||
|
||||
EDDataParams eDDataParams = new EDDataParams();
|
||||
|
||||
return eDDataParams;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EDDataInfo getEDDataInfo(EDDataRequest request) {
|
||||
if ( request == null ) {
|
||||
return null;
|
||||
}
|
||||
|
||||
EDDataInfo eDDataInfo = new EDDataInfo();
|
||||
|
||||
return eDDataInfo;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue