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

实体类调整

Browse Source
This commit is contained in:
xy
2024-08-13 10:53:37 +08:00
parent 14bc4e9dd8
commit 703a145bb3
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
View File

@@ -76,7 +76,7 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
* 接入状态(1:未注册 2:注册 3:接入) * 接入状态(1:未注册 2:注册 3:接入)
*/ */
@TableField(value = "status") @TableField(value = "status")
private String status; private Integer status;
/** /**
* 设备状态(0:删除 1:离线 2:在线) * 设备状态(0:删除 1:离线 2:在线)

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

@@ -107,7 +107,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
} }
CsEquipmentDeliveryPO csEquipmentDeliveryPo = new CsEquipmentDeliveryPO(); CsEquipmentDeliveryPO csEquipmentDeliveryPo = new CsEquipmentDeliveryPO();
BeanUtils.copyProperties (csEquipmentDeliveryAddParm,csEquipmentDeliveryPo); BeanUtils.copyProperties (csEquipmentDeliveryAddParm,csEquipmentDeliveryPo);
csEquipmentDeliveryPo.setStatus ("1"); csEquipmentDeliveryPo.setStatus (1);
csEquipmentDeliveryPo.setRunStatus(1); csEquipmentDeliveryPo.setRunStatus(1);
String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode(); String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) { if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
@@ -471,7 +471,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
String path = this.createPath(temp.getNdid()); String path = this.createPath(temp.getNdid());
csEquipmentDeliveryPO.setMac(path); csEquipmentDeliveryPO.setMac(path);
csEquipmentDeliveryPO.setRunStatus(1); csEquipmentDeliveryPO.setRunStatus(1);
csEquipmentDeliveryPO.setStatus("1"); csEquipmentDeliveryPO.setStatus(1);
csEquipmentDeliveryPO.setProcess(2); csEquipmentDeliveryPO.setProcess(2);
CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO(); CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
@@ -546,8 +546,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
public void testCompletion(String deviceId,Integer type,String remark) { public void testCompletion(String deviceId,Integer type,String remark) {
CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, deviceId).one(); CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId, deviceId).one();
this.lambdaUpdate().eq(CsEquipmentDeliveryPO::getId,deviceId). this.lambdaUpdate().eq(CsEquipmentDeliveryPO::getId,deviceId).
// set(CsEquipmentDeliveryPO::getStatus,1). set(CsEquipmentDeliveryPO::getStatus,1).
// set(CsEquipmentDeliveryPO::getRunStatus,2). set(CsEquipmentDeliveryPO::getRunStatus,1).
set(CsEquipmentDeliveryPO::getProcess,type+1).update(); set(CsEquipmentDeliveryPO::getProcess,type+1).update();
this.delete(deviceId); this.delete(deviceId);
List<CsEquipmentProcessPO> list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()). List<CsEquipmentProcessPO> list = csEquipmentProcessPOService.lambdaQuery().eq(CsEquipmentProcessPO::getDevId, one.getNdid()).

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.getStatus());
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.getStatus());
} }
portable.setChildren(portables); portable.setChildren(portables);