辅助选址添加字段

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzDTO.java

@@ -14,24 +14,27 @@ public class FzxzDTO {
     private Date cjsj;// 创建时间
     @TableField(value = "user_id")
     private Long userId;// 创建用户
-    // private String cjyh;// 创建用户
     private Date rwkssj;// 任务开始时间
     private Date rwjssj;// 任务结束时间
     private String fxbg;// 分析报告
     private String ydxz_bsm;// 用地性质标识码
     private Float ydmjbegin;// 用地面积范围开始
     private Float ydmjend;// 用地面积范围结束
-    private String kddk;// 可多地块，0允许，1不允许
+    @TableField(value = "is_multiple")
+    private Boolean isMultiple;// 可多地块
+    @TableField(value = "multiple_length")
+    private Integer multipleLength;// 多地块最大距离
+    @TableField(value = "is_ydxz")
+    private Boolean isYdxz;// 是否保持用地性质一致
     private String zdpd;// 最大坡度
-    private Double xzmj;// 选址面积(m2)
+    private Double xzmj;// 选址面积(㎡)
     private String sjy;// 数据源,对应表的名称
-    // private String xzfw; //fwlx=1：wkt格式，4326，区域面积；fwlx=2：shp文件地址
     @TableField(value = "geom_id")
     private String geomId; // 选址范围信息
     private String xmmc;//项目名称
     private String xmlx;//项目类型
     // TODO:字段待确认
     private String jsdw;
-    @TableField(value = "is_deleted")
-    private Boolean isDeleted=false;
+    @TableField(value = "is_delete")
+    private Boolean isDelete=false;
 }

sql/pgsql/0_init.sql

@@ -10,14 +10,30 @@ UPDATE t_fzss_fzxz SET is_delete=FALSE;
 update  vector."TB_TDGY_SJ" set  geom= st_setsrid(geom,4326)
 
 -- vector新增表
-t_table
-t_table_conversion
-t_table_filed
-t_table_filed_relation
-t_table_inside_outside
-t_table_res_rule
-t_table_res_tabel
+-- t_table
+-- t_table_conversion
+-- t_table_filed
+-- t_table_filed_relation
+-- t_table_inside_outside
+-- t_table_res_rule
+-- t_table_res_tabel
 
 -- vector新增表
 -- 生成火葬场图斑
-CREATE TABLE "TB_HZC" as SELECT * FROM "TB_GHDK" WHERE lbdm like '%1506%';
+CREATE TABLE "TB_HZC" as SELECT * FROM "TB_GHDK" WHERE lbdm like '%1506%';
+
+
+-- t_fzss_fzxz 表添加字段了
+ALTER TABLE "base"."t_fzss_fzxz" ADD COLUMN "is_multiple" varchar(50) COLLATE "pg_catalog"."default";
+
+COMMENT ON COLUMN "base"."t_fzss_fzxz"."is_multiple" IS '是否允许多地块';
+
+ALTER TABLE "base"."t_fzss_fzxz" ADD COLUMN "multiple_length" int4;
+
+COMMENT ON COLUMN "base"."t_fzss_fzxz"."multiple_length" IS '多地块间最大距离';
+
+ALTER TABLE "base"."t_fzss_fzxz" ADD COLUMN "is_ydxz" bool;
+
+COMMENT ON COLUMN "base"."t_fzss_fzxz"."is_ydxz" IS '是否与控规用地性质一致';
+
+ALTER TABLE "base"."t_fzss_fzxz" DROP COLUMN "kddk";