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

1.解决pq公共方法查询监测点信息，母线，终端等信息

Browse Source 
2.解决device模块swagger页面出不来问题
3.技术监督变电站台账接口增加
4.监测点试运行报告增加，间谐波电压和暂态列表
This commit is contained in:
wr
2024-08-01 11:41:19 +08:00
parent d972bbef80
commit cdbb4fe428
25 changed files with 2753 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/ReportFeignClient.java
View File

@@ -21,16 +21,16 @@ import java.io.IOException;
contextId = "exportmodel")
public interface ReportFeignClient {
@PostMapping(value ="/exportModel",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
HttpResult<String> exportWorld(
@RequestParam("startTime") String startTime,
@RequestParam("endTime") String endTime,
@RequestParam("type") Integer type,
@RequestParam("lineIndex") String lineIndex,
@RequestParam("name") String name,
@RequestParam("reportNumber") String reportNumber,
@RequestParam("crmName") String crmName,
@RequestParam("isUrl") Boolean isUrl,
@RequestPart("file") MultipartFile file) throws IOException;
@PostMapping(value ="/exportModelJB",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
HttpResult<String> exportModelJB(
@RequestParam(value ="startTime",required = false) String startTime,
@RequestParam(value ="endTime",required = false) String endTime,
@RequestParam(value ="type",required = false) Integer type,
@RequestParam(value ="lineIndex",required = false) String lineIndex,
@RequestParam(value ="name",required = false) String name,
@RequestParam(value ="reportNumber",required = false) String reportNumber,
@RequestParam(value ="crmName",required = false) String crmName,
@RequestParam(value = "isUrl",required = false) Boolean isUrl,
@RequestPart(value ="file",required = false) MultipartFile file) throws IOException;
}

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/fallback/ReportClientFallbackFactory.java
View File

@@ -41,7 +41,7 @@ public class ReportClientFallbackFactory implements FallbackFactory<ReportFeignC
return new ReportFeignClient() {
@Override
public HttpResult<String> exportWorld( String startTime, String endTime, Integer type, String lineIndex, String name, String reportNumber, String crmName, Boolean isUrl, MultipartFile file) throws IOException {
public HttpResult<String> exportModelJB( String startTime, String endTime, Integer type, String lineIndex, String name, String reportNumber, String crmName, Boolean isUrl, MultipartFile file) throws IOException {
log.error("{}异常，降级处理，异常为：{}", "获取谐波报告失败", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}