|
@@ -7,15 +7,19 @@ import com.persagy.dmp.basic.dto.RequestData;
|
|
|
import com.persagy.dmp.common.constant.ResponseCode;
|
|
|
import com.persagy.dmp.common.exception.BusinessException;
|
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
|
+import com.persagy.dmp.common.utils.ResultHelper;
|
|
|
import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
|
+import com.persagy.dmp.rwd.basic.constant.ComputationalStateEnum;
|
|
|
import com.persagy.dmp.rwd.digital.service.RelationCalService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
/***
|
|
@@ -27,6 +31,7 @@ import java.util.List;
|
|
|
@RestController
|
|
|
@RequestMapping("/rwd/instance/object/compatible/")
|
|
|
@RequiredArgsConstructor
|
|
|
+@Slf4j
|
|
|
public class RelationCaclController {
|
|
|
|
|
|
private final RelationCalService relationCaclService;
|
|
@@ -82,7 +87,22 @@ public class RelationCaclController {
|
|
|
|| StrUtil.isBlank(requestData.getRelCode())){
|
|
|
throw new BusinessException(ResponseCode.A0400.getCode(),ResponseCode.A0400.getDesc());
|
|
|
}
|
|
|
- return relationCaclService.calculatingObjRelation(requestData);
|
|
|
+ // 更新计算时间
|
|
|
+ try{
|
|
|
+ relationCaclService.updateComputeTimeByProjectAndGraphCodeAndRelCode(requestData.getGraphCode(),
|
|
|
+ requestData.getRelCode(), ComputationalStateEnum.COMPUTING.getState());
|
|
|
+ CommonResult<List<ObjectRelation>> listCommonResult = relationCaclService.calculatingObjRelation(requestData);
|
|
|
+ // 更新计算时间
|
|
|
+ relationCaclService.updateComputeTimeByProjectAndGraphCodeAndRelCode(requestData.getGraphCode(),
|
|
|
+ requestData.getRelCode(), ComputationalStateEnum.INIT.getState());
|
|
|
+ return listCommonResult;
|
|
|
+ }catch (Exception e){
|
|
|
+ log.error("计算关系失败",e);
|
|
|
+ // 更新计算时间
|
|
|
+ relationCaclService.updateComputeTimeByProjectAndGraphCodeAndRelCode(requestData.getGraphCode(),
|
|
|
+ requestData.getRelCode(), ComputationalStateEnum.FAIL.getState());
|
|
|
+ }
|
|
|
+ return ResultHelper.multi(new ArrayList<>(),0L);
|
|
|
}
|
|
|
|
|
|
|