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

1.冀北合格率接口调整

Browse Source 
2.综合评估接口调整
3.算法调整
This commit is contained in:
xy
2024-05-08 14:54:15 +08:00
parent d8cb5479e8
commit 3e9d8638cb
6 changed files with 54 additions and 55 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/hebeinorth/GridController.java
View File

@@ -41,9 +41,9 @@ public class GridController extends BaseController {
@PostMapping("/getAssessOverview")
@ApiOperation("综合评估概览数据")
@ApiImplicitParam(name = "param", value = "参数", required = true)
public HttpResult<List<AssessVo>> getAssessOverview(@RequestBody @Validated AssessParam param){
public HttpResult<AssessVo.AssessOverview> getAssessOverview(@RequestBody @Validated AssessParam param){
String methodDescribe = getMethodDescribe("getAssessOverview");
List<AssessVo> result = gridService.getAssessOverview(param);
AssessVo.AssessOverview result = gridService.getAssessOverview(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

1
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitRateDMapper.xml
View File

@@ -310,6 +310,7 @@
select
my_index as lineId,
SUM(all_time) as allTime,
SUM(flicker_all_time) as flickerAllTime,
SUM(freq_dev_overtime) as freqDevOvertime,
SUM(voltage_dev_overtime) as voltageDevOvertime,
SUM(flicker_overtime) as flickerOvertime,

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/hebeinorth/IGridService.java
View File

@@ -28,7 +28,7 @@ public interface IGridService {
* @param param
* @return
*/
List<AssessVo> getAssessOverview(AssessParam param);
AssessVo.AssessOverview getAssessOverview(AssessParam param);
/**
* 综合评估详细界面

19
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.njcn.harmonic.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import com.njcn.common.utils.PubUtils;
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
@@ -36,7 +35,6 @@ import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -67,8 +65,9 @@ public class GridServiceImpl implements IGridService {
private final DeptFeignClient deptFeignClient;
@Override
public List<AssessVo> getAssessOverview(AssessParam param) {
List<AssessVo> result = new ArrayList<>();
public AssessVo.AssessOverview getAssessOverview(AssessParam param) {
AssessVo.AssessOverview overview = new AssessVo.AssessOverview();
List<AssessVo> children = new ArrayList<>();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
@@ -101,20 +100,18 @@ public class GridServiceImpl implements IGridService {
assessVo.setLevel(getLevel(synData));
comasses.addAll(communicateList);
}
result.add(assessVo);
children.add(assessVo);
}
});
//计算冀北整体
AssessVo assessVo = new AssessVo();
assessVo.setName("冀北");
if (CollUtil.isNotEmpty(comasses)) {
float synData = comAssesUtil.getAllComAss(comasses);
assessVo.setScore(PubUtils.floatRound(2,synData));
assessVo.setLevel(getLevel(synData));
overview.setScore(PubUtils.floatRound(2,synData));
overview.setLevel(getLevel(synData));
}
result.add(assessVo);
overview.setChildren(children);
}
return result;
return overview;
}
@Override