Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补招添加测试项

Browse Source
This commit is contained in:
hzj
2024-11-13 13:04:55 +08:00
parent 625ed864c7
commit be4f50fbc5
1 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.nacos.shaded.com.google.gson.Gson;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.tocrhz.mqtt.publisher.MqttPublisher; import com.github.tocrhz.mqtt.publisher.MqttPublisher;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.api.EquipmentFeignClient;
import com.njcn.csdevice.constant.DataParam; import com.njcn.csdevice.constant.DataParam;
@@ -13,9 +14,11 @@ import com.njcn.csdevice.mapper.PortableOfflLogMapper;
import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
import com.njcn.csdevice.pojo.po.PortableOffMainLog; import com.njcn.csdevice.pojo.po.PortableOffMainLog;
import com.njcn.csdevice.pojo.po.PortableOfflLog; import com.njcn.csdevice.pojo.po.PortableOfflLog;
import com.njcn.csdevice.pojo.po.WlRecord;
import com.njcn.csdevice.service.IPortableOfflLogService; import com.njcn.csdevice.service.IPortableOfflLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.param.UploadDataParam; import com.njcn.csdevice.param.UploadDataParam;
import com.njcn.csdevice.service.IWlRecordService;
import com.njcn.csdevice.service.PortableOffMainLogService; import com.njcn.csdevice.service.PortableOffMainLogService;
import com.njcn.csdevice.util.InfluxDbParamUtil; import com.njcn.csdevice.util.InfluxDbParamUtil;
import com.njcn.csharmonic.api.EventFeignClient; import com.njcn.csharmonic.api.EventFeignClient;
@@ -52,7 +55,9 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.*; import java.io.*;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -93,6 +98,7 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
private final MqttPublisher publisher; private final MqttPublisher publisher;
private final PortableOffMainLogService portableOffMainLogService; private final PortableOffMainLogService portableOffMainLogService;
private final IWlRecordService wlRecordService;
@Override @Override
public Page<PortableOfflLog> queryPage(BaseParam baseParam) { public Page<PortableOfflLog> queryPage(BaseParam baseParam) {
@@ -287,6 +293,40 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
temp.setProcess(data1.get(0).getProcess()+""); temp.setProcess(data1.get(0).getProcess()+"");
temp.setLineId(uploadDataParam.getLineId()); temp.setLineId(uploadDataParam.getLineId());
}); });
Instant instantMax = pqdData.stream().map(PqdData::getTime).max(Instant::compareTo).get();
Instant instantMin = pqdData.stream().map(PqdData::getTime).min(Instant::compareTo).get();
//插入测试项
WlRecord wlRecord = new WlRecord();
wlRecord.setId(IdUtil.fastSimpleUUID());
wlRecord.setItemName("基础数据");
wlRecord.setGcName("补召数据");
wlRecord.setDevId(csEquipmentDeliveryDTO.getId());
wlRecord.setLineId(lineId);
// wlRecord.setStatisticalInterval();
// wlRecord.setPt();
// wlRecord.setCt();
// wlRecord.setPt1();
// wlRecord.setCt1();
// wlRecord.setVoltageLevel();
// wlRecord.setCapacitySscb();
// wlRecord.setCapacitySscmin();
// wlRecord.setCapacitySt();
// wlRecord.setCapacitySi();
// wlRecord.setVolConType();
// wlRecord.setCurConSel();
wlRecord.setStartTime(instantMin.atZone(ZoneId.systemDefault()).toLocalDateTime());
wlRecord.setEndTime(instantMax.atZone(ZoneId.systemDefault()).toLocalDateTime());
// wlRecord.setLocation();
wlRecord.setType(1);
wlRecord.setState(DataStateEnum.ENABLE.getCode());
wlRecordService.lambdaUpdate().set(WlRecord::getState,DataStateEnum.DELETED.getCode())
.eq(WlRecord::getLineId,lineId)
.eq(WlRecord::getStartTime,wlRecord.getStartTime())
.eq(WlRecord::getEndTime,wlRecord.getEndTime()).update();
wlRecordService.save(wlRecord);
//如果明确返回了state 那么当前文件解析出错 //如果明确返回了state 那么当前文件解析出错
if(response.getState() != null){ if(response.getState() != null){
portableOfflLog.setState(response.getState()); portableOfflLog.setState(response.getState());