luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用水用电数据接口返回修改

Browse Source
This commit is contained in:
wuyw 2024-08-14 07:17:19 +08:00
parent 5272ca1570
commit 84500495f1
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fastbee-open-api/src/main/java/com/fastbee/data/controller/waterele/MaWatereleRecordController.java
View File

@ -1,5 +1,6 @@
package com.fastbee.data.controller.waterele; package com.fastbee.data.controller.waterele;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -57,8 +58,8 @@ public class MaWatereleRecordController extends BaseController {
@GetMapping("/echart") @GetMapping("/echart")
@ApiOperation("查询水电双计数据记录echart") @ApiOperation("查询水电双计数据记录echart")
public Map<String, Object> echart(MaWatereleRecord maWatereleRecord) { public Map<String, Object> echart(MaWatereleRecord maWatereleRecord) {
Map<String, Object> map = maWatereleRecordService.chartData(maWatereleRecord); ArrayList<Object> list = maWatereleRecordService.chartData(maWatereleRecord);
return success(map); return success(list);
} }

3
fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/IMaWatereleRecordService.java
View File

@ -1,5 +1,6 @@
package com.fastbee.waterele.service; package com.fastbee.waterele.service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -61,7 +62,7 @@ public interface IMaWatereleRecordService
*/ */
public int deleteMaWatereleRecordById(Long id); public int deleteMaWatereleRecordById(Long id);
Map<String, Object> chartData(MaWatereleRecord maWatereleRecord); ArrayList<Object> chartData(MaWatereleRecord maWatereleRecord);
} }

23
fastbee-service/fastbee-waterele-service/src/main/java/com/fastbee/waterele/service/impl/MaWatereleRecordServiceImpl.java
View File

@ -96,20 +96,33 @@ public class MaWatereleRecordServiceImpl implements IMaWatereleRecordService
} }
@Override @Override
public Map<String, Object> chartData(MaWatereleRecord maWatereleRecord) { public ArrayList<Object> chartData(MaWatereleRecord maWatereleRecord) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
ArrayList<Object> list = new ArrayList<>();
List<MaWatereleRecord> maWatereleRecords = maWatereleRecordMapper.selectMaWatereleRecordList(maWatereleRecord); List<MaWatereleRecord> maWatereleRecords = maWatereleRecordMapper.selectMaWatereleRecordList(maWatereleRecord);
List<String> time = new ArrayList<>(); List<String> time = new ArrayList<>();
List<String> sumFlow = new ArrayList<>(); List<String> sumFlow = new ArrayList<>();
List<String> sumEle = new ArrayList<>(); List<String> sumEle = new ArrayList<>();
HashMap<String, Object> sumFlowtMap = new HashMap<>();
sumFlowtMap.put("name", "累计水量");
sumFlowtMap.put("unit", "m³");
HashMap<String, Object> sumEletMap = new HashMap<>();
sumEletMap.put("name", "累计电量");
sumEletMap.put("unit", "度");
for (MaWatereleRecord record : maWatereleRecords) { for (MaWatereleRecord record : maWatereleRecords) {
time.add(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, record.getCreateTime())); time.add(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, record.getCreateTime()));
sumFlow.add(record.getSumflow()); sumFlow.add(record.getSumflow());
sumEle.add(record.getSumele()); sumEle.add(record.getSumele());
} }
map.put("time", time); sumFlowtMap.put("time", time);
map.put("sumFlow", sumFlow); sumFlowtMap.put("data", sumFlow);
map.put("sumEle", sumEle); sumEletMap.put("time", time);
return map; sumEletMap.put("data", sumEle);
list.add(sumFlowtMap);
list.add(sumEletMap);
// map.put("time", time);
// map.put("sumFlow", sumFlow);
// map.put("sumEle", sumEle);
return list;
} }
} }