Skip to content

B
bi-report
Commit 3cb4c510 authored by 赵建伟's avatar 赵建伟
Browse files
Options

update codes

parent f11377f8
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 49 deletions
.idea/workspace.xml
View file @ 3cb4c510
<?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="">
<change beforePath="$PROJECT_DIR$/conf/en-cn.properties" beforeDir="false" afterPath="$PROJECT_DIR$/conf/en-cn.properties" afterDir="false" />
</list>
<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" />
......@@ -60,13 +58,20 @@
<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$/jobs/demo_java_gen" />
<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" />
......@@ -74,13 +79,6 @@
<recent name="$PROJECT_DIR$/sqls/demo" />
<recent name="$PROJECT_DIR$/lib/java" />
</key>
<key name="CopyFile.RECENT_KEYS">
<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" />
<recent name="$PROJECT_DIR$/jobs/meigou-detail-page" />
</key>
</component>
<component name="RunManager">
<configuration default="true" type="ClojureREPL" factoryName="Local" activateToolWindowBeforeRun="false">
......@@ -128,7 +126,7 @@
<workItem from="1588344251422" duration="21636000" />
<workItem from="1588761853482" duration="3826000" />
<workItem from="1588905392183" duration="4522000" />
<workItem from="1589447155495" duration="7400000" />
<workItem from="1589447155495" duration="12776000" />
</task>
<task id="LOCAL-00001" summary="add init codes.">
<created>1587723565207</created>
......@@ -284,7 +282,42 @@
<option name="project" value="LOCAL" />
<updated>1588522705925</updated>
</task>
<option name="localTasksCounter" value="23" />
<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">
......@@ -350,10 +383,11 @@
<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="197" key="CommitChangelistDialog2" timestamp="1588522705736">
<screen x="0" y="22" width="1920" height="1129" />
<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">
......@@ -366,12 +400,17 @@
</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="331" key="Vcs.Push.Dialog.v2" timestamp="1588522707302">
<screen x="0" y="22" width="1920" height="1129" />
<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>
......
lib/java/bi-report-service/.idea/workspace.xml
View file @ 3cb4c510
<?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">
<change beforePath="$PROJECT_DIR$/../../../conf/en-cn.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../../../conf/en-cn.properties" afterDir="false" />
</list>
<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" />
......@@ -87,7 +85,7 @@
<command value="mvn clean" />
</option>
</component>
<component name="RunManager" selected="Application.DateUtils">
<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" />
......@@ -120,7 +118,7 @@
<setting name="fixLineNumbers" value="false" />
<method v="2" />
</configuration>
<configuration name="BiReportServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<configuration name="EmailServiceTest.testSendFormattedMail" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="service-server" />
<extension name="coverage">
<pattern>
......@@ -129,8 +127,9 @@
</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.BiReportServiceTest" />
<option name="TEST_OBJECT" value="class" />
<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>
......@@ -191,11 +190,11 @@
</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" />
<item itemvalue="JUnit.BiReportServiceTest" />
</list>
</recent_temporary>
</component>
......@@ -219,7 +218,7 @@
<workItem from="1588344252163" duration="15923000" />
<workItem from="1588762492573" duration="403000" />
<workItem from="1588837331043" duration="673000" />
<workItem from="1589455301393" duration="4293000" />
<workItem from="1589455301393" duration="8819000" />
</task>
<servers />
</component>
......@@ -289,54 +288,67 @@
</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="1588838004638">
<screen x="246" y="1080" width="1920" height="1151" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom" timestamp="1589943863598">
<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="1589943863598" />
<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="1588838004637">
<screen x="246" y="1080" width="1920" height="1151" />
<state width="1878" height="243" key="GridCell.Tab.0.center" timestamp="1589943863597">
<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="1589943863597" />
<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="1588838004636">
<screen x="246" y="1080" width="1920" height="1151" />
<state width="1878" height="243" key="GridCell.Tab.0.left" timestamp="1589943863596">
<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="1589943863596" />
<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="1588838004637">
<screen x="246" y="1080" width="1920" height="1151" />
<state width="1878" height="243" key="GridCell.Tab.0.right" timestamp="1589943863597">
<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="1589943863597" />
<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="319" key="GridCell.Tab.1.bottom" timestamp="1588216559611">
<screen x="246" y="1080" width="1920" height="1151" />
<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="319" key="GridCell.Tab.1.center" timestamp="1588216559609">
<screen x="246" y="1080" width="1920" height="1151" />
<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="319" key="GridCell.Tab.1.left" timestamp="1588216559609">
<screen x="246" y="1080" width="1920" height="1151" />
<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="319" key="GridCell.Tab.1.right" timestamp="1588216559611">
<screen x="246" y="1080" width="1920" height="1151" />
<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="715" y="1270" width="670" height="675" key="run.anything.popup" timestamp="1588837938694">
<screen x="246" y="1080" width="1920" height="1151" />
<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/service/impl/BiReportServiceImpl.java
View file @ 3cb4c510
......@@ -43,9 +43,13 @@ public class BiReportServiceImpl implements BiReportService {
public int sendEmail(String to,String cc,String name){
int rs = Constants.SUCCESS;
ExcelGenDto resultDto = sparksqlService.getResultDto(name);
int genExcelRs = excelService.genExcel(resultDto,name);
if(Constants.SUCCESS == genExcelRs){
rs = emailService.sendAttachmentsMail(to,cc,name);
if(null == resultDto){
rs = Constants.FAIL;
}else{
int genExcelRs = excelService.genExcel(resultDto,name);
if(Constants.SUCCESS == genExcelRs){
rs = emailService.sendAttachmentsMail(to,cc,name);
}
}
return rs;
}
......
lib/java/bi-report-service/service-server/src/main/resources/application.yml
View file @ 3cb4c510
......@@ -39,4 +39,5 @@ logging:
proper:
file:
path: /home/bi/bi-report/conf/en-cn.properties
\ No newline at end of file
#path: /home/bi/bi-report/conf/en-cn.properties
path: /Users/apple/git-repo/bi-report/conf/en-cn.properties
\ No newline at end of file
lib/java/bi-report-service/service-server/src/test/html/demo.html 0 → 100644
View file @ 3cb4c510
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<h1 style="text-align:center;">北极星监控预警信息</h1>
<h2 style="color:red;">北极星监控预警</h2>
<h3>北极星监控预警</h3>
<h4>北极星监控预警</h4>
<h5>北极星监控预警</h5>
<h6>北极星监控预警</h6>
\ No newline at end of file
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