Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
ca4bc189cf
3 changed files with 6 additions and 4 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java
  3. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java View File

@@ -330,7 +330,7 @@ public class WxEnergyController extends BaseController {
@PostMapping("deleteChildMeter")
public ResultData deleteChildMeter(@RequestBody WxEnergyMeter record) {
record.updateTenantInfo(getTenantInfo());
if (null == record.getParentMeterId()) {
if (null == record.getParentMeterId() || null == record.getChildMeterId()) {
return new ResultData(Result.ERROR,"请选择一个关联");
}
record.setTreeParentType("meter");


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java View File

@@ -111,5 +111,7 @@ public class WxEnergyMeter extends TenantEntity {
@TableField(exist = false)
private Long parentMeterId;
@TableField(exist = false)
private Long childMeterId;
@TableField(exist = false)
private List<Long> notInIds;
}

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java View File

@@ -263,20 +263,20 @@ public class WxEnergyServiceImpl implements WxEnergyService {
sf.updateTenantInfo(record);
sf.setType(EnumEnergyMeterShopFloorType.BUILDING.getCode());
sf.setAliseId(record.getTreeParentId());
sf.setMeterId(record.getId());
sf.setMeterId(record.getChildMeterId());
wxEnergyMeterShopFloorMapper.deleteByConditon(sf);
}if (record.getTreeParentType().equals("floor")) {
WxEnergyMeterShopFloor sf = new WxEnergyMeterShopFloor();
sf.updateTenantInfo(record);
sf.setType(EnumEnergyMeterShopFloorType.FLOOR.getCode());
sf.setAliseId(record.getTreeParentId());
sf.setMeterId(record.getId());
sf.setMeterId(record.getChildMeterId());
wxEnergyMeterShopFloorMapper.deleteByConditon(sf);
}if (record.getTreeParentType().equals("meter")) {
WxEnergyMeterChild sf = new WxEnergyMeterChild();
sf.updateTenantInfo(record);
sf.setParentMeterId(record.getTreeParentId());
sf.setChildMeterId(record.getId());
sf.setChildMeterId(record.getChildMeterId());
wxEnergyMeterChildMapper.deleteByCondition(sf);
}


Loading…
Cancel
Save