From 889039f2b4f8cde7f7b0509d9d71dce5c42aa051 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 16 May 2023 09:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledgerManger/DeptMonitorController.java | 100 +++++++++--------- .../pq/service/ISubstationExpendService.java | 5 + 2 files changed, 55 insertions(+), 50 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java index 94154c611..8a02a587a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java @@ -1,50 +1,50 @@ -package com.njcn.device.pms.controller.ledgerManger; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; -import com.njcn.device.biz.pojo.param.DeptGetLineParam; -import com.njcn.device.pms.service.majornetwork.IMonitorService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @author wr - * @description - * @date 2023/4/26 10:00 - */ -@RestController -@RequestMapping("/commTerminal") -@RequiredArgsConstructor -@Slf4j -@Api(tags = "通用台账-所有子孙部门以及监测点") -public class DeptMonitorController extends BaseController { - - private final IMonitorService monitorService; - - /** - * 通过部门获取所有子集部门所拥有的监测点 - * - * @author wr - * @date 2023/4/26 - */ - @PostMapping("/deptGetLineIds") - @ApiImplicitParam(name = "param", value = "请求参数", required = true) - public HttpResult> deptGetLineList(@RequestBody @Validated DeptGetLineParam param) { - String methodDescribe = getMethodDescribe("deptGetLineList"); - List monitor = monitorService.deptMonitor(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); - } - -} +//package com.njcn.device.pms.controller.ledgerManger; +// +//import com.njcn.common.pojo.enums.response.CommonResponseEnum; +//import com.njcn.common.pojo.response.HttpResult; +//import com.njcn.common.utils.HttpResultUtil; +//import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; +//import com.njcn.device.biz.pojo.param.DeptGetLineParam; +//import com.njcn.device.pms.service.majornetwork.IMonitorService; +//import com.njcn.web.controller.BaseController; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiImplicitParam; +//import lombok.RequiredArgsConstructor; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestBody; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.util.List; +// +///** +// * @author wr +// * @description +// * @date 2023/4/26 10:00 +// */ +//@RestController +//@RequestMapping("/commTerminal") +//@RequiredArgsConstructor +//@Slf4j +//@Api(tags = "通用台账-所有子孙部门以及监测点") +//public class DeptMonitorController extends BaseController { +// +// private final IMonitorService monitorService; +// +// /** +// * 通过部门获取所有子集部门所拥有的监测点 +// * +// * @author wr +// * @date 2023/4/26 +// */ +// @PostMapping("/deptGetLineIds") +// @ApiImplicitParam(name = "param", value = "请求参数", required = true) +// public HttpResult> deptGetLineList(@RequestBody @Validated DeptGetLineParam param) { +// String methodDescribe = getMethodDescribe("deptGetLineList"); +// List monitor = monitorService.deptMonitor(param); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); +// } +// +//} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java index 58437386c..72ad7e90c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java @@ -17,5 +17,10 @@ import java.util.List; */ public interface ISubstationExpendService { + /** + * 冀北主网监测点通讯状态统计 + * @param param + * @return + */ List getCommunicationStatus(DeviceInfoParam.CompareLimitParam param); }