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

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

@@ -94,15 +94,15 @@ public class ExportModelController extends BaseController {
@PostMapping("/exportModel")
@ApiOperation("word报告")
public HttpResult<String> exportWorld(HttpServletResponse response,
@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 {
@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 {
String methodDescribe = getMethodDescribe("exportWorld");
//获取监测点信息
String bdname;
@@ -119,6 +119,9 @@ public class ExportModelController extends BaseController {
}
bdname = lineDto.getBdName();
areaName = lineDto.getAreaName();
if(areaName.equals("冀北")){
areaName="国网"+areaName;
}
pttype = PubUtils.ptTypeName(lineDto.getPtType());
} else {
List<Monitor> monitorList = monitorClient.getMonitorList(Arrays.asList(lineIndex)).getData();
@@ -780,39 +783,43 @@ public class ExportModelController extends BaseController {
String strResultFlicker = "";
String tmpstrResultFlicker = "";
String strResultFlickerValue = "";
String strPhase = "";// 相别，A、B、C
String strType = "";// 长闪还是短闪；S:短闪；L：长闪
String strValueType = "";// 值类型，最大，最小，平均，95%概率值
Double fmaxValue1 = 0.0;
Double fmaxValue2 = 0.0;
Double fmaxValue3 = 0.0;
Double flickerLimit = 0.0;
try {
if (Double.parseDouble(plt1.getFmaxValue().toString()) > Double.parseDouble(valueOfFlickerLimit)) {
if (!"".equals(tmpstrResultFlicker))
tmpstrResultFlicker += ",";
tmpstrResultFlicker += atype + "最大值为：" + plt1.getFmaxValue().toString();
reportmap.put("$" + "L" + "V0R_" + "A" + "$", "不合格");
} else {
reportmap.put("$" + "L" + "V0R_" + "A" + "$", "合格");
}
if (Double.parseDouble(plt2.getFmaxValue().toString()) > Double.parseDouble(valueOfFlickerLimit)) {
if (!"".equals(tmpstrResultFlicker))
tmpstrResultFlicker += ",";
tmpstrResultFlicker += btype + "最大值为：" + plt2.getFmaxValue().toString();
reportmap.put("$" + "L" + "V0R_" + "B" + "$", "不合格");
} else {
reportmap.put("$" + "L" + "V0R_" + "B" + "$", "合格");
}
if (Double.parseDouble(plt3.getFmaxValue().toString()) > Double.parseDouble(valueOfFlickerLimit) && pttype != 2) {
if (!"".equals(tmpstrResultFlicker))
tmpstrResultFlicker += ",";
tmpstrResultFlicker += ctype + "最大值为：" + plt3.getFmaxValue().toString();
reportmap.put("$" + "L" + "V0R_" + "C" + "$", "不合格");
} else {
reportmap.put("$" + "L" + "V0R_" + "C" + "$", "合格");
}
fmaxValue1 = Double.parseDouble(plt1.getFmaxValue().toString());
fmaxValue2 = Double.parseDouble(plt2.getFmaxValue().toString());
fmaxValue3 = Double.parseDouble(plt3.getFmaxValue().toString());
flickerLimit = Double.parseDouble(valueOfFlickerLimit);
} catch (Exception e) {
if ("".equals(strResultFlickerValue))
strResultFlickerValue += "注意:从上表中可以看出" + strLineBaseName + "长时闪变数据存在异常(不是数值类型)。";
strResultFlickerValue += "注意:从上表中可以看出" + strLineBaseName + "长时闪变数据存在异常(不是数值类型)。";
}
if (fmaxValue1 > flickerLimit) {
if (!"".equals(tmpstrResultFlicker))
tmpstrResultFlicker += ",";
tmpstrResultFlicker += atype + "最大值为：" + plt1.getFmaxValue().toString();
reportmap.put("$" + "L" + "V0R_" + "A" + "$", "不合格");
} else {
reportmap.put("$" + "L" + "V0R_" + "A" + "$", "合格");
}
if (fmaxValue2 > flickerLimit) {
if (!"".equals(tmpstrResultFlicker))
tmpstrResultFlicker += ",";
tmpstrResultFlicker += btype + "最大值为：" + plt2.getFmaxValue().toString();
reportmap.put("$" + "L" + "V0R_" + "B" + "$", "不合格");
} else {
reportmap.put("$" + "L" + "V0R_" + "B" + "$", "合格");
}
if (fmaxValue3 > flickerLimit && pttype != 2) {
if (!"".equals(tmpstrResultFlicker))
tmpstrResultFlicker += ",";
tmpstrResultFlicker += ctype + "最大值为：" + plt3.getFmaxValue().toString();
reportmap.put("$" + "L" + "V0R_" + "C" + "$", "不合格");
} else {
reportmap.put("$" + "L" + "V0R_" + "C" + "$", "合格");
}
reportmap.put("$PSTX_A$", judgeNull(pst1.getFmaxValue()));
@@ -1227,9 +1234,9 @@ public class ExportModelController extends BaseController {
try {
String fileName = name + formatter.format(currentTime) + ".docx";
if (isUrl) {
reportFileUrl = wordUtil2.getReportFileUrl(rtfPath, name + formatter.format(currentTime) + ".docx", reportmap);
reportFileUrl = wordUtil2.getReportFileUrl(rtfPath, name + formatter.format(currentTime) + ".docx",null ,reportmap);
} else {
wordUtil2.getWord(rtfPath, reportmap, fileName, response);
wordUtil2.getWord(rtfPath, reportmap, fileName,null, response);
}
} catch (Exception e) {
log.error("获取报告发生异常，异常是" + e.getMessage());

1962
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java Normal file
View File

File diff suppressed because it is too large Load Diff

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java
View File

@@ -111,7 +111,10 @@ public class PollutionSubstationController extends BaseController {
@ApiImplicitParam(name = "startTime", value = "开始时间"),
@ApiImplicitParam(name = "endTime", value = "结束时间")
})
public HttpResult<List<SubstationVo>> getSubstationInfo(@RequestParam(value = "deptIndex") String deptIndex, @RequestParam(value = "searchValue") String searchValue, @RequestParam(value = "startTime") String startTime, @RequestParam(value = "endTime") String endTime) {
public HttpResult<List<SubstationVo>> getSubstationInfo(@RequestParam(value = "deptIndex") String deptIndex,
@RequestParam(value = "searchValue",required=false) String searchValue,
@RequestParam(value = "startTime") String startTime,
@RequestParam(value = "endTime") String endTime) {
String methodDescribe = getMethodDescribe("getSubstationInfo");
LogUtil.njcnDebug(log, "{}，实体参数：{},{}", methodDescribe, deptIndex, searchValue);
List<SubstationVo> list = pollutionSubstationService.getSubstationInfo(deptIndex,searchValue,startTime,endTime);