wuweihao 3 éve
szülő
commit
cb091242ce

+ 37 - 37
720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -142,43 +142,43 @@ public class WorkServiceImpl extends IBaseServiceImpl<WorkEntity, Long> implemen
 
 
 //        // 创建someData
-//        // 如基someData作出修改,记得把代码里的someData 跟服务器里的someData都修改
-//        String baseSomeDataPath = configConstant.serverBasePath + "baseData/someData.json";
-//        log.info("服务器base someData.json path: {}", baseSomeDataPath);
-//        // someData.json 内容
-//        String content = null;
-//        if (FileUtil.isFile(baseSomeDataPath)) {
-//            log.info("使用服务器someData.json");
-//            content = FileUtil.readUtf8String(baseSomeDataPath);
-//        } else {
-//            // 获取文件内容
-//            log.info("创建someData.json");
-//            content = FileUtils.getResourceContent("data/someData.json");
-//            FileUtil.writeUtf8String(content, baseSomeDataPath);
-//        }
-//
-//
-//
-//
-//        JSONObject jsonObject = JSONObject.parseObject(content);
-//        jsonObject.put("id", id + "");
-//
-//
-//        // 创建二维码、二维码url
-//        String shareUrl = configConstant.domain4dKK + "/panorama/showMobile.html?id=" + id;
-//        String qrCode = qrCodeUtils.generateLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id);
-//        jsonObject.put("share", shareUrl);
-//        jsonObject.put("qrCode", qrCode);
-//
-//        String ossKeyPath = configConstant.ossBasePath + id + "/someData.json";
-//
-//        try {
-//            aliyunOssUtil.upload(jsonObject.toJSONString().getBytes(), ossKeyPath);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//        String ossUrl = configConstant.ossDomain + ossKeyPath;
-//        log.info("ossSomeData:{}", ossUrl);
+        // 如基someData作出修改,记得把代码里的someData 跟服务器里的someData都修改
+        String baseSomeDataPath = configConstant.serverBasePath + "baseData/someData.json";
+        log.info("服务器base someData.json path: {}", baseSomeDataPath);
+        // someData.json 内容
+        String content = null;
+        if (FileUtil.isFile(baseSomeDataPath)) {
+            log.info("使用服务器someData.json");
+            content = FileUtil.readUtf8String(baseSomeDataPath);
+        } else {
+            // 获取文件内容
+            log.info("创建someData.json");
+            content = FileUtils.getResourceContent("data/someData.json");
+            FileUtil.writeUtf8String(content, baseSomeDataPath);
+        }
+
+
+
+
+        JSONObject jsonObject = JSONObject.parseObject(content);
+        jsonObject.put("id", id + "");
+
+
+        // 创建二维码、二维码url
+        String shareUrl = configConstant.domain4dKK + "/panorama/showMobile.html?id=" + id;
+        String qrCode = qrCodeUtils.generateLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id);
+        jsonObject.put("share", shareUrl);
+        jsonObject.put("qrCode", qrCode);
+
+        String ossKeyPath = configConstant.ossBasePath + id + "/someData.json";
+
+        try {
+            aliyunOssUtil.upload(jsonObject.toJSONString().getBytes(), ossKeyPath);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        String ossUrl = configConstant.ossDomain + ossKeyPath;
+        log.info("ossSomeData:{}", ossUrl);
 
         return Result.success(entity);
     }