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

左侧tree节点两个接口的comflag状态从装置的status改为runStatus

Browse Source
This commit is contained in:
guofeihu
2024-08-15 15:09:04 +08:00
parent 14bc4e9dd8
commit b7542b522c
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
for(CsLedgerVO c : portables){ for(CsLedgerVO c : portables){
c.setPid(portable.getId()); c.setPid(portable.getId());
CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId()); CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId());
c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus())); c.setComFlag(csEquipmentDeliveryPO.getRunStatus());
c.setChildren(wlRecordMapper.getAllLine(c.getId())); c.setChildren(wlRecordMapper.getAllLine(c.getId()));
for(CsLedgerVO cs : c.getChildren()){ for(CsLedgerVO cs : c.getChildren()){
cs.setPid(c.getId()); cs.setPid(c.getId());
@@ -208,7 +208,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
for(CsLedgerVO c : portables){ for(CsLedgerVO c : portables){
c.setPid(portable.getId()); c.setPid(portable.getId());
CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId()); CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId());
c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus())); c.setComFlag(csEquipmentDeliveryPO.getRunStatus());
} }
portable.setChildren(portables); portable.setChildren(portables);

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

@@ -168,9 +168,8 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
portableOfflLog.setAllCount(pqdData.size()); portableOfflLog.setAllCount(pqdData.size());
portableOfflLog.setRealCount(pqdData.size()); portableOfflLog.setRealCount(pqdData.size());
if(minFlag){ if(minFlag){
//高频谐波数据入库 log.info("类型min,插入infulxDb的pqdData");
//pqdDataMapper.insertBatch(pqdData); //pqdDataMapper.insertBatch(pqdData);
log.info("插入min-pqdData,其长度为:"+pqdData.size());
//min结果集解析入库后就不需要在解析了 //min结果集解析入库后就不需要在解析了
minFlag = false; minFlag = false;
} }
@@ -293,10 +292,10 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
} }
} }
} }
log.info("插入"+entData.toString()); log.info("类型log,插入infulxDb的evtData");
//evtDataMapper.insertOne(entData); //evtDataMapper.insertOne(entData);
} }
log.info("插旗"+csEventPOS.toString()); log.info("类型log,插入mysql事件表cs_event");
//eventFeignClient.saveBatchEventList(csEventPOS); //eventFeignClient.saveBatchEventList(csEventPOS);
} }
} }