|
@@ -24,6 +24,7 @@ import com.persagy.proxy.adm.service.IAdmRelationService;
|
|
|
import com.persagy.proxy.adm.service.impl.AbstractAdmBaseServiceImpl;
|
|
|
import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
import com.persagy.proxy.adm.utils.AdmEntityTransferUtil;
|
|
|
+import com.persagy.proxy.calculation.service.AdmRelCalService;
|
|
|
import com.persagy.proxy.common.client.DmpRwdClient;
|
|
|
import com.persagy.proxy.common.entity.DmpResult;
|
|
|
import com.persagy.proxy.common.entity.InstanceUrlParam;
|
|
@@ -61,6 +62,8 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
|
|
|
@Autowired
|
|
|
private IAdmDictService dictService;
|
|
|
@Autowired
|
|
|
+ private AdmRelCalService admRelCalService;
|
|
|
+ @Autowired
|
|
|
private IAdmRelationService relationService;
|
|
|
|
|
|
@Override
|
|
@@ -73,24 +76,8 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
|
|
|
|
|
|
@Override
|
|
|
public List<AdmEquipment> doUpdateEuip(InstanceUrlParam context, Class<AdmEquipment> clazz, List<AdmEquipment> voList) {
|
|
|
- //TODO 处理关系标记
|
|
|
- /*try {
|
|
|
- *//** 处理关系标记 *//*
|
|
|
- val listtype = ArrayList<String>()
|
|
|
- listtype.add("pe2bd")
|
|
|
- listtype.add("pe2fl")
|
|
|
- listtype.add("pe2sh")
|
|
|
- listtype.add("pe2sp")
|
|
|
- for (type in listtype){
|
|
|
- val entity = relationTypeProjectservice.select(SFilter.eq("projectId", Opt.projectId!!), SFilter.eq("relationType", type)).entity()
|
|
|
- if (entity!=null){
|
|
|
- entity.computationalState = 2
|
|
|
- relationTypeProjectservice.update(entity)
|
|
|
- }
|
|
|
- }
|
|
|
- } catch (e: Exception) {
|
|
|
- e.printStackTrace()
|
|
|
- }*/
|
|
|
+ // 处理关系标记
|
|
|
+ processRelationType(voList);
|
|
|
Map<String, AdmEquipment> voMap = CollUtil.fieldValueMap(voList, BaseEntity.PROP_ID);
|
|
|
//查询设备对应的资产 关系 Pe2Eq (1:N,一个资产关联多个设备,设备是最小单位 by:lvxianyun)
|
|
|
DmpResult<List<ObjRelationDTO>> relationRes = queryRelation(context, voMap);
|
|
@@ -423,4 +410,14 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
|
|
|
public AdmResponse queryEquipClassCode(InstanceUrlParam context,AdmQueryCriteria request,Class<AdmEquipment> clazz){
|
|
|
return queryObjectClassCode(context,request,clazz);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void processRelationType(List<AdmEquipment> vos) {
|
|
|
+ admRelCalService.calcRelation(AdmContextUtil.toDmpContext(),
|
|
|
+ CollUtil.newArrayList(
|
|
|
+ AdmRelationTypeEnum.PE2BD,
|
|
|
+ AdmRelationTypeEnum.PE2FL,
|
|
|
+ AdmRelationTypeEnum.PE2SH,
|
|
|
+ AdmRelationTypeEnum.PE2SP),null);
|
|
|
+ }
|
|
|
}
|