update codes

.idea/workspace.xml

 <?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/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/BiReportServiceImpl.java

@@ -43,10 +43,14 @@ public class BiReportServiceImpl implements BiReportService {
     public int sendEmail(String to,String cc,String name){
         int rs = Constants.SUCCESS;
         ExcelGenDto resultDto = sparksqlService.getResultDto(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

@@ -39,4 +39,5 @@ logging:
 
 proper:
   file:
-    path: /home/bi/bi-report/conf/en-cn.properties
+    #path: /home/bi/bi-report/conf/en-cn.properties
\ No newline at end of file
+    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

+<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