Skip to content

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

update codes

parent 74822eed
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 16 deletions
.idea/workspace.xml
View file @ f2d009d7
......@@ -2,8 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/sqls/demo/demo_bak.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sqls/demo/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/demo/demo.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/conf/en-cn.properties" beforeDir="false" afterPath="$PROJECT_DIR$/conf/en-cn.properties" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -124,7 +123,7 @@
<workItem from="1588154352798" duration="195000" />
<workItem from="1588220085338" duration="7993000" />
<workItem from="1588248522289" duration="2820000" />
<workItem from="1588344251422" duration="2995000" />
<workItem from="1588344251422" duration="3878000" />
</task>
<task id="LOCAL-00001" summary="add init codes.">
<created>1587723565207</created>
......
conf/en-cn.properties
View file @ f2d009d7
demo=示例程序
demo=示例程序-demo
demo_bak=示例程序-demo_bak
demo_param=带参数的示例程序
\ No newline at end of file
lib/java/bi-report-service/.idea/workspace.xml
View file @ f2d009d7
......@@ -2,8 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add">
<change afterPath="$PROJECT_DIR$/../../../sqls/demo/demo_bak.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../sqls/demo/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo/demo.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../conf/en-cn.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../../../conf/en-cn.properties" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -219,7 +218,7 @@
<workItem from="1588148891822" duration="2318000" />
<workItem from="1588152718016" duration="1463000" />
<workItem from="1588154601852" duration="28557000" />
<workItem from="1588344252163" duration="4375000" />
<workItem from="1588344252163" duration="4621000" />
</task>
<servers />
</component>
......@@ -288,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="238" key="GridCell.Tab.0.bottom" timestamp="1588347196873">
<state width="1878" height="238" key="GridCell.Tab.0.bottom" timestamp="1588350960858">
<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="1588347196873" />
<state width="1878" height="238" key="GridCell.Tab.0.bottom/0.22.1920.1129@0.22.1920.1129" timestamp="1588350960858" />
<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="1588347196872">
<state width="1878" height="238" key="GridCell.Tab.0.center" timestamp="1588350960853">
<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="1588347196872" />
<state width="1878" height="238" key="GridCell.Tab.0.center/0.22.1920.1129@0.22.1920.1129" timestamp="1588350960853" />
<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="1588347196871">
<state width="1878" height="238" key="GridCell.Tab.0.left" timestamp="1588350960852">
<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="1588347196871" />
<state width="1878" height="238" key="GridCell.Tab.0.left/0.22.1920.1129@0.22.1920.1129" timestamp="1588350960852" />
<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="1588347196873">
<state width="1878" height="238" key="GridCell.Tab.0.right" timestamp="1588350960854">
<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="1588347196873" />
<state width="1878" height="238" key="GridCell.Tab.0.right/0.22.1920.1129@0.22.1920.1129" timestamp="1588350960854" />
<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/SparksqlServiceImpl.java
View file @ f2d009d7
......@@ -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.ProperUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
......@@ -28,6 +29,8 @@ public class SparksqlServiceImpl implements SparksqlService {
private String sqlPath;
@Value("${datasource.sparksql.jdbcUrl}")
private String sparksqlJdbcUrl;
@Value("${proper.file.path}")
private String properFilePath;
private static final Logger logger = LoggerFactory.getLogger(SparksqlServiceImpl.class);
@Override
......@@ -40,7 +43,16 @@ public class SparksqlServiceImpl implements SparksqlService {
File[] files = sqlDir.listFiles();
for(File file : files){
String fileName = file.getName();
sheetNameList.add(fileName.replace(".sql",""));
String nameStr =fileName.replace(".sql","");
String subject = "";
String value = ProperUtils.getValue(properFilePath, nameStr);
if(null != value){
subject = value;
}else{
subject = nameStr;
}
sheetNameList.add(subject);
List<String> headers = new ArrayList<String>();
List<List> rows = new ArrayList<List>();
......
sbin/push.sh
View file @ f2d009d7
#!/bin/bash
cd /Users/apple/git-repo/bi-report
git add .
git commit -m 'update codes'
git push
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