Skip to content

B
bi-report
Commit c1754fc6 authored by 魏艺敏's avatar 魏艺敏
Browse files
Options

update

parents ca0537f5 b78cda04
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 782 deletions
.DS_Store deleted 100644 → 0
View file @ ca0537f5
File deleted
.idea/workspace.xml deleted 100644 → 0
View file @ ca0537f5
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="" />
<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="CodeStyleSettingsInfer">
<option name="done" value="true" />
</component>
<component name="ComposerSettings">
<execution>
<executable />
</execution>
</component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand />
<select />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Python Script" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectCodeStyleSettingsMigration">
<option name="version" value="1" />
</component>
<component name="ProjectId" id="1aysyG2qT4fAjb9xIJrCaUFkciz" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DatabaseDriversLRU" value="hive" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="ignore_missing_gitignore" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/bin" />
<property name="project.structure.last.edited" value="Global Libraries" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="File.Encoding" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/bin" />
<recent name="$PROJECT_DIR$/jobs/demo_java_gen" />
<recent name="$PROJECT_DIR$/jobs" />
<recent name="$PROJECT_DIR$/jobs/hive_insert" />
<recent name="$PROJECT_DIR$/sqls" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/jobs/bak" />
<recent name="$PROJECT_DIR$/sqls/bak" />
<recent name="$PROJECT_DIR$/sqls/demo_param" />
<recent name="$PROJECT_DIR$/sqls/demo" />
<recent name="$PROJECT_DIR$/lib/java" />
</key>
</component>
<component name="RunManager">
<configuration default="true" type="ClojureREPL" factoryName="Local" activateToolWindowBeforeRun="false">
<setting name="replType" value="NREPL" />
<setting name="execution" value="LEININGEN" />
<setting name="jvmArgs" value="" />
<setting name="parameters" value="" />
<setting name="workingDir" value="" />
<setting name="profiles" value="" />
<setting name="aliases" value="" />
<setting name="fixLineNumbers" value="false" />
<method v="2" />
</configuration>
<configuration default="true" type="ClojureREPL" factoryName="Remote" activateToolWindowBeforeRun="false">
<setting name="host" value="" />
<setting name="port" value="0" />
<setting name="replType" value="SOCKET" />
<setting name="configType" value="SPECIFY" />
<setting name="fixLineNumbers" value="false" />
<method v="2" />
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="" />
<created>1587719420978</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1587719420978</updated>
<workItem from="1587719424641" duration="476000" />
<workItem from="1587719926678" duration="119000" />
<workItem from="1587720070582" duration="11805000" />
<workItem from="1587826396471" duration="66000" />
<workItem from="1587826484161" duration="454000" />
<workItem from="1587871840753" duration="12281000" />
<workItem from="1587978090931" duration="1001000" />
<workItem from="1587982524517" duration="5052000" />
<workItem from="1588152481879" duration="139000" />
<workItem from="1588154352798" duration="195000" />
<workItem from="1588220085338" duration="7993000" />
<workItem from="1588248522289" duration="2820000" />
<workItem from="1588344251422" duration="21636000" />
<workItem from="1588761853482" duration="3826000" />
<workItem from="1588905392183" duration="4522000" />
<workItem from="1589447155495" duration="14053000" />
</task>
<task id="LOCAL-00001" summary="add init codes.">
<created>1587723565207</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1587723565207</updated>
</task>
<task id="LOCAL-00002" summary="update codes">
<created>1587724233782</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1587724233782</updated>
</task>
<task id="LOCAL-00003" summary="update codes">
<created>1587724478965</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1587724478965</updated>
</task>
<task id="LOCAL-00004" summary="update codes">
<created>1587725269143</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1587725269143</updated>
</task>
<task id="LOCAL-00005" summary="update codes">
<created>1587727247724</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1587727247724</updated>
</task>
<task id="LOCAL-00006" summary="update codes">
<created>1587729641130</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1587729641130</updated>
</task>
<task id="LOCAL-00007" summary="update codes">
<created>1587730186385</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1587730186385</updated>
</task>
<task id="LOCAL-00008" summary="update codes">
<created>1587731467430</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1587731467430</updated>
</task>
<task id="LOCAL-00009" summary="update codes">
<created>1587732013388</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1587732013388</updated>
</task>
<task id="LOCAL-00010" summary="update codes">
<created>1587732630719</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1587732630719</updated>
</task>
<task id="LOCAL-00011" summary="update codes">
<created>1587891829314</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1587891829314</updated>
</task>
<task id="LOCAL-00012" summary="update codes">
<created>1587893445656</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1587893445656</updated>
</task>
<task id="LOCAL-00013" summary="update codes">
<created>1587893981031</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1587893981031</updated>
</task>
<task id="LOCAL-00014" summary="update codes">
<created>1587894242907</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1587894242907</updated>
</task>
<task id="LOCAL-00015" summary="update codes">
<created>1587899162205</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1587899162205</updated>
</task>
<task id="LOCAL-00016" summary="update codes">
<created>1587899271311</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1587899271311</updated>
</task>
<task id="LOCAL-00017" summary="update codes">
<created>1587900238329</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1587900238329</updated>
</task>
<task id="LOCAL-00018" summary="update codes">
<created>1588231376318</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1588231376318</updated>
</task>
<task id="LOCAL-00019" summary="update codes">
<created>1588231605376</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1588231605376</updated>
</task>
<task id="LOCAL-00020" summary="update codes">
<created>1588232535161</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1588232535161</updated>
</task>
<task id="LOCAL-00021" summary="update codes">
<created>1588522573935</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1588522573935</updated>
</task>
<task id="LOCAL-00022" summary="update codes">
<created>1588522705925</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1588522705925</updated>
</task>
<task id="LOCAL-00023" summary="update codes">
<created>1589531180950</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1589531180950</updated>
</task>
<task id="LOCAL-00024" summary="update codes">
<created>1589531276027</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1589531276027</updated>
</task>
<task id="LOCAL-00025" summary="update codes">
<created>1589531399499</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1589531399499</updated>
</task>
<task id="LOCAL-00026" summary="update codes">
<created>1589534027533</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1589534027533</updated>
</task>
<task id="LOCAL-00027" summary="update codes">
<created>1589536751237</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1589536751237</updated>
</task>
<option name="localTasksCounter" value="28" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="1">
<value>
<State>
<option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
<option name="FILTERS">
<map>
<entry key="branch">
<value>
<list>
<option value="HEAD" />
</list>
</value>
</entry>
<entry key="roots">
<value>
<list>
<option value="$PROJECT_DIR$" />
</list>
</value>
</entry>
</map>
</option>
</State>
</value>
</entry>
</map>
</option>
<option name="OPEN_TABS">
<set>
<option value="1" />
</set>
</option>
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="add init codes." />
<MESSAGE value="update codes" />
<option name="LAST_COMMIT_MESSAGE" value="update codes" />
</component>
<component name="WindowStateProjectService">
<state x="806" y="1321" key="#Plugins" timestamp="1587719899315">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="806" y="1321" key="#Plugins/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587719899315" />
<state x="806" y="1321" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1587721119316">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="806" y="1321" key="#com.intellij.execution.impl.EditConfigurationsDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587721119316" />
<state x="690" y="400" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1588522985742">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="690" y="400" key="#com.intellij.fileTypes.FileTypeChooser/0.22.1920.1129@0.22.1920.1129" timestamp="1588522985742" />
<state x="936" y="1465" key="#com.intellij.fileTypes.FileTypeChooser/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587721869266" />
<state x="826" y="1351" key="#com.intellij.ide.util.frameworkSupport.AddFrameworkSupportDialog" timestamp="1587720303076">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="826" y="1351" key="#com.intellij.ide.util.frameworkSupport.AddFrameworkSupportDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587720303076" />
<state x="554" y="205" key="CommitChangelistDialog2" timestamp="1589536751036">
<screen x="0" y="22" width="1920" height="1178" />
</state>
<state x="554" y="197" key="CommitChangelistDialog2/0.22.1920.1129@0.22.1920.1129" timestamp="1588522705736" />
<state x="554" y="205" key="CommitChangelistDialog2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@0.22.1920.1178" timestamp="1589536751036" />
<state x="554" y="186" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588232534973" />
<state x="800" y="1258" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587900238196" />
<state x="792" y="309" key="RollbackChangesDialog" timestamp="1588521468770">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="792" y="309" key="RollbackChangesDialog/0.22.1920.1129@0.22.1920.1129" timestamp="1588521468770" />
<state x="1038" y="1373" key="RollbackChangesDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587898773703" />
<state x="448" y="176" key="SettingsEditor" timestamp="1588346857662">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="448" y="176" key="SettingsEditor/0.22.1920.1129@0.22.1920.1129" timestamp="1588346857662" />
<state x="694" y="1237" key="SettingsEditor/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587720319782" />
<state x="560" y="344" key="Vcs.Push.Dialog.v2" timestamp="1589536752839">
<screen x="0" y="22" width="1920" height="1178" />
</state>
<state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129@0.22.1920.1129" timestamp="1588522707302" />
<state x="560" y="344" key="Vcs.Push.Dialog.v2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@0.22.1920.1178" timestamp="1589536752839" />
<state x="560" y="312" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588232541898" />
<state x="806" y="1395" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587900239771" />
<state x="625" y="409" key="git4idea.merge.GitPullDialog" timestamp="1589534639344">
<screen x="0" y="22" width="1920" height="1178" />
</state>
<state x="625" y="409" key="git4idea.merge.GitPullDialog/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@0.22.1920.1178" timestamp="1589534639344" />
<state x="578" y="257" key="search.everywhere.popup" timestamp="1588231057499">
<screen x="0" y="22" width="1920" height="1058" />
</state>
<state x="578" y="257" key="search.everywhere.popup/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588231057499" />
</component>
</project>
\ No newline at end of file
lib/java/bi-report-service/.idea/workspace.xml deleted 100644 → 0
View file @ ca0537f5
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add" />
<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="CodeStyleSettingsInfer">
<option name="done" value="true" />
</component>
<component name="ComposerSettings">
<execution>
<executable />
</execution>
</component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand />
<select />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Interface" />
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
</component>
<component name="MavenImportPreferences">
<option name="importingSettings">
<MavenImportingSettings>
<option name="importAutomatically" value="true" />
</MavenImportingSettings>
</option>
</component>
<component name="ProjectCodeStyleSettingsMigration">
<option name="version" value="1" />
</component>
<component name="ProjectId" id="1XghNxDWp0YvihXg70m3QcE9Kh4" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="ignore_missing_gitignore" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.gmei.data.gateway.server.service.impl" />
<recent name="com.gmei.data.gateway.server.service" />
<recent name="com.gmei.data.gateway.server.bean" />
</key>
</component>
<component name="RunAnythingCache">
<option name="myCommands">
<command value="mvn clean install" />
<command value="mvn clean install -DskipTests" />
<command value="mvn clean" />
</option>
</component>
<component name="RunManager" selected="JUnit.EmailServiceTest.testSendFormattedMail">
<configuration name="DateUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.utils.DateUtils" />
<module name="service-server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.gmei.data.gateway.server.utils.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="ClojureREPL" factoryName="Local" activateToolWindowBeforeRun="false">
<setting name="replType" value="NREPL" />
<setting name="execution" value="LEININGEN" />
<setting name="jvmArgs" value="" />
<setting name="parameters" value="" />
<setting name="workingDir" value="" />
<setting name="profiles" value="" />
<setting name="aliases" value="" />
<setting name="fixLineNumbers" value="false" />
<method v="2" />
</configuration>
<configuration default="true" type="ClojureREPL" factoryName="Remote" activateToolWindowBeforeRun="false">
<setting name="host" value="" />
<setting name="port" value="0" />
<setting name="replType" value="SOCKET" />
<setting name="configType" value="SPECIFY" />
<setting name="fixLineNumbers" value="false" />
<method v="2" />
</configuration>
<configuration name="EmailServiceTest.testSendFormattedMail" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="service-server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.gmei.data.gateway.server.service.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.gmei.data.gateway.server.service" />
<option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.service.EmailServiceTest" />
<option name="METHOD_NAME" value="testSendFormattedMail" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ExcelServiceTest.testGenExcel" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="service-server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.gmei.data.gateway.server.service.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.gmei.data.gateway.server.service" />
<option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.service.ExcelServiceTest" />
<option name="METHOD_NAME" value="testGenExcel" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="SparksqlServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="service-server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.gmei.data.gateway.server.service.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.gmei.data.gateway.server.service" />
<option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.service.SparksqlServiceTest" />
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="SparksqlServiceTest.testGenExcel" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="service-server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.gmei.data.gateway.server.service.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="com.gmei.data.gateway.server.service" />
<option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.service.SparksqlServiceTest" />
<option name="METHOD_NAME" value="testGenExcel" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="GatewayServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="service-server" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.gmei.data.gateway.server.ServiceServerApplication" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="JUnit.EmailServiceTest.testSendFormattedMail" />
<item itemvalue="Application.DateUtils" />
<item itemvalue="JUnit.SparksqlServiceTest" />
<item itemvalue="JUnit.SparksqlServiceTest.testGenExcel" />
<item itemvalue="JUnit.ExcelServiceTest.testGenExcel" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="" />
<created>1581473609392</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1581473609392</updated>
<workItem from="1581473614335" duration="2000" />
<workItem from="1584674865836" duration="4179000" />
<workItem from="1584686940901" duration="809000" />
<workItem from="1584945647680" duration="4469000" />
<workItem from="1588148891822" duration="2318000" />
<workItem from="1588152718016" duration="1463000" />
<workItem from="1588154601852" duration="28557000" />
<workItem from="1588344252163" duration="15923000" />
<workItem from="1588762492573" duration="403000" />
<workItem from="1588837331043" duration="673000" />
<workItem from="1589455301393" duration="9516000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="1">
<value>
<State>
<option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
<option name="FILTERS">
<map>
<entry key="branch">
<value>
<list>
<option value="HEAD" />
</list>
</value>
</entry>
<entry key="roots">
<value>
<list>
<option value="$PROJECT_DIR$" />
</list>
</value>
</entry>
</map>
</option>
</State>
</value>
</entry>
</map>
</option>
<option name="OPEN_TABS">
<set>
<option value="1" />
</set>
</option>
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<option name="LAST_COMMIT_MESSAGE" value="" />
</component>
<component name="WindowStateProjectService">
<state x="1019" y="1319" key="#com.intellij.ide.util.MemberChooser" timestamp="1588218526746">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="773" y="242" key="#com.intellij.ide.util.MemberChooser/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584949083609" />
<state x="1019" y="1319" key="#com.intellij.ide.util.MemberChooser/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588218526746" />
<state x="810" y="447" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog" timestamp="1588148906635">
<screen x="0" y="22" width="1920" height="1058" />
</state>
<state x="810" y="447" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588148906635" />
<state x="834" y="1337" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog" timestamp="1588234678587">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="834" y="1337" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588234678587" />
<state x="957" y="1126" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1588224593023">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="957" y="1126" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588224593023" />
<state x="784" y="1223" key="CommitChangelistDialog2" timestamp="1588154132365">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="553" y="153" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584956237641" />
<state x="784" y="1223" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588154132365" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom" timestamp="1589943908805">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state width="1878" height="243" key="GridCell.Tab.0.bottom/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074648" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943908805" />
<state width="1878" height="321" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137007" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004638" />
<state width="1878" height="243" key="GridCell.Tab.0.center" timestamp="1589943908804">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state width="1878" height="243" key="GridCell.Tab.0.center/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074647" />
<state width="1878" height="243" key="GridCell.Tab.0.center/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943908804" />
<state width="1878" height="321" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137005" />
<state width="1878" height="243" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004637" />
<state width="1878" height="243" key="GridCell.Tab.0.left" timestamp="1589943908803">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state width="1878" height="243" key="GridCell.Tab.0.left/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074647" />
<state width="1878" height="243" key="GridCell.Tab.0.left/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943908803" />
<state width="1878" height="321" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137005" />
<state width="1878" height="243" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004636" />
<state width="1878" height="243" key="GridCell.Tab.0.right" timestamp="1589943908805">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state width="1878" height="243" key="GridCell.Tab.0.right/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074648" />
<state width="1878" height="243" key="GridCell.Tab.0.right/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943908805" />
<state width="1878" height="321" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137006" />
<state width="1878" height="243" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004637" />
<state width="1878" height="395" key="GridCell.Tab.1.bottom" timestamp="1589536486433">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state width="1878" height="395" key="GridCell.Tab.1.bottom/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589536486433" />
<state width="1878" height="319" key="GridCell.Tab.1.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559611" />
<state width="1878" height="395" key="GridCell.Tab.1.center" timestamp="1589536486431">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state width="1878" height="395" key="GridCell.Tab.1.center/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589536486431" />
<state width="1878" height="319" key="GridCell.Tab.1.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559609" />
<state width="1878" height="395" key="GridCell.Tab.1.left" timestamp="1589536486430">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state width="1878" height="395" key="GridCell.Tab.1.left/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589536486430" />
<state width="1878" height="319" key="GridCell.Tab.1.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559609" />
<state width="1878" height="395" key="GridCell.Tab.1.right" timestamp="1589536486432">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state width="1878" height="395" key="GridCell.Tab.1.right/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589536486432" />
<state width="1878" height="319" key="GridCell.Tab.1.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559611" />
<state x="560" y="291" key="Vcs.Push.Dialog.v2" timestamp="1584949293518">
<screen x="0" y="22" width="1920" height="1058" />
</state>
<state x="560" y="291" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584949293518" />
<state x="2221" y="1390" width="670" height="675" key="run.anything.popup" timestamp="1589943863616">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state x="469" y="208" width="670" height="663" key="run.anything.popup/0.22.1920.1129@0.22.1920.1129" timestamp="1588345465540" />
<state x="2221" y="1390" width="670" height="675" key="run.anything.popup/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943863616" />
<state x="715" y="1270" width="670" height="675" key="run.anything.popup/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588837938694" />
<state x="2330" y="1458" width="764" height="676" key="search.everywhere.popup" timestamp="1589943432014">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state x="2330" y="1458" width="764" height="676" key="search.everywhere.popup/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943432014" />
</component>
</project>
\ No newline at end of file
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/endpoint/BiReportEndpoint.java
View file @ c1754fc6
......@@ -17,6 +17,12 @@ public class BiReportEndpoint {
return biReportService.execSql(name);
}
@ResponseBody
@RequestMapping(value = "/execSqlByHive")
public int execSqlByHive(@RequestParam String name){
return biReportService.execSql(name);
}
@ResponseBody
@RequestMapping(value = "/genExcel")
public int genExcel(@RequestParam String name){
......
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/BiReportService.java
View file @ c1754fc6
......@@ -2,6 +2,7 @@ package com.gmei.data.gateway.server.service;
public interface BiReportService {
int execSql(String name);
int execSqlByHive(String name);
int genExcel(String name);
int sendEmail(String to,String cc,String name);
}
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/HivesqlService.java
View file @ c1754fc6
package com.gmei.data.gateway.server.service;
import com.gmei.data.gateway.server.dto.ExcelGenDto;
public interface HivesqlService {
int executeSql(String name);
}
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/SparksqlService.java
View file @ c1754fc6
......@@ -3,5 +3,6 @@ package com.gmei.data.gateway.server.service;
import com.gmei.data.gateway.server.dto.ExcelGenDto;
public interface SparksqlService {
int executeSql(String name);
ExcelGenDto getResultDto(String name);
}
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/BiReportServiceImpl.java
View file @ c1754fc6
......@@ -26,6 +26,11 @@ public class BiReportServiceImpl implements BiReportService {
@Override
public int execSql(String name){
return sparksqlService.executeSql(name);
}
@Override
public int execSqlByHive(String name){
return hivesqlService.executeSql(name);
}
......
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/ExcelServiceImpl.java
View file @ c1754fc6
......@@ -5,9 +5,11 @@ import com.gmei.data.gateway.server.dto.ExcelGenDto;
import com.gmei.data.gateway.server.service.ExcelService;
import com.gmei.data.gateway.server.utils.DateUtils;
import com.gmei.data.gateway.server.utils.ProperUtils;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
......@@ -156,5 +159,102 @@ public class ExcelServiceImpl implements ExcelService {
logger.error("the value is null!");
}
}
/**
* 画excel格局的demo代码
* @param args
*/
public static void main(String[] args) {
HSSFWorkbook workbook = new HSSFWorkbook();
HSSFCellStyle style = workbook.createCellStyle();
style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
HSSFSheet sheet = workbook.createSheet("sheet");
HSSFRow row0 = sheet.createRow(0);
HSSFCell cell_00 = row0.createCell(0);
cell_00.setCellStyle(style);
cell_00.setCellValue("分类");
HSSFCell cell_01 = row0.createCell(1);
cell_01.setCellStyle(style);
cell_01.setCellValue("指标");
HSSFCell cell_02 = row0.createCell(2);
cell_02.setCellStyle(style);
cell_02.setCellValue("昨日值");
HSSFCell cell_03 = row0.createCell(3);
cell_03.setCellStyle(style);
cell_03.setCellValue("前日值");
HSSFCell cell_04 = row0.createCell(4);
cell_04.setCellStyle(style);
cell_04.setCellValue("前日环比");
HSSFCell cell_05 = row0.createCell(5);
cell_05.setCellStyle(style);
cell_05.setCellValue("上周同比");
HSSFCell cell_06 = row0.createCell(6);
cell_06.setCellStyle(style);
cell_06.setCellValue("上月日均值环比");
HSSFCell cell_07 = row0.createCell(7);
cell_07.setCellStyle(style);
cell_07.setCellValue("历史同期上月日均值同比");
HSSFCell cell_08 = row0.createCell(8);
cell_08.setCellStyle(style);
cell_08.setCellValue("预警");
HSSFRow row1 = sheet.createRow(1);
HSSFCell cell_10 = row1.createCell(0);
cell_10.setCellStyle(style);
cell_10.setCellValue("活跃情况");
HSSFCell cell_11 = row1.createCell(1);
cell_11.setCellStyle(style);
cell_11.setCellValue("DAU");
HSSFRow row2 = sheet.createRow(2);
HSSFCell cell_21 = row2.createCell(1);
cell_21.setCellStyle(style);
cell_21.setCellValue("新增");
HSSFRow row3 = sheet.createRow(3);
HSSFCell cell_31 = row3.createCell(1);
cell_31.setCellStyle(style);
cell_31.setCellValue("老活");
HSSFRow row4 = sheet.createRow(4);
HSSFCell cell_41 = row4.createCell(1);
cell_41.setCellStyle(style);
cell_41.setCellValue("新增次日app留存率（前日）");
HSSFRow row5 = sheet.createRow(5);
HSSFCell cell_51 = row5.createCell(1);
cell_51.setCellStyle(style);
cell_51.setCellValue("老活次日app留存率（前日）");
HSSFRow row6 = sheet.createRow(6);
HSSFCell cell_61 = row6.createCell(1);
cell_61.setCellStyle(style);
cell_61.setCellValue("新增单设备app时长");
HSSFRow row7 = sheet.createRow(7);
HSSFCell cell_71 = row7.createCell(1);
cell_71.setCellStyle(style);
cell_71.setCellValue("新增单设备app打开");
// 合并日期占两行(4个参数，分别为起始行，结束行，起始列，结束列)
// 行和列都是从0开始计数，且起始结束都会合并
// 这里是合并excel中日期的两行为一行
CellRangeAddress region = new CellRangeAddress(1, 7, 0, 0);
sheet.addMergedRegion(region);
try{
File file = new File("/Users/apple/Downloads/北极星指标_dev.xls");
FileOutputStream fout = new FileOutputStream(file);
workbook.write(fout);
fout.close();
}catch (Exception e){
e.printStackTrace();
}
}
}
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/HivesqlServiceImpl.java
View file @ c1754fc6
package com.gmei.data.gateway.server.service.impl;
import com.gmei.data.gateway.server.service.HivesqlService;
import com.gmei.data.gateway.server.utils.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
......@@ -40,7 +41,7 @@ public class HivesqlServiceImpl implements HivesqlService {
reader = new BufferedReader(new FileReader(file));
String tempStr;
while ((tempStr = reader.readLine()) != null) {
sbf.append("\t").append(tempStr);
sbf.append("\n").append(tempStr);
}
reader.close();
} catch (IOException e) {
......@@ -59,6 +60,8 @@ public class HivesqlServiceImpl implements HivesqlService {
}
}
String hql = sbf.toString();
hql = hql.replaceAll("#partition_date", String.format("'%s'", DateUtils.getYesterdayDateSimpleStr()))
.replaceAll("#partition_day", String.format("'%s'", DateUtils.getYesterdayDateSimpleStr()));
Connection conn = null;
try{
......@@ -68,13 +71,13 @@ public class HivesqlServiceImpl implements HivesqlService {
statement.executeUpdate("set mapreduce.job.queuename=data");
int updateCount = statement.executeUpdate(hql);
if(updateCount > 0){
logger.info("*** Execute success, hql: {}",hql);
logger.info("*** Execute By Hive success, hql: {}",hql);
}else{
logger.warn("*** Execute finish, hql: {}",hql);
logger.warn("*** Execute By Hive finish, hql: {}",hql);
}
}catch (Exception e){
e.printStackTrace();
logger.error("*** Execute failed, error message: {}, hql: {}",e.getMessage(),hql);
logger.error("*** Execute By Hive failed, error message: {}, hql: {}",e.getMessage(),hql);
return 1;
}
}
......
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/SparksqlServiceImpl.java
View file @ c1754fc6
......@@ -2,6 +2,7 @@ package com.gmei.data.gateway.server.service.impl;
import com.gmei.data.gateway.server.dto.ExcelGenDto;
import com.gmei.data.gateway.server.service.SparksqlService;
import com.gmei.data.gateway.server.utils.DateUtils;
import com.gmei.data.gateway.server.utils.ProperUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -33,6 +34,58 @@ public class SparksqlServiceImpl implements SparksqlService {
private String properFilePath;
private static final Logger logger = LoggerFactory.getLogger(SparksqlServiceImpl.class);
@Override
public int executeSql(String name){
File sqlDir = new File(sqlPath + name);
File[] files = sqlDir.listFiles();
for(File file : files){
BufferedReader reader = null;
StringBuffer sbf = new StringBuffer();
try {
reader = new BufferedReader(new FileReader(file));
String tempStr;
while ((tempStr = reader.readLine()) != null) {
sbf.append("\n").append(tempStr);
}
reader.close();
} catch (IOException e) {
e.printStackTrace();
logger.error(e.getMessage());
continue;
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e1) {
e1.printStackTrace();
logger.error(e1.getMessage());
continue;
}
}
}
String hql = sbf.toString();
hql = hql.replaceAll("#partition_date", String.format("'%s'", DateUtils.getYesterdayDateSimpleStr()))
.replaceAll("#partition_day", String.format("'%s'", DateUtils.getYesterdayDateSimpleStr()));
Connection conn = null;
try{
conn = DriverManager.getConnection(sparkSqlJdbcUrl,"bi","");
Statement statement = conn.createStatement();
int updateCount = statement.executeUpdate(hql);
if(updateCount > 0){
logger.info("*** Execute By Sparksql success, hql: {}",hql);
}else{
logger.warn("*** Execute By Sparksql finish, hql: {}",hql);
}
}catch (Exception e){
e.printStackTrace();
logger.error("*** Execute By Sparksql failed, error message: {}, hql: {}",e.getMessage(),hql);
return 1;
}
}
return 0;
}
@Override
public ExcelGenDto getResultDto(String name){
List<String> sheetNameList = new ArrayList<String>();
......@@ -82,6 +135,9 @@ public class SparksqlServiceImpl implements SparksqlService {
}
}
String hql = sbf.toString();
hql = hql.replaceAll("#partition_date", String.format("'%s'", DateUtils.getYesterdayDateSimpleStr()))
.replaceAll("#partition_day", String.format("'%s'", DateUtils.getYesterdayDateSimpleStr()));
Connection conn = null;
try{
conn = DriverManager.getConnection(sparkSqlJdbcUrl,"data","");
......
sbin/start_service.sh
View file @ c1754fc6
#!/bin/bash
nohup java -jar /home/bi/bi-report/lib/java/bi-report-service/service-server/target/report-service-server-1.0.0-SNAPSHOT.jar >> /data/bi-report/logs/bi-report-service.out 2>&1 &
tail -100f /data/bi-report/logs/bi-report-service.out
\ No newline at end of file
sqls/daily_content_data_insert/daily_content_data_insert.sql
View file @ c1754fc6
INSERT OVERWRITE TABLE tl_pm_content_d PARTITION (PARTITION_DAY = #partition_day)
INSERT OVERWRITE TABLE pm.tl_pm_content_d PARTITION (PARTITION_DAY = #partition_day)
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment