diff --git a/src/main/java/com/example/demo/common/config/SqliteDataSourceConfig.java b/src/main/java/com/example/demo/common/config/SqliteDataSourceConfig.java index 16dba07..377e689 100644 --- a/src/main/java/com/example/demo/common/config/SqliteDataSourceConfig.java +++ b/src/main/java/com/example/demo/common/config/SqliteDataSourceConfig.java @@ -16,8 +16,8 @@ import javax.sql.DataSource; * SQLite数据源配置类 * 配置主数据库SQLite的数据源和初始化 * - * @author system - * @since 1.0.0 + * @author 岳佳君 (2025年09月25日 10:44:21) + * @version 1.0.0 */ @Configuration public class SqliteDataSourceConfig { diff --git a/src/main/java/com/example/demo/draft/demo043/0.java b/src/main/java/com/example/demo/draft/demo043/0.java index 2726ca9..29b7f10 100644 --- a/src/main/java/com/example/demo/draft/demo043/0.java +++ b/src/main/java/com/example/demo/draft/demo043/0.java @@ -13,8 +13,12 @@ // TODO XML 转成 JSON 可能存在的问题 // 8、 XML标签，一定存在部分数据是固定数据，例如： 各种类型、枚举 // 9、 XML标签、值、属性 内容需要合并 - // 10、 XML标签 自定义函数问题 - // 11、 XML标签值，存在一部分值需要拆分成多个数据 // 97、 增量更新问题，例如： 推演过程中，数据是动态不断更新的，这种是需要追加旧数据，还是读到什么数据就是什么数据？ // 98、 允许组合规则、条件生效 // 99、 对接时，需要一个字段一个字段对应 + + // DONE + // 10、 XML标签 自定义函数问题 + // 可以调用自定义函数 + // 11、 XML标签值，存在一部分值需要拆分成多个数据 + // 通过正则表达式进行拆分 diff --git a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__01.java b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__01.java index b2ceb65..9097226 100644 --- a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__01.java +++ b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__01.java @@ -1,9 +1,9 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson.JSON; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.core.EnhancedTemplateGenerator; -import com.example.demo.draft.demo043.core.Xml2AFSIMTransformation; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.core.EnhancedTemplateGenerator; +import com.example.demo.parser.process.core.Xml2AFSIMTransformation; import com.example.demo.draft.demo043.util.FormatUtil; import java.io.File; diff --git a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__02.java b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__02.java index 65a5dc7..f1a38f1 100644 --- a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__02.java +++ b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__02.java @@ -1,9 +1,9 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson.JSON; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.core.EnhancedTemplateGenerator; -import com.example.demo.draft.demo043.core.Xml2AFSIMTransformation; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.core.EnhancedTemplateGenerator; +import com.example.demo.parser.process.core.Xml2AFSIMTransformation; import com.example.demo.draft.demo043.util.FormatUtil; import java.io.File; diff --git a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__03.java b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__03.java index 26696c5..a55d46a 100644 --- a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__03.java +++ b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__03.java @@ -1,9 +1,9 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson.JSON; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.core.EnhancedTemplateGenerator; -import com.example.demo.draft.demo043.core.Xml2AFSIMTransformation; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.core.EnhancedTemplateGenerator; +import com.example.demo.parser.process.core.Xml2AFSIMTransformation; import com.example.demo.draft.demo043.util.FormatUtil; import java.io.File; diff --git a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__04.java b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__04.java index 3ee019d..e0d500d 100644 --- a/src/main/java/com/example/demo/draft/demo043/ApplicationTest__04.java +++ b/src/main/java/com/example/demo/draft/demo043/ApplicationTest__04.java @@ -1,9 +1,9 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson.JSON; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.core.EnhancedTemplateGenerator; -import com.example.demo.draft.demo043.core.Xml2AFSIMTransformation; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.core.EnhancedTemplateGenerator; +import com.example.demo.parser.process.core.Xml2AFSIMTransformation; import com.example.demo.draft.demo043.util.FormatUtil; import java.io.File; diff --git a/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__02.java b/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__02.java index 1be5958..84f79cc 100644 --- a/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__02.java +++ b/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__02.java @@ -1,11 +1,11 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson.JSON; -import com.example.demo.draft.demo043.core.EnhancedTemplateGenerator; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.domain.ConfigValue; -import com.example.demo.draft.demo043.domain.LevelConfig; -import com.example.demo.draft.demo043.domain.ValueConfig; +import com.example.demo.parser.process.core.EnhancedTemplateGenerator; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.domain.ConfigValue; +import com.example.demo.parser.process.domain.LevelConfig; +import com.example.demo.parser.process.domain.ValueConfig; import lombok.SneakyThrows; import java.util.*; diff --git a/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__03.java b/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__03.java index 1cce026..ccf8be7 100644 --- a/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__03.java +++ b/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__03.java @@ -1,11 +1,11 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson.JSON; -import com.example.demo.draft.demo043.core.EnhancedTemplateGenerator; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.domain.ConfigValue; -import com.example.demo.draft.demo043.domain.LevelConfig; -import com.example.demo.draft.demo043.domain.ValueConfig; +import com.example.demo.parser.process.core.EnhancedTemplateGenerator; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.domain.ConfigValue; +import com.example.demo.parser.process.domain.LevelConfig; +import com.example.demo.parser.process.domain.ValueConfig; import lombok.SneakyThrows; import java.util.*; diff --git a/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__04.java b/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__04.java index aa0b6cd..600e367 100644 --- a/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__04.java +++ b/src/main/java/com/example/demo/draft/demo043/ConfigDataCreator__04.java @@ -1,11 +1,11 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson.JSON; -import com.example.demo.draft.demo043.core.EnhancedTemplateGenerator; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.domain.ConfigValue; -import com.example.demo.draft.demo043.domain.LevelConfig; -import com.example.demo.draft.demo043.domain.ValueConfig; +import com.example.demo.parser.process.core.EnhancedTemplateGenerator; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.domain.ConfigValue; +import com.example.demo.parser.process.domain.LevelConfig; +import com.example.demo.parser.process.domain.ValueConfig; import lombok.SneakyThrows; import java.util.Arrays; diff --git a/src/main/java/com/example/demo/draft/demo043/TestLoopCountFix.java b/src/main/java/com/example/demo/draft/demo043/TestLoopCountFix.java index c4fb2ba..20d7a80 100644 --- a/src/main/java/com/example/demo/draft/demo043/TestLoopCountFix.java +++ b/src/main/java/com/example/demo/draft/demo043/TestLoopCountFix.java @@ -1,8 +1,8 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson2.JSON; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.domain.LevelConfig; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.domain.LevelConfig; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/com/example/demo/parser/process/constant/ParserProcessConstant.java b/src/main/java/com/example/demo/parser/process/constant/ParserProcessConstant.java new file mode 100644 index 0000000..d49e151 --- /dev/null +++ b/src/main/java/com/example/demo/parser/process/constant/ParserProcessConstant.java @@ -0,0 +1,4 @@ +package com.example.demo.parser.process.constant; + +public final class ParserProcessConstant { +} diff --git a/src/main/java/com/example/demo/draft/demo043/core/EnhancedConfigProcessor.java b/src/main/java/com/example/demo/parser/process/core/EnhancedConfigProcessor.java similarity index 98% rename from src/main/java/com/example/demo/draft/demo043/core/EnhancedConfigProcessor.java rename to src/main/java/com/example/demo/parser/process/core/EnhancedConfigProcessor.java index e141b6f..6ef02ff 100644 --- a/src/main/java/com/example/demo/draft/demo043/core/EnhancedConfigProcessor.java +++ b/src/main/java/com/example/demo/parser/process/core/EnhancedConfigProcessor.java @@ -1,10 +1,10 @@ -package com.example.demo.draft.demo043.core; +package com.example.demo.parser.process.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.example.demo.draft.demo043.domain.ConfigValue; -import com.example.demo.draft.demo043.domain.LevelConfig; -import com.example.demo.draft.demo043.domain.ValueConfig; +import com.example.demo.parser.process.domain.ConfigValue; +import com.example.demo.parser.process.domain.LevelConfig; +import com.example.demo.parser.process.domain.ValueConfig; import com.example.demo.draft.demo043.util.FormatUtil; import java.lang.reflect.Method; diff --git a/src/main/java/com/example/demo/draft/demo043/core/EnhancedTemplateGenerator.java b/src/main/java/com/example/demo/parser/process/core/EnhancedTemplateGenerator.java similarity index 98% rename from src/main/java/com/example/demo/draft/demo043/core/EnhancedTemplateGenerator.java rename to src/main/java/com/example/demo/parser/process/core/EnhancedTemplateGenerator.java index e14ff20..95a3373 100644 --- a/src/main/java/com/example/demo/draft/demo043/core/EnhancedTemplateGenerator.java +++ b/src/main/java/com/example/demo/parser/process/core/EnhancedTemplateGenerator.java @@ -1,19 +1,14 @@ -package com.example.demo.draft.demo043.core; +package com.example.demo.parser.process.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; -import com.example.demo.draft.demo043.domain.ConfigValue; -import com.example.demo.draft.demo043.domain.LevelConfig; -import com.example.demo.draft.demo043.domain.ValueConfig; +import com.example.demo.parser.process.domain.ConfigValue; +import com.example.demo.parser.process.domain.LevelConfig; +import com.example.demo.parser.process.domain.ValueConfig; import com.example.demo.draft.demo043.util.FormatUtil; import com.hubspot.jinjava.Jinjava; import com.hubspot.jinjava.JinjavaConfig; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/example/demo/draft/demo043/core/TemplateFileLoader.java b/src/main/java/com/example/demo/parser/process/core/TemplateFileLoader.java similarity index 99% rename from src/main/java/com/example/demo/draft/demo043/core/TemplateFileLoader.java rename to src/main/java/com/example/demo/parser/process/core/TemplateFileLoader.java index 4580ad7..262e6f5 100644 --- a/src/main/java/com/example/demo/draft/demo043/core/TemplateFileLoader.java +++ b/src/main/java/com/example/demo/parser/process/core/TemplateFileLoader.java @@ -1,4 +1,4 @@ -package com.example.demo.draft.demo043.core; +package com.example.demo.parser.process.core; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/demo/draft/demo043/core/Xml2AFSIMTransformation.java b/src/main/java/com/example/demo/parser/process/core/Xml2AFSIMTransformation.java similarity index 99% rename from src/main/java/com/example/demo/draft/demo043/core/Xml2AFSIMTransformation.java rename to src/main/java/com/example/demo/parser/process/core/Xml2AFSIMTransformation.java index 8739f78..6e39877 100644 --- a/src/main/java/com/example/demo/draft/demo043/core/Xml2AFSIMTransformation.java +++ b/src/main/java/com/example/demo/parser/process/core/Xml2AFSIMTransformation.java @@ -1,4 +1,4 @@ -package com.example.demo.draft.demo043.core; +package com.example.demo.parser.process.core; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/demo/draft/demo043/domain/ConfigDocument.java b/src/main/java/com/example/demo/parser/process/domain/ConfigDocument.java similarity index 98% rename from src/main/java/com/example/demo/draft/demo043/domain/ConfigDocument.java rename to src/main/java/com/example/demo/parser/process/domain/ConfigDocument.java index bbbef97..d233d52 100644 --- a/src/main/java/com/example/demo/draft/demo043/domain/ConfigDocument.java +++ b/src/main/java/com/example/demo/parser/process/domain/ConfigDocument.java @@ -1,4 +1,4 @@ -package com.example.demo.draft.demo043.domain; +package com.example.demo.parser.process.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/demo/draft/demo043/domain/ConfigValue.java b/src/main/java/com/example/demo/parser/process/domain/ConfigValue.java similarity index 98% rename from src/main/java/com/example/demo/draft/demo043/domain/ConfigValue.java rename to src/main/java/com/example/demo/parser/process/domain/ConfigValue.java index 6f519ef..8b20e42 100644 --- a/src/main/java/com/example/demo/draft/demo043/domain/ConfigValue.java +++ b/src/main/java/com/example/demo/parser/process/domain/ConfigValue.java @@ -1,4 +1,4 @@ -package com.example.demo.draft.demo043.domain; +package com.example.demo.parser.process.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/demo/draft/demo043/domain/LevelConfig.java b/src/main/java/com/example/demo/parser/process/domain/LevelConfig.java similarity index 97% rename from src/main/java/com/example/demo/draft/demo043/domain/LevelConfig.java rename to src/main/java/com/example/demo/parser/process/domain/LevelConfig.java index bbc4ff6..270615c 100644 --- a/src/main/java/com/example/demo/draft/demo043/domain/LevelConfig.java +++ b/src/main/java/com/example/demo/parser/process/domain/LevelConfig.java @@ -1,7 +1,5 @@ -package com.example.demo.draft.demo043.domain; +package com.example.demo.parser.process.domain; -import com.alibaba.fastjson2.JSON; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/draft/demo043/domain/ValueConfig.java b/src/main/java/com/example/demo/parser/process/domain/ValueConfig.java similarity index 94% rename from src/main/java/com/example/demo/draft/demo043/domain/ValueConfig.java rename to src/main/java/com/example/demo/parser/process/domain/ValueConfig.java index cda9460..41d31db 100644 --- a/src/main/java/com/example/demo/draft/demo043/domain/ValueConfig.java +++ b/src/main/java/com/example/demo/parser/process/domain/ValueConfig.java @@ -1,4 +1,4 @@ -package com.example.demo.draft.demo043.domain; +package com.example.demo.parser.process.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/test/java/com/example/demo/draft/demo043/LoopCountIntegrationTest.java b/src/test/java/com/example/demo/draft/demo043/LoopCountIntegrationTest.java index 4566038..43751be 100644 --- a/src/test/java/com/example/demo/draft/demo043/LoopCountIntegrationTest.java +++ b/src/test/java/com/example/demo/draft/demo043/LoopCountIntegrationTest.java @@ -1,8 +1,8 @@ package com.example.demo.draft.demo043; import com.alibaba.fastjson2.JSON; -import com.example.demo.draft.demo043.domain.ConfigDocument; -import com.example.demo.draft.demo043.domain.LevelConfig; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.domain.LevelConfig; import org.junit.jupiter.api.Test; import java.nio.file.Files; diff --git a/src/test/java/com/example/demo/draft/demo043/core/EnhancedTemplateGeneratorTest.java b/src/test/java/com/example/demo/draft/demo043/core/EnhancedTemplateGeneratorTest.java index ebb783e..62bd066 100644 --- a/src/test/java/com/example/demo/draft/demo043/core/EnhancedTemplateGeneratorTest.java +++ b/src/test/java/com/example/demo/draft/demo043/core/EnhancedTemplateGeneratorTest.java @@ -1,6 +1,7 @@ package com.example.demo.draft.demo043.core; import com.alibaba.fastjson2.JSON; +import com.example.demo.parser.process.core.EnhancedTemplateGenerator; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/example/demo/draft/demo043/domain/LevelConfigTest.java b/src/test/java/com/example/demo/draft/demo043/domain/LevelConfigTest.java index 8e96db9..656d43d 100644 --- a/src/test/java/com/example/demo/draft/demo043/domain/LevelConfigTest.java +++ b/src/test/java/com/example/demo/draft/demo043/domain/LevelConfigTest.java @@ -1,6 +1,8 @@ package com.example.demo.draft.demo043.domain; import com.alibaba.fastjson.JSON; +import com.example.demo.parser.process.domain.ConfigDocument; +import com.example.demo.parser.process.domain.LevelConfig; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*;