Parcourir la source

更新打印日志

wuweihao il y a 3 ans
Parent
commit
fcfae370b1

+ 1 - 17
laser/src/main/java/com/fdkankan/indoor/base/util/CmdUtils.java

@@ -91,22 +91,6 @@ public class CmdUtils {
         }
     }
 
-    /**
-     * 调用sh脚本上传oss
-     */
-//    public static void ossUploadDir(String sceneCode, String uploadDir, String target){
-//
-//        String cmd = CmdConstant.OSSUTIL_UPLOAD_DIR;
-//        cmd = cmd.replaceAll("@sceneCode", sceneCode);
-//        cmd = cmd.replaceAll("@uploadDir", uploadDir);
-//        cmd = cmd.replaceAll("@target", target);
-//
-//        log.info("ossCmd: " + cmd);
-//        long start = System.currentTimeMillis();
-//        CmdUtils.callLineSh(cmd);
-//        long end = System.currentTimeMillis();
-//        log.info("场景码目录:{} 上传完成, 耗时:{} s" , sceneCode, (end-start)/1000 );
-//    }
 
 
     /**
@@ -118,7 +102,7 @@ public class CmdUtils {
         long start = System.currentTimeMillis();
         CmdUtils.callLineSh(cmd);
         long end = System.currentTimeMillis();
-        log.info("场景码目录:{} 上传完成, 耗时:{} s" , (end-start)/1000 );
+        log.info("场景码目录 上传完成, 耗时:{} s" , (end-start)/1000 );
     }
 
     public static void ossDeleteDir(String cmd) {

+ 4 - 2
laser/src/main/java/com/fdkankan/indoor/core/service/impl/TiledMapServiceImpl.java

@@ -76,13 +76,14 @@ public class TiledMapServiceImpl extends IBaseServiceImpl implements TiledMapSer
     public void init(String sceneCode, String from) {
         TiledMapEntity entity = findById(sceneCode);
         if (entity == null) {
+            log.info("来自age, 处理平面图开始");
             entity = new TiledMapEntity();
             entity.setCreateTime(LocalDateTime.now());
             entity.setId(sceneCode);
             // 2021.09.03
             entity.setData(initData(sceneCode, from));
         } else {
-            // web端重算, 把cover重新上传oss就行
+            log.info("来自web端重算,处理平面图开始, 把cover重新上传oss就行");
             uploadCover(sceneCode);
         }
 
@@ -91,7 +92,7 @@ public class TiledMapServiceImpl extends IBaseServiceImpl implements TiledMapSer
         entity.setDisplay(1);
         this.save(entity);
 
-        log.info("TiledMap数据初始化完成");
+        log.info("初始化平面图-TiledMap完成");
     }
 
     @Override
@@ -483,6 +484,7 @@ public class TiledMapServiceImpl extends IBaseServiceImpl implements TiledMapSer
         // 压缩并上传oss提供下载
 //        zipAndUploadOss(path, uploadDir, sceneCode);
         tiledMapUploadOss(path, sceneCode);
+        log.info("算法生成平面图上传oss完成");
 
         return list;
     }