修改bug

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,6 +34,9 @@ public class PortableOffMainLog extends BaseEntity {
      * 导入开始时间
      */
     @TableField(value = "start_time")
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
     private LocalDateTime startTime;
 
     /**
@@ -44,6 +48,9 @@ public class PortableOffMainLog extends BaseEntity {
     /**
      * 导入结束时间
      */
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
     @TableField(value = "end_time")
     private LocalDateTime endTime;
 

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

@@ -66,6 +66,9 @@ public class RecordVo {
     @ApiModelProperty("电压接线方式")
     private String volConType;
 
+    @ApiModelProperty("基础数据集合ID")
+    private List<String> list;
+
     @Data
     public static class RecordItemVo{
 

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

@@ -186,6 +186,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
             wlRecord.setStartTime(getFirstTimeById(wlRecord.getId()));
             wlRecord.setEndTime(getLastTimeById(wlRecord.getId()));
             BeanUtils.copyProperties(wlRecord, recordVo);
+            recordVo.setList(this.baseMapper.getDataRecordBytestId(wlRecord.getId()));
             recordVoList.add(recordVo);
         }else{
             //反之则是方案ID 则返回该方案下所有的测试项信息
@@ -199,6 +200,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
                 wl.setStartTime(getFirstTimeById(wl.getId()));
                 wl.setEndTime(getLastTimeById(wl.getId()));
                 BeanUtils.copyProperties(wl, recordVo);
+                recordVo.setList(this.baseMapper.getDataRecordBytestId(wl.getId()));
                 recordVoList.add(recordVo);
             }
         }
@@ -363,7 +365,8 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         List<WlRecord> data = new ArrayList<>();
         if(wlRecord.getPId() == null){
             //如果查询的是方案 则查询该方案下所有的测试项关联的设备基础数据
-            data = this.baseMapper.getDataRecordByTestId(wlRecord.getId(),1);
+            return null;
+//            data = this.baseMapper.getDataRecordByTestId(wlRecord.getId(),1);
         }else{
             //如果查询的是测试项 则查询该测试项下所有的关联的设备基础数据
             data = this.baseMapper.getDataRecordByTestId(wlRecord.getId(),0);
@@ -387,8 +390,8 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
                         if(Objects.isNull(csDataSet) || StrUtil.isBlank(csDataSet.getDataLevel())){
                             throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
                         }
-                        Double ct = finalCsLinePOList.get(0).getCtRatio();
+                        Double ct = Double.valueOf(wlRecord.getCt())/wlRecord.getCt1();
-                        Double pt = finalCsLinePOList.get(0).getPtRatio();
+                        Double pt =Double.valueOf(wlRecord.getPt())/wlRecord.getPt1();
 
 
                         List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of(wl.getDevId()).collect(Collectors.toList())).getData();
@@ -439,7 +442,13 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
                                 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);