|
@@ -38,12 +38,12 @@ public class LoadrateHourlyService {
|
|
public Map<String, Integer> getTpMap() {
|
|
public Map<String, Integer> getTpMap() {
|
|
if (tpMap == null) {
|
|
if (tpMap == null) {
|
|
tpMap = new HashMap<>(5);
|
|
tpMap = new HashMap<>(5);
|
|
- tpMap.put("PL_GDC",0);
|
|
|
|
- tpMap.put("DWK_GDC",1);
|
|
|
|
- tpMap.put("XH_GDC",2);
|
|
|
|
- tpMap.put("MCH_GDC",3);
|
|
|
|
- tpMap.put("HZJ_GDC",4);
|
|
|
|
- tpMap.put("AK_GDC",4);
|
|
|
|
|
|
+ tpMap.put("PL_GDC", 0);
|
|
|
|
+ tpMap.put("DWK_GDC", 1);
|
|
|
|
+ tpMap.put("XH_GDC", 2);
|
|
|
|
+ tpMap.put("MCH_GDC", 3);
|
|
|
|
+ tpMap.put("HZJ_GDC", 4);
|
|
|
|
+ tpMap.put("AK_GDC", 5);
|
|
}
|
|
}
|
|
return tpMap;
|
|
return tpMap;
|
|
}
|
|
}
|
|
@@ -138,7 +138,7 @@ public class LoadrateHourlyService {
|
|
File file = getPath(date, time);
|
|
File file = getPath(date, time);
|
|
List<LoadrateHourly> stringListMap = null;
|
|
List<LoadrateHourly> stringListMap = null;
|
|
if (file.exists()) {
|
|
if (file.exists()) {
|
|
- stringListMap = sheets2LoadrateHourly(stationid, file,time);
|
|
|
|
|
|
+ stringListMap = sheets2LoadrateHourly(stationid, file, time);
|
|
}
|
|
}
|
|
return stringListMap;
|
|
return stringListMap;
|
|
}
|
|
}
|
|
@@ -154,7 +154,7 @@ public class LoadrateHourlyService {
|
|
getTpMap();
|
|
getTpMap();
|
|
XSSFSheet sheetAt = sheets.getSheetAt(tpMap.get(stationid));
|
|
XSSFSheet sheetAt = sheets.getSheetAt(tpMap.get(stationid));
|
|
List<LoadrateHourly> loadrateHourlys = new ArrayList<>();
|
|
List<LoadrateHourly> loadrateHourlys = new ArrayList<>();
|
|
- if(time.equals("2200")){
|
|
|
|
|
|
+ if (time.equals("2200")) {
|
|
for (int i1 = 0; i1 < sheetAt.getLastRowNum() - 1; i1++) {
|
|
for (int i1 = 0; i1 < sheetAt.getLastRowNum() - 1; i1++) {
|
|
XSSFRow row = sheetAt.getRow(i1 + 2);
|
|
XSSFRow row = sheetAt.getRow(i1 + 2);
|
|
LoadrateHourly lrh = new LoadrateHourly();
|
|
LoadrateHourly lrh = new LoadrateHourly();
|
|
@@ -167,7 +167,7 @@ public class LoadrateHourlyService {
|
|
lrh.setUtilizationhour(getCellValue(row.getCell(6)));
|
|
lrh.setUtilizationhour(getCellValue(row.getCell(6)));
|
|
loadrateHourlys.add(lrh);
|
|
loadrateHourlys.add(lrh);
|
|
}
|
|
}
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
for (int i1 = 0; i1 < sheetAt.getLastRowNum() - 1; i1++) {
|
|
for (int i1 = 0; i1 < sheetAt.getLastRowNum() - 1; i1++) {
|
|
XSSFRow row = sheetAt.getRow(i1 + 2);
|
|
XSSFRow row = sheetAt.getRow(i1 + 2);
|
|
LoadrateHourly lrh = new LoadrateHourly();
|
|
LoadrateHourly lrh = new LoadrateHourly();
|