fix: 优化流域对象结构

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;
 
 /**
  * <p>
- * 水电基地流域表
+ * 水电基地河段字典表
  * </p>
  */
 @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;
-}
+
+    /**
+     * 创建人
+     */
+    private String recordUser;
+
+    /**
+     * 创建时间
+     */
+    private Date recordTime;
+
+    /**
+     * 更新人
+     */
+    private String modifyUser;
+
+    /**
+     * 更新时间
+     */
+    private Date modifyTime;
+
+    /**
+     * 是否已删除：0=未删除 1=已删除
+     */
+    private Integer isDeleted;
+
+    /**
+     * 删除人
+     */
+    private String deleteUser;
+
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+}

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;
 
 /**
  * <p>
@@ -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;
+
 }

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;
 
 /**
  * <p>
@@ -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;
 }

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;
 
     /**
      * 子节点（用于树形结构，不映射数据库字段）

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

backend/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: devtw
 
 jasypt:
   encryptor:

backend/src/main/resources/mapper/qgc_base/SdHbrvDicMapper.xml

@@ -5,31 +5,47 @@
 
     <resultMap id="BaseResultMap" type="com.yfd.platform.qgc_base.domain.SdHbrvDic">
         <id column="HBRVCD" property="hbrvcd"/>
-        <id column="BASEID" property="baseid"/>
         <result column="HBRVNM" property="hbrvnm"/>
+        <result column="PHBRVCD" property="phbrvcd"/>
+        <result column="BASEID" property="baseid"/>
         <result column="GRD" property="grd"/>
         <result column="PATH" property="path"/>
         <result column="ORDER_INDEX" property="orderIndex"/>
+        <result column="REMARK" property="remark"/>
         <result column="ENABLED" property="enabled"/>
+        <result column="RECORD_USER" property="recordUser"/>
+        <result column="RECORD_TIME" property="recordTime"/>
+        <result column="MODIFY_USER" property="modifyUser"/>
+        <result column="MODIFY_TIME" property="modifyTime"/>
+        <result column="IS_DELETED" property="isDeleted"/>
+        <result column="DELETE_USER" property="deleteUser"/>
+        <result column="DELETE_TIME" property="deleteTime"/>
     </resultMap>
 
     <select id="selectByBaseid" resultMap="BaseResultMap">
         SELECT * FROM SD_HBRV_DIC
         WHERE BASEID = #{baseid}
+          AND NVL(ENABLED, 1) = 1
+          AND NVL(IS_DELETED, 0) = 0
         ORDER BY ORDER_INDEX ASC
     </select>
 
     <select id="selectByPhycd" resultMap="BaseResultMap">
         SELECT * FROM SD_HBRV_DIC
-        WHERE HBRVCD = #{hbrvcd}
+        WHERE PHBRVCD = #{hbrvcd}
+          AND NVL(ENABLED, 1) = 1
+          AND NVL(IS_DELETED, 0) = 0
+        <if test="baseid != null and baseid != ''">
           AND BASEID = #{baseid}
+        </if>
         ORDER BY ORDER_INDEX ASC
     </select>
 
     <select id="selectEnabledList" resultMap="BaseResultMap">
         SELECT * FROM SD_HBRV_DIC
-        WHERE ENABLED = 1
+        WHERE NVL(ENABLED, 1) = 1
+          AND NVL(IS_DELETED, 0) = 0
         ORDER BY ORDER_INDEX ASC
     </select>
 
-</mapper>
+</mapper>

backend/src/main/resources/mapper/qgc_base/SdHycdDicMapper.xml

@@ -10,18 +10,28 @@
         <result column="PHYCD" property="phycd"/>
         <result column="GRD" property="grd"/>
         <result column="PATH" property="path"/>
-        <result column="LGTD" property="lgtd"/>
+        <result column="ORDER_INDEX" property="orderIndex"/>
-        <result column="LTTD" property="lttd"/>
+        <result column="REMARK" property="remark"/>
         <result column="COUNTRY" property="country"/>
         <result column="LOGO" property="logo"/>
-        <result column="DES" property="des"/>
+        <result column="INTRODUCE" property="introduce"/>
         <result column="INFFILE" property="inffile"/>
-        <result column="ORDERINDEX" property="orderIndex"/>
+        <result column="LX" property="lx"/>
+        <result column="ENABLED" property="enabled"/>
+        <result column="RECORD_USER" property="recordUser"/>
+        <result column="RECORD_TIME" property="recordTime"/>
+        <result column="MODIFY_USER" property="modifyUser"/>
+        <result column="MODIFY_TIME" property="modifyTime"/>
+        <result column="IS_DELETED" property="isDeleted"/>
+        <result column="DELETE_USER" property="deleteUser"/>
+        <result column="DELETE_TIME" property="deleteTime"/>
     </resultMap>
 
     <select id="selectByPhycd" resultMap="BaseResultMap">
         SELECT * FROM SD_HYCD_DIC
         WHERE 1=1
+          AND NVL(ENABLED, 1) = 1
+          AND NVL(IS_DELETED, 0) = 0
         <if test="phycd != null and phycd != ''">
             AND PHYCD = #{phycd}
         </if>
@@ -33,7 +43,9 @@
 
     <select id="selectRootList" resultMap="BaseResultMap">
         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
     </select>
 

backend/src/main/resources/mapper/qgc_base/SdHydrobaseMapper.xml

@@ -10,14 +10,24 @@
         <result column="PBASEID" property="pbaseid"/>
         <result column="GRD" property="grd"/>
         <result column="PATH" property="path"/>
-        <result column="ORDERINDEX" property="orderIndex"/>
+        <result column="ORDER_INDEX" property="orderIndex"/>
         <result column="RMK" property="rmk"/>
         <result column="DES" property="des"/>
+        <result column="ENABLED" property="enabled"/>
+        <result column="RECORD_USER" property="recordUser"/>
+        <result column="RECORD_TIME" property="recordTime"/>
+        <result column="MODIFY_USER" property="modifyUser"/>
+        <result column="MODIFY_TIME" property="modifyTime"/>
+        <result column="IS_DELETED" property="isDeleted"/>
+        <result column="DELETE_USER" property="deleteUser"/>
+        <result column="DELETE_TIME" property="deleteTime"/>
     </resultMap>
 
     <select id="selectByPbaseid" resultMap="BaseResultMap">
         SELECT * FROM SD_HYDROBASE
         WHERE 1=1
+          AND NVL(ENABLED, 1) = 1
+          AND NVL(IS_DELETED, 0) = 0
         <if test="pbaseid != null and pbaseid != ''">
             AND PBASEID = #{pbaseid}
         </if>
@@ -29,7 +39,9 @@
 
     <select id="selectRootList" resultMap="BaseResultMap">
         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
     </select>
 

backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml

@@ -15,19 +15,27 @@
         <result column="AREA" property="area"/>
         <result column="PERIMETER" property="perimeter"/>
         <result column="COUNTRY" property="country"/>
+        <result column="LOGO" property="logo"/>
         <result column="INTRODUCE" property="introduce"/>
         <result column="INFFILE" property="inffile"/>
         <result column="SHORTNAME" property="shortname"/>
-        <result column="WEATHER_FORECAST" property="weatherForecast"/>
-        <result column="WEATHER_INVERSION" property="weatherInversion"/>
         <result column="SHEPRANGE" property="sheprange"/>
         <result column="BASEID" property="baseid"/>
-        <result column="ISMAP" property="ismap"/>
+        <result column="ENABLED" property="enabled"/>
+        <result column="RECORD_USER" property="recordUser"/>
+        <result column="RECORD_TIME" property="recordTime"/>
+        <result column="MODIFY_USER" property="modifyUser"/>
+        <result column="MODIFY_TIME" property="modifyTime"/>
+        <result column="IS_DELETED" property="isDeleted"/>
+        <result column="DELETE_USER" property="deleteUser"/>
+        <result column="DELETE_TIME" property="deleteTime"/>
     </resultMap>
 
     <select id="selectByPrvcd" resultMap="BaseResultMap">
         SELECT * FROM SD_RVCD_DIC
         WHERE 1=1
+          AND NVL(ENABLED, 1) = 1
+          AND NVL(IS_DELETED, 0) = 0
         <if test="prvcd != null and prvcd != ''">
             AND PRVCD = #{prvcd}
         </if>
@@ -39,8 +47,9 @@
 
     <select id="selectRootList" resultMap="BaseResultMap">
         SELECT * FROM SD_RVCD_DIC
-        WHERE GRD =3 AND
+        WHERE NVL(ENABLED, 1) = 1
-        PRVCD IS NULL OR PRVCD = '' OR PRVCD = '0'
+          AND NVL(IS_DELETED, 0) = 0
+          AND (PRVCD IS NULL OR PRVCD = '' OR PRVCD = '0')
         ORDER BY ORDER_INDEX ASC
     </select>