|
@@ -89,15 +89,9 @@ public class AddMoldelBuild {
|
|
|
}
|
|
|
@RabbitHandler
|
|
|
@RabbitListener(queues = TopicRabbitConfig.ADDMODELTO3D)
|
|
|
- public void addmodelto3d(Message<RequestRenovationPartsDetailManager> message, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag, Channel channel) {
|
|
|
+ public void addmodelto3d(Message<RequestRenovationPartsDetailManager> message) {
|
|
|
AddMoldelBuild.log.info("模型addmodelto3d:" + message.getPayload() + ",开始同步");
|
|
|
- try {
|
|
|
- syncModel(message.getPayload());
|
|
|
- channel.basicAck(deliveryTag, false);//消息确认
|
|
|
- } catch (IOException e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
-
|
|
|
+ syncModel(message.getPayload());
|
|
|
}
|
|
|
public void syncModel(RequestRenovationPartsDetailManager param) {
|
|
|
String token = RedisUtil.tryLock(param.getFileId().toString() + "syncModel", 60 * 1000);
|
|
@@ -193,7 +187,7 @@ public class AddMoldelBuild {
|
|
|
modelUploadEntity.setPartsDetailId(renovationPartsDetailEntity.getId());
|
|
|
modelUploadEntity.setFacesNum(param.getFacesNum());
|
|
|
modelUploadEntity.setObjSize(param.getObjSize());
|
|
|
- modelUploadEntity.setImgPath(previewPath);
|
|
|
+ modelUploadEntity.setThumPath(previewPath.replaceAll(buildPath, ""));
|
|
|
modelUploadService.save(modelUploadEntity);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -201,7 +195,7 @@ public class AddMoldelBuild {
|
|
|
AddMoldelBuild.log.error("直接模型入库报错-{}", e.getMessage());
|
|
|
} finally {
|
|
|
if (token != null) {
|
|
|
- RedisUtil.unlock(param.getModelUploadId().toString(), token);
|
|
|
+ RedisUtil.unlock(param.getFileId().toString(), token);
|
|
|
}
|
|
|
}
|
|
|
}
|