1.地市数据完整性

2.监测点稳态指标合格率
This commit is contained in:
wr
2025-03-13 20:07:40 +08:00
parent d94b4e6ac7
commit 127ad2e563
41 changed files with 832 additions and 115 deletions

View File

@@ -7,9 +7,9 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.dataProcess.annotation.InsertBean;
import com.njcn.dataProcess.annotation.QueryBean;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
import com.njcn.dataProcess.service.IDataIntegrity;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
@@ -34,15 +34,27 @@ import java.util.List;
@RequiredArgsConstructor
public class DataIntegrityController extends BaseController {
@QueryBean
private IDataIntegrity iDataIntegrityQuery;
@InsertBean
private IDataIntegrity iDataIntegrity;
private IDataIntegrity iDataIntegrityInsert;
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/batchInsertion")
@ApiOperation("批量插入")
public HttpResult<String> batchInsertion(@RequestBody List<RStatIntegrityD> poList) {
public HttpResult<String> batchInsertion(@RequestBody List<DataIntegrityDto> poList) {
String methodDescribe = getMethodDescribe("batchInsertion");
iDataIntegrity.batchInsertion(poList);
iDataIntegrityInsert.batchInsertion(poList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getRawData")
@ApiOperation("获取原始数据")
public HttpResult<List<DataIntegrityDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
String methodDescribe = getMethodDescribe("getRawData");
List<DataIntegrityDto> rawData = iDataIntegrityInsert.getRawData(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
}
}

View File

@@ -50,7 +50,7 @@ public class DataLimitRateController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getRawData")
@ApiOperation("获取原始数据")
public HttpResult<List<DataLimitRateDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {

View File

@@ -8,6 +8,8 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.dataProcess.annotation.InsertBean;
import com.njcn.dataProcess.annotation.QueryBean;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto;
import com.njcn.dataProcess.service.IDataLimitTarget;
import com.njcn.web.controller.BaseController;
@@ -52,4 +54,12 @@ public class DataLimitTargetController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getRawData")
@ApiOperation("获取原始数据")
public HttpResult<List<DataLimitTargetDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
String methodDescribe = getMethodDescribe("getRawData");
List<DataLimitTargetDto> rawData = limitTargetInsert.getRawData(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
}
}

View File

@@ -54,7 +54,7 @@ public class DataOnlineRateController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getRawData")
@ApiOperation("获取原始数据")
public HttpResult<List<DataOnlineRateDto.Detail>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {

View File

@@ -0,0 +1,60 @@
package com.njcn.dataProcess.controller;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
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.dataProcess.annotation.InsertBean;
import com.njcn.dataProcess.annotation.QueryBean;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataOrgIntegrityDto;
import com.njcn.dataProcess.service.IDataOrgIntegrity;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
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 java.util.List;
/**
* @Author: cdf
* @CreateTime: 2025-03-12
* @Description: 数据完整性
*/
@RestController
@RequestMapping("/dataOrgIntegrity")
@Api(tags = "单位数据完整性")
@RequiredArgsConstructor
public class DataOrgIntegrityController extends BaseController {
@QueryBean
private IDataOrgIntegrity dataOrgIntegrityQuery;
@InsertBean
private IDataOrgIntegrity dataOrgIntegrityInsert;
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/batchInsertion")
@ApiOperation("批量插入")
public HttpResult<String> batchInsertion(@RequestBody List<DataOrgIntegrityDto> poList) {
String methodDescribe = getMethodDescribe("batchInsertion");
dataOrgIntegrityInsert.batchInsertion(poList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getRawData")
@ApiOperation("获取原始数据")
public HttpResult<List<DataOrgIntegrityDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
String methodDescribe = getMethodDescribe("getRawData");
List<DataOrgIntegrityDto> rawData = dataOrgIntegrityInsert.getRawData(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
}
}

View File

@@ -1,6 +1,7 @@
package com.njcn.dataProcess.controller;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
@@ -71,7 +72,7 @@ public class PqsCommunicateController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/insertion")
@ApiOperation("插入数据")
public HttpResult<String> insertion(@RequestBody PqsCommunicateDto pqsCommunicateDto) {

View File

@@ -0,0 +1,16 @@
package com.njcn.dataProcess.dao.relation.mapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.dataProcess.pojo.po.RStatOrgIntegrityD;
/**
* @Description:
* @Author: wr
* @Date: 2025/3/12 9:29
*/
public interface RStatOrgIntegrityDMapper extends MppBaseMapper<RStatOrgIntegrityD> {
}

View File

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.service;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
@@ -18,6 +19,13 @@ public interface IDataIntegrity extends IMppService<RStatIntegrityD>{
* 批量插入数据
* @param onlineRateList
*/
void batchInsertion(List<RStatIntegrityD> onlineRateList);
void batchInsertion(List<DataIntegrityDto> onlineRateList);
/**
* 获取原始数据
* @param lineParam
*/
List<DataIntegrityDto> getRawData(LineCountEvaluateParam lineParam);
}

View File

@@ -1,6 +1,7 @@
package com.njcn.dataProcess.service;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto;
import com.njcn.dataProcess.pojo.po.RStatLimitTargetD;
@@ -20,4 +21,11 @@ public interface IDataLimitTarget extends IMppService<RStatLimitTargetD> {
*/
void batchInsertion(List<DataLimitTargetDto> limitRateList);
/**
* 获取原始数据
* @param lineParam
* @return
*/
List<DataLimitTargetDto> getRawData(LineCountEvaluateParam lineParam);
}

View File

@@ -0,0 +1,31 @@
package com.njcn.dataProcess.service;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataOrgIntegrityDto;
import com.njcn.dataProcess.pojo.po.RStatOrgIntegrityD;
import java.util.List;
/**
* @Description:
* @Author: wr
* @Date: 2025/3/12 9:32
*/
public interface IDataOrgIntegrity extends IMppService<RStatOrgIntegrityD>{
/**
* 批量插入数据
* @param onlineRateList
*/
void batchInsertion(List<DataOrgIntegrityDto> onlineRateList);
/**
* 获取原始数据
* @param lineParam
*/
List<DataOrgIntegrityDto> getRawData(LineCountEvaluateParam lineParam);
}

View File

@@ -3,12 +3,14 @@ package com.njcn.dataProcess.service.impl.influxdb;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.dataProcess.dao.relation.mapper.RStatIntegrityDMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
import com.njcn.dataProcess.service.IDataIntegrity;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
@@ -23,7 +25,12 @@ public class InfluxdbDataIntegrityImpl extends MppServiceImpl<RStatIntegrityDMap
@Override
public void batchInsertion(List<RStatIntegrityD> onlineRateList) {
public void batchInsertion(List<DataIntegrityDto> onlineRateList) {
}
@Override
public List<DataIntegrityDto> getRawData(LineCountEvaluateParam lineParam) {
return Collections.emptyList();
}
}

View File

@@ -2,12 +2,14 @@ package com.njcn.dataProcess.service.impl.influxdb;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.dataProcess.dao.relation.mapper.RStatLimitTargetRelationMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto;
import com.njcn.dataProcess.pojo.po.RStatLimitTargetD;
import com.njcn.dataProcess.service.IDataLimitTarget;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
@@ -25,4 +27,9 @@ public class InfluxdbDataLimitTargetImpl extends MppServiceImpl<RStatLimitTarget
public void batchInsertion(List<DataLimitTargetDto> limitRateList) {
}
@Override
public List<DataLimitTargetDto> getRawData(LineCountEvaluateParam lineParam) {
return Collections.emptyList();
}
}

View File

@@ -0,0 +1,36 @@
package com.njcn.dataProcess.service.impl.influxdb;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.dataProcess.dao.relation.mapper.RStatOrgIntegrityDMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataOrgIntegrityDto;
import com.njcn.dataProcess.pojo.po.RStatOrgIntegrityD;
import com.njcn.dataProcess.service.IDataOrgIntegrity;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
* @Description:
* @Author: wr
* @Date: 2025/3/6 10:22
*/
@Service("InfluxdbDataOrgIntegrityImpl")
@RequiredArgsConstructor
public class InfluxdbDataOrgIntegrityImpl extends MppServiceImpl<RStatOrgIntegrityDMapper, RStatOrgIntegrityD> implements IDataOrgIntegrity {
@Override
public void batchInsertion(List<DataOrgIntegrityDto> onlineRateList) {
}
@Override
public List<DataOrgIntegrityDto> getRawData(LineCountEvaluateParam lineParam) {
return Collections.emptyList();
}
}

View File

@@ -1,9 +0,0 @@
package com.njcn.dataProcess.service.impl.relation;
/**
* @Author: cdf
* @CreateTime: 2025-03-12
* @Description: 数据完整性
*/
public class RStatIntegrityDImpl {
}

View File

@@ -1,15 +1,19 @@
package com.njcn.dataProcess.service.impl.relation;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.dataProcess.dao.relation.mapper.RStatIntegrityDMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
import com.njcn.dataProcess.service.IDataIntegrity;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +28,30 @@ public class RelationDataIntegrityImpl extends MppServiceImpl<RStatIntegrityDMap
@Override
public void batchInsertion(List<RStatIntegrityD> dataIntegrityDtoList) {
this.saveOrUpdateBatchByMultiId(dataIntegrityDtoList);
public void batchInsertion(List<DataIntegrityDto> dataIntegrityDtoList) {
List<RStatIntegrityD> result = new ArrayList<>();
dataIntegrityDtoList.forEach(item->{
RStatIntegrityD onlineRate = new RStatIntegrityD();
BeanUtils.copyProperties(item, onlineRate);
result.add(onlineRate);
});
this.saveOrUpdateBatchByMultiId(result);
}
@Override
public List<DataIntegrityDto> getRawData(LineCountEvaluateParam lineParam) {
List<DataIntegrityDto> result = new ArrayList<>();
LambdaQueryWrapper<RStatIntegrityD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()),RStatIntegrityD::getLineIndex,lineParam.getLineId())
.ge(RStatIntegrityD::getTimeId,lineParam.getStartTime())
.le(RStatIntegrityD::getTimeId,lineParam.getEndTime());
List<RStatIntegrityD> list = this.list(lambdaQueryWrapper);
list.forEach(item->{
DataIntegrityDto dto = new DataIntegrityDto();
BeanUtils.copyProperties(item,dto);
result.add(dto);
});
return result;
}
}

View File

@@ -1,8 +1,13 @@
package com.njcn.dataProcess.service.impl.relation;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.dataProcess.dao.relation.mapper.RStatLimitTargetRelationMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto;
import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
import com.njcn.dataProcess.pojo.po.RStatLimitTargetD;
import com.njcn.dataProcess.service.IDataLimitRate;
import com.njcn.dataProcess.service.IDataLimitTarget;
@@ -12,6 +17,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -38,4 +44,21 @@ public class RelationDataLimitTargetImpl extends MppServiceImpl<RStatLimitTarget
});
this.saveOrUpdateBatchByMultiId(result);
}
@Override
public List<DataLimitTargetDto> getRawData(LineCountEvaluateParam lineParam) {
List<DataLimitTargetDto> result = new ArrayList<>();
LambdaQueryWrapper<RStatLimitTargetD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()),RStatLimitTargetD::getLineId,lineParam.getLineId())
.ge(RStatLimitTargetD::getTime,lineParam.getStartTime())
.le(RStatLimitTargetD::getTime,lineParam.getEndTime());
List<RStatLimitTargetD> list = this.list(lambdaQueryWrapper);
list.forEach(item->{
DataLimitTargetDto dto = new DataLimitTargetDto();
BeanUtils.copyProperties(item,dto);
result.add(dto);
});
return result;
}
}

View File

@@ -4,12 +4,9 @@ package com.njcn.dataProcess.service.impl.relation;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.dataProcess.constant.PhaseType;
import com.njcn.dataProcess.dao.relation.mapper.RStatOnlineRateDMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
import com.njcn.dataProcess.pojo.po.RStatLimitRateD;
import com.njcn.dataProcess.pojo.po.RStatOnlineRateD;
import com.njcn.dataProcess.service.IDataOnlineRate;
import lombok.RequiredArgsConstructor;
@@ -17,7 +14,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

View File

@@ -0,0 +1,57 @@
package com.njcn.dataProcess.service.impl.relation;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.dataProcess.dao.relation.mapper.RStatOrgIntegrityDMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataOrgIntegrityDto;
import com.njcn.dataProcess.pojo.po.RStatOrgIntegrityD;
import com.njcn.dataProcess.service.IDataOrgIntegrity;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @Description:
* @Author: wr
* @Date: 2025/3/6 10:22
*/
@Service("RelationDataOrgIntegrityImpl")
@RequiredArgsConstructor
public class RelationDataOrgIntegrityImpl extends MppServiceImpl<RStatOrgIntegrityDMapper, RStatOrgIntegrityD> implements IDataOrgIntegrity {
@Override
public void batchInsertion(List<DataOrgIntegrityDto> dataIntegrityDtoList) {
List<RStatOrgIntegrityD> result = new ArrayList<>();
dataIntegrityDtoList.forEach(item->{
RStatOrgIntegrityD onlineRate = new RStatOrgIntegrityD();
BeanUtils.copyProperties(item, onlineRate);
result.add(onlineRate);
});
this.saveOrUpdateBatchByMultiId(result);
}
@Override
public List<DataOrgIntegrityDto> getRawData(LineCountEvaluateParam lineParam) {
List<DataOrgIntegrityDto> result = new ArrayList<>();
LambdaQueryWrapper<RStatOrgIntegrityD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()),RStatOrgIntegrityD::getOrgId,lineParam.getLineId())
.ge(RStatOrgIntegrityD::getTimeId,lineParam.getStartTime())
.le(RStatOrgIntegrityD::getTimeId,lineParam.getEndTime());
List<RStatOrgIntegrityD> list = this.list(lambdaQueryWrapper);
list.forEach(item->{
DataOrgIntegrityDto dto = new DataOrgIntegrityDto();
BeanUtils.copyProperties(item,dto);
result.add(dto);
});
return result;
}
}