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:
xy
2025-07-28 21:02:50 +08:00
parent 2009009296
commit 67680628a1
25 changed files with 638 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
View File

@@ -1,7 +1,11 @@
package com.njcn.device.pq.api;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.ServerInfo;
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.device.biz.pojo.dto.PollutionLineDTO;
import com.njcn.device.pq.api.fallback.LineFeignClientFallbackFactory;
import com.njcn.device.pq.pojo.dto.*;
@@ -13,6 +17,8 @@ import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.device.biz.pojo.po.Overlimit;
import com.njcn.device.pq.pojo.po.line.LineInfoVO;
import com.njcn.device.pq.pojo.vo.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -21,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @author denghuajun
@@ -366,4 +373,7 @@ import java.util.Map;
@PostMapping("/getPowerStationByMonitorIds")
HttpResult<List<PollutionSubstationDTO>> getPowerStationByMonitorIds(@RequestBody List<String> ids);
@PostMapping("/getDevListByLineIdList")
HttpResult<Set<String>> getDevListByLineIdList(@RequestBody List<String> list);
}

7
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
View File

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* @author denghuajun
@@ -306,6 +307,12 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
log.error("{}异常，降级处理，异常为：{}", "根据监测id集合查询场站用户信息: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Set<String>> getDevListByLineIdList(List<String> list) {
log.error("{}异常，降级处理，异常为：{}", "根据监测点id集合获取装置id集合: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

12
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
View File

@@ -33,6 +33,7 @@ import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
/**
* @author denghuajun
@@ -138,6 +139,17 @@ public class LineController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getDevListByLineIdList")
@ApiOperation("根据监测点id集合获取装置id集合")
@ApiImplicitParam(name = "list", value = "监测点id集合", required = true)
public HttpResult<Set<String>> getDevListByLineIdList(@RequestBody List<String> list) {
String methodDescribe = getMethodDescribe("getDevListByLineIdList");
Set<String> result = lineService.getDevListByLineIdList(list);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getOverLimitData")
@ApiOperation("根据监测点id获取越限数值")

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineDetailMapper.xml
View File

@@ -58,7 +58,7 @@
<select id="getMonitorDetail" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
select a.id pointId,a.name pointName,b.Time_Interval timeInterval,bus.pid devId
select a.id pointId,a.name pointName,b.Time_Interval timeInterval,bus.pid devId,b.PT_Type wiringMethod
from pq_line a
inner join pq_line_detail b on a.id=b.id
inner join pq_line bus on a.pid =bus.id

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
View File

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* 监测点类
@@ -63,6 +64,8 @@ public interface LineService extends IService<Line> {
*/
String getLineIdByDevId(String id);
Set<String> getDevListByLineIdList(List<String> list);
/**
* 获取限值表信息
* @param id 监测点id

18
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -293,6 +293,24 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
return devId;
}
@Override
public Set<String> getDevListByLineIdList(List<String> list) {
Set<String> set = new HashSet<>();
list.forEach(item->{
String devId = "";
//根据id查询当前信息的pids
List<String> pids = Arrays.asList(this.baseMapper.selectById(item).getPids().split(","));
List<LineDataVO> lineDataVOList = this.baseMapper.getLineDetail(pids);
for (LineDataVO lineDataVO : lineDataVOList) {
if (lineDataVO.getLevel() == 4) {
devId = lineDataVO.getId();
}
}
set.add(devId);
});
return set;
}
@Override
public Overlimit getOverLimitData(String id) {
return overlimitMapper.selectById(id);