|
@@ -146,7 +146,6 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
|
|
|
|
|
|
public Map<String, Object> energyYear(){
|
|
|
Map<String, Object> res = new HashMap<>();
|
|
|
- List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
String json = platBuildingMapper.energyYear();
|
|
|
if (json == null || json.isEmpty()) {
|
|
|
return null;
|
|
@@ -157,24 +156,22 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
|
|
|
res.put("yearTotal", yearTotal);
|
|
|
res.put("yearGrowth", yearGrowth);
|
|
|
JSONArray twoYearData = dataObject.getJSONArray("twoYearData");
|
|
|
+ List<String> xList = new ArrayList<>();
|
|
|
+ List<String> yList = new ArrayList<>();
|
|
|
for (int i = 0; i < twoYearData.size(); i++) {
|
|
|
JSONObject dataItem = twoYearData.getJSONObject(i);
|
|
|
String year = dataItem.getString("value");
|
|
|
String lastYear = dataItem.getString("value1");
|
|
|
- String month = dataItem.getString("key");
|
|
|
- Map<String, Object> data = new HashMap<>();
|
|
|
- data.put("year", year);
|
|
|
- data.put("lastYear", lastYear);
|
|
|
- data.put("month", month);
|
|
|
- resultList.add(data);
|
|
|
+ xList.add(year);
|
|
|
+ yList.add(lastYear);
|
|
|
}
|
|
|
- res.put("monthData", resultList);
|
|
|
+ res.put("year", xList);
|
|
|
+ res.put("lastYear", yList);
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
public Map<String, Object> powerYear(){
|
|
|
Map<String, Object> res = new HashMap<>();
|
|
|
- List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
String json = platBuildingMapper.powerYear();
|
|
|
if (json == null || json.isEmpty()) {
|
|
|
return null;
|
|
@@ -184,25 +181,23 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
|
|
|
String yearGrowth = dataObject.getString("yearGrowth");
|
|
|
res.put("yearTotal", yearTotal);
|
|
|
res.put("yearGrowth", yearGrowth);
|
|
|
+ List<String> xList = new ArrayList<>();
|
|
|
+ List<String> yList = new ArrayList<>();
|
|
|
JSONArray twoYearData = dataObject.getJSONArray("twoYearData");
|
|
|
for (int i = 0; i < twoYearData.size(); i++) {
|
|
|
JSONObject dataItem = twoYearData.getJSONObject(i);
|
|
|
String year = dataItem.getString("value");
|
|
|
String lastYear = dataItem.getString("value1");
|
|
|
- String month = dataItem.getString("key");
|
|
|
- Map<String, Object> data = new HashMap<>();
|
|
|
- data.put("year", year);
|
|
|
- data.put("lastYear", lastYear);
|
|
|
- data.put("month", month);
|
|
|
- resultList.add(data);
|
|
|
+ xList.add(year);
|
|
|
+ yList.add(lastYear);
|
|
|
}
|
|
|
- res.put("monthData", resultList);
|
|
|
+ res.put("year", xList);
|
|
|
+ res.put("lastYear", yList);
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
public Map<String, Object> waterYear(){
|
|
|
Map<String, Object> res = new HashMap<>();
|
|
|
- List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
String json = platBuildingMapper.waterYear();
|
|
|
if (json == null || json.isEmpty()) {
|
|
|
return null;
|
|
@@ -212,39 +207,41 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
|
|
|
String yearGrowth = dataObject.getString("yearGrowth");
|
|
|
res.put("yearTotal", yearTotal);
|
|
|
res.put("yearGrowth", yearGrowth);
|
|
|
+ List<String> xList = new ArrayList<>();
|
|
|
+ List<String> yList = new ArrayList<>();
|
|
|
JSONArray twoYearData = dataObject.getJSONArray("twoYearData");
|
|
|
for (int i = 0; i < twoYearData.size(); i++) {
|
|
|
JSONObject dataItem = twoYearData.getJSONObject(i);
|
|
|
String year = dataItem.getString("value");
|
|
|
String lastYear = dataItem.getString("value1");
|
|
|
- String month = dataItem.getString("key");
|
|
|
- Map<String, Object> data = new HashMap<>();
|
|
|
- data.put("year", year);
|
|
|
- data.put("lastYear", lastYear);
|
|
|
- data.put("month", month);
|
|
|
- resultList.add(data);
|
|
|
+ xList.add(year);
|
|
|
+ yList.add(lastYear);
|
|
|
}
|
|
|
- res.put("monthData", resultList);
|
|
|
+ res.put("year", xList);
|
|
|
+ res.put("lastYear", yList);
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- public List<Map<String, Object>> frequency(){
|
|
|
- List<Map<String, Object>> resultList = new ArrayList<>();
|
|
|
+ public Map<String, Object> frequency(){
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
String json = platBuildingMapper.frequency();
|
|
|
if (json == null || json.isEmpty()) {
|
|
|
return null;
|
|
|
}
|
|
|
+ List<String> xList = new ArrayList<>();
|
|
|
+ List<String> yList = new ArrayList<>();
|
|
|
JSONArray dataArray = JSONArray.parseArray(json);
|
|
|
for (int i = 0; i < dataArray.size(); i++) {
|
|
|
JSONObject dataItem = dataArray.getJSONObject(i);
|
|
|
- String month = dataItem.getString("month");
|
|
|
+ String month = dataItem.getString("month") + "月";
|
|
|
String num = dataItem.getString("num");
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
- data.put("month", month);
|
|
|
- data.put("num", num);
|
|
|
- resultList.add(data);
|
|
|
+ xList.add(month);
|
|
|
+ yList.add(num);
|
|
|
}
|
|
|
- return resultList;
|
|
|
+ map.put("xList", xList);
|
|
|
+ map.put("yList", yList);
|
|
|
+ return map;
|
|
|
}
|
|
|
|
|
|
public Map<String, Object> patrol(){
|