From b7542b522cbf3ca93cd2e06afcab0cfdab804895 Mon Sep 17 00:00:00 2001
From: guofeihu <3347277866@qq.com>
Date: Thu, 15 Aug 2024 15:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7tree=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=8E=A5=E5=8F=A3=E7=9A=84comflag=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BB=8E=E8=A3=85=E7=BD=AE=E7=9A=84status=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BArunStatus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/csdevice/service/impl/CsLedgerServiceImpl.java    | 4 ++--
 .../csdevice/service/impl/PortableOfflLogServiceImpl.java  | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
index 13bc0b0..5141d97 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
@@ -126,7 +126,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         for(CsLedgerVO c : portables){
             c.setPid(portable.getId());
             CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId());
-            c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus()));
+            c.setComFlag(csEquipmentDeliveryPO.getRunStatus());
             c.setChildren(wlRecordMapper.getAllLine(c.getId()));
             for(CsLedgerVO cs : c.getChildren()){
                 cs.setPid(c.getId());
@@ -208,7 +208,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         for(CsLedgerVO c : portables){
             c.setPid(portable.getId());
             CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId());
-            c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus()));
+            c.setComFlag(csEquipmentDeliveryPO.getRunStatus());
         }
         portable.setChildren(portables);
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java
index 3231207..30d1dff 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java
@@ -168,9 +168,8 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                         portableOfflLog.setAllCount(pqdData.size());
                         portableOfflLog.setRealCount(pqdData.size());
                         if(minFlag){
-                            //高频谐波数据入库
+                            log.info("类型min,插入infulxDb的pqdData");
                             //pqdDataMapper.insertBatch(pqdData);
-                            log.info("插入min-pqdData,其长度为:"+pqdData.size());
                             //min结果集解析入库后就不需要在解析了
                             minFlag = false;
                         }
@@ -293,10 +292,10 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                                         }
                                     }
                                 }
-                                log.info("插入"+entData.toString());
+                                log.info("类型log,插入infulxDb的evtData");
                                 //evtDataMapper.insertOne(entData);
                             }
-                            log.info("插旗"+csEventPOS.toString());
+                            log.info("类型log,插入mysql事件表cs_event");
                             //eventFeignClient.saveBatchEventList(csEventPOS);
                         }
                     }