diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java index 919760a2..4a4f8409 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java @@ -37,6 +37,9 @@ public class SdAiboxBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 数据时间 */ @@ -80,6 +83,9 @@ public class SdAiboxBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 是否启用 */ @@ -90,6 +96,9 @@ public class SdAiboxBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -101,6 +110,9 @@ public class SdAiboxBH implements Serializable { */ private Integer mway; + @TableField(exist = false) + private String mwayName; + /** * 站索引 */ @@ -121,6 +133,9 @@ public class SdAiboxBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java index 0fdc10a6..ddf3b79c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java @@ -37,6 +37,9 @@ public class SdArtsgBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 数据时间 */ @@ -73,6 +76,9 @@ public class SdArtsgBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -94,6 +100,9 @@ public class SdArtsgBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ @@ -150,6 +159,8 @@ public class SdArtsgBH implements Serializable { */ private Integer bldsttCode; + private String bldsttCodeName; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java index a371b55a..e235d033 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java @@ -43,6 +43,9 @@ public class SdDwBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 位置经度 */ @@ -73,6 +76,9 @@ public class SdDwBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -89,6 +95,9 @@ public class SdDwBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ @@ -140,6 +149,9 @@ public class SdDwBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java index 615d595a..b57e4ace 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java @@ -43,6 +43,9 @@ public class SdEqBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 所属建设阶段 */ @@ -78,6 +81,9 @@ public class SdEqBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -99,6 +105,9 @@ public class SdEqBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ @@ -145,6 +154,9 @@ public class SdEqBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java index 5eb9dcc5..71d6acea 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java @@ -37,6 +37,9 @@ public class SdFbrdBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 数据时间 */ @@ -78,6 +81,9 @@ public class SdFbrdBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -99,6 +105,9 @@ public class SdFbrdBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ @@ -150,6 +159,9 @@ public class SdFbrdBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java index 01caef6a..c7a7c0a5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java @@ -73,6 +73,9 @@ public class SdFhbtBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -94,6 +97,9 @@ public class SdFhbtBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java index f4c7f644..56ed36be 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java @@ -20,6 +20,9 @@ public class SdOpinfoBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -37,6 +40,9 @@ public class SdOpinfoBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; @@ -49,6 +55,9 @@ public class SdOpinfoBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -82,6 +91,9 @@ public class SdOpinfoBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java index 72cdd511..9ada1d4a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java @@ -20,6 +20,9 @@ public class SdOtteBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -37,6 +40,9 @@ public class SdOtteBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; @@ -49,6 +55,9 @@ public class SdOtteBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -82,6 +91,9 @@ public class SdOtteBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java index c5aa7e0a..2dc6e874 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java @@ -20,6 +20,9 @@ public class SdOtweBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -37,6 +40,9 @@ public class SdOtweBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; @@ -49,6 +55,9 @@ public class SdOtweBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -82,6 +91,9 @@ public class SdOtweBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java index 51724149..507a4570 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java @@ -22,6 +22,9 @@ public class SdSonarBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -44,16 +47,25 @@ public class SdSonarBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private Integer usfl; private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; private Integer mway; + @TableField(exist = false) + private String mwayName; + private String stindx; @TableField("ORDER_INDEX") @@ -64,6 +76,9 @@ public class SdSonarBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java index 3aafa40d..8b54bd3a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java @@ -20,6 +20,9 @@ public class SdTeBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -35,6 +38,9 @@ public class SdTeBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; @@ -47,6 +53,9 @@ public class SdTeBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -80,6 +89,9 @@ public class SdTeBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java index 2a22b642..536c56b1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java @@ -20,6 +20,9 @@ public class SdVaBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -36,6 +39,8 @@ public class SdVaBH implements Serializable { private Integer usfl; private Integer dtin; + @TableField(exist = false) + private String dtinName; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") @@ -49,6 +54,9 @@ public class SdVaBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rstcdmap; @@ -80,6 +88,9 @@ public class SdVaBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java index 201f6a8e..900b68bd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java @@ -28,6 +28,9 @@ public class SdVdinfoB implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + private BigDecimal lgtd; private BigDecimal lttd; @@ -53,6 +56,9 @@ public class SdVdinfoB implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String fhstcd; @@ -69,10 +75,16 @@ public class SdVdinfoB implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private Integer usfl; private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_SRC") private String dtinSrc; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java index 97913f9b..6e8f9c2b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java @@ -23,6 +23,10 @@ public class SdVpBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -40,6 +44,9 @@ public class SdVpBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; @@ -52,6 +59,9 @@ public class SdVpBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -75,6 +85,9 @@ public class SdVpBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java index 01e0795f..396429f1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java @@ -23,6 +23,9 @@ public class SdWeBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -38,6 +41,9 @@ public class SdWeBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; @@ -50,6 +56,9 @@ public class SdWeBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -77,6 +86,9 @@ public class SdWeBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java index 43acd821..9f8c3591 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java @@ -26,6 +26,9 @@ public class SdWqBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + private BigDecimal lgtd; private BigDecimal lttd; @@ -47,6 +50,9 @@ public class SdWqBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; @@ -57,18 +63,27 @@ public class SdWqBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_SRC") private String dtinSrc; @TableField("DTIN_TYPE") private Integer dtinType; + @TableField(exist = false) + private String dtinTypeName; + @TableField("DTIN_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; private Integer mway; + @TableField(exist = false) + private Integer mwayName; + private String stindx; @TableField("ORDER_INDEX") @@ -79,6 +94,9 @@ public class SdWqBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String fhstcd; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java index 4dcad49f..07f0be4e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java @@ -26,6 +26,9 @@ public class SdWtBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + private BigDecimal lgtd; private BigDecimal lttd; @@ -62,6 +65,9 @@ public class SdWtBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private BigDecimal inv; private Integer invinmn; @@ -76,18 +82,27 @@ public class SdWtBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_SRC") private String dtinSrc; @TableField("DTIN_TYPE") private Integer dtinType; + @TableField(exist = false) + private String dtinTypeName; + @TableField("DTIN_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; private Integer mway; + @TableField(exist = false) + private String mwayName; + private String stindx; @TableField("ORDER_INDEX") @@ -140,6 +155,9 @@ public class SdWtBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; @TableField("WARN_STATE") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java index fd43b02a..525f718f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdAiboxBH; import com.yfd.platform.qgc_base.mapper.SdAiboxBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdAiboxBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,40 @@ public class SdAiboxBHServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdAiboxBH.class, this); + Page sdAiboxBHPage = DataSourceRequestUtil.executeQuery(request, SdAiboxBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdAiboxBHPage, CODE_TO_NAME_META_LIST); + return sdAiboxBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java index 5c73425b..47f0b135 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdArtsgBH; import com.yfd.platform.qgc_base.mapper.SdArtsgBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdArtsgBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -19,12 +22,42 @@ public class SdArtsgBHServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Resource private IMsOperationLogService msOperationLogService; @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdArtsgBH.class, this); + Page sdArtsgBHPage = DataSourceRequestUtil.executeQuery(request, SdArtsgBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdArtsgBHPage, CODE_TO_NAME_META_LIST); + return sdArtsgBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java index 5c7e8799..f2fbe57d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdDwBH; import com.yfd.platform.qgc_base.mapper.SdDwBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdDwBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,39 @@ public class SdDwBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdDwBH.class, this); + Page sdDwBHPage = DataSourceRequestUtil.executeQuery(request, SdDwBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdDwBHPage, CODE_TO_NAME_META_LIST); + return sdDwBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java index 5b1ec0b4..91e4793e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdEqBH; import com.yfd.platform.qgc_base.mapper.SdEqBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdEqBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,39 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdEqBH.class, this); + Page sdEqBHPage = DataSourceRequestUtil.executeQuery(request, SdEqBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdEqBHPage, CODE_TO_NAME_META_LIST); + return sdEqBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java index e6027445..fe3134c8 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdFbrdBH; import com.yfd.platform.qgc_base.mapper.SdFbrdBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdFbrdBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -22,9 +25,39 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdFbrdBH.class, this); + Page sdFbrdBHPage = DataSourceRequestUtil.executeQuery(request, SdFbrdBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdFbrdBHPage, CODE_TO_NAME_META_LIST); + return sdFbrdBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java index b22d1ee9..2d6f26fa 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdFhbtBH; import com.yfd.platform.qgc_base.mapper.SdFhbtBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdFhbtBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,39 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdFhbtBH.class, this); + Page sdFhbtBHPage = DataSourceRequestUtil.executeQuery(request, SdFhbtBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdFhbtBHPage, CODE_TO_NAME_META_LIST); + return sdFhbtBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java index 3ccad258..fb3e0d02 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdOpinfoBH; import com.yfd.platform.qgc_base.mapper.SdOpinfoBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdOpinfoBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,39 @@ public class SdOpinfoBHServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdOpinfoBH.class, this); + Page sdOpinfoBHPage = DataSourceRequestUtil.executeQuery(request, SdOpinfoBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdOpinfoBHPage, CODE_TO_NAME_META_LIST); + return sdOpinfoBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java index 1499673b..14553f59 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdOtteBH; import com.yfd.platform.qgc_base.mapper.SdOtteBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdOtteBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -22,9 +25,39 @@ public class SdOtteBHServiceImpl extends ServiceImpl i @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdOtteBH.class, this); + Page sdOtteBHPage = DataSourceRequestUtil.executeQuery(request, SdOtteBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdOtteBHPage, CODE_TO_NAME_META_LIST); + return sdOtteBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java index 0b89a0b2..94deb103 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdOtweBH; import com.yfd.platform.qgc_base.mapper.SdOtweBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdOtweBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -21,10 +24,39 @@ public class SdOtweBHServiceImpl extends ServiceImpl i @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdOtweBH.class, this); + Page sdOtweBHPage = DataSourceRequestUtil.executeQuery(request, SdOtweBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdOtweBHPage, CODE_TO_NAME_META_LIST); + return sdOtweBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java index 4a535f49..80827689 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdSonarBH; import com.yfd.platform.qgc_base.mapper.SdSonarBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdSonarBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,10 +27,40 @@ public class SdSonarBHServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdSonarBH.class, this); + Page sdSonarBHPage = DataSourceRequestUtil.executeQuery(request, SdSonarBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdSonarBHPage, CODE_TO_NAME_META_LIST); + return sdSonarBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java index bd2e9767..1c30c4ba 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdTeBH; import com.yfd.platform.qgc_base.mapper.SdTeBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdTeBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -21,10 +24,39 @@ public class SdTeBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdTeBH.class, this); + Page sdTeBHPage = DataSourceRequestUtil.executeQuery(request, SdTeBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdTeBHPage, CODE_TO_NAME_META_LIST); + return sdTeBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java index ac272e4b..b7868d86 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdVaBH; import com.yfd.platform.qgc_base.mapper.SdVaBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdVaBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,10 +27,39 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdVaBH.class, this); + Page sdVaBHPage = DataSourceRequestUtil.executeQuery(request, SdVaBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdVaBHPage, CODE_TO_NAME_META_LIST); + return sdVaBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java index 52bbbad3..d8cf051d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdVdinfoB; import com.yfd.platform.qgc_base.mapper.SdVdinfoBMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdVdinfoBService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -21,10 +24,39 @@ public class SdVdinfoBServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdVdinfoB.class, this); + Page sdVdinfoBPage = DataSourceRequestUtil.executeQuery(request, SdVdinfoB.class, this); + dictCodeToNameConverter.convertCodeToName(sdVdinfoBPage, CODE_TO_NAME_META_LIST); + return sdVdinfoBPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java index 7038e14d..f52dee58 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdVpBH; import com.yfd.platform.qgc_base.mapper.SdVpBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdVpBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,10 +27,39 @@ public class SdVpBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdVpBH.class, this); + Page sdVpBHPage = DataSourceRequestUtil.executeQuery(request, SdVpBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdVpBHPage, CODE_TO_NAME_META_LIST); + return sdVpBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java index 5825e303..abb7d382 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdWeBH; import com.yfd.platform.qgc_base.mapper.SdWeBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdWeBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -22,9 +25,40 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdWeBH.class, this); + Page sdWeBHPage = DataSourceRequestUtil.executeQuery(request, SdWeBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdWeBHPage, CODE_TO_NAME_META_LIST); + return sdWeBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java index 2f1a9d1b..d52e2640 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdWqBH; import com.yfd.platform.qgc_base.mapper.SdWqBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdWqBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,40 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdWqBH.class, this); + Page sdWqBHPage = DataSourceRequestUtil.executeQuery(request, SdWqBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdWqBHPage, CODE_TO_NAME_META_LIST); + return sdWqBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java index 42f4d7e8..c112084a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java @@ -1,5 +1,6 @@ package com.yfd.platform.qgc_base.service.impl; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,12 +9,15 @@ import com.yfd.platform.qgc_base.domain.SdWtBH; import com.yfd.platform.qgc_base.mapper.SdWtBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdWtBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +29,42 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表(静态初始化) + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList, + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + *
+     * 使用示例:
+     * // 在查询方法末尾调用:
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     * 
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdWtBH.class, this); + Page sdWtBHPage = DataSourceRequestUtil.executeQuery(request, SdWtBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdWtBHPage, CODE_TO_NAME_META_LIST); + return sdWtBHPage; } @Override