瀏覽代碼

增加线下版本上传,查询

xiewenjie 3 年之前
父節點
當前提交
54353057c4

+ 1 - 5
sxz-core/src/main/java/com/fdkk/sxz/other/listener/Model3dBuild.java

@@ -59,13 +59,9 @@ public class Model3dBuild {
     public void modelBiz3d(Message<RequestQueue> message) {
     public void modelBiz3d(Message<RequestQueue> message) {
         Model3dBuild.log.info("modelBiz3d同步消息开始:" + message + ",开始同步");
         Model3dBuild.log.info("modelBiz3d同步消息开始:" + message + ",开始同步");
         String token = RedisUtil.tryLock("modelBiz3d:" + message.getPayload().getName(), 60 * 60 * 1000);
         String token = RedisUtil.tryLock("modelBiz3d:" + message.getPayload().getName(), 60 * 60 * 1000);
-        ModelUploadOfflineEntity modelUploadOfflineEntity = new ModelUploadOfflineEntity();
+        ModelUploadOfflineEntity modelUploadOfflineEntity = modelUploadOfflineService.findById(message.getPayload().getEntityId());
         try {
         try {
             if (token != null) {
             if (token != null) {
-                modelUploadOfflineEntity.setName(message.getPayload().getName());
-                modelUploadOfflineEntity.setStatus(0);
-                modelUploadOfflineEntity.setProgress(0);
-                modelUploadOfflineService.save(modelUploadOfflineEntity);
                 modelBiz3dHandler(message.getPayload(), modelUploadOfflineEntity);
                 modelBiz3dHandler(message.getPayload(), modelUploadOfflineEntity);
             }
             }
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {

+ 8 - 0
sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/QueueController.java

@@ -64,6 +64,14 @@ public class QueueController {
 
 
         for (RequestQueue param : params) {
         for (RequestQueue param : params) {
             Message message = MessageBuilder.withPayload(param).build();
             Message message = MessageBuilder.withPayload(param).build();
+
+            ModelUploadOfflineEntity modelUploadOfflineEntity = new ModelUploadOfflineEntity();
+            modelUploadOfflineEntity.setName(param.getName());
+            modelUploadOfflineEntity.setStatus(0);
+            modelUploadOfflineEntity.setProgress(0);
+            modelUploadOfflineService.save(modelUploadOfflineEntity);
+            param.setEntityId(modelUploadOfflineEntity.getId());
+
             rabbitTemplate.convertAndSend(TopicRabbitConfig.TOPICE, TopicRabbitConfig.MODEL_BIZ_3D, message);
             rabbitTemplate.convertAndSend(TopicRabbitConfig.TOPICE, TopicRabbitConfig.MODEL_BIZ_3D, message);
 
 
         }
         }

+ 1 - 0
sxz-modules/src/main/java/com/fdkk/sxz/vo/request/RequestQueue.java

@@ -18,5 +18,6 @@ public class RequestQueue implements Serializable {
 
 
     private String taskId;
     private String taskId;
 
 
+    private Long entityId;
 
 
 }
 }