切换mysql为达梦数据库-代码审查
1.systemboot模块
This commit is contained in:
@@ -17,7 +17,6 @@ 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:
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.njcn.prepare.harmonic.service.mysql.Impl.area;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
@@ -24,7 +25,6 @@ import java.util.List;
|
||||
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;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -54,17 +54,13 @@ public class PmsMonitorPOServiceImpl extends ServiceImpl<PmsMonitorPOMapper, Mon
|
||||
*/
|
||||
@Override
|
||||
public List<Monitor> qurymeasurementRunPoints(String orgid) {
|
||||
|
||||
LambdaQueryWrapper<Monitor> monitorPOLambdaQueryWrapper = new LambdaQueryWrapper ( );
|
||||
/*获取当前部门及子部门*/
|
||||
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(orgid).getData();
|
||||
|
||||
monitorPOLambdaQueryWrapper.in (Monitor::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 (NAME_KEY+
|
||||
SPLIT_SIGN+ DicDataTypeEnum.LINE_STATE.getCode ( )+
|
||||
SPLIT_SIGN+ DicDataEnum.RUN.getCode ( ));
|
||||
StrUtil.DASHED + DicDataTypeEnum.LINE_STATE.getCode ( )+
|
||||
StrUtil.DASHED+ DicDataEnum.RUN.getCode ( ));
|
||||
if(StringUtils.isEmpty (state)){
|
||||
throw new BusinessException (PqsPrepareExceptionEnum.REDIS_NULL_EXCEPTION);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.area;
|
||||
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
|
||||
@@ -39,7 +40,6 @@ 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:
|
||||
@@ -122,8 +122,8 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService {
|
||||
/*获取终端下的监测点集合*/
|
||||
QueryWrapper<Monitor> queryWrapper = new QueryWrapper<>();
|
||||
String state = redisUtil.getStringByKey(NAME_KEY +
|
||||
SPLIT_SIGN + DicDataTypeEnum.LINE_STATE.getCode() +
|
||||
SPLIT_SIGN + DicDataEnum.RUN.getCode());
|
||||
StrUtil.DASHED + DicDataTypeEnum.LINE_STATE.getCode() +
|
||||
StrUtil.DASHED + DicDataEnum.RUN.getCode());
|
||||
if (StringUtils.isEmpty(state)) {
|
||||
throw new BusinessException(PqsPrepareExceptionEnum.REDIS_NULL_EXCEPTION);
|
||||
}
|
||||
@@ -375,8 +375,8 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService {
|
||||
|
||||
/*在运监测终端个数 online_measurement_count*/
|
||||
String state = redisUtil.getStringByKey(NAME_KEY +
|
||||
SPLIT_SIGN + DicDataTypeEnum.DEV_STATUS.getCode() +
|
||||
SPLIT_SIGN + DicDataEnum.RUNNING.getCode());
|
||||
StrUtil.DASHED + DicDataTypeEnum.DEV_STATUS.getCode() +
|
||||
StrUtil.DASHED + DicDataEnum.RUNNING.getCode());
|
||||
Integer online_measurement_count = Integer.valueOf(pmsTerminalPOS.stream().filter(temp -> Objects.equals(temp.getTerminalState(), state)).count() + "");
|
||||
|
||||
/*主网单位数据完整率 data_integrity_rate*/
|
||||
|
||||
Reference in New Issue
Block a user