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

GIS设备弹窗用水用电的折线图

Browse Source
This commit is contained in:
wyw
2024-08-13 21:37:47 +08:00
parent 6422dedef7
commit 5272ca1570
6 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java
View File

@ -47,6 +47,9 @@ public class DeviceDetailController extends BaseController {
}
/**
* 查询灌溉记录
* @param maWatereleRecordDto 传参

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

@ -1,6 +1,7 @@
package com.fastbee.data.controller.waterele;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
@ -33,8 +34,7 @@ import com.fastbee.common.core.page.TableDataInfo;
@RestController
@RequestMapping("/waterele/watereleRecord")
@Api(tags = "水电双计数据记录")
public class MaWatereleRecordController extends BaseController
{
public class MaWatereleRecordController extends BaseController {
@Autowired
private IMaWatereleRecordService maWatereleRecordService;
@ -44,21 +44,31 @@ public class MaWatereleRecordController extends BaseController
@PreAuthorize("@ss.hasPermi('waterele:watereleRecord:list')")
@GetMapping("/list")
@ApiOperation("查询水电双计数据记录列表")
public TableDataInfo list(MaWatereleRecord maWatereleRecord)
{
public TableDataInfo list(MaWatereleRecord maWatereleRecord) {
startPage();
List<MaWatereleRecord> list = maWatereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
return getDataTable(list);
}
/**
* 查询水电双计数据记录echart
*/
@PreAuthorize("@ss.hasPermi('waterele:watereleRecord:echart')")
@GetMapping("/echart")
@ApiOperation("查询水电双计数据记录echart")
public Map<String, Object> echart(MaWatereleRecord maWatereleRecord) {
Map<String, Object> map = maWatereleRecordService.chartData(maWatereleRecord);
return success(map);
}
/**
* 导出水电双计数据记录列表
*/
@ApiOperation("导出水电双计数据记录列表")
@PreAuthorize("@ss.hasPermi('waterele:watereleRecord:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, MaWatereleRecord maWatereleRecord)
{
public void export(HttpServletResponse response, MaWatereleRecord maWatereleRecord) {
List<MaWatereleRecord> list = maWatereleRecordService.selectMaWatereleRecordList(maWatereleRecord);
ExcelUtil<MaWatereleRecord> util = new ExcelUtil<MaWatereleRecord>(MaWatereleRecord.class);
util.exportExcel(response, list, "水电双计数据记录数据");
@ -70,8 +80,7 @@ public class MaWatereleRecordController extends BaseController
@PreAuthorize("@ss.hasPermi('waterele:watereleRecord:query')")
@GetMapping(value = "/{id}")
@ApiOperation("获取水电双计数据记录详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(maWatereleRecordService.selectMaWatereleRecordById(id));
}
@ -81,8 +90,7 @@ public class MaWatereleRecordController extends BaseController
@PreAuthorize("@ss.hasPermi('waterele:watereleRecord:add')")
@PostMapping
@ApiOperation("新增水电双计数据记录")
public AjaxResult add(@RequestBody MaWatereleRecord maWatereleRecord)
{
public AjaxResult add(@RequestBody MaWatereleRecord maWatereleRecord) {
return toAjax(maWatereleRecordService.insertMaWatereleRecord(maWatereleRecord));
}
@ -92,8 +100,7 @@ public class MaWatereleRecordController extends BaseController
@PreAuthorize("@ss.hasPermi('waterele:watereleRecord:edit')")
@PutMapping
@ApiOperation("修改水电双计数据记录")
public AjaxResult edit(@RequestBody MaWatereleRecord maWatereleRecord)
{
public AjaxResult edit(@RequestBody MaWatereleRecord maWatereleRecord) {
return toAjax(maWatereleRecordService.updateMaWatereleRecord(maWatereleRecord));
}
@ -103,8 +110,7 @@ public class MaWatereleRecordController extends BaseController
@PreAuthorize("@ss.hasPermi('waterele:watereleRecord:remove')")
@DeleteMapping("/{ids}")
@ApiOperation("删除水电双计数据记录")
public AjaxResult remove(@PathVariable Long[] ids)
{
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(maWatereleRecordService.deleteMaWatereleRecordByIds(ids));
}
}

1
fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java
View File

@ -112,5 +112,4 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService {
}

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

@ -1,6 +1,8 @@
package com.fastbee.waterele.service;
import java.util.List;
import java.util.Map;
import com.fastbee.waterele.domain.MaWatereleRecord;
/**
@ -58,4 +60,8 @@ public interface IMaWatereleRecordService
* @return 结果
*/
public int deleteMaWatereleRecordById(Long id);
Map<String, Object> chartData(MaWatereleRecord maWatereleRecord);
}

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

@ -1,6 +1,7 @@
package com.fastbee.waterele.service.impl;
import java.util.List;
import java.util.*;
import com.fastbee.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -93,4 +94,22 @@ public class MaWatereleRecordServiceImpl implements IMaWatereleRecordService
{
return maWatereleRecordMapper.deleteMaWatereleRecordById(id);
}
@Override
public Map<String, Object> chartData(MaWatereleRecord maWatereleRecord) {
Map<String, Object> map = new HashMap<String, Object>();
List<MaWatereleRecord> maWatereleRecords = maWatereleRecordMapper.selectMaWatereleRecordList(maWatereleRecord);
List<String> time = new ArrayList<>();
List<String> sumFlow = new ArrayList<>();
List<String> sumEle = new ArrayList<>();
for (MaWatereleRecord record : maWatereleRecords) {
time.add(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, record.getCreateTime()));
sumFlow.add(record.getSumflow());
sumEle.add(record.getSumele());
}
map.put("time", time);
map.put("sumFlow", sumFlow);
map.put("sumEle", sumEle);
return map;
}
}

6
fastbee-service/fastbee-waterele-service/src/main/resources/mapper/waterele/MaWatereleRecordMapper.xml
View File

@ -51,6 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="cardid != null and cardid != ''"> and cardId = #{cardid}</if>
<if test="areacode != null and areacode != ''"> and areaCode = #{areacode}</if>
<if test="action != null and action != ''"> and action = #{action}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(create_time ,'%y%m%d%H%i%s') &gt;= date_format(#{params.beginTime},'%y%m%d%H%i%s')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(create_time ,'%y%m%d%H%i%s') &lt;= date_format(#{params.endTime},'%y%m%d%H%i%s')
</if>
</where>
order by create_time desc
</select>