Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/EnergyBaseParam.java

@@ -44,5 +44,6 @@ public class EnergyBaseParam implements Serializable {
     @ApiModelProperty("searchValue")
     private String searchValue;
 
-
+    @ApiModelProperty("dataLevel")
+    private String dataLevel;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java

@@ -76,7 +76,7 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
      * 接入状态(1:未注册 2:注册 3:接入)
      */
     @TableField(value = "status")
-    private String status;
+    private Integer status;
 
     /**
      * 设备状态(0:删除 1:离线 2:在线)

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerVO.java

@@ -39,6 +39,9 @@ public class DeviceManagerVO {
     @ApiModelProperty(value = "装置数据集集合")
     private List<DataSetVO> dataSetList;
 
+    @ApiModelProperty(value = "装置数据标识")
+    private String dataLevel;
+
     @Data
     public static class DataSetVO {
         @ApiModelProperty(value = "数据集Id")

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java

@@ -51,5 +51,7 @@ public class ProjectEquipmentVO  {
     private String isPrimaryUser;
     private Integer runStatus;
     private String mac;
+    @ApiModelProperty(value = "设备nDid")
+    private String nDid;
 
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java

@@ -61,10 +61,11 @@ public class CsGroupController extends BaseController {
             @ApiImplicitParam(name = "pageSize", value = "页面尺寸", required = true),
             @ApiImplicitParam(name = "lineId", value = "监测点id", required = true),
             @ApiImplicitParam(name = "searchValue", value = "搜索值", required = true),
+            @ApiImplicitParam(name = "dataLevel", value = "数据标志", required = true)
     })
-    public HttpResult<IPage<DataGroupTemplateVO>> getDeviceRtData(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "lineId")String lineId, @RequestParam(value = "searchValue") String searchValue){
+    public HttpResult<IPage<DataGroupTemplateVO>> getDeviceRtData(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "lineId")String lineId, @RequestParam(value = "searchValue") String searchValue, @RequestParam(value = "dataLevel",required = false) String dataLevel){
         String methodDescribe = getMethodDescribe("getDeviceRtData");
-        IPage<DataGroupTemplateVO> list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId,searchValue);
+        IPage<DataGroupTemplateVO> list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId,searchValue,dataLevel);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml

@@ -36,6 +36,7 @@
         b.id projectId,
         b.name projectName,
         c.id equipmentId,
+        c.ndid nDid,
         c.name equipmentName,
         c.create_time createTime,
         c.run_status,

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

@@ -34,7 +34,7 @@ public interface ICsGroupService extends IService<CsGroup> {
      * 获取装置分组后的实时数据
      * @return
      */
-    IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue);
+    IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue, String dataLevel);
 
     /**
      * 获取装置时间范围内的历史数据

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

@@ -107,7 +107,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         }
         CsEquipmentDeliveryPO csEquipmentDeliveryPo = new CsEquipmentDeliveryPO();
         BeanUtils.copyProperties (csEquipmentDeliveryAddParm,csEquipmentDeliveryPo);
-        csEquipmentDeliveryPo.setStatus ("1");
+        csEquipmentDeliveryPo.setStatus (1);
         csEquipmentDeliveryPo.setRunStatus(1);
         String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
         if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
@@ -349,6 +349,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 dataSetVO.setName(item.getAnotherName());
                 dataSetVO.setType("rt");
                 dataSetList.add(dataSetVO);
+                deviceManagerVo.setDataLevel(item.getDataLevel());
                 if (Objects.equals(type, "history")) {
                     //历史数据tab
                     DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO();
@@ -356,6 +357,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     dataSetVo2.setName("历史" + item.getAnotherName());
                     dataSetVo2.setType("history");
                     dataSetList.add(dataSetVo2);
+                    deviceManagerVo.setDataLevel(item.getDataLevel());
                     //下面这些tab仅仅只限于设备监控的便携式设备才会有
                     if(DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType())){
                         //趋势数据tab
@@ -471,7 +473,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     String path = this.createPath(temp.getNdid());
                     csEquipmentDeliveryPO.setMac(path);
                     csEquipmentDeliveryPO.setRunStatus(1);
-                    csEquipmentDeliveryPO.setStatus("1");
+                    csEquipmentDeliveryPO.setStatus(1);
                     csEquipmentDeliveryPO.setProcess(2);
 
                     CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
@@ -546,8 +548,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     public void testCompletion(String deviceId,Integer type,String remark) {
         CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, deviceId).one();
         this.lambdaUpdate().eq(CsEquipmentDeliveryPO::getId,deviceId).
-//                set(CsEquipmentDeliveryPO::getStatus,1).
+                set(CsEquipmentDeliveryPO::getStatus,1).
-//                set(CsEquipmentDeliveryPO::getRunStatus,2).
+                set(CsEquipmentDeliveryPO::getRunStatus,1).
                 set(CsEquipmentDeliveryPO::getProcess,type+1).update();
         this.delete(deviceId);
         List<CsEquipmentProcessPO> list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()).

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

@@ -1,8 +1,8 @@
 package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,14 +48,11 @@ import com.njcn.system.api.CsStatisticalSetFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.EleEvtFeignClient;
 import com.njcn.system.api.EpdFeignClient;
-import com.njcn.system.enums.DicDataEnum;
-import com.njcn.system.pojo.po.DictData;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.system.pojo.po.EleEvtParm;
 import com.njcn.system.pojo.vo.CsStatisticalSetVO;
 import com.njcn.system.pojo.vo.EleEpdPqdListVO;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -64,14 +61,12 @@ import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.njcn.csdevice.constant.DataParam.overlimitsGroup;
-
 /**
  * <p>
  * 数据分组表 服务实现类
@@ -134,7 +129,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
     }
 
     @Override
-    public IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue) {
+    public IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue, String dataLevel) {
         IPage<DataGroupTemplateVO> pageTurn = new Page<>();
         List<EnergyTemplateVO> arrayList = new ArrayList<>();
         IPage<DataGroupTemplateVO> pageRes = csGroupMapper.getGroupDataList(new Page<>(pageNum, pageSize),id,searchValue);
@@ -143,16 +138,27 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             List<String> group = groupList.stream().map(DataGroupTemplateVO::getId).collect(Collectors.toList());
             //获取当前组的所有指标项
             List<EnergyTemplateVO> list = csDataArrayMapper.getArrayByGroup(group);
+            //获取所有字典指标
+            List<EleEpdPqd> epdPqdList = epdFeignClient.selectByIds(list.stream().map(EnergyTemplateVO::getDataId).distinct().collect(Collectors.toList())).getData();
+            Map<String, EleEpdPqd> eventTypeMap = epdPqdList.stream().collect(Collectors.toMap(EleEpdPqd::getId, Function.identity()));
+            //根据lineId获取监测点pt、ct变比
+            CsLinePO csLinePO = csLineFeignClient.queryLineById(Collections.singletonList(lineId)).getData().get(0);
             for (EnergyTemplateVO item : list) {
                 EnergyTemplateVO vo = new EnergyTemplateVO();
                 BeanUtils.copyProperties(item,vo);
-                EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
+                EleEpdPqd eleEpdPqd = eventTypeMap.get(item.getDataId());
                 vo.setClassId(eleEpdPqd.getClassId());
                 vo.setUnit(eleEpdPqd.getUnit());
                 StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(eleEpdPqd.getClassId()),item.getName(),item.getPhase(),item.getStatMethod(),influxDbParamUtil.getClDidByLineId(lineId));
-                if (!Objects.isNull(statisticalDataDTO)){
+                if (Objects.nonNull(statisticalDataDTO)) {
                     vo.setTime(statisticalDataDTO.getTime());
+                    //判断监测点类型 针对治理设备 模块数据是一次值、电能质量设备是二次值
+                    if (csLinePO.getClDid() != 0 && Objects.equals("Primary",dataLevel) && ObjectUtil.isNotNull(eleEpdPqd.getPrimaryFormula())) {
+                        double secondaryData = secondaryToPrimary(eleEpdPqd.getPrimaryFormula(), statisticalDataDTO.getValue(), csLinePO.getPtRatio(), csLinePO.getCtRatio());
+                        vo.setDataValue(BigDecimal.valueOf(secondaryData).setScale(4, RoundingMode.UP).doubleValue());
+                    } else {
                         vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue());
+                    }
                 } else {
                     vo.setDataValue(3.1415926);
                 }
@@ -186,23 +192,37 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             List<String> group = groupList.stream().map(DataGroupTemplateVO::getId).collect(Collectors.toList());
             //获取当前组的所有指标项
             List<EnergyTemplateVO> list = csDataArrayMapper.getArrayByGroup(group);
+            //获取所有字典指标
+            List<EleEpdPqd> epdPqdList = epdFeignClient.selectByIds(list.stream().map(EnergyTemplateVO::getDataId).distinct().collect(Collectors.toList())).getData();
+            Map<String, EleEpdPqd> eventTypeMap = epdPqdList.stream().collect(Collectors.toMap(EleEpdPqd::getId, Function.identity()));
+            //根据lineId获取监测点pt、ct变比
+            CsLinePO po = csLineFeignClient.queryLineById(Collections.singletonList(energyBaseParam.getLineId())).getData().get(0);
             for (EnergyTemplateVO item : list) {
                 EnergyTemplateVO vo = new EnergyTemplateVO();
                 BeanUtils.copyProperties(item,vo);
-                EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
+                EleEpdPqd eleEpdPqd = eventTypeMap.get(item.getDataId());
                 vo.setClassId(eleEpdPqd.getClassId());
                 vo.setUnit(eleEpdPqd.getUnit());
-                StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),influxDbParamUtil.getTableNameByClassId(eleEpdPqd.getClassId()),item.getName(),energyBaseParam.getStartTime(),energyBaseParam.getEndTime(),influxDbParamUtil.getClDidByLineId(energyBaseParam.getLineId()));
+                StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),influxDbParamUtil.getTableNameByClassId(eleEpdPqd.getClassId()),item.getName(),energyBaseParam.getStartTime() + " 00:00:00",energyBaseParam.getEndTime() + " 23:59:59",influxDbParamUtil.getClDidByLineId(energyBaseParam.getLineId()));
-                if (!Objects.isNull(statisticalDataDTO)){
+                if (Objects.nonNull(statisticalDataDTO)) {
+                    vo.setTime(statisticalDataDTO.getTime());
+                    //判断监测点类型 针对治理设备 模块数据是一次值、电能质量设备是二次值
+                    if (po.getClDid() != 0 && Objects.equals("Primary",energyBaseParam.getDataLevel()) && ObjectUtil.isNotNull(eleEpdPqd.getPrimaryFormula())) {
+                        double secondaryData1 = secondaryToPrimary(eleEpdPqd.getPrimaryFormula(), statisticalDataDTO.getMaxValue(), po.getPtRatio(), po.getCtRatio());
+                        double secondaryData2 = secondaryToPrimary(eleEpdPqd.getPrimaryFormula(), statisticalDataDTO.getMinValue(), po.getPtRatio(), po.getCtRatio());
+                        double secondaryData3 = secondaryToPrimary(eleEpdPqd.getPrimaryFormula(), statisticalDataDTO.getAvgValue(), po.getPtRatio(), po.getCtRatio());
+                        vo.setMaxValue(BigDecimal.valueOf(secondaryData1).setScale(4, RoundingMode.UP).doubleValue());
+                        vo.setMinValue(BigDecimal.valueOf(secondaryData2).setScale(4, RoundingMode.UP).doubleValue());
+                        vo.setAvgValue(BigDecimal.valueOf(secondaryData3).setScale(4, RoundingMode.UP).doubleValue());
+                    } else {
                         vo.setMaxValue(BigDecimal.valueOf(statisticalDataDTO.getMaxValue()).setScale(4, RoundingMode.UP).doubleValue());
                         vo.setMinValue(BigDecimal.valueOf(statisticalDataDTO.getMinValue()).setScale(4, RoundingMode.UP).doubleValue());
                         vo.setAvgValue(BigDecimal.valueOf(statisticalDataDTO.getAvgValue()).setScale(4, RoundingMode.UP).doubleValue());
-
+                    }
                 } else {
                     vo.setMaxValue(3.1415956);
                     vo.setMinValue(3.1415956);
                     vo.setAvgValue(3.1415956);
-
                 }
                 arrayList.add(vo);
             }
@@ -663,6 +683,27 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
         return result;
     }
 
-
+    /**
+     * 二次值换算成一次值
+     */
+    public double secondaryToPrimary(String formula, Double data,Double pt, Double ct) {
+        switch (formula) {
+            case "*PT":
+                data = data * pt;
+                break;
+            case "*CT":
+                data = data * ct;
+                break;
+            case "*PT*CT/1000":
+                data = data * pt * ct / 1000;
+                break;
+            case "*PT/1000":
+                data = data * pt / 1000;
+                break;
+            default:
+                break;
+        }
+        return data;
+    }
 
 }

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

@@ -84,33 +84,16 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         List<String> device = roleEngineerDevService.getDevice();
         engineeringList = allList.stream().filter(item->roleengineer.contains(item.getId())).collect(Collectors.toList());
 
-//        if (Objects.equals(RequestUtil.getUsername(),"root") || Objects.equals(RequestUtil.getUsername(),"njcnser")){
-//            engineeringList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-//        } else {
-//            List<CsEngineeringPO> engineering = csEngineeringUserService.getEngineeringByUser();
-//            engineeringList = allList.stream().filter(item->engineering.stream().map(CsEngineeringPO::getId).collect(Collectors.toList()).contains(item.getId())).collect(Collectors.toList());
-//        }
         List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-//        List<CsLedgerVO> deviceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId())).
-                map(
+                peek(
                         temp->{
                             CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(temp.getId());
                             temp.setComFlag(csEquipmentDeliveryPO.getRunStatus());
-                            return temp;
                         }
                 ).
                 sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-
+        List<CsLedgerVO> finalLineList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-        List<CsLedgerVO> lineList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-//        List<String> collect = lineList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
-//        List<CsLinePO> csLinePOS = csLinePOService.listByIds(collect);
-//        List<CsLinePO> collect1 = csLinePOS.stream().filter(temp -> Objects.equals(temp.getPosition(), areaId)).collect(Collectors.toList());
-//        List<String> collect2 = collect1.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
-//        lineList = lineList.stream().filter(temp -> collect2.contains(temp.getId())).collect(Collectors.toList());
-
-
-        List<CsLedgerVO> finalLineList = lineList;
         checkDevSetData(deviceList);
         deviceList.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
         projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
@@ -341,8 +324,12 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
      * 获取子节点
      */
     public List<CsLedgerVO> getChildren(CsLedgerVO item, List<CsLedgerVO> all) {
-        return all.stream().filter(allItem -> allItem.getPid().equals(item.getId())).collect(Collectors.toList());
+        return all.stream()
+                .filter(allItem -> allItem.getPid().equals(item.getId()))
+                .peek(child -> child.setComFlag(item.getComFlag()))
+                .collect(Collectors.toList());
     }
+
     public String getAreaById(String id){
 
         String areaName =redisUtil.getStringByKey (id);

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java

@@ -37,6 +37,9 @@ public class DevicDataTrendQueryParam {
     @NotNull(message="结束时间不能为空！")
     private String endTime;
 
+    @ApiModelProperty(value = "数据类型")
+    private String dataLevel;
+
     private String devId;
     @Data
     public static class StatisticalParam{

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java

@@ -390,6 +390,14 @@ public class MqttMessageHandler {
                 return "APF模块 5";
             case "6":
                 return "APF模块 6";
+            case "7":
+                return "APF模块 7";
+            case "8":
+                return "APF模块 8";
+            case "9":
+                return "APF模块 9";
+            case "10":
+                return "APF模块 10";
             default:
                 break;
         }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java

@@ -1,14 +1,13 @@
 package com.njcn.csharmonic.service.impl;
 
-import com.njcn.common.pojo.exception.BusinessException;
+import cn.hutool.core.util.ObjectUtil;
 import com.njcn.csdevice.api.CsLedgerFeignClient;
 import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.DataArrayFeignClient;
 import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
 import com.njcn.csdevice.pojo.dto.LineParamDTO;
 import com.njcn.csdevice.pojo.po.CsLedger;
+import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csharmonic.param.DevicDataTrendQueryParam;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
 import com.njcn.csharmonic.service.DeviceDataTrendService;
@@ -16,18 +15,16 @@ import com.njcn.csharmonic.util.InfluxDbParamUtil;
 import com.njcn.influx.pojo.bo.CommonQueryParam;
 import com.njcn.influx.pojo.dto.StatisticalDataDTO;
 import com.njcn.influx.service.CommonService;
-import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.EpdFeignClient;
-import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.pojo.po.EleEpdPqd;
-import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -46,9 +43,9 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
     private final CommonService commonService;
     private final CsLedgerFeignClient csLedgerFeignClient;
     private final CsLineFeignClient csLineFeignClient;
-    private final DicDataFeignClient dicDataFeignClient;
     private final EquipmentFeignClient equipmentFeignClient;
     private final InfluxDbParamUtil influxDbParamUtil;
+    private final EpdFeignClient epdFeignClient;
     @Override
     public List<List<ThdDataVO>> queryDataTrend(DevicDataTrendQueryParam devicDataTrendQueryParam) {
         List<List<ThdDataVO>> result = new ArrayList<>();
@@ -60,29 +57,35 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
         lineParamDTO.setLineId(devicDataTrendQueryParam.getLineId());
         List<CsLedger> data = csLedgerFeignClient.queryLine(lineParamDTO).getData();
         List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of((data == null || data.isEmpty()) ? devicDataTrendQueryParam.getDevId() : data.get(0).getPid()).collect(Collectors.toList())).getData();
+        //根据lineId获取监测点pt、ct变比
+        CsLinePO linePo = csLineFeignClient.queryLineById(Collections.singletonList(devicDataTrendQueryParam.getLineId())).getData().get(0);
+
         devicDataTrendQueryParam.getStatisticalParams().forEach(temp->{
             CommonQueryParam commonQueryParam = new CommonQueryParam();
             commonQueryParam.setLineId(devicDataTrendQueryParam.getLineId());
             commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(temp.getClassId()));
             commonQueryParam.setColumnName(temp.getName());
             commonQueryParam.setPhasic(temp.getPhase());
-            commonQueryParam.setStartTime( devicDataTrendQueryParam.getStartTime());
+            commonQueryParam.setStartTime( devicDataTrendQueryParam.getStartTime() + " 00:00:00");
-            commonQueryParam.setEndTime(devicDataTrendQueryParam.getEndTime());
+            commonQueryParam.setEndTime(devicDataTrendQueryParam.getEndTime() + " 23:59:59");
             commonQueryParam.setDataType(temp.getStatMethod());
             commonQueryParam.setProcess(data1.get(0).getProcess()+"");
             commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(devicDataTrendQueryParam.getLineId()));
-
+            EleEpdPqd epdPqd = epdFeignClient.selectByIds(Collections.singletonList(temp.getDataId())).getData().get(0);
-
-
             List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(Stream.of(commonQueryParam).collect(Collectors.toList()));
             List<ThdDataVO> collect1 = deviceRtData.stream().map(statisticalDataDTO -> {
                 ThdDataVO vo = new ThdDataVO();
                 vo.setLineId(statisticalDataDTO.getLineId());
                 vo.setPhase(statisticalDataDTO.getPhaseType());
-
                 vo.setTime(statisticalDataDTO.getTime());
                 vo.setStatMethod(statisticalDataDTO.getValueType());
+                //判断监测点类型 针对治理设备 模块数据是一次值、电能质量设备是二次值
+                if (linePo.getClDid() != 0 && Objects.equals(devicDataTrendQueryParam.getDataLevel(),"Primary") && ObjectUtil.isNotNull(epdPqd.getPrimaryFormula())) {
+                    double secondaryData = secondaryToPrimary(epdPqd.getPrimaryFormula(), statisticalDataDTO.getValue(), linePo.getPtRatio(), linePo.getCtRatio());
+                    vo.setStatisticalData(BigDecimal.valueOf(secondaryData).setScale(4, RoundingMode.UP).doubleValue());
+                } else {
                     vo.setStatisticalData(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue());
+                }
                 vo.setStatisticalIndex(temp.getDataId());
                 vo.setStatisticalName(temp.getName());
                 vo.setUnit(temp.getUnit());
@@ -91,9 +94,29 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
             }).collect(Collectors.toList());
             result.add(collect1);
         });
-
-
-
         return result;
     }
+
+    /**
+     * 二次值换算成一次值
+     */
+    public double secondaryToPrimary(String formula, Double data,Double pt, Double ct) {
+        switch (formula) {
+            case "*PT":
+                data = data * pt;
+                break;
+            case "*CT":
+                data = data * ct;
+                break;
+            case "*PT*CT/1000":
+                data = data * pt * ct / 1000;
+                break;
+            case "*PT/1000":
+                data = data * pt / 1000;
+                break;
+            default:
+                break;
+        }
+        return data;
+    }
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java

@@ -281,8 +281,8 @@ public class StableDataServiceImpl implements StableDataService {
                 commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
                 commonQueryParam.setColumnName(epdPqd.getName()+ finalFrequency1);
                 commonQueryParam.setPhasic(epdPqd.getPhase());
-                commonQueryParam.setStartTime(commonStatisticalQueryParam.getStartTime());
+                commonQueryParam.setStartTime(commonStatisticalQueryParam.getStartTime() + " 00:00:00");
-                commonQueryParam.setEndTime(commonStatisticalQueryParam.getEndTime());
+                commonQueryParam.setEndTime(commonStatisticalQueryParam.getEndTime() + " 23:59:59");
                 commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType());
                 commonQueryParam.setProcess(data1.get(0).getProcess()+"");
                 commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(temp.getLineId()));