Skip to content

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

update codes

parent ca286705
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
.idea/workspace.xml
View file @ d5bc9430
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<workItem from="1587982524517" duration="5052000" /> <workItem from="1587982524517" duration="5052000" />
<workItem from="1588152481879" duration="139000" /> <workItem from="1588152481879" duration="139000" />
<workItem from="1588154352798" duration="195000" /> <workItem from="1588154352798" duration="195000" />
<workItem from="1588220085338" duration="5469000" /> <workItem from="1588220085338" duration="5973000" />
</task> </task>
<task id="LOCAL-00001" summary="add init codes."> <task id="LOCAL-00001" summary="add init codes.">
<created>1587723565207</created> <created>1587723565207</created>
......
lib/java/bi-report-service/.idea/workspace.xml
View file @ d5bc9430
...@@ -79,9 +79,9 @@ ...@@ -79,9 +79,9 @@
</component> </component>
<component name="RunAnythingCache"> <component name="RunAnythingCache">
<option name="myCommands"> <option name="myCommands">
<command value="mvn clean" />
<command value="mvn clean install" /> <command value="mvn clean install" />
<command value="mvn clean install -DskipTests" /> <command value="mvn clean install -DskipTests" />
<command value="mvn clean" />
</option> </option>
</component> </component>
<component name="RunManager" selected="JUnit.SparksqlServiceTest"> <component name="RunManager" selected="JUnit.SparksqlServiceTest">
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
<workItem from="1584945647680" duration="4469000" /> <workItem from="1584945647680" duration="4469000" />
<workItem from="1588148891822" duration="2318000" /> <workItem from="1588148891822" duration="2318000" />
<workItem from="1588152718016" duration="1463000" /> <workItem from="1588152718016" duration="1463000" />
<workItem from="1588154601852" duration="18346000" /> <workItem from="1588154601852" duration="18998000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -284,26 +284,26 @@ ...@@ -284,26 +284,26 @@
</state> </state>
<state x="553" y="153" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584956237641" /> <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 x="784" y="1223" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588154132365" />
<state width="1878" height="244" key="GridCell.Tab.0.bottom" timestamp="1588234705846"> <state width="1878" height="244" key="GridCell.Tab.0.bottom" timestamp="1588234844753">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="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="1588234705846" /> <state width="1878" height="244" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588234844753" />
<state width="1878" height="244" key="GridCell.Tab.0.center" timestamp="1588234705845"> <state width="1878" height="244" key="GridCell.Tab.0.center" timestamp="1588234844751">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="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="1588234705845" /> <state width="1878" height="244" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588234844751" />
<state width="1878" height="244" key="GridCell.Tab.0.left" timestamp="1588234705844"> <state width="1878" height="244" key="GridCell.Tab.0.left" timestamp="1588234844751">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="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="1588234705844" /> <state width="1878" height="244" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588234844751" />
<state width="1878" height="244" key="GridCell.Tab.0.right" timestamp="1588234705846"> <state width="1878" height="244" key="GridCell.Tab.0.right" timestamp="1588234844752">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="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="1588234705846" /> <state width="1878" height="244" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588234844752" />
<state width="1878" height="319" key="GridCell.Tab.1.bottom" timestamp="1588216559611"> <state width="1878" height="319" key="GridCell.Tab.1.bottom" timestamp="1588216559611">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
......
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/SparksqlServiceImpl.java
View file @ d5bc9430
...@@ -32,7 +32,6 @@ public class SparksqlServiceImpl implements SparksqlService { ...@@ -32,7 +32,6 @@ public class SparksqlServiceImpl implements SparksqlService {
@Override @Override
public ExcelGenDto getResultDto(String name){ public ExcelGenDto getResultDto(String name){
ExcelGenDto excelGenDto = null;
List<String> sheetNameList = new ArrayList<String>(); List<String> sheetNameList = new ArrayList<String>();
List<List<String>> headersList = new ArrayList<List<String>>(); List<List<String>> headersList = new ArrayList<List<String>>();
List<List<List>> rowsList = new ArrayList<List<List>>(); List<List<List>> rowsList = new ArrayList<List<List>>();
...@@ -52,7 +51,7 @@ public class SparksqlServiceImpl implements SparksqlService { ...@@ -52,7 +51,7 @@ public class SparksqlServiceImpl implements SparksqlService {
reader = new BufferedReader(new FileReader(file)); reader = new BufferedReader(new FileReader(file));
String tempStr; String tempStr;
while ((tempStr = reader.readLine()) != null) { while ((tempStr = reader.readLine()) != null) {
sbf.append(tempStr); sbf.append("\n").append(tempStr);
} }
reader.close(); reader.close();
} catch (IOException e) { } catch (IOException e) {
......
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