|
@@ -291,7 +291,7 @@ public class RabbitMqListener {
|
|
|
ModelingBuildStatus buildStatus = null;
|
|
|
try {
|
|
|
buildStatus = buildSceneResult.getBuildStatus();
|
|
|
- log.info("服务{} 计算结束:{},计算状态:{}", SysConstants.hostName, buildLog.getNum(),buildStatus.message());
|
|
|
+ log.info("服务{} 计算结束:{},计算状态:{}", SysConstants.hostName, buildLog.getSceneNum(),buildStatus.message());
|
|
|
if(!buildStatus.equals(ModelingBuildStatus.REPEAT)){
|
|
|
//释放锁
|
|
|
redisUtil.del(String.format(RedisKey.SCENE_BUILDING, message.getSceneNum()));
|
|
@@ -325,16 +325,16 @@ public class RabbitMqListener {
|
|
|
// 初始化日志参数
|
|
|
buildLog.setHostName(SysConstants.hostName);
|
|
|
buildLog.setQueueName(queueModelingCall);
|
|
|
- buildLog.setNum(message.getSceneNum());
|
|
|
+ buildLog.setSceneNum(message.getSceneNum());
|
|
|
buildLog.setDataSource(message.getDataSource());
|
|
|
|
|
|
// 设置缓存锁
|
|
|
- String key = SysConstants.SCENE_BUILDING + buildLog.getNum();
|
|
|
+ String key = SysConstants.SCENE_BUILDING + buildLog.getSceneNum();
|
|
|
// 获取缓存锁,防止重复消费
|
|
|
Long building = redisUtil.incr(key, 1);
|
|
|
buildLogService.save(buildLog);
|
|
|
if (building.compareTo(1L) != 0) {
|
|
|
- log.error("服务:{},重复构建:{}",SysConstants.hostName,buildLog.getNum());
|
|
|
+ log.error("服务:{},重复构建:{}",SysConstants.hostName,buildLog.getSceneNum());
|
|
|
throw new BuildException(ModelingBuildStatus.REPEAT);
|
|
|
}else{
|
|
|
redisUtil.expire(key,SysConstants.modelTimeOut);
|