bug调整

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java

@@ -10,9 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.utils.PubUtils;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.constant.DataParam;
@@ -26,7 +24,6 @@ import com.njcn.csdevice.pojo.vo.CsGroupVO;
 import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
 import com.njcn.csdevice.pojo.vo.EnergyTemplateVO;
-import com.njcn.csdevice.service.CsDevModelRelationService;
 import com.njcn.csdevice.service.ICsDataArrayService;
 import com.njcn.csdevice.service.ICsGroupService;
 import com.njcn.csdevice.service.ICsLedgerService;
@@ -36,11 +33,9 @@ import com.njcn.csharmonic.api.EventFeignClient;
 import com.njcn.csharmonic.constant.HarmonicConstant;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
 import com.njcn.csharmonic.param.CsEventUserQueryPage;
-import com.njcn.csharmonic.pojo.vo.CsEventVO;
 import com.njcn.csharmonic.pojo.vo.ThdDataTdVO;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
 import com.njcn.device.biz.pojo.po.Overlimit;
-
 import com.njcn.influx.pojo.bo.CommonQueryParam;
 import com.njcn.influx.pojo.dto.EventDataSetDTO;
 import com.njcn.influx.pojo.dto.StatisticalDataDTO;
@@ -337,6 +332,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             vo.setStatMethod(temp.getValueType());
                             vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
                             vo.setUnit(epdPqd.getUnit());
+                            if(temp.getValue()!=null) {
                                 double re;
                                 if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
                                     if (Objects.equals("Primary",csDataSet.getDataLevel())) {
@@ -360,6 +356,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                                     }
                                     vo.setUnit(epdPqd.getUnit());
                                 }
+                            }else {
+                                vo.setStatisticalData(null);
+                            }
                             vo.setStatisticalIndex(epdPqd.getId());
                             vo.setStatisticalName(epdPqd.getName());
                             vo.setAnotherName(epdPqd.getShowName());

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -18,13 +17,14 @@ import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.LineBaseEnum;
-import com.njcn.csdevice.mapper.*;
+import com.njcn.csdevice.mapper.CsDataSetMapper;
+import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
+import com.njcn.csdevice.mapper.CsLinePOMapper;
+import com.njcn.csdevice.mapper.WlRecordMapper;
 import com.njcn.csdevice.param.WlRecordPageParam;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.dto.CsEquipmentProcessDTO;
 import com.njcn.csdevice.pojo.param.WlRecordParam;
 import com.njcn.csdevice.pojo.po.CsDataSet;
-import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.po.WlRecord;
 import com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo;
@@ -33,6 +33,7 @@ import com.njcn.csdevice.pojo.vo.RecordVo;
 import com.njcn.csdevice.service.IWlRecordService;
 import com.njcn.csdevice.util.InfluxDbParamUtil;
 import com.njcn.csdevice.utils.DataChangeUtil;
+import com.njcn.csharmonic.constant.HarmonicConstant;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
 import com.njcn.device.biz.pojo.po.Overlimit;
@@ -49,18 +50,17 @@ import com.njcn.system.pojo.po.DictData;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.cglib.core.Local;
 import org.springframework.beans.BeanUtils;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.text.DecimalFormat;
-import java.time.*;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -453,32 +453,37 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
                                 vo.setPosition(position);
                                 vo.setTime(temp.getTime());
                                 vo.setStatMethod(temp.getValueType());
-
+                                vo.setUnit(epdPqd.getUnit());
                                 if(temp.getValue()!=null) {
-                                    if (ObjectUtil.isNotNull(epdPqd.getPrimaryFormula()) && !Objects.equals(csDataSet.getDataLevel(), commonStatisticalQueryParam.getDataLevel())) {
+                                    double re;
-                                        Double re;
+                                    if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
-                                        if ("Primary".equals(csDataSet.getDataLevel())) {
+                                        if (Objects.equals("Primary",csDataSet.getDataLevel())) {
-                                            re = DataChangeUtil.primaryToSecondary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct);
+                                            vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                            vo.setUnit(epdPqd.getUnit());
                                         } else {
-                                            re = DataChangeUtil.secondaryToPrimary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct);
+                                            if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
-                                        }
+                                                re = DataChangeUtil.secondaryToPrimary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct) / 1000;
                                                 vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                                vo.setUnit("k" + epdPqd.getUnit());
+                                            }
+                                        }
+                                    } else {
+                                        if (Objects.equals("Primary",csDataSet.getDataLevel())) {
+                                            if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
+                                                re = DataChangeUtil.primaryToSecondary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct);
+                                                vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                            }
                                         } else {
                                             vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
                                         }
+                                        vo.setUnit(epdPqd.getUnit());
+                                    }
                                 }else {
                                     vo.setStatisticalData(null);
                                 }
                                 vo.setStatisticalIndex(epdPqd.getId());
-                                vo.setUnit(epdPqd.getUnit());
                                 vo.setStatisticalName(epdPqd.getName());
-
                                 vo.setAnotherName(epdPqd.getShowName());
-                                //如果是电压总有效值且是1次值，将单位换成kv，数值/1000
-                                if(Objects.equals("Pq_RmsU",vo.getStatisticalName())&&"Primary".equals(commonStatisticalQueryParam.getDataLevel())){
-                                    vo.setUnit("kV");
-                                    vo.setStatisticalData(Objects.isNull(vo.getStatisticalData())?null:Double.valueOf(df.format(vo.getStatisticalData()/1000)));
-                                }
                                 return vo;
                             }).collect(Collectors.toList());
                             result.addAll(collect1);