Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java
This commit is contained in:
雨木c
2023-05-16 09:12:30 +08:00
parent 5b5cd670fe 889039f2b4
commit 656da9ff21
2 changed files with 76 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java
View File

@@ -1,50 +1,50 @@
package com.njcn.device.pms.controller.ledgerManger; //package com.njcn.device.pms.controller.ledgerManger;
//
import com.njcn.common.pojo.enums.response.CommonResponseEnum; //import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; //import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; //import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; //import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam; //import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.pms.service.majornetwork.IMonitorService; //import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.web.controller.BaseController; //import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; //import io.swagger.annotations.ApiImplicitParam;
import lombok.RequiredArgsConstructor; //import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated; //import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping; //import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; //import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
import java.util.List; //import java.util.List;
//
/** ///**
* @author wr // * @author wr
* @description // * @description
* @date 2023/4/26 10:00 // * @date 2023/4/26 10:00
*/ // */
@RestController //@RestController
@RequestMapping("/commTerminal") //@RequestMapping("/commTerminal")
@RequiredArgsConstructor //@RequiredArgsConstructor
@Slf4j //@Slf4j
@Api(tags = "通用台账-所有子孙部门以及监测点") //@Api(tags = "通用台账-所有子孙部门以及监测点")
public class DeptMonitorController extends BaseController { //public class DeptMonitorController extends BaseController {
//
private final IMonitorService monitorService; // private final IMonitorService monitorService;
//
/** // /**
* 通过部门获取所有子集部门所拥有的监测点 // * 通过部门获取所有子集部门所拥有的监测点
* // *
* @author wr // * @author wr
* @date 2023/4/26 // * @date 2023/4/26
*/ // */
@PostMapping("/deptGetLineIds") // @PostMapping("/deptGetLineIds")
@ApiImplicitParam(name = "param", value = "请求参数", required = true) // @ApiImplicitParam(name = "param", value = "请求参数", required = true)
public HttpResult<List<DeptGetChildrenDTO>> deptGetLineList(@RequestBody @Validated DeptGetLineParam param) { // public HttpResult<List<DeptGetChildrenDTO>> deptGetLineList(@RequestBody @Validated DeptGetLineParam param) {
String methodDescribe = getMethodDescribe("deptGetLineList"); // String methodDescribe = getMethodDescribe("deptGetLineList");
List<DeptGetChildrenDTO> monitor = monitorService.deptMonitor(param); // List<DeptGetChildrenDTO> monitor = monitorService.deptMonitor(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
} // }
//
} //}

26
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java Normal file
View File

@@ -0,0 +1,26 @@
package com.njcn.device.pq.service;
import com.njcn.device.pq.pojo.param.CommunicateParam;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.vo.CommunicateVO;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author zhuxinyu
* @since 2023-05-08
*/
public interface ISubstationExpendService {
/**
* 冀北主网监测点通讯状态统计
* @param param
* @return
*/
List<CommunicateVO.PVCommunicateVO> getCommunicationStatus(DeviceInfoParam.CompareLimitParam param);
}