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

修改bug

Browse Source
This commit is contained in:
hzj
2024-10-16 10:50:58 +08:00
parent eb7a1d9beb
commit 10e0e96b65
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ 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;
import com.njcn.csdevice.util.InfluxDbParamUtil;
import com.njcn.csdevice.utils.DataChangeUtil;
import com.njcn.csharmonic.api.EventFeignClient;
@@ -92,6 +93,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
private final EpdFeignClient epdFeignClient;
private final CsLineFeignClient csLineFeignClient;
private final ICsLedgerService iCsLedgerService;
private final DicDataFeignClient dicDataFeignClient;
@@ -421,9 +423,12 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
csEventVOPage.getRecords().forEach(temp->{
//事件描述、相别、暂降幅值,需要特殊处理赋值
//事件描述
CsLedger dataById = iCsLedgerService.findDataById(temp.getLineId());
temp.setLineName(dataById.getName());
EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
if(ele!=null){
temp.setShowName(ele.getShowName());
//相别
List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>();

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

@@ -251,9 +251,11 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
PortableOffMainLog portableOffMainLog = new PortableOffMainLog();
portableOffMainLog.setId(IdUtil.fastSimpleUUID());
portableOffMainLog.setStartTime(LocalDateTime.now());
portableOffMainLog.setProjectName(uploadDataParam.getPaths().stream()
String paths = uploadDataParam.getFiles().stream().map(MultipartFile::getOriginalFilename)
.reduce((s1, s2) -> getCommonPrefix(s1, s2))
.orElse(null));
.orElse(null);
String[] split = paths.split("/");
portableOffMainLog.setProjectName(split.length>0?split[split.length-1]:"/");
int successcCount = 0;
portableOffMainLog.setStatus("1");