|
@@ -2,6 +2,7 @@ package com.energy.manage.service.service.units.impl;
|
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.energy.manage.common.base.BaseServiceImpl;
|
|
|
import com.energy.manage.common.base.Page;
|
|
|
import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
|
|
@@ -215,9 +216,11 @@ public class UnitServiceImpl implements UnitService {
|
|
|
criteria.andEqualTo("millTypeCode", millTypeCode);
|
|
|
UnitBearingsPO unitBearingsPO = unitBearingsMapper.selectOneByExample(queryExample);
|
|
|
|
|
|
- UnitVo.UnitBearingsVo unitBearingsVo = new UnitVo.UnitBearingsVo();
|
|
|
- BeanUtil.copyProperties(unitBearingsPO,unitBearingsVo);
|
|
|
- unitVo.setUnitBearingsVo(unitBearingsVo);
|
|
|
+ if (!ObjectUtil.isEmpty(unitBearingsPO)) {
|
|
|
+ UnitVo.UnitBearingsVo unitBearingsVo = new UnitVo.UnitBearingsVo();
|
|
|
+ BeanUtil.copyProperties(unitBearingsPO, unitBearingsVo);
|
|
|
+ unitVo.setUnitBearingsVo(unitBearingsVo);
|
|
|
+ }
|
|
|
|
|
|
// 发电机
|
|
|
Example queryUdExample = new Example(UnitDynamoPO.class);
|
|
@@ -225,9 +228,11 @@ public class UnitServiceImpl implements UnitService {
|
|
|
criteriaUd.andEqualTo("millTypeCode", millTypeCode);
|
|
|
UnitDynamoPO unitDynamoPO = unitDynamoMapper.selectOneByExample(queryUdExample);
|
|
|
|
|
|
- UnitVo.UnitDynamoVo unitDynamoVo = new UnitVo.UnitDynamoVo();
|
|
|
- BeanUtil.copyProperties(unitDynamoPO,unitDynamoVo);
|
|
|
- unitVo.setUnitDynamoVo(unitDynamoVo);
|
|
|
+ if (!ObjectUtil.isEmpty(unitDynamoPO)) {
|
|
|
+ UnitVo.UnitDynamoVo unitDynamoVo = new UnitVo.UnitDynamoVo();
|
|
|
+ BeanUtil.copyProperties(unitDynamoPO, unitDynamoVo);
|
|
|
+ unitVo.setUnitDynamoVo(unitDynamoVo);
|
|
|
+ }
|
|
|
|
|
|
// 齿轮箱
|
|
|
UnitVo.UnitGearVo unitGearVo = new UnitVo.UnitGearVo();
|
|
@@ -236,40 +241,41 @@ public class UnitServiceImpl implements UnitService {
|
|
|
criteriaUg.andEqualTo("millTypeCode", millTypeCode);
|
|
|
|
|
|
UnitGearboxPO unitGearboxPO = unitGearboxMapper.selectOneByExample(queryUgExample);
|
|
|
- BeanUtil.copyProperties(unitGearboxPO,unitGearVo);
|
|
|
+ BeanUtil.copyProperties(unitGearboxPO, unitGearVo);
|
|
|
|
|
|
// 齿轮箱轴承
|
|
|
- Example queryUgbExample = new Example(UnitGearboxBearingsPO.class);
|
|
|
- Example.Criteria criteriaUgb = queryUgbExample.createCriteria();
|
|
|
- criteriaUgb.andEqualTo("gearboxCode", unitGearboxPO.getCode());
|
|
|
- List<UnitGearboxBearingsPO> unitGearboxBearingsPOList = unitGearboxBearingsMapper.selectByExample(queryUgbExample);
|
|
|
-
|
|
|
- UnitVo.UnitGearboxBearingsVo unitGearboxBearingsVo = null;
|
|
|
- List<UnitVo.UnitGearboxBearingsVo> unitGearboxBearingsVos = Lists.newArrayList();
|
|
|
- for(UnitGearboxBearingsPO unitGearboxBearingsPO : unitGearboxBearingsPOList){
|
|
|
- unitGearboxBearingsVo = new UnitVo.UnitGearboxBearingsVo();
|
|
|
- BeanUtil.copyProperties(unitGearboxBearingsPO,unitGearboxBearingsVo);
|
|
|
- unitGearboxBearingsVos.add(unitGearboxBearingsVo);
|
|
|
- }
|
|
|
- unitGearVo.setUnitGearboxBearingsList(unitGearboxBearingsVos);
|
|
|
-
|
|
|
- // 齿轮箱结构
|
|
|
- Example queryUgsExample = new Example(UnitGearboxStructurePO.class);
|
|
|
- Example.Criteria criteriaUgs = queryUgbExample.createCriteria();
|
|
|
- criteriaUgs.andEqualTo("gearboxCode", unitGearboxPO.getCode());
|
|
|
- List<UnitGearboxStructurePO> unitGearboxStructurePOList = unitGearboxStructureMapper.selectByExample(queryUgbExample);
|
|
|
-
|
|
|
- UnitVo.UnitGearboxStructureVo unitGearboxStructureVo = null;
|
|
|
- List<UnitVo.UnitGearboxStructureVo> unitGearboxStructureVos = Lists.newArrayList();
|
|
|
- for(UnitGearboxStructurePO unitGearboxStructurePO : unitGearboxStructurePOList){
|
|
|
- unitGearboxStructureVo = new UnitVo.UnitGearboxStructureVo();
|
|
|
- BeanUtil.copyProperties(unitGearboxStructurePO,unitGearboxStructureVo);
|
|
|
- unitGearboxStructureVos.add(unitGearboxStructureVo);
|
|
|
- }
|
|
|
- unitGearVo.setUnitGearboxStructureList(unitGearboxStructureVos);
|
|
|
-
|
|
|
- unitVo.setUnitGearVo(unitGearVo);
|
|
|
+ if (!ObjectUtil.isEmpty(unitGearboxPO)) {
|
|
|
+ Example queryUgbExample = new Example(UnitGearboxBearingsPO.class);
|
|
|
+ Example.Criteria criteriaUgb = queryUgbExample.createCriteria();
|
|
|
+ criteriaUgb.andEqualTo("gearboxCode", unitGearboxPO.getCode());
|
|
|
+ List<UnitGearboxBearingsPO> unitGearboxBearingsPOList = unitGearboxBearingsMapper.selectByExample(queryUgbExample);
|
|
|
+
|
|
|
+ UnitVo.UnitGearboxBearingsVo unitGearboxBearingsVo = null;
|
|
|
+ List<UnitVo.UnitGearboxBearingsVo> unitGearboxBearingsVos = Lists.newArrayList();
|
|
|
+ for (UnitGearboxBearingsPO unitGearboxBearingsPO : unitGearboxBearingsPOList) {
|
|
|
+ unitGearboxBearingsVo = new UnitVo.UnitGearboxBearingsVo();
|
|
|
+ BeanUtil.copyProperties(unitGearboxBearingsPO, unitGearboxBearingsVo);
|
|
|
+ unitGearboxBearingsVos.add(unitGearboxBearingsVo);
|
|
|
+ }
|
|
|
+ unitGearVo.setUnitGearboxBearingsList(unitGearboxBearingsVos);
|
|
|
+
|
|
|
+ // 齿轮箱结构
|
|
|
+ Example queryUgsExample = new Example(UnitGearboxStructurePO.class);
|
|
|
+ Example.Criteria criteriaUgs = queryUgbExample.createCriteria();
|
|
|
+ criteriaUgs.andEqualTo("gearboxCode", unitGearboxPO.getCode());
|
|
|
+ List<UnitGearboxStructurePO> unitGearboxStructurePOList = unitGearboxStructureMapper.selectByExample(queryUgbExample);
|
|
|
+
|
|
|
+ UnitVo.UnitGearboxStructureVo unitGearboxStructureVo = null;
|
|
|
+ List<UnitVo.UnitGearboxStructureVo> unitGearboxStructureVos = Lists.newArrayList();
|
|
|
+ for (UnitGearboxStructurePO unitGearboxStructurePO : unitGearboxStructurePOList) {
|
|
|
+ unitGearboxStructureVo = new UnitVo.UnitGearboxStructureVo();
|
|
|
+ BeanUtil.copyProperties(unitGearboxStructurePO, unitGearboxStructureVo);
|
|
|
+ unitGearboxStructureVos.add(unitGearboxStructureVo);
|
|
|
+ }
|
|
|
|
|
|
+ unitGearVo.setUnitGearboxStructureList(unitGearboxStructureVos);
|
|
|
+ unitVo.setUnitGearVo(unitGearVo);
|
|
|
+ }
|
|
|
return unitVo;
|
|
|
}
|
|
|
}
|