合并官网最新代码

src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -18,6 +18,7 @@ import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.StopWatch;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.Queue;
@@ -278,6 +279,11 @@ public class RabbitMqListener {
         buildLog.setStatus(0);
         // 设置缓存锁
         String key = SysConstants.SCENE_BUILDING + buildLog.getSceneNum();
+        // 如果是强制重新计算，则删除key。
+        if (StringUtils.equals(message.getRebuild(), "1")) {
+            redisUtil.del(key);
+        }
+
         // 获取缓存锁，防止重复消费
         Long building = redisUtil.incr(key, 1);
         buildLogService.save(buildLog);