.gitignore

@@ -31,7 +31,7 @@ build/
 
 ### VS Code ###
 .vscode/
-/config/application.yml
+/config/*.yml
 /log/*.log
 log
 log/

src/main/java/com/lqkj/link/module/config/service/ConfigInfoService.java

@@ -37,12 +37,12 @@ public class ConfigInfoService {
             configInfo = configInfoRepository.findById("jarVersion").get();
             String configValue = configInfo.getConfigValue();
             JSONObject jsonObject = JSON.parseObject(configValue);
-            jsonObject.put("java", "V1.1.0.20250208");
+            jsonObject.put("java", "V1.2.0.20250221");
             configInfo.setConfigValue(jsonObject.toJSONString());
             configInfo.setContentType("application/json");
         } else {
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("java", "V1.1.0.20250208");
+            jsonObject.put("java", "V1.2.0.20250221");
             configInfo = new ConfigInfo("jarVersion", jsonObject.toJSONString(), "application/json");
         }
         configInfoRepository.save(configInfo);

src/main/java/com/lqkj/link/module/zone/domain/ModelInfo.java

@@ -45,6 +45,12 @@ public class ModelInfo {
     @Column(name = "template_id")
     private Integer templateId;
 
+    /**
+     * 类型编号1：fbx文件 2：pak包
+     **/
+    @Column(name = "type_number")
+    private Integer typeNumber;
+
     public String getName() {
         return modelId.toString();
     }

src/main/java/com/lqkj/link/module/zone/domain/ZoneInfo.java

@@ -65,4 +65,12 @@ public class ZoneInfo {
     @Column(name = "effect_address")
     @Schema(description = "模板文件路径")
     private String effectAddress;
+
+    @Column(name = "type_number")
+    @Schema(description = "类型编号1：不需下载pak包 2：需下载pak包")
+    private Integer typeNumber;
+
+    @Schema(description = "pak文件地址")
+    @Column(name = "pak_path")
+    private String pakPath;
 }

src/main/java/com/lqkj/link/module/zone/service/ResourceService.java

@@ -93,7 +93,7 @@ public class ResourceService {
                         if (!modelInfoMap.containsKey(modelFileName.substring(0, modelFileName.lastIndexOf(".")))) {
                             list.add(new ModelInfo(null, category.getCategoryId(), modelFileName.substring(0, modelFileName.lastIndexOf(".")),
                                     null, null, null, modelPath,
-                                    modelIconPath.substring(1), null, null));
+                                    modelIconPath.substring(1), null, null, 1));
                         } else {
                             ModelInfo modelInfo = modelInfoMap.get(modelFileName.substring(0, modelFileName.lastIndexOf(".")));
                             modelInfo.setOriginalPath(modelPath);

src/main/java/com/lqkj/link/module/zone/service/ZoneInfoService.java

@@ -80,24 +80,20 @@ public class ZoneInfoService {
             return result;
         }
         zoneInfo.setUpdateTime(new Date());
+        boolean isUpdated = true;
         if (zoneInfo.getZoneId() == null) {
             zoneInfo.setShareCount(0);
             zoneInfo.setViewCount(0);
             zoneInfo.setTemplateUse(0);
-        }
-        Boolean isUpdated = true;
-        if (Objects.nonNull(zoneInfo.getZoneId())){
+        }else {
             ZoneInfo oldZoneInfo = zoneInfoRepository.findById(zoneInfo.getZoneId()).get();
             isUpdated = !oldZoneInfo.getTemplateFilePath().equals(zoneInfo.getTemplateFilePath());
-
         }
         ZoneInfo zoneInfo1 = zoneInfoRepository.save(zoneInfo);
-
         if (StringUtils.isNotBlank(zoneInfo.getTemplateFilePath()) && isUpdated) {
             // 清除元素与模型
             geomInfoRepository.deleteAllByZoneId(zoneInfo1.getZoneId());
             modelInfoRepository.deleteAllByTemplateIds(Collections.singletonList(zoneInfo1.getZoneId()));
-
             // 解压压缩文件
             // 文件目录格式：
             // --geom.json
@@ -163,41 +159,78 @@ public class ZoneInfoService {
                 result.put("msg", "模板压缩文件解压失败！");
                 return result;
             }
+            checkZipContent(zoneInfo1);
             TemplateGeom templateGeom = JSON.parseObject(geomJsonString, TemplateGeom.class);
 
             zoneInfo1.setInitLocation(templateGeom.getInit());
             zoneInfoRepository.save(zoneInfo1);
 
             List<TemplateInfo> templateInfoList = templateGeom.getModels();
-
-            String modelFolderPath = "./upload/template/" + zoneInfo1.getZoneId() + "/models";
-            File modelFolder = new File(modelFolderPath);
             List<ModelInfo> list = new ArrayList<>();
-            File[] models = modelFolder.listFiles();
-            assert models != null;
-            for (File model : models) {
-                if (model.isFile()) {
-                    String modelFileName = model.getName();
-                    if (modelFileName.endsWith(".fbx")) {
-                        String modelPath = aliOSSUtils.upload(model);
-                        list.add(new ModelInfo(null, null, modelFileName.substring(0, modelFileName.lastIndexOf(".")).toLowerCase(),
-                                null, null, null, modelPath,
-                                zoneInfo1.getThumbnail(), null, zoneInfo1.getZoneId()));
+            if (zoneInfo1.getTypeNumber() == 1){
+                String modelFolderPath = "./upload/template/" + zoneInfo1.getZoneId() + "/models";
+                File modelFolder = new File(modelFolderPath);
+                File[] models = modelFolder.listFiles();
+                assert models != null;
+                for (File model : models) {
+                    if (model.isFile()) {
+                        String modelFileName = model.getName();
+                        if (modelFileName.endsWith(".fbx")) {
+                            String modelPath = aliOSSUtils.upload(model);
+                            ModelInfo modelInfo = new ModelInfo();
+                            modelInfo.setModelName(modelFileName.substring(0, modelFileName.lastIndexOf(".")).toLowerCase());
+                            modelInfo.setOriginalPath(modelPath);
+                            modelInfo.setModelIcon(zoneInfo1.getThumbnail());
+                            modelInfo.setTemplateId(zoneInfo1.getZoneId());
+                            modelInfo.setTypeNumber(1);
+                            list.add(modelInfo);
+                        }
                     }
                 }
+            }else {
+                String directoryPath = "./upload/template/" + zoneInfo1.getZoneId();
+                File directory = new File(directoryPath);
+                // 获取目录下的所有文件
+                File[] files = directory.listFiles((dir, name) -> name.endsWith(".pak"));
+                assert files != null;
+                StringBuilder pakPath = new StringBuilder();
+                for (File file : files){
+                    assert false;
+                    pakPath.append(aliOSSUtils.upload(file)).append(",");
+
+                }
+                zoneInfo1.setPakPath(pakPath.toString());
+                zoneInfoRepository.save(zoneInfo1);
+                for (TemplateInfo templateInfo : templateInfoList) {
+                    ModelInfo modelInfo = new ModelInfo();
+                    modelInfo.setModelName(templateInfo.getModelPath().substring(templateInfo.getModelPath().lastIndexOf(".") + 1));
+                    modelInfo.setOriginalPath(templateInfo.getModelPath());
+                    modelInfo.setModelIcon(zoneInfo1.getThumbnail());
+                    modelInfo.setTemplateId(zoneInfo1.getZoneId());
+                    modelInfo.setTypeNumber(2);
+                    list.add(modelInfo);
+                }
             }
             List<ModelInfo> modelInfoList = modelInfoRepository.saveAll(list);
+
             Map<String, ModelInfo> modelPathIdMap = modelInfoList
                     .stream()
-                    .collect(Collectors.toMap(ModelInfo::getModelName, ModelInfo -> ModelInfo));
-
+                    .collect(Collectors.toMap(ModelInfo::getOriginalPath, ModelInfo -> ModelInfo));
+            Map<String, String> collect = null;
+            if (zoneInfo1.getTypeNumber() == 1) {
+                collect = modelInfoList.stream().collect(Collectors.toMap(ModelInfo::getModelName, ModelInfo::getOriginalPath));
+            }
             List<GeomInfo> geomInfoList = new ArrayList<>();
             GeometryFactory geometryFactory = new GeometryFactory();
             int j = 1;
             for (TemplateInfo templateInfo : templateInfoList) {
-
-                String modelName = templateInfo.getModelPath().substring(0, templateInfo.getModelPath().lastIndexOf(".")).toLowerCase();
+                String modelName = templateInfo.getModelPath();
+                if (zoneInfo1.getTypeNumber() == 1) {
+                    assert collect != null;
+                    modelName = collect.get(modelName.substring(0, modelName.lastIndexOf(".")).toLowerCase());
+                }
                 ModelInfo modelInfo = modelPathIdMap.get(modelName);
+
                 for (int i = 0; i < templateInfo.getLocation().size(); i++) {
                     JSONObject trans = templateInfo.getLocation().get(i);
                     GeomInfo geomInfo = new GeomInfo();
@@ -227,6 +260,31 @@ public class ZoneInfoService {
         return result;
     }
 
+    /**
+     * 检查zip包内容
+     * @param zoneInfo
+     */
+    private void checkZipContent(ZoneInfo zoneInfo) {
+        int fileLength;
+        if (zoneInfo.getTypeNumber() == 1){
+            String modelFolderPath = "./upload/template/" + zoneInfo.getZoneId() + "/models";
+            File modelFolder = new File(modelFolderPath);
+            File[] models = modelFolder.listFiles();
+            fileLength = models == null ? 0 : models.length;
+        }
+        else {
+            String directoryPath = "./upload/template/" + zoneInfo.getZoneId();
+            File directory = new File(directoryPath);
+            // 获取目录下的所有文件
+            File[] files = directory.listFiles((dir, name) -> name.endsWith(".pak"));
+            fileLength = files == null ? 0 : files.length;
+        }
+        if (fileLength == 0){
+            throw new RuntimeException("模板内容选择有误，请确认后重新上传!");
+        }
+
+    }
+
     @Transactional
     public void deleteTemplate(List<Integer> zoneIds) {
         zoneInfoRepository.deleteAllByIdInBatch(zoneIds);
@@ -384,7 +442,7 @@ public class ZoneInfoService {
 
         ZoneInfo zoneInfo = new ZoneInfo(null, userInfo.getUserId(), name, template == null ? new JSONObject(JSON.parseObject("{\"rotation\":{\"x\":0,\"y\":0.4383658766746521,\"z\":0,\"w\":0.8987966179847717},\"translation\":{\"x\":-820.947265625,\"y\":0,\"z\":955.6719360351563},\"scale3D\":{\"x\":1,\"y\":1,\"z\":1}}")) : template.getInitLocation(),
                 template == null ? null : template.getThumbnail(), 0, new Date(), 0, 0,
-                null, null, 0,0, null);
+                null, null, 0,0, null, template == null ? 1 : template.getTypeNumber(), template == null ? null : template.getPakPath());
         ZoneInfo newInfo = zoneInfoRepository.save(zoneInfo);
         GeometryFactory geometryFactory = new GeometryFactory();
         if (templateId != null) {

src/main/resources/db/migration/V13__1.2.0.sql

@@ -0,0 +1,11 @@
+ALTER TABLE zone_info
+    add COLUMN if not exists type_number int default 1;
+comment on column zone_info.type_number is '类型编号1：不需下载pak包 2：需下载pak包';
+
+ALTER TABLE zone_info
+    add COLUMN if not exists pak_path varchar(999);
+comment on column zone_info.pak_path is 'pak文件地址';
+
+ALTER TABLE model_info
+    add COLUMN if not exists type_number int default 1;
+comment on column model_info.type_number is '类型编号1：fbx文件 2：pak包';