Skip to content

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

update codes

parent e3836d6d
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 19 deletions
.idea/workspace.xml
View file @ 1d986457
<?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="" />
<list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/docs/readme.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/docs/README.txt" beforeDir="false" afterPath="$PROJECT_DIR$/docs/deploy.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/jobs/meigou-detail-page/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/meigou-detail-page/step2.job" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
......@@ -123,7 +127,8 @@
<workItem from="1588154352798" duration="195000" />
<workItem from="1588220085338" duration="7993000" />
<workItem from="1588248522289" duration="2820000" />
<workItem from="1588344251422" duration="20378000" />
<workItem from="1588344251422" duration="21636000" />
<workItem from="1588761853482" duration="763000" />
</task>
<task id="LOCAL-00001" summary="add init codes.">
<created>1587723565207</created>
......
docs/readme.txt 0 → 100644
View file @ 1d986457
目前支持的功能：
1.附件改为xlsx格式 【metabase支持csv、xlsx两种格式】 python代码实现 ok
2.指定发送人 优先级比较低【metabase默认为doctor】 重新写邮件发送代码 ok
3.更改附件的名 指定 中文 带账期【metabase默认取的是问题的名称】 指定附件的名称为中文，重新转换或者直接指定 ok
4.优化邮件内容，wps打开去掉 样式格式化【metabase中包含内容简略视图，而且有metabaselogo】 邮件内容格式化 python实现 ok
5.一个附件多个sheet 或者 一封邮件 多个附件【metabase默认支持指定多个问题、多个附件】 python发送邮件实现，一个文件多个sheet实现起来相对比较难 发送邮件时需要指定附件名称(带账期) ok
6.excel文件内容格式化 优先级比较低 【指定每个字段的最大长度】 使用python实现，尝试 ok
jobs/meigou-detail-page/step2.job
View file @ 1d986457
#step2.job
type=command
dependencies=step1_1,step1_2,step1_3,step1_4
command=curl -X GET http://localhost:8553/api/report/sendEmail/zhaojianwei@igengmei.com/jianweizhao@yeah.net/meigou-detail-page
\ No newline at end of file
command=curl -X GET http://localhost:8553/api/report/sendEmail/zhanghuixin@igengmei.com/zhaojianwei@igengmei.com,jianweizhao@yeah.net/meigou-detail-page
\ No newline at end of file
lib/java/bi-report-service/.idea/workspace.xml
View file @ 1d986457
......@@ -217,7 +217,7 @@
<workItem from="1588148891822" duration="2318000" />
<workItem from="1588152718016" duration="1463000" />
<workItem from="1588154601852" duration="28557000" />
<workItem from="1588344252163" duration="15282000" />
<workItem from="1588344252163" duration="15923000" />
</task>
<servers />
</component>
......@@ -287,28 +287,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="243" key="GridCell.Tab.0.bottom" timestamp="1588756924804">
<screen x="246" y="1080" width="1920" height="1151" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom" timestamp="1588761074648">
<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="1588350960858" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074648" />
<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="1588756924804" />
<state width="1878" height="243" key="GridCell.Tab.0.center" timestamp="1588756924803">
<screen x="246" y="1080" width="1920" height="1151" />
<state width="1878" height="243" key="GridCell.Tab.0.center" timestamp="1588761074647">
<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="1588350960853" />
<state width="1878" height="243" key="GridCell.Tab.0.center/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074647" />
<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="1588756924803" />
<state width="1878" height="243" key="GridCell.Tab.0.left" timestamp="1588756924802">
<screen x="246" y="1080" width="1920" height="1151" />
<state width="1878" height="243" key="GridCell.Tab.0.left" timestamp="1588761074647">
<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="1588350960852" />
<state width="1878" height="243" key="GridCell.Tab.0.left/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074647" />
<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="1588756924802" />
<state width="1878" height="243" key="GridCell.Tab.0.right" timestamp="1588756924804">
<screen x="246" y="1080" width="1920" height="1151" />
<state width="1878" height="243" key="GridCell.Tab.0.right" timestamp="1588761074648">
<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="1588350960854" />
<state width="1878" height="243" key="GridCell.Tab.0.right/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074648" />
<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="1588756924804" />
<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
View file @ 1d986457
......@@ -55,10 +55,12 @@ public class EmailServiceImpl implements EmailService {
helper.setSubject(subject);
helper.setText(content, true);
if (cc != null && !"".equals(cc.trim())) {
helper.setCc(cc);
String[] ccUsers = cc.split(",");
helper.setCc(ccUsers);
}
if (bcc != null && !"".equals(bcc.trim())) {
helper.setBcc(bcc);
String[] bccUsers = bcc.split(",");
helper.setBcc(bccUsers);
}
String fileName = subject + "-" + DateUtils.getCurrentDateSimpleStr() + ".xlsx";
String fileNameSrc = name + "-" + DateUtils.getCurrentDateSimpleStr() + ".xlsx";
......
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