diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java index 94b45e33..6c355d33 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHbrvDic.java @@ -5,10 +5,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** *

- * 水电基地流域表 + * 水电基地河段字典表 *

*/ @Data @@ -29,6 +30,11 @@ public class SdHbrvDic implements Serializable { */ private String hbrvnm; + /** + * 所属基地流域编码,根节点为空 + */ + private String phbrvcd; + /** * 水电基地编码 */ @@ -49,8 +55,48 @@ public class SdHbrvDic implements Serializable { */ private Integer orderIndex; + /** + * 备注 + */ + private String remark; + /** * 是否启用:0=禁用 1=启用 */ private Integer enabled; -} \ No newline at end of file + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + private Date modifyTime; + + /** + * 是否已删除:0=未删除 1=已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHycdDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHycdDic.java index 4d8826ea..fe161975 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHycdDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHycdDic.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** *

@@ -30,7 +31,7 @@ public class SdHycdDic implements Serializable { private String hynm; /** - * 所属公司编码,根节点为0 + * 所属公司编码,根节点为空 */ private String phycd; @@ -49,14 +50,18 @@ public class SdHycdDic implements Serializable { */ private Integer orderIndex; + /** + * 备注 + */ + private String remark; /** - * 所属国家,关联SD_COUNTRY_B.COUNTRY_ID + * 所属国家 */ private String country; /** - * 公司Logo + * 公司LOGO */ private String logo; @@ -80,4 +85,44 @@ public class SdHycdDic implements Serializable { */ private Integer lx; + /** + * 是否启用:0=禁用 1=启用 + */ + private Integer enabled; + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + private Date modifyTime; + + /** + * 是否已删除:0=未删除 1=已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + private Date deleteTime; + } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHydrobase.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHydrobase.java index 296090ae..acd0c913 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHydrobase.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdHydrobase.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** *

@@ -63,4 +64,44 @@ public class SdHydrobase implements Serializable { * 简称 */ private String shortname; + + /** + * 是否启用:0=禁用 1=启用 + */ + private Integer enabled; + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + private Date modifyTime; + + /** + * 是否已删除:0=未删除 1=已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + private Date deleteTime; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java index 2b92f18d..53178c88 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -71,10 +72,15 @@ public class SdRvcdDic implements Serializable { private Double perimeter; /** - * 所属国家,关联SD_COUNTRY_B.COUNTRY_ID + * 所属国家 */ private String country; + /** + * 流域LOGO + */ + private String logo; + /** * 简介 */ @@ -86,20 +92,10 @@ public class SdRvcdDic implements Serializable { private String inffile; /** - * 简称 + * 流域简称 */ private String shortname; - /** - * 气象预报 0=不支持 1=支持 - */ - private Integer weatherForecast; - - /** - * 气象反演 0=不支持 1=支持 - */ - private Integer weatherInversion; - /** * 范围 */ @@ -111,9 +107,44 @@ public class SdRvcdDic implements Serializable { private String baseid; /** - * 地图专题流域标识:1=是 0否 + * 是否启用:0=禁用 1=启用 */ - private Integer ismap; + private Integer enabled; + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + private Date modifyTime; + + /** + * 是否已删除:0=未删除 1=已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + private Date deleteTime; /** * 子节点(用于树形结构,不映射数据库字段) diff --git a/backend/src/main/resources/application-devtw.yml b/backend/src/main/resources/application-devtw.yml index e34ac55d..597cd003 100644 --- a/backend/src/main/resources/application-devtw.yml +++ b/backend/src/main/resources/application-devtw.yml @@ -13,7 +13,7 @@ spring: druid: master: driverClassName: oracle.jdbc.OracleDriver - url: "${DB_MASTER_URL:jdbc:oracle:thin:@172.16.31.190:1521/SDLYZ}" + url: "${DB_MASTER_URL:jdbc:oracle:thin:@172.16.21.134:1521/SDLYZ}" username: "${DB_MASTER_USERNAME:QGC_REFA}" password: "${DB_MASTER_PASSWORD:Y4M4K1oCkL8U}" initial-size: 5 diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index cd6f706e..03a78ea5 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod + active: devtw jasypt: encryptor: diff --git a/backend/src/main/resources/mapper/qgc_base/SdHbrvDicMapper.xml b/backend/src/main/resources/mapper/qgc_base/SdHbrvDicMapper.xml index 09f8a32d..8bdffbb7 100644 --- a/backend/src/main/resources/mapper/qgc_base/SdHbrvDicMapper.xml +++ b/backend/src/main/resources/mapper/qgc_base/SdHbrvDicMapper.xml @@ -5,31 +5,47 @@ - + + + + + + + + + + - \ No newline at end of file + diff --git a/backend/src/main/resources/mapper/qgc_base/SdHycdDicMapper.xml b/backend/src/main/resources/mapper/qgc_base/SdHycdDicMapper.xml index 4ed2f89c..a222e511 100644 --- a/backend/src/main/resources/mapper/qgc_base/SdHycdDicMapper.xml +++ b/backend/src/main/resources/mapper/qgc_base/SdHycdDicMapper.xml @@ -10,18 +10,28 @@ - - + + - + - + + + + + + + + + SELECT * FROM SD_HYCD_DIC - WHERE PHYCD IS NULL OR PHYCD = '' OR PHYCD = '0' + WHERE NVL(ENABLED, 1) = 1 + AND NVL(IS_DELETED, 0) = 0 + AND (PHYCD IS NULL OR PHYCD = '' OR PHYCD = '0') ORDER BY ORDER_INDEX ASC diff --git a/backend/src/main/resources/mapper/qgc_base/SdHydrobaseMapper.xml b/backend/src/main/resources/mapper/qgc_base/SdHydrobaseMapper.xml index 839bafd4..8e6a6398 100644 --- a/backend/src/main/resources/mapper/qgc_base/SdHydrobaseMapper.xml +++ b/backend/src/main/resources/mapper/qgc_base/SdHydrobaseMapper.xml @@ -10,14 +10,24 @@ - + + + + + + + + + SELECT * FROM SD_HYDROBASE - WHERE PBASEID IS NULL OR PBASEID = '' OR PBASEID = '0' + WHERE NVL(ENABLED, 1) = 1 + AND NVL(IS_DELETED, 0) = 0 + AND (PBASEID IS NULL OR PBASEID = '' OR PBASEID = '0') ORDER BY ORDER_INDEX ASC diff --git a/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml b/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml index e4f11d28..913d985a 100644 --- a/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml +++ b/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml @@ -15,19 +15,27 @@ + - - - + + + + + + + + SELECT * FROM SD_RVCD_DIC - WHERE GRD =3 AND - PRVCD IS NULL OR PRVCD = '' OR PRVCD = '0' + WHERE NVL(ENABLED, 1) = 1 + AND NVL(IS_DELETED, 0) = 0 + AND (PRVCD IS NULL OR PRVCD = '' OR PRVCD = '0') ORDER BY ORDER_INDEX ASC