upadte codes

.idea/workspace.xml

@@ -120,7 +120,7 @@
       <workItem from="1588154352798" duration="195000" />
       <workItem from="1588220085338" duration="7993000" />
       <workItem from="1588248522289" duration="2820000" />
-      <workItem from="1588344251422" duration="1165000" />
+      <workItem from="1588344251422" duration="1726000" />
     </task>
     <task id="LOCAL-00001" summary="add init codes.">
       <created>1587723565207</created>

lib/java/bi-report-service/.idea/workspace.xml

@@ -216,7 +216,7 @@
       <workItem from="1588148891822" duration="2318000" />
       <workItem from="1588152718016" duration="1463000" />
       <workItem from="1588154601852" duration="28557000" />
-      <workItem from="1588344252163" duration="2588000" />
+      <workItem from="1588344252163" duration="3149000" />
     </task>
     <servers />
   </component>
@@ -285,28 +285,28 @@
     </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="238" key="GridCell.Tab.0.bottom" timestamp="1588345465517">
+    <state width="1878" height="238" key="GridCell.Tab.0.bottom" timestamp="1588347196873">
       <screen x="0" y="22" width="1920" height="1129" />
     </state>
-    <state width="1878" height="238" key="GridCell.Tab.0.bottom/0.22.1920.1129@0.22.1920.1129" timestamp="1588345465517" />
+    <state width="1878" height="238" key="GridCell.Tab.0.bottom/0.22.1920.1129@0.22.1920.1129" timestamp="1588347196873" />
     <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="244" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588242806115" />
-    <state width="1878" height="238" key="GridCell.Tab.0.center" timestamp="1588345465516">
+    <state width="1878" height="238" key="GridCell.Tab.0.center" timestamp="1588347196872">
       <screen x="0" y="22" width="1920" height="1129" />
     </state>
-    <state width="1878" height="238" key="GridCell.Tab.0.center/0.22.1920.1129@0.22.1920.1129" timestamp="1588345465516" />
+    <state width="1878" height="238" key="GridCell.Tab.0.center/0.22.1920.1129@0.22.1920.1129" timestamp="1588347196872" />
     <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="244" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588242806111" />
-    <state width="1878" height="238" key="GridCell.Tab.0.left" timestamp="1588345465515">
+    <state width="1878" height="238" key="GridCell.Tab.0.left" timestamp="1588347196871">
       <screen x="0" y="22" width="1920" height="1129" />
     </state>
-    <state width="1878" height="238" key="GridCell.Tab.0.left/0.22.1920.1129@0.22.1920.1129" timestamp="1588345465515" />
+    <state width="1878" height="238" key="GridCell.Tab.0.left/0.22.1920.1129@0.22.1920.1129" timestamp="1588347196871" />
     <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="244" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588242806108" />
-    <state width="1878" height="238" key="GridCell.Tab.0.right" timestamp="1588345465517">
+    <state width="1878" height="238" key="GridCell.Tab.0.right" timestamp="1588347196873">
       <screen x="0" y="22" width="1920" height="1129" />
     </state>
-    <state width="1878" height="238" key="GridCell.Tab.0.right/0.22.1920.1129@0.22.1920.1129" timestamp="1588345465517" />
+    <state width="1878" height="238" key="GridCell.Tab.0.right/0.22.1920.1129@0.22.1920.1129" timestamp="1588347196873" />
     <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="244" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588242806112" />
     <state width="1878" height="319" key="GridCell.Tab.1.bottom" timestamp="1588216559611">

lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/EmailServiceImpl.java

@@ -61,7 +61,8 @@ public class EmailServiceImpl implements EmailService {
                 helper.setBcc(bcc);
             }
             String fileName = subject + "-" + DateUtils.getCurrentDateSimpleStr() + ".xlsx";
-            FileSystemResource file = new FileSystemResource(new File(filePath + fileName));
+            String fileNameSrc = name + "-" + DateUtils.getCurrentDateSimpleStr() + ".xlsx";
+            FileSystemResource file = new FileSystemResource(new File(filePath + fileNameSrc));
             helper.addAttachment(fileName, file);
             mailSender.send(message);
             logger.info("带附件的邮件已经发送。");

lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/ExcelServiceImpl.java

@@ -60,15 +60,15 @@ public class ExcelServiceImpl implements ExcelService {
             rs = Constants.FAIL;
             logger.error("Error!");
         }
-        String subject = "";
-        String value = ProperUtils.getValue(properFilePath, name);
-        if(null != value){
-            subject = value;
-        }else{
-            subject = name;
-        }
+//        String subject = "";
+//        String value = ProperUtils.getValue(properFilePath, name);
+//        if(null != value){
+//            subject = value;
+//        }else{
+//            subject = name;
+//        }
         try {
-            FileOutputStream out = new FileOutputStream(filePath + subject + "-" + DateUtils.getCurrentDateSimpleStr() + ".xlsx");
+            FileOutputStream out = new FileOutputStream(filePath + name + "-" + DateUtils.getCurrentDateSimpleStr() + ".xlsx");
             wb.write(out);
             out.close();
         } catch (IOException e) {

lib/java/bi-report-service/service-server/src/main/resources/application.yml

@@ -29,7 +29,7 @@ sql:
 #---excel config---
 excel:
   output:
-    path: /tmp/
+    path: /data/bi-report/result/
 
 #---log config---
 logging: