修改算法

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java

@@ -143,13 +143,15 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService
         //流程状态排除不通过的，不通过会放在待办中，一直到该流程通过
         processInstanceQuery.variableValueNotEquals(BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, BpmTaskStatusEnum.REJECT.getStatus());
 
-
+        if (Objects.nonNull(bpmProcessInstancePageParam.getSearchBeginTime()) && Objects.nonNull(bpmProcessInstancePageParam.getSearchEndTime())) {
             String beginTimeStr = bpmProcessInstancePageParam.getSearchBeginTime();
             String endTimeStr = bpmProcessInstancePageParam.getSearchEndTime();
             LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
             LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
             processInstanceQuery.startedBefore(DateUtils.of(endTime));
             processInstanceQuery.startedAfter(DateUtils.of(beginTime));
+        }
+
         // 查询数量
         long processInstanceCount = processInstanceQuery.count();
         if (processInstanceCount == 0) {

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java

@@ -142,12 +142,14 @@ public class BpmTaskServiceImpl implements IBpmTaskService {
         if (StrUtil.isNotBlank(bpmTaskQueryParam.getSearchValue())) {
             taskQuery.processDefinitionNameLike("%" + bpmTaskQueryParam.getSearchValue() + "%");
         }
+        if (Objects.nonNull(bpmTaskQueryParam.getSearchBeginTime()) && Objects.nonNull(bpmTaskQueryParam.getSearchEndTime())) {
             String beginTimeStr = bpmTaskQueryParam.getSearchBeginTime();
             String endTimeStr = bpmTaskQueryParam.getSearchEndTime();
             LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
             LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
             taskQuery.taskCreatedBefore(DateUtils.of(endTime));
             taskQuery.taskCreatedAfter(DateUtils.of(beginTime));
+        }
         // 执行查询
         long count = taskQuery.count();
         if (count == 0) {

pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java

@@ -182,7 +182,7 @@ public interface PatternRegex {
     /**
      * 描述32
      */
-    String DES32_REGEX = "^.{0,10}$";
+    String DES32_REGEX = "^.{0,32}$";
 
     /**
      * 描述64

pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java

@@ -51,5 +51,16 @@ public interface ServerInfo {
 
     String DATA_PLATFORM = "data-platform-boot";
 
+    String PLATFORM_STAT_BOOT = "stat-boot";
+
+    String PLATFORM_RT_BOOT = "rt-boot";
+    String PLATFORM_EVENT_BOOT = "event-boot";
+
+    String PLATFORM_DATA_PROCESSING_BOOT = "data-processing-boot";
+
+    String PLATFORM_MESSAGE_BOOT = "message-boot";
+
+
+
 
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java

@@ -3,6 +3,7 @@ package com.njcn.device.pms.pojo.dto;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -28,7 +29,7 @@ public class PushMonitorDTO {
     private String customName;
     private String status;
     private Date ctime;
-    private Date updateTime;
+    private LocalDateTime updateTime;
     private String lineId;
     private String chv;
     private String chi;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java

@@ -222,12 +222,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
 
 
 
-          /*  if (tranMap.containsKey(item.getPotentialTransFormerType())) {
-                pushMonitorDTO.setEvtType(tranMap.get(item.getPotentialTransFormerType()).getValue());
-            }
-            if (pointMap.containsKey(item.getNeutralGroundingMode())) {
-                pushMonitorDTO.setNeutralGround(pointMap.get(item.getNeutralGroundingMode()).getValue());
-            }*/
+            pushMonitorDTO.setUpdateTime(item.getUpdateTime());
 
 
             if (StrUtil.isNotBlank(item.getOrgName())) {

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/DeviceUtil.java

@@ -23,7 +23,7 @@ public class DeviceUtil {
     public static String decoderString(Integer cd,String content){
         String seriesTmp = null;
         if (cd == 0) {
-            seriesTmp = Base64.decodeBase64(content).toString();
+            seriesTmp = new String(Base64.decodeBase64(content));
         } else if (cd == 1) {
             seriesTmp = ThreeDesUtil.decryptThreeDes(content);
         } else if (cd == 2) {

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java

@@ -274,7 +274,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         deviceDetail.setUpdateTime(LocalDateTime.now());
 
                         //处理装置识别码秘钥
-                        coderM3d(deviceDetail);
+                        coderM3d(deviceDetail,false);
                         deviceMapper.insert(deviceDetail);
                         //装置功能
                         List<DictData> funList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_FUN.getName()).getData();
@@ -633,7 +633,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     Device deviceDetail = new Device();
                     BeanUtils.copyProperties(updateDeviceParam, deviceDetail);
                     deviceDetail.setId(updateDeviceParam.getDevIndex());
-                    coderM3d(deviceDetail);
+                    coderM3d(deviceDetail,true);
                     this.updateById(device);
                     deviceMapper.updateById(deviceDetail);
                 }
@@ -813,7 +813,17 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         return true;
     }
 
-    private void coderM3d(Device deviceDetail){
+    private void coderM3d(Device deviceDetail,Boolean updateFlag){
+        if(updateFlag){
+            Device deviceRes = deviceMapper.selectById(deviceDetail.getId());
+            if(StrUtil.isNotBlank(deviceDetail.getDevKey()) && !deviceRes.getDevKey().equals(deviceDetail.getDevKey())){
+                deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey()));
+            }
+
+            if(StrUtil.isNotBlank(deviceDetail.getSeries()) && !deviceRes.getSeries().equals(deviceDetail.getSeries())){
+                deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries()));
+            }
+        }else {
             if(StrUtil.isNotBlank(deviceDetail.getDevKey())){
                 deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey()));
             }
@@ -821,6 +831,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries()));
             }
         }
+
+    }
     private void decoderM3d(Device deviceDetail){
         if(StrUtil.isNotBlank(deviceDetail.getDevKey())){
             deviceDetail.setDevKey(DeviceUtil.decoderString(devCD,deviceDetail.getDevKey()));
@@ -951,7 +963,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
                     Device deviceDetail = deviceMapper.selectById(device.getId());
                     //解密
-                    decoderM3d(deviceDetail);
+                    //decoderM3d(deviceDetail);
                     BeanUtils.copyProperties(deviceDetail, deviceVO);
                     deviceVO.setDevIndex(device.getId());
                     //母线
@@ -1011,7 +1023,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
             Device deviceDetail = deviceMapper.selectById(obj.getId());
             //解密
-            decoderM3d(deviceDetail);
+            //decoderM3d(deviceDetail);
             BeanUtils.copyProperties(deviceDetail, deviceVO);
             deviceVO.setDevIndex(obj.getId());
 
@@ -1107,7 +1119,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 deviceVO.setSort(device.getSort());
                 Device deviceDetail = deviceMapper.selectById(device.getId());
                 //解密
-                decoderM3d(deviceDetail);
+                //decoderM3d(deviceDetail);
                 BeanUtils.copyProperties(deviceDetail, deviceVO);
                 deviceVO.setDevIndex(device.getId());
 
@@ -1158,7 +1170,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
                         Device deviceDetail = deviceMapper.selectById(device.getId());
                         //解密
-                        decoderM3d(deviceDetail);
+                        //decoderM3d(deviceDetail);
                         BeanUtils.copyProperties(deviceDetail, deviceVO);
                         deviceVO.setDevIndex(device.getId());
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java

@@ -237,91 +237,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     objectListData.add(list);
 
                 }
-                ;
 
-                //下面代码稳定后可删除
-               /* List<HarmonicHistoryData> aList = harmonicHistoryDataList.stream()
-                        .filter(temp -> temp.getPhasicType().equalsIgnoreCase(InfluxDBTableConstant.PHASE_TYPE_A))
-                        .collect(Collectors.toList());
-                List<HarmonicHistoryData> bList = harmonicHistoryDataList.stream()
-                        .filter(temp -> temp.getPhasicType().equalsIgnoreCase(InfluxDBTableConstant.PHASE_TYPE_B))
-                        .collect(Collectors.toList());
-                List<HarmonicHistoryData> cList = harmonicHistoryDataList.stream()
-                        .filter(temp -> temp.getPhasicType().equalsIgnoreCase(InfluxDBTableConstant.PHASE_TYPE_C))
-                        .collect(Collectors.toList());
-
-                int maxSize = Math.max(aList.size(), Math.max(bList.size(), cList.size()));
-                if (maxSize == aList.size()) {
-                    time = aList.stream()
-                            .map(temp -> PubUtils.instantToDate(temp.getTime()))
-                            .collect(Collectors.toList());
-                } else if (maxSize == bList.size()) {
-                    time = bList.stream()
-                            .map(temp -> PubUtils.instantToDate(temp.getTime()))
-                            .collect(Collectors.toList());
-                } else {
-                    time = cList.stream()
-                            .map(temp -> PubUtils.instantToDate(temp.getTime()))
-                            .collect(Collectors.toList());
-                }
-
-
-                aValue = aList.stream()
-                        .map(temp -> BigDecimal.valueOf(temp.getAValue()).setScale(4, RoundingMode.HALF_UP).floatValue())
-                        .collect(Collectors.toList());
-                bValue = bList.stream()
-                        .map(temp -> BigDecimal.valueOf(temp.getAValue()).setScale(4, RoundingMode.HALF_UP).floatValue())
-                        .collect(Collectors.toList());
-                cValue = cList.stream()
-                        .map(temp -> BigDecimal.valueOf(temp.getAValue()).setScale(4, RoundingMode.HALF_UP).floatValue())
-                        .collect(Collectors.toList());
-                //组装二维数组
-
-                boolean flagA = true,flagB = true,flagC =true;
-                if(CollectionUtil.isEmpty(aValue)){
-                    flagA = false;
-                }
-                if(CollectionUtil.isEmpty(bValue)){
-                    flagB = false;
-                }
-                if(CollectionUtil.isEmpty(cValue)){
-                    flagC = false;
-                }
-                for (int i = 0; i < time.size(); i++) {
-                    List<Object> objects = new ArrayList<>();
-                    //指定
-                    objects.add(time.get(i));
-                    if(flagA){
-                        objects.add(aValue.get(i));
-                    }
-                    if(flagB) {
-                        objects.add(bValue.get(i));
-                    }
-                    if(flagC) {
-                        objects.add(cValue.get(i));
-                    }
-                    objectListData.add(objects);
-                }
-                Float aValueMin = CollectionUtil.isEmpty(aValue) ? null : Collections.min(aValue);
-                Float bValueMin = CollectionUtil.isEmpty(bValue) ? null : Collections.min(bValue);
-                Float cValueMin = CollectionUtil.isEmpty(cValue) ? null : Collections.min(cValue);
-                Float aValueMax = CollectionUtil.isEmpty(aValue) ? null : Collections.max(aValue);
-                Float bValueMax = CollectionUtil.isEmpty(bValue) ? null : Collections.max(bValue);
-                Float cValueMax = CollectionUtil.isEmpty(cValue) ? null : Collections.max(cValue);
-                List<Float> list = Arrays.asList(aValueMin, bValueMin, cValueMin, aValueMax, bValueMax, cValueMax);
-                Optional<Float> min = list.stream()
-                        .filter(Objects::nonNull)  // 过滤掉null值
-                        .min(Float::compareTo);
-                if (min.isPresent()) {
-                    historyDataResultVO.setMinValue(min.get());
-                }
-
-                Optional<Float> max = list.stream()
-                        .filter(Objects::nonNull)  // 过滤掉null值
-                        .max(Float::compareTo);
-                if (min.isPresent()) {
-                    historyDataResultVO.setMaxValue(max.get());
-                }*/
                 historyDataResultVO.setMaxValue(maxI);
                 historyDataResultVO.setMinValue(minI);
                 historyDataResultVO.setTopLimit(queryResultLimitVO.getTopLimit());
@@ -526,14 +442,18 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                 case 40:
                     //谐波电压含有率
                     if (number == 1) {
+                        targetName = "基波电压幅值";
                         sql = "SELECT time as time, v_1 as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmrate_v WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
+                        unit.add(pqsDeviceUnit.getPhaseVoltage());
                     } else {
+                        targetName = "谐波电压含有率";
                         sql = "SELECT time as time, v_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmrate_v WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
                         if (number < 26) {
                             topLimit = PubUtils.getValueByMethod(overlimit, "getUharm", number);
                         }
+                        unit.add("%");
                     }
                     if (ptType == 0) {
                         phasicType.add("A相");
@@ -544,23 +464,28 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                         phasicType.add("BC相");
                         phasicType.add("CA相");
                     }
-                    unit.add("%");
-                    targetName = "谐波电压含有率";
+
+
                     break;
                 case 41:
                     //谐波电流含有率
                     if (number == 1) {
+                        targetName = "谐波电流幅值";
                         sql = "SELECT time as time, i_1 as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmrate_i WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
+
+                        unit.add("A");
                     } else {
+                        targetName = "谐波电流含有率";
                         sql = "SELECT time as time, i_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmrate_i WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
+                        unit.add("%");
                     }
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
-                    unit.add("%");
-                    targetName = "谐波电流含有率";
+
+
                     break;
                 case 42:
                     //谐波电压幅值
@@ -582,28 +507,34 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                     }
                     if (number == 1) {
                         unit.add(pqsDeviceUnit.getVfundEffective());
+                        targetName = "基波电压幅值";
+
                     } else {
                         unit.add("V");
-                    }
                         targetName = "谐波电压幅值";
+
+                    }
                     break;
                 case 43:
                     //谐波电流幅值
                     if (number == 1) {
                         sql = "SELECT time as time, i_1 as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_i WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
+                        targetName = "基波电流幅值";
+
                     } else {
                         sql = "SELECT time as time, i_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_i WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
                         if (number < 26) {
                             topLimit = PubUtils.getValueByMethod(overlimit, "getIharm", number);
                         }
+                        targetName = "谐波电流幅值";
+
                     }
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
                     unit.add("A");
-                    targetName = "谐波电流幅值";
                     break;
                 case 44:
                     //谐波电压相角
@@ -615,31 +546,37 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
                     }
                     if (ptType == 0) {
+                        targetName = "基波电压相角";
+
                         phasicType.add("A相");
                         phasicType.add("B相");
                         phasicType.add("C相");
                     } else {
+                        targetName = "谐波电压相角";
+
                         phasicType.add("AB相");
                         phasicType.add("BC相");
                         phasicType.add("CA相");
                     }
                     unit.add("°");
-                    targetName = "谐波电压相角";
                     break;
                 case 45:
                     //谐波电流相角
                     if (number == 1) {
                         sql = "SELECT time as time, i_1 as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmphasic_i WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
+                        targetName = "基波电流相角";
+
                     } else {
                         sql = "SELECT time as time, i_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmphasic_i WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
+                        targetName = "谐波电流相角";
+
                     }
                     phasicType.add("A相");
                     phasicType.add("B相");
                     phasicType.add("C相");
                     unit.add("°");
-                    targetName = "谐波电流相角";
                     break;
                 case 46:
                     //间谐波电压含有率

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java

@@ -36,6 +36,7 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -293,11 +294,11 @@ public class RStatOrgServiceImpl implements RStatOrgService {
                             between("data_date",begin,end);
                     RMpPassRateMPO rMpPassRateMPO = rMpPassRateMMapper.selectOne(rMpPassRateMPOQueryWrapper);
                     //todo 这边有点问题,每日监测点信息从公共接口获取，当日监测点应该都一样，不存在表数据不一致的情况
-//                    if (!Objects.isNull(rMpPassRateMPO)){
+                    if (!Objects.isNull(rMpPassRateMPO)){
                     rStatOrgMPO.setFreqPassRate(rMpPassRateMPO.getFreqPassRate());
                     rStatOrgMPO.setFlickerPassRate(rMpPassRateMPO.getFlickerPassRate());
                     rStatOrgMPO.setVDevPassRate(rMpPassRateMPO.getVDevPassRate());
-//                    }
+                    }
 
                     /*11、日均监测到暂态指标的监测点数*/
                     rMpEventDetailDPOQueryWrapper.clear();

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java

@@ -104,7 +104,7 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
      * @Description: 3、频率在【45，55】之间；
      * 4、相电压有效值在【0.85p.u.，1.2p.u.】之间；p.u=电压等级/1.732
      * 5、线电压有效值在【0.85p.u.，1.2p.u.】之间；p.u=电压等级
-     * 6、电压总谐波畸变率在【0.1%，20%】之间；
+     * 6、电压总谐波畸变率在【0%，20%】之间；
      * 7、负序电压不平衡度在【0，20%】。满足以上条件则是一条有效数据
      * @Param: [fiveItems, pmsAbnormalRules, voltage]
      * @return: java.lang.Integer
@@ -144,12 +144,12 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
                 Boolean rmsLvrflag = false;
                 Boolean vUnbalanceflag = false;
 
-                freqCount++;
-                unbalanceCount++;
-                phaseVoltageCount++;
-                lineVoltageCount++;
-                vThdCount++;
-                effectiveMinuteCount++;
+//                freqCount++;
+//                unbalanceCount++;
+//                phaseVoltageCount++;
+//                lineVoltageCount++;
+//                vThdCount++;
+//                effectiveMinuteCount++;
                 // 先注释掉 校验跑出监测点
                 if (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit()) {
                     freqCount++;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java

@@ -93,7 +93,7 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
                     rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf(
                             (Double.valueOf(rMpMonitorEvaluateD.getFreqCount ()+ rMpMonitorEvaluateD.getLineVoltageCount ()+
                                     rMpMonitorEvaluateD.getPhaseVoltageCount ()+ rMpMonitorEvaluateD.getUnbalanceCount ()+
-                                    rMpMonitorEvaluateD.getVThdCount ()))/(5* rMpMonitorEvaluateD.getEffectiveMinuteCount ())
+                                    rMpMonitorEvaluateD.getVThdCount ()))*statisticalInterval/(5*1440)
                     ).setScale(5, BigDecimal.ROUND_HALF_UP));
                 }
 

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ROperatingMonitorService.java

@@ -20,7 +20,7 @@ public interface ROperatingMonitorService extends IMppService<ROperatingMonitorD
      * @Description: 采用以下公式计算数据完整率：
      * 〖数据完整率〗_日统计=有效值数据个数/(1440/interval)*100%
      * 	采用以下公式计算数据准确率
-     * 〖数据准确率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(有效值数据个数*5)*100%
+     * 〖数据准确率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(有效值数据个数*5)*100%（有效值数据个数修改为1440/interval)
      * 	采用以下公式计算指标完整率
      * 〖指标完整率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(1440/interval*5)*100%	采用以下公式计算数据完整率：
      * 〖数据完整率〗_日统计=有效值数据个数/(1440/interval)*100%

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java

@@ -224,7 +224,9 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                 .distinct()
                 .collect(Collectors.toList());
         QueryWrapper<LineWarning> queryWrapper = new QueryWrapper<>();
+        if (Objects.nonNull(param.getSearchBeginTime()) && Objects.nonNull(param.getSearchEndTime())) {
             queryWrapper.between("A.alarm_time", param.getSearchBeginTime(), param.getSearchEndTime());
+        }
         //监测点id
         if (CollUtil.isNotEmpty(lineList)) {
             queryWrapper.in("A.line_id", lineList);

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java

@@ -160,10 +160,11 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
 //                quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType());
 //                quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_id", quitRunningDeviceQueryParam.getDeviceId());
 //            }
-            //添加上时间范围
+            if (Objects.nonNull(quitRunningDeviceQueryParam.getSearchBeginTime()) && Objects.nonNull(quitRunningDeviceQueryParam.getSearchEndTime())) {
                 quitRunningDeviceVOQueryWrapper.between("supervision_quit_running_device.Create_Time",
                         DateUtil.beginOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchBeginTime())),
                         DateUtil.endOfDay(DateUtil.parse(quitRunningDeviceQueryParam.getSearchEndTime())));
+            }
             //判断监测点/设备的选择
             quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType());
             if (2 == quitRunningDeviceQueryParam.getDeviceType()) {

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java

@@ -226,9 +226,11 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
             );
         }
         //添加上时间范围
+        if (Objects.nonNull(supervisionDevMainReportQuery.getSearchBeginTime()) && Objects.nonNull(supervisionDevMainReportQuery.getSearchEndTime())) {
             queryWrapper.between("supervision_dev_main_report.Create_Time",
                     DateUtil.beginOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchBeginTime())),
                     DateUtil.endOfDay(DateUtil.parse(supervisionDevMainReportQuery.getSearchEndTime())));
+        }
         queryWrapper.orderByDesc("supervision_dev_main_report.Update_Time");
         Page<SupervisionDevMainReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionDevMainReportQuery), PageFactory.getPageSize(supervisionDevMainReportQuery)), queryWrapper);
         page.getRecords().forEach(temp -> {

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java

@@ -244,9 +244,11 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             );
         }
         //添加上时间范围
+        if (Objects.nonNull(supervisionTempLineDebugQuery.getSearchBeginTime()) && Objects.nonNull(supervisionTempLineDebugQuery.getSearchEndTime())) {
             queryWrapper.between("supervision_temp_line_debug.Create_Time",
                     DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
                     DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
+        }
         queryWrapper.orderByDesc("supervision_temp_line_debug.Update_Time");
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
     }
@@ -271,9 +273,11 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             queryWrapper.eq("supervision_temp_line_debug.status", supervisionTempLineDebugQuery.getStatus());
         }
         //添加上时间范围
+        if (Objects.nonNull(supervisionTempLineDebugQuery.getSearchBeginTime()) && Objects.nonNull(supervisionTempLineDebugQuery.getSearchEndTime())) {
             queryWrapper.between("supervision_temp_line_debug.Create_Time",
                     DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
                     DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
+        }
         queryWrapper.orderByDesc("supervision_temp_line_debug.Update_Time");
         return this.baseMapper.pageHasDebug(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
     }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java

@@ -173,9 +173,11 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
             );
         }
         //添加上时间范围
+        if (Objects.nonNull(supervisionTempLineReportQuery.getSearchBeginTime()) && Objects.nonNull(supervisionTempLineReportQuery.getSearchEndTime())) {
             queryWrapper.between("supervision_temp_line_report.Create_Time",
                     DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchBeginTime())),
                     DateUtil.endOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchEndTime())));
+        }
         queryWrapper.orderByDesc("supervision_temp_line_report.Update_Time");
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineReportQuery), PageFactory.getPageSize(supervisionTempLineReportQuery)), queryWrapper);
     }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java

@@ -130,11 +130,13 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     public Page<WarningLeafletVO> warningPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam) {
         QueryWrapper<WarningLeafletVO> warningLeafletVOQueryWrapper = new QueryWrapper<>();
         if (Objects.nonNull(warningLeafletQueryParam)) {
+            if (Objects.nonNull(warningLeafletQueryParam.getSearchBeginTime()) && Objects.nonNull(warningLeafletQueryParam.getSearchEndTime())) {
                 //添加上时间范围
                 warningLeafletVOQueryWrapper.between("supervision_warning_leaflet.Create_Time",
                         DateUtil.beginOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchBeginTime())),
                         DateUtil.endOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchEndTime())));
             }
+        }
 
         //筛选负责单位
         if (StrUtil.isNotBlank(warningLeafletQueryParam.getDeptIndex())) {
@@ -336,11 +338,13 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
     public Page<WarningLeafletVO> alarmPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam) {
         QueryWrapper<WarningLeafletVO> warningLeafletVOQueryWrapper = new QueryWrapper<>();
         if (Objects.nonNull(warningLeafletQueryParam)) {
+            if (Objects.nonNull(warningLeafletQueryParam.getSearchBeginTime()) && Objects.nonNull(warningLeafletQueryParam.getSearchEndTime())) {
                 //添加上时间范围
                 warningLeafletVOQueryWrapper.between("supervision_warning_leaflet.Create_Time",
                         DateUtil.beginOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchBeginTime())),
                         DateUtil.endOfDay(DateUtil.parse(warningLeafletQueryParam.getSearchEndTime())));
             }
+        }
         warningLeafletVOQueryWrapper
                 .and(w -> w.in("supervision_warning_leaflet.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(),
                                         BpmTaskStatusEnum.APPROVE.getStatus(),

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java

@@ -81,9 +81,11 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
         QueryWrapper<SurveyPlanVO> surveyPlanVOQueryWrapper = new QueryWrapper<>();
         if (Objects.nonNull(surveyPlanQueryParam)) {
             //添加上时间范围
+            if (Objects.nonNull(surveyPlanQueryParam.getSearchBeginTime()) && Objects.nonNull(surveyPlanQueryParam.getSearchEndTime())) {
                 surveyPlanVOQueryWrapper.and(x -> x.between("supervision_survey_plan.plan_start_time",
                         DateUtil.beginOfDay(DateUtil.parse(surveyPlanQueryParam.getSearchBeginTime())),
                         DateUtil.endOfDay(DateUtil.parse(surveyPlanQueryParam.getSearchEndTime()))).or().isNull("supervision_survey_plan.plan_start_time"));
+            }
             //根据工程名称模糊搜索
             if (StrUtil.isNotBlank(surveyPlanQueryParam.getSearchValue())) {
                 surveyPlanVOQueryWrapper.like("supervision_survey_plan.plan_name", surveyPlanQueryParam.getSearchValue());

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java

@@ -90,6 +90,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
         QueryWrapper<SurveyTestVO> surveyTestVOQueryWrapper = new QueryWrapper<>();
         List<String> deptIds =   new ArrayList<>();
         if (Objects.nonNull(surveyTestQueryParam)) {
+            if (Objects.nonNull(surveyTestQueryParam.getSearchBeginTime()) && Objects.nonNull(surveyTestQueryParam.getSearchEndTime())) {
                 //添加上时间范围
                 surveyTestVOQueryWrapper.and(wrapper ->
                         wrapper.between("supervision_survey_plan.plan_start_time",
@@ -106,7 +107,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
                                                 DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())))
                                 )
                 );
-
+            }
             //根据工程名称模糊搜索
             if (Objects.nonNull(surveyTestQueryParam.getSearchValue())) {
                 LambdaQueryWrapper<SurveyPlan> surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>();

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/CheckDeviceTaskRunner.java

@@ -1,7 +1,9 @@
 package com.njcn.system.timer.tasks;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.njcn.csdevice.api.WlRecordFeignClient;
-import com.njcn.supervision.api.CheckDeviceFeignClient;
 import com.njcn.system.timer.TimerTaskRunner;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -17,6 +19,9 @@ public class CheckDeviceTaskRunner implements TimerTaskRunner {
 
     @Override
     public void action(String date) {
+        if(StrUtil.isBlank(date)){
+            date = DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN);
+        }
         wlRecordFeignClient.dayDealNoEndTimeEvent(date);
     }
 }

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java

@@ -296,7 +296,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         //运维管理员，展示管理员和App用户
         else if (Objects.equals(UserType.ADMINISTRATOR, type) && roleCodeList.contains("operation_manager")) {
-            types.addAll(Arrays.asList(UserType.ADMINISTRATOR, UserType.APP));
+            types.addAll(Arrays.asList(UserType.ADMINISTRATOR, UserType.USER, UserType.APP));
         }
         if (ObjectUtil.isNotNull(queryParam)) {
             //查询参数不为空，进行条件填充