更新:

dev-1.2 消费者添加日志
修改门面日志

cms_pano_consumer/src/main/java/com/gis/listener/PanoConsumer.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Date;
 import java.util.concurrent.*;
 
 
@@ -91,13 +92,18 @@ public class PanoConsumer {
         // 超时回调
         Future<String> future = exec.submit(call);
         try {
-            String obj = future.get(configConstant.queueTimeout, TimeUnit.MINUTES); //任务处理超时时间设为 3分钟
+            //任务处理超时时间设为 3分钟
+            String obj = future.get(configConstant.queueTimeout, TimeUnit.MINUTES);
             entity.setStatus(3);
             // 上传切图
             uploadOssDir(entity);
             log.info("任务成功返回: " + obj);
         } catch (InterruptedException e) {
             e.printStackTrace();
+            log.error("其他异常");
+            StringWriter trace=new StringWriter();
+            log.error(trace.toString());
+            entity.setStatus(2);
         } catch (ExecutionException e) {
             e.printStackTrace();
             StringWriter trace=new StringWriter();
@@ -116,6 +122,7 @@ public class PanoConsumer {
             entity.setStatus(2);
             future.cancel(true);
         } finally {
+            entity.setUpdateTime(new Date());
             sceneService.update(entity);
         }
     }

cms_pano_consumer/src/main/resources/application-pro.properties

@@ -65,7 +65,7 @@ logging.level.com.gis=debug
 # 本地保存路径
 file.path=/mnt/cms_pano_fcb_data/
 
-# 单位是分钟
+# 队列超时时间，单位是分钟
 queue.timeout=3
 
 

cms_pano_fcb/gis_web/src/main/java/com/gis/web/aop/WebLogAspect.java

@@ -54,7 +54,7 @@ public class WebLogAspect {
         log.info("request Args : {}" , Arrays.toString(joinPoint.getArgs()));
 
         Map<String, Object> controllerLog = getControllerLog(joinPoint);
-        if (controllerLog == null) {
+        if (controllerLog.size() == 0) {
             return;
         }
 

cms_pano_fcb/remark.md

@@ -168,8 +168,11 @@ sit:
    得到 house_id 然后查伟玉tm_house
    select id, house_title , estate_id from tm_house where id = 'houseId';
    
-   select * from tm_estate where id = 'estate_id';
    
+   
+   查询相关VR项目信息
+   select id, house_title , estate_id from tm_house where id in ('HUS000011394121801578721280','HUS000011394144078557802496,'HUS000011393785418390167552');
+   select id,estate_name,belong_company_name,create_by_name,create_time from tm_estate where id in ('');
     
 # 720yun 需求
  1. 先上传全景图