合并

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

@@ -433,7 +433,7 @@ public class RabbitMqListener {
         // 设置缓存锁
         String key = SysConstants.SCENE_BUILDING + buildLog.getSceneNum();
         // 如果是强制重新计算，则删除key。
-        if (StringUtils.equals(message.getRebuild(), "1")) {
+        if (message.getExt().containsKey("forceRebuild") && (boolean) message.getExt().get("forceRebuild")) {
             redisUtil.del(key);
         }
 
@@ -478,6 +478,7 @@ public class RabbitMqListener {
         buildResult.setBuildContext(message.getBuildContext());
         buildResult.setExt(message.getExt());
         buildResult.setDetFloorplan(buildSceneResult.getDetFloorplan());
+        buildResult.setRebuild(message.getRebuild());
         rabbitMqProducer.sendByWorkQueue(buildSceneResult.getResultQueueName(),buildResult);
     }
 }