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
This commit is contained in:
xuyang
2023-09-13 16:29:52 +08:00
parent aaca80a328 9c3464c998
commit 61743b4b7e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsLineWeightController.java
View File

@@ -70,7 +70,7 @@ public class PqsLineWeightController extends BaseController {
@PostMapping(value = "/batchWeight") @PostMapping(value = "/batchWeight")
@ApiOperation("批量导入监测点评分权重") @ApiOperation("批量导入监测点评分权重")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<String> batchTerminal(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) { public HttpResult<String> batchWeight(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("batchWeight"); String methodDescribe = getMethodDescribe("batchWeight");
iPqsLineWeightService.batchWeight(file, response); iPqsLineWeightService.batchWeight(file, response);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTransformerController.java
View File

@@ -108,7 +108,7 @@ public class PqsTransformerController extends BaseController {
@GetMapping("/getTransformerTree") @GetMapping("/getTransformerTree")
@ApiOperation(value = "获取变压器台账") @ApiOperation(value = "获取变压器台账")
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<List<TerminalTree>> getTerminalTree() { public HttpResult<List<TerminalTree>> getTransformerTree() {
String methodDescribe = getMethodDescribe("getTransformerTree"); String methodDescribe = getMethodDescribe("getTransformerTree");
List<TerminalTree> terminalTree = iPqsTransformerService.getTransformerTree(); List<TerminalTree> terminalTree = iPqsTransformerService.getTransformerTree();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, terminalTree, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, terminalTree, methodDescribe);

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
View File

@@ -811,7 +811,10 @@ public class HistoryResultServiceImpl implements HistoryResultService {
if (Integer.parseInt(normHistoryParam.getTargetCode()) != 60 || Integer.parseInt(normHistoryParam.getTargetCode()) != 61 || Integer.parseInt(normHistoryParam.getTargetCode()) != 62) { if (Integer.parseInt(normHistoryParam.getTargetCode()) != 60 || Integer.parseInt(normHistoryParam.getTargetCode()) != 61 || Integer.parseInt(normHistoryParam.getTargetCode()) != 62) {
stringBuilder.append(" and ").append(InfluxDBTableConstant.VALUE_TYPE + "='").append(valueTypeName).append("'"); stringBuilder.append(" and ").append(InfluxDBTableConstant.VALUE_TYPE + "='").append(valueTypeName).append("'");
} }
if(StrUtil.isNotBlank(phasicType)){
stringBuilder.append(" and ").append("phasic_type ='").append(phasicType).append("'"); stringBuilder.append(" and ").append("phasic_type ='").append(phasicType).append("'");
}
String sql = ""; String sql = "";
List<String> unit = new ArrayList<>(); List<String> unit = new ArrayList<>();
Integer number = normHistoryParam.getNumber(); Integer number = normHistoryParam.getNumber();