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

代码合并终

Browse Source
This commit is contained in:
雨木c
2023-02-06 13:32:26 +08:00
parent 4f64623dbd
commit 51041ad52d
8 changed files with 108 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/DictCache.java
View File

@@ -1,3 +1,4 @@
/*
package com.njcn.prepare.harmonic.constant;
import com.njcn.redis.utils.RedisUtil;
@@ -14,6 +15,7 @@ import javax.annotation.PreDestroy;
import java.util.List;
import java.util.Set;
*/
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
@@ -21,7 +23,8 @@ import java.util.Set;
*
* @author clam
* @version V1.0.0
*/
*//*
@Component
@Slf4j
@@ -41,15 +44,19 @@ public class DictCache {
@PostConstruct
public void init(){
log.info("系统启动中。。。加载dictDataMap");
/*todo 后续将字典表全部加载*/
*/
/*todo 后续将字典表全部加载*//*
List<DictData> data = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.LINE_STATE.getCode ( )).getData ( );
List<DictData> data2 = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.DEV_STATUS.getCode ( )).getData ( );
List<DictData> data3 = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.LINE_SORT.getCode ( )).getData ( );
/*
*/
/*
* key:NAME_KEY前缀（清缓存使用）+SPLIT_SIGN（拼接符号）+DicDataTypeEnum+SPLIT_SIGN（拼接符号）+Code
* Value:id
* */
* *//*
data.forEach (temp->{
redisUtil.saveByKey (NAME_KEY+SPLIT_SIGN+DicDataTypeEnum.LINE_STATE.getCode ( )+SPLIT_SIGN+temp.getCode (),temp.getId ());
});
@@ -75,3 +82,4 @@ public class DictCache {
}
}
*/

8
pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java
View File

@@ -44,12 +44,8 @@ public class ReportController extends BaseController {
@ApiImplicitParam(name = "reportParam", value = "查询体", required = true)
public HttpResult<Boolean> batchReport(@RequestBody @Validated LineParam reportParam){
String methodDescribe = getMethodDescribe("batchReport");
boolean res = reportService.batchReport(reportParam);
if(res){
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
reportService.batchReport(reportParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}

40
pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/AreaCountServiceImpl.java
View File

@@ -9,7 +9,6 @@ import com.njcn.harmonic.pojo.po.RStatAbnormalDPO;
import com.njcn.harmonic.pojo.po.RStatOrgDPO;
import com.njcn.harmonic.pojo.po.RStatOrgMPO;
import com.njcn.prepare.harmonic.constant.AlgorithmParam;
import com.njcn.prepare.harmonic.constant.DictCache;
import com.njcn.prepare.harmonic.constant.PqsPrepareExceptionEnum;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatAbnormalDPOMapper;
import com.njcn.prepare.harmonic.pojo.dto.MonitorDataIntegrityDTO;
@@ -30,6 +29,9 @@ import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import static com.njcn.system.pojo.constant.DicDataConstant.NAME_KEY;
import static com.njcn.system.pojo.constant.DicDataConstant.SPLIT_SIGN;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
@@ -125,15 +127,15 @@ public class AreaCountServiceImpl implements AreaCountService {
final Date tempDate = new SimpleDateFormat ("yyyy-MM-dd").parse (dataDate);
/*在运的字典表id，配网1，2，3类监测点字典表id用于for循环中过滤*/
String lineTypeOneId = redisUtil.getStringByKey (DictCache.NAME_KEY +
DictCache.SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
DictCache.SPLIT_SIGN + DicDataEnum.LINE_ONE.getCode ( ));
String lineTypeTwoId = redisUtil.getStringByKey (DictCache.NAME_KEY +
DictCache.SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
DictCache.SPLIT_SIGN + DicDataEnum.LINE_TWO.getCode ( ));
String lineTypeThreeId = redisUtil.getStringByKey (DictCache.NAME_KEY +
DictCache.SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
DictCache.SPLIT_SIGN + DicDataEnum.LINE_THREE.getCode ( ));
String lineTypeOneId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_ONE.getCode ( ));
String lineTypeTwoId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_TWO.getCode ( ));
String lineTypeThreeId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_THREE.getCode ( ));
if (
StringUtils.isEmpty (lineTypeOneId) ||
StringUtils.isEmpty (lineTypeTwoId) ||
@@ -190,15 +192,15 @@ public class AreaCountServiceImpl implements AreaCountService {
final Date tempDate = new SimpleDateFormat ("yyyy-MM-dd").parse (dataDate);
/*在运的字典表id，配网1，2，3类监测点字典表id用于for循环中过滤*/
String lineTypeOneId = redisUtil.getStringByKey (DictCache.NAME_KEY +
DictCache.SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
DictCache.SPLIT_SIGN + DicDataEnum.LINE_ONE.getCode ( ));
String lineTypeTwoId = redisUtil.getStringByKey (DictCache.NAME_KEY +
DictCache.SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
DictCache.SPLIT_SIGN + DicDataEnum.LINE_TWO.getCode ( ));
String lineTypeThreeId = redisUtil.getStringByKey (DictCache.NAME_KEY +
DictCache.SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
DictCache.SPLIT_SIGN + DicDataEnum.LINE_THREE.getCode ( ));
String lineTypeOneId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_ONE.getCode ( ));
String lineTypeTwoId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_TWO.getCode ( ));
String lineTypeThreeId = redisUtil.getStringByKey (NAME_KEY +
SPLIT_SIGN + DicDataTypeEnum.LINE_SORT.getCode ( ) +
SPLIT_SIGN + DicDataEnum.LINE_THREE.getCode ( ));
if (
StringUtils.isEmpty (lineTypeOneId) ||
StringUtils.isEmpty (lineTypeTwoId) ||

12
pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PmsMonitorPOServiceImpl.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.harmonic.pojo.po.PmsMonitorPO;
import com.njcn.prepare.harmonic.constant.DictCache;
import com.njcn.prepare.harmonic.constant.PqsPrepareExceptionEnum;
import com.njcn.prepare.harmonic.mapper.mysql.area.PmsMonitorPOMapper;
import com.njcn.prepare.harmonic.service.mysql.area.PmsMonitorPOService;
@@ -18,8 +17,11 @@ import org.springframework.util.StringUtils;
import java.util.List;
import static com.njcn.system.pojo.constant.DicDataConstant.NAME_KEY;
import static com.njcn.system.pojo.constant.DicDataConstant.SPLIT_SIGN;
/**
*
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/11/29 15:32【需求编号】
@@ -56,9 +58,9 @@ public class PmsMonitorPOServiceImpl extends ServiceImpl<PmsMonitorPOMapper, Pms
monitorPOLambdaQueryWrapper.in (PmsMonitorPO::getOrgId, deptIds);
// List<DictData> data = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.LINE_STATE.getCode ( )).getData ( );
// List<DictData> collect = data.stream ( ).filter (temp -> Objects.equals (temp.getCode ( ), DicDataEnum.RUN.getCode ())).collect (Collectors.toList ( ));
String state = redisUtil.getStringByKey (DictCache.NAME_KEY+
DictCache.SPLIT_SIGN+ DicDataTypeEnum.LINE_STATE.getCode ( )+
DictCache.SPLIT_SIGN+ DicDataEnum.RUN.getCode ( ));
String state = redisUtil.getStringByKey (NAME_KEY+
SPLIT_SIGN+ DicDataTypeEnum.LINE_STATE.getCode ( )+
SPLIT_SIGN+ DicDataEnum.RUN.getCode ( ));
if(StringUtils.isEmpty (state)){
throw new BusinessException (PqsPrepareExceptionEnum.REDIS_NULL_EXCEPTION);
}

26
pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PrimaryGridDataServiceImpl.java
View File

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.harmonic.pojo.po.*;
import com.njcn.prepare.harmonic.constant.AlgorithmParam;
import com.njcn.prepare.harmonic.constant.DictCache;
import com.njcn.prepare.harmonic.constant.PqsPrepareExceptionEnum;
import com.njcn.prepare.harmonic.mapper.mysql.area.RStatAbnormalDPOMapper;
import com.njcn.prepare.harmonic.pojo.dto.MonitorDataIntegrityDTO;
@@ -32,6 +31,9 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import static com.njcn.system.pojo.constant.DicDataConstant.NAME_KEY;
import static com.njcn.system.pojo.constant.DicDataConstant.SPLIT_SIGN;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
@@ -122,9 +124,9 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService {
double dev_data_rate=0.00;
/*获取终端下的监测点集合*/
QueryWrapper<PmsMonitorPO> queryWrapper = new QueryWrapper<> ();
String state = redisUtil.getStringByKey (DictCache.NAME_KEY+
DictCache.SPLIT_SIGN+ DicDataTypeEnum.LINE_STATE.getCode ( )+
DictCache.SPLIT_SIGN+ DicDataEnum.RUN.getCode ( ));
String state = redisUtil.getStringByKey (NAME_KEY+
SPLIT_SIGN+ DicDataTypeEnum.LINE_STATE.getCode ( )+
SPLIT_SIGN+ DicDataEnum.RUN.getCode ( ));
if(StringUtils.isEmpty (state)){
throw new BusinessException (PqsPrepareExceptionEnum.REDIS_NULL_EXCEPTION);
}
@@ -294,9 +296,9 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService {
Integer online_measurement_points = pmsTerminalPOS.size ();
/*在运监测终端个数 online_measurement_count*/
String state = redisUtil.getStringByKey (DictCache.NAME_KEY+
DictCache.SPLIT_SIGN+ DicDataTypeEnum.DEV_STATUS.getCode ( )+
DictCache.SPLIT_SIGN+ DicDataEnum.RUNNING.getCode ( ));
String state = redisUtil.getStringByKey (NAME_KEY+
SPLIT_SIGN+ DicDataTypeEnum.DEV_STATUS.getCode ( )+
SPLIT_SIGN+ DicDataEnum.RUNNING.getCode ( ));
Integer online_measurement_count = Integer.valueOf (pmsTerminalPOS.stream ( ).filter (temp -> Objects.equals (temp.getTerminalState ( ),state)).count ( )+"");
/*主网单位数据完整率 data_integrity_rate*/
@@ -355,7 +357,7 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService {
/**
/**
* @Description: 主网单位有效接入监测点个数
* 1.获取pms_monitor表中监测点状态为投运的监测点id列表
* 2.根据id查询r_mp_integrity_d表中当天各项指标个数，采用以下公式计算数据完整率
@@ -364,11 +366,11 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService {
* 4、根据id查询r_stat_abnormal_d表，value_alarm为1。
* 5、以上两个条件满足表明该监测点为有效监测点。
* 6、统计有效监测点个数
* @Param: [indexlist, dataDate]
* @Param: [indexlist, dataDate]
* @return: java.lang.String
* @Author: clam
* @Date: 2022/11/25
*/
* @Date: 2022/11/25
*/
private Integer queryEffectiveAccessMeasurementCount(List<String> indexlist, String dataDate) {
/*获取监测点的数据完整性*/
@@ -389,7 +391,7 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService {
List<RStatAbnormalDPO> rStatAbnormalDPOS = rStatAbnormalDPOMapper.selectList (rStatAbnormalDPOLambdaQueryWrapper);
return rStatAbnormalDPOS.size ();
}