diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TerminalMainQueryParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TerminalMainQueryParam.java index ad2fa3a1c..7fd43c519 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TerminalMainQueryParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TerminalMainQueryParam.java @@ -24,4 +24,6 @@ public class TerminalMainQueryParam extends BaseParam { private String version; @ApiModelProperty(name = "监测点等级") private String lineGrade; + @ApiModelProperty(name = "装置id") + private String devId; } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java new file mode 100644 index 000000000..0de9e7b38 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java @@ -0,0 +1,27 @@ +package com.njcn.device.pq.pojo.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@ApiModel(value = "装置每日流量VO") +@AllArgsConstructor +@NoArgsConstructor +public class TerminalDaliyFlowVO { + + @ApiModelProperty(name = "devId",value = "装置Id") + private String devId; + @ApiModelProperty(name = "date",value = "日期") + private LocalDateTime date; + @ApiModelProperty(name = "actualValue",value = "实际使用流量") + private Float actualValue; + @ApiModelProperty(name = "statisValue",value = "统计流量") + private Float statisValue; + + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java index bd3cac931..f0241aa18 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java @@ -1,6 +1,7 @@ package com.njcn.device.pq.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; @@ -10,6 +11,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.param.TerminalParam; +import com.njcn.device.pq.pojo.vo.TerminalDaliyFlowVO; import com.njcn.device.pq.pojo.vo.TerminalMaintainVO; import com.njcn.device.pq.service.TerminalMaintainService; import com.njcn.web.controller.BaseController; @@ -91,6 +93,15 @@ public class TerminalMaintainController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, resList, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getFlowManageDetail") + @ApiOperation("终端流量管理列表") + public HttpResult> getFlowManageDetail(@RequestBody TerminalMainQueryParam param) { + String methodDescribe = getMethodDescribe("getFlowManageDetail"); + Page resList = terminalMaintainService.getFlowManageDetail(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, resList, methodDescribe); + } + /** * 终端流量策略配置主界面 * diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java index b94ca9b00..909e1484c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java @@ -1,5 +1,7 @@ package com.njcn.device.pq.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.device.pq.pojo.vo.TerminalDaliyFlowVO; import com.njcn.device.pq.pojo.vo.TerminalMaintainVO; import org.apache.ibatis.annotations.Param; @@ -74,4 +76,5 @@ public interface TerminalMaintainMapper { List getFlowStrategyList(@Param("ids") List ids); + PagegetFlowManageDetail(Page page, @Param("devId") String deviceId); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml index 4d9e21b8b..658b7058c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml @@ -123,6 +123,10 @@ FROM order by a.sort + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java index 23d8591e6..43fc9aa3b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java @@ -1,8 +1,10 @@ package com.njcn.device.pq.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.param.TerminalParam; +import com.njcn.device.pq.pojo.vo.TerminalDaliyFlowVO; import com.njcn.device.pq.pojo.vo.TerminalMaintainVO; import java.util.List; @@ -52,4 +54,5 @@ public interface TerminalMaintainService { boolean updateFlowStrategy(TerminalParam terminalParam); + Page getFlowManageDetail(TerminalMainQueryParam param); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index e6dab484c..aee95534a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -377,7 +377,7 @@ public class LineServiceImpl extends ServiceImpl implements Li } @Override - public Page getNewDeviceRunStatistics( PqsParam deviceInfoParam) { + public Page getNewDeviceRunStatistics(PqsParam deviceInfoParam) { List deviceIndexes = new ArrayList<>(); Page page = new Page(); List deviceInfoList = generalDeviceService.getDeviceInfo(deviceInfoParam, null, Stream.of(1).collect(Collectors.toList())); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java index b6e02ce02..6aa73f05d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -14,6 +15,7 @@ import com.njcn.device.pq.pojo.param.TerminalParam; import com.njcn.device.pq.pojo.po.DevMeal; import com.njcn.device.pq.pojo.po.DevStrategy; import com.njcn.device.pq.pojo.po.Device; +import com.njcn.device.pq.pojo.vo.TerminalDaliyFlowVO; import com.njcn.device.pq.pojo.vo.TerminalMaintainVO; import com.njcn.device.pq.service.IDevMealService; import com.njcn.device.pq.service.IDevStrategyService; @@ -54,9 +56,6 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { private final DeptFeignClient deptFeignClient; - - - @Override public List getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) { List resList = new ArrayList<>(); @@ -155,6 +154,12 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { return iDevStrategyService.saveBatch(tem); } + @Override + public Page getFlowManageDetail (TerminalMainQueryParam param) { + Page page = terminalMaintainMapper.getFlowManageDetail(new Page(param.getPageNum(), param.getPageSize()), param.getDevId()); + return page; + } + private List getChildren(String id,List all){ return all.stream().filter(item->item.getPid().equals(id)).collect(Collectors.toList()); }