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

bug修改

Browse Source
This commit is contained in:
雨木c
2023-03-06 09:37:11 +08:00
parent d522f2afe9
commit c20ef391d7
10 changed files with 87 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/AnalyzeController.java
View File

@@ -49,7 +49,7 @@ public class AnalyzeController extends BaseController {
private final IHarmonicService harmonicService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
/* @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/deptSubstationRelations")
@ApiOperation("污区图-部门变电站关系")
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
@@ -81,7 +81,7 @@ public class AnalyzeController extends BaseController {
List<PollutionLineDTO> list = pollutionService.getLineInfoById(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getLineRank")
@ApiOperation("污区图-获取前十监测点排名")

100
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java
View File

@@ -1,100 +0,0 @@
package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller;
//
//import com.njcn.common.pojo.annotation.OperateInfo;
//import com.njcn.common.pojo.enums.common.LogEnum;
//import com.njcn.common.pojo.enums.response.CommonResponseEnum;
//import com.njcn.common.pojo.response.HttpResult;
//import com.njcn.common.utils.HttpResultUtil;
//import com.njcn.common.utils.LogUtil;
//import com.njcn.harmonic.pojo.param.HarmonicPublicParam;
//import com.njcn.harmonic.pojo.vo.HarmonicDeptVO;
//import com.njcn.harmonic.pojo.vo.HarmonicLineVO;
//import com.njcn.harmonic.pojo.vo.HarmonicSubstationVO;
//import com.njcn.harmonic.pojo.vo.PollutionVO;
//import com.njcn.harmonic.service.IHarmonicService;
//import com.njcn.web.controller.BaseController;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiOperation;
//import lombok.AllArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.*;
//
//import java.util.List;
//import java.util.Objects;
//
///**
// * 类的介绍：
// *
// * @author xuyang
// * @version 1.0.0
// * @createTime 2022/2/23 10:39
// */
//@Validated
//@Slf4j
//@RestController
//@RequestMapping("/harmonic")
//@Api(tags = "谐波统计")
//@AllArgsConstructor
//public class HarmonicController extends BaseController {
//
// private final IHarmonicService harmonicService;
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/deptSubstationRelations")
// @ApiOperation("部门变电站关系")
// @ApiImplicitParam(name = "param", value = "实体参数", required = true)
// public HttpResult<List<PollutionVO>> deptSubstationRelations(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("deptSubstationRelations");
// LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
// List<PollutionVO> list = harmonicService.getDeptSubstationRelations(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/deptInfo")
// @ApiOperation("部门列表")
// @ApiImplicitParam(name = "param", value = "实体参数", required = true)
// public HttpResult<List<HarmonicDeptVO>> deptInfo(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("deptInfo");
// LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
// List<HarmonicDeptVO> list = harmonicService.getDeptInfo(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/getSubstationInfoById")
// @ApiOperation("根据部门获取变电站详情")
// @ApiImplicitParam(name = "param", value = "实体参数", required = true)
// public HttpResult<List<HarmonicSubstationVO>> getSubstationInfoById(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("getSubstationInfoById");
// LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
// List<HarmonicSubstationVO> list = harmonicService.getSubstationInfoById(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/getLineInfoById")
// @ApiOperation("根据变电站获取监测点详情")
// @ApiImplicitParam(name = "param", value = "实体参数", required = true)
// public HttpResult<List<HarmonicLineVO>> getLineInfoById(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("getLineInfoById");
// LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
// List<HarmonicLineVO> list = harmonicService.getLineInfoById(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/getLineRank")
// @ApiOperation("获取前十监测点排名")
// @ApiImplicitParam(name = "param", value = "实体参数", required = true)
// public HttpResult<List<HarmonicLineVO>> getLineRank(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("getLineRank");
// LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
// List<HarmonicLineVO> list = harmonicService.getLineRank(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//}

91
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java
View File

@@ -1,91 +0,0 @@
package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller;
//
//import com.njcn.common.pojo.annotation.OperateInfo;
//import com.njcn.common.pojo.enums.common.LogEnum;
//import com.njcn.common.pojo.enums.response.CommonResponseEnum;
//import com.njcn.common.pojo.response.HttpResult;
//import com.njcn.common.utils.HttpResultUtil;
//import com.njcn.common.utils.LogUtil;
//import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
//import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
//import com.njcn.harmonic.pojo.param.HarmonicPublicParam;
//import com.njcn.harmonic.pojo.vo.PollutionVO;
//import com.njcn.harmonic.service.IPollutionService;
//import com.njcn.web.controller.BaseController;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiOperation;
//import lombok.AllArgsConstructor;
//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 xuyang
// * @version 1.0.0
// * @createTime 2022/2/21 15:59
// */
//@Validated
//@Slf4j
//@RestController
//@RequestMapping("/pollution")
//@Api(tags = "电能质量污区图")
//@AllArgsConstructor
//public class PollutionController extends BaseController {
//
// private final IPollutionService pollutionService;
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/deptSubstationRelations")
// @ApiOperation("部门变电站关系")
// @ApiImplicitParam(name = "param", value = "实体参数", required = true)
// public HttpResult<List<PollutionVO>> deptSubstationRelations(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("deptSubstationRelations");
// LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
// List<PollutionVO> list = pollutionService.getDeptSubstationRelations(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/getSubstationInfoById")
// @ApiOperation("根据部门获取变电站详情")
// @ApiImplicitParam(name = "param", value = "部门参数", required = true)
// public HttpResult<List<PollutionSubstationDTO>> getSubstationInfoById(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("getSubstationInfoById");
// LogUtil.njcnDebug(log, "{}，部门参数：{}", methodDescribe, param);
// List<PollutionSubstationDTO> list = pollutionService.getSubstationInfoById(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/getLineInfoById")
// @ApiOperation("根据变电站获取监测点详情")
// @ApiImplicitParam(name = "param", value = "变电站参数", required = true)
// public HttpResult<List<PollutionLineDTO>> getLineInfoById(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("getLineInfoById");
// LogUtil.njcnDebug(log, "{}，变电站参数：{}", methodDescribe, param);
// List<PollutionLineDTO> list = pollutionService.getLineInfoById(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//
// @OperateInfo(info = LogEnum.BUSINESS_COMMON)
// @PostMapping("/getLineRank")
// @ApiOperation("获取前十监测点排名")
// @ApiImplicitParam(name = "param", value = "实体参数", required = true)
// public HttpResult<List<PollutionLineDTO>> getLineRank(@RequestBody HarmonicPublicParam param) {
// String methodDescribe = getMethodDescribe("getLineRank");
// LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
// List<PollutionLineDTO> list = pollutionService.getLineRank(param);
// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
// }
//
//
//
//}

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IPollutionService.java
View File

@@ -20,7 +20,7 @@ public interface IPollutionService {
* @author xy
* @date 2022/2/21 16:48
*/
List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam param);
// List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam param);
/**
* 功能描述: 根据部门获取变电站详情
@@ -30,7 +30,7 @@ public interface IPollutionService {
* @author xy
* @date 2022/2/21 20:51
*/
List<PollutionSubstationDTO> getSubstationInfoById(HarmonicPublicParam param);
//List<PollutionSubstationDTO> getSubstationInfoById(HarmonicPublicParam param);
/**
* 功能描述: 根据变电站获取监测点详情
@@ -39,7 +39,7 @@ public interface IPollutionService {
* @author xy
* @date 2022/2/21 20:51
*/
List<PollutionLineDTO> getLineInfoById(HarmonicPublicParam param);
// List<PollutionLineDTO> getLineInfoById(HarmonicPublicParam param);
/**
* 功能描述:获取排名前10的监测点

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionServiceImpl.java
View File

@@ -63,7 +63,7 @@ public class PollutionServiceImpl implements IPollutionService {
private final LineFeignClient lineFeignClient;
@Override
/* @Override
public List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam harmonicPublicParam) {
//用于区分是pms 还是 pq
List<PollutionVO> list = new ArrayList<>();
@@ -174,7 +174,7 @@ public class PollutionServiceImpl implements IPollutionService {
}
return list.stream().sorted(Comparator.comparing(PollutionLineDTO::getData).reversed().thenComparing(PollutionLineDTO::getName)).collect(Collectors.toList());
}
*/
@Override
public List<PollutionLineDTO> getLineRank(HarmonicPublicParam harmonicPublicParam) {
harmonicPublicParam.setServerName(generalInfo.getMicroServiceName());