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

1.监测评分权重，新增字段添加

Browse Source 
2.企业概览页面接口 在线率、畸变率和暂降次数
This commit is contained in:
wr
2023-08-31 15:32:49 +08:00
parent 9b7341aa3d
commit 9f38947e28
14 changed files with 194 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java
View File

@@ -5,13 +5,10 @@ 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.pq.mapper.OnlineRateMapper;
import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.param.OnlineRateParam;
import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam;
import com.njcn.device.pq.pojo.po.OnlineRate;
import com.njcn.device.pq.pojo.po.RStatOnlinerateD;
import com.njcn.device.pq.pojo.vo.OnlineRateCensusVO;
import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO;
@@ -23,10 +20,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -56,7 +50,17 @@ public class TerminalOnlineRateDataController extends BaseController {
@ApiImplicitParam(name = "terminalOnlineRateDataParam", value = "参数实体", required = true)
public HttpResult<List<TerminalOnlineRateDataVO>> getOnlineRateData(@RequestBody TerminalOnlineRateDataParam terminalOnlineRateDataParam) {
String methodDescribe = getMethodDescribe("getOnlineRateData");
List<TerminalOnlineRateDataVO> onlineRateData = terminalOnlineRateDataService.getOnlineRateData(terminalOnlineRateDataParam);
List<TerminalOnlineRateDataVO> onlineRateData = terminalOnlineRateDataService.getOnlineRateData(terminalOnlineRateDataParam,0);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateData,methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getNodeOnlineRateData")
@ApiOperation("终端在线率节点图")
@ApiImplicitParam(name = "terminalOnlineRateDataParam", value = "参数实体", required = true)
public HttpResult<List<TerminalOnlineRateDataVO>> getNodeOnlineRateData(@RequestBody TerminalOnlineRateDataParam terminalOnlineRateDataParam) {
String methodDescribe = getMethodDescribe("getOnlineRateData");
List<TerminalOnlineRateDataVO> onlineRateData = terminalOnlineRateDataService.getOnlineRateData(terminalOnlineRateDataParam,1);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateData,methodDescribe);
}

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

@@ -13,6 +13,7 @@
pld.Line_Grade AS lineGrade,
line.id AS lineIndex,
COMMUN_FEE_MARK,
ASSET_BELONG,
SERVICE_MARK,
AGENT_MARK,
COMPANY_MARK,

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java
View File

@@ -20,7 +20,7 @@ public interface TerminalOnlineRateDataService {
* @param terminalOnlineRateDataParam
* @return
*/
List<TerminalOnlineRateDataVO> getOnlineRateData(TerminalOnlineRateDataParam terminalOnlineRateDataParam);
List<TerminalOnlineRateDataVO> getOnlineRateData(TerminalOnlineRateDataParam terminalOnlineRateDataParam,Integer nodeType);
OnlineRateCensusVO getOnlineRateDataCensus(DeviceInfoParam.CompareBusinessParam onlineRateCensusParam);
}

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

@@ -69,7 +69,7 @@ public class PqsLineWeightServiceImpl extends ServiceImpl<PqsLineWeightMapper, P
@Override
public InputStreamResource exportTemplate() throws IOException {
ExportParams exportParams = new ExportParams("批量导入模板（所有字段均是必填,请严格按照模板标准填入数据）", "终端入网检测录入信息");
ExportParams exportParams = new ExportParams("批量导入模板（所有字段均是必填,请严格按照模板标准填入数据）", "监测点评分权重录入信息");
exportParams.setStyle(ExcelStyleUtil.class);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, PqsLineWeightVo.WeightExcel.class, new ArrayList<PqsLineWeightVo.WeightExcel>());
//临时缓冲区

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

@@ -72,7 +72,7 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
* @return
*/
@Override
public List<TerminalOnlineRateDataVO> getOnlineRateData (TerminalOnlineRateDataParam terminalOnlineRateDataParam) {
public List<TerminalOnlineRateDataVO> getOnlineRateData (TerminalOnlineRateDataParam terminalOnlineRateDataParam,Integer nodeType) {
// 获取所有数据
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(terminalOnlineRateDataParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
@@ -147,13 +147,24 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData
}
getAreaOnlineRateData(pro, alarmStrategyVos, terminalOnlineRateDataParam.getLineGrade(),terminalOnlineRateDataParam.getServerName());
if(nodeType==1){
pro.stream().forEach(data->{
if(CollUtil.isNotEmpty(data.getChildren())){
//市
List<TerminalOnlineRateDataVO> sub = data.getChildren().stream().flatMap(dto -> dto.getChildren().stream()).collect(Collectors.toList());
sub.stream().forEach(x->{
x.setChildren(new ArrayList<>());
});
data.setChildren(sub);
}
});
}
return pro;
} else {
return new ArrayList<>();
}
}
@Override
public OnlineRateCensusVO getOnlineRateDataCensus(DeviceInfoParam.CompareBusinessParam onlineRateCensusParam) {
OnlineRateCensusVO onlineRateCensusVO = new OnlineRateCensusVO();