diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java index a5b25da..8af5634 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java @@ -76,7 +76,7 @@ public class CsEquipmentDeliveryPO extends BaseEntity { * 接入状态(1:未注册 2:注册 3:接入) */ @TableField(value = "status") - private String status; + private Integer status; /** * 设备状态(0:删除 1:离线 2:在线) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index f6698a3..5689bf8 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -107,7 +107,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()). 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..f4f50bd 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 i for(CsLedgerVO c : portables){ c.setPid(portable.getId()); CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId()); - c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus())); + c.setComFlag(csEquipmentDeliveryPO.getStatus()); c.setChildren(wlRecordMapper.getAllLine(c.getId())); for(CsLedgerVO cs : c.getChildren()){ cs.setPid(c.getId()); @@ -208,7 +208,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i for(CsLedgerVO c : portables){ c.setPid(portable.getId()); CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId()); - c.setComFlag(Integer.parseInt(csEquipmentDeliveryPO.getStatus())); + c.setComFlag(csEquipmentDeliveryPO.getStatus()); } portable.setChildren(portables);