发布UAT调试
This commit is contained in:
@@ -4,7 +4,7 @@ package com.volvo.ai.analytic.center.rabbitMq;
|
|||||||
import com.volvo.ai.analytic.center.constant.Constant;
|
import com.volvo.ai.analytic.center.constant.Constant;
|
||||||
import com.volvo.ai.analytic.center.service.MqMessageRecordService;
|
import com.volvo.ai.analytic.center.service.MqMessageRecordService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
//import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import com.volvo.ai.analytic.center.service.DiFyService;
|
|||||||
import com.volvo.ai.analytic.center.service.DiffdefeatApproveService;
|
import com.volvo.ai.analytic.center.service.DiffdefeatApproveService;
|
||||||
import com.volvo.ai.analytic.center.service.MqMessageRecordService;
|
import com.volvo.ai.analytic.center.service.MqMessageRecordService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.amqp.core.AmqpTemplate;
|
//import org.springframework.amqp.core.AmqpTemplate;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.jdbc.core.JdbcTemplate;
|
import org.springframework.jdbc.core.JdbcTemplate;
|
||||||
@@ -334,26 +334,26 @@ public class MqMessageRecordServiceImpl extends ServiceImpl<MqMessageRecordMappe
|
|||||||
curMQMessageRecord.setTaskStatus(MqTaskStatusEnum.ANALYSIS_FAILURE.getCode());
|
curMQMessageRecord.setTaskStatus(MqTaskStatusEnum.ANALYSIS_FAILURE.getCode());
|
||||||
}
|
}
|
||||||
if (Objects.equals(MqTaskStatusEnum.ANALYSIS_COMPLETION.getCode(),curMQMessageRecord.getTaskStatus())){
|
if (Objects.equals(MqTaskStatusEnum.ANALYSIS_COMPLETION.getCode(),curMQMessageRecord.getTaskStatus())){
|
||||||
DiffdefeatApprove curDiffdefeatApprove = diffdefeatApproveService.lambdaQuery()
|
DiffdefeatApprove approve = diffdefeatApproveService.lambdaQuery()
|
||||||
.eq(DiffdefeatApprove::getFormId, oldItem.getFormId())
|
.eq(DiffdefeatApprove::getFormId, oldItem.getFormId())
|
||||||
.eq(DiffdefeatApprove::getBusinessId, curMQMessageRecord.getSubBizNo())
|
.eq(DiffdefeatApprove::getBusinessId, curMQMessageRecord.getSubBizNo())
|
||||||
.orderByDesc(DiffdefeatApprove::getId)
|
.orderByDesc(DiffdefeatApprove::getId)
|
||||||
.last("limit 1").one();
|
.last("limit 1").one();
|
||||||
if(curDiffdefeatApprove!=null){
|
if(approve!=null){
|
||||||
curDiffdefeatApprove.setAppointmentResult(diffDefeatResult.getAppointmentResult());
|
approve.setAppointmentResult(diffDefeatResult.getAppointmentResult());
|
||||||
curDiffdefeatApprove.setUserStatus(getUserStatus(diffDefeatResult.getUserStatus()));
|
approve.setUserStatus(getUserStatus(diffDefeatResult.getUserStatus()));
|
||||||
curDiffdefeatApprove.setInputStr(response.getContentStr());
|
approve.setInputStr(response.getContentStr());
|
||||||
diffdefeatApproveService.updateById(curDiffdefeatApprove);
|
diffdefeatApproveService.updateById(approve);
|
||||||
} else {
|
} else {
|
||||||
log.info("数据分析结果正常");
|
log.info("数据分析结果正常");
|
||||||
curDiffdefeatApprove = new DiffdefeatApprove();
|
approve = new DiffdefeatApprove();
|
||||||
curDiffdefeatApprove.setFormId(oldItem.getFormId());
|
approve.setFormId(oldItem.getFormId());
|
||||||
curDiffdefeatApprove.setBusinessId(diffDefeatanAlysis.getBusinessId());
|
approve.setBusinessId(diffDefeatanAlysis.getBusinessId());
|
||||||
curDiffdefeatApprove.setUserStatus(getUserStatus(diffDefeatResult.getUserStatus()));
|
approve.setUserStatus(getUserStatus(diffDefeatResult.getUserStatus()));
|
||||||
curDiffdefeatApprove.setAppointmentResult(diffDefeatResult.getAppointmentResult());
|
approve.setAppointmentResult(diffDefeatResult.getAppointmentResult());
|
||||||
curDiffdefeatApprove.setInputStr(response.getContentStr());
|
approve.setInputStr(response.getContentStr());
|
||||||
curDiffdefeatApprove.setDefeatTime(diffDefeatanAlysis.getDefeatTime());
|
approve.setDefeatTime(diffDefeatanAlysis.getDefeatTime());
|
||||||
diffdefeatApproveService.save(curDiffdefeatApprove);
|
diffdefeatApproveService.save(approve);
|
||||||
log.info("插入数据记录完成");
|
log.info("插入数据记录完成");
|
||||||
}
|
}
|
||||||
this.toMqSinceType53(diffDefeatanAlysis,diffDefeatResult,oldItem);
|
this.toMqSinceType53(diffDefeatanAlysis,diffDefeatResult,oldItem);
|
||||||
@@ -364,9 +364,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl<MqMessageRecordMappe
|
|||||||
curMQMessageRecord.setRetryCount(curMQMessageRecord.getRetryCount()+1);
|
curMQMessageRecord.setRetryCount(curMQMessageRecord.getRetryCount()+1);
|
||||||
this.updateById(curMQMessageRecord);
|
this.updateById(curMQMessageRecord);
|
||||||
log.info("数据更改分析状态完成");
|
log.info("数据更改分析状态完成");
|
||||||
}
|
} else if (Objects.equals(curMQMessageRecord.getSinceType(),SinceTypeEnum.SINCETYPE2.getCode()) && Objects.equals(curMQMessageRecord.getSubSinceType(), SubSinceTypeEnum.SINCETYPE52.getCode())) {
|
||||||
|
|
||||||
if (Objects.equals(curMQMessageRecord.getSinceType(),SinceTypeEnum.SINCETYPE2.getCode()) && Objects.equals(curMQMessageRecord.getSubSinceType(), SubSinceTypeEnum.SINCETYPE52.getCode())) {
|
|
||||||
DiffdefeatApprove approveEntity = diffdefeatApproveService.lambdaQuery()
|
DiffdefeatApprove approveEntity = diffdefeatApproveService.lambdaQuery()
|
||||||
.eq(DiffdefeatApprove::getFormId, oldItem.getFormId())
|
.eq(DiffdefeatApprove::getFormId, oldItem.getFormId())
|
||||||
.eq(DiffdefeatApprove::getBusinessId, curMQMessageRecord.getSubBizNo())
|
.eq(DiffdefeatApprove::getBusinessId, curMQMessageRecord.getSubBizNo())
|
||||||
@@ -386,6 +384,8 @@ public class MqMessageRecordServiceImpl extends ServiceImpl<MqMessageRecordMappe
|
|||||||
curMQMessageRecord.setRetryCount(curMQMessageRecord.getRetryCount()+1);
|
curMQMessageRecord.setRetryCount(curMQMessageRecord.getRetryCount()+1);
|
||||||
this.updateById(curMQMessageRecord);
|
this.updateById(curMQMessageRecord);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
log.info("辨别数据为未知类型sinceType {},subSinceType {}", oldItem.getSinceType(), oldItem.getSubSinceType());
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("数据处理异常", e);
|
log.error("数据处理异常", e);
|
||||||
|
|||||||
Reference in New Issue
Block a user