Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/HgxfxController.java

@@ -84,18 +84,18 @@ public class HgxfxController extends BaseController {
         RequestResult res = hgxfxService.GetFxjg(bsm);
         return res;
     }
-//
-//    /**
-//     * 删除分析结果
-//     *
-//     * @param bsm
-//     * @return
-//     */
-//    @GetMapping("/DeleteFxjg")
-//    public RequestResult DeleteFxjg(String bsm) {
-//        RequestResult res = hgxfxService.DeleteFxjg(bsm);
-//        return res;
-//    }
+
+    /**
+     * 删除分析结果
+     *
+     * @param bsm
+     * @return
+     */
+    @GetMapping("/DeleteFxjg")
+    public RequestResult DeleteFxjg(String bsm) {
+        RequestResult res = hgxfxService.DeleteFxjg(bsm);
+        return res;
+    }
 //
 //    /**
 //     * 同步合规性审查因子项

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/HgxfxDTO.java

@@ -21,6 +21,7 @@ public class HgxfxDTO {
     private Date rwjssj;
     private String cjyh;
     private Date cjsj;
+    private Date scsj;
     @TableField(exist = false)
     private List<HgxfxScxRwDTO> scxList;
     @TableField(exist = false)
@@ -145,4 +146,12 @@ public class HgxfxDTO {
     public void setGeom(String geom) {
         this.geom = geom;
     }
+
+    public Date getScsj() {
+        return scsj;
+    }
+
+    public void setScsj(Date scsj) {
+        this.scsj = scsj;
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IHgxfxService.java

@@ -16,7 +16,7 @@ public interface IHgxfxService {
 
     RequestResult GetFxjg(String bsm);
 
-//    RequestResult DeleteFxjg(String bsm);
+    RequestResult DeleteFxjg(String bsm);
 //
 //    RequestResult UpdateScx(String params);
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/HgxfxServiceImpl.java

@@ -82,8 +82,8 @@ public class HgxfxServiceImpl implements IHgxfxService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public RequestResult AddHgxfx(HgxfxDTO hgxfxDTO) {
+
         if (StringUtils.isEmpty(hgxfxDTO.getXmmc())) {
             return RequestResult.error("项目参数为空");
         }
@@ -103,6 +103,17 @@ public class HgxfxServiceImpl implements IHgxfxService {
             return RequestResult.error("选址范围参数为空");
         }
         hgxfxDTO.setFxmj(area);
+        hgxfxDTO.setCjsj(new Date());
+        hgxfxDTO.setRwzt(0);
+        String bsm = insertHgxfx(hgxfxDTO);
+        FixedThreadUtil.FIXED_THREAD_POOL.execute(() -> {
+            hxfxHandleService.hgxfxHandle(bsm, ewkt);
+        });
+        return RequestResult.success(bsm);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public String insertHgxfx(HgxfxDTO hgxfxDTO) {
         hgxfxDTO.setCjsj(new Date());
         hgxfxDTO.setBsm(StringUtils.getUUID());
         hgxfxDTO.setRwzt(0);
@@ -119,12 +130,10 @@ public class HgxfxServiceImpl implements IHgxfxService {
             scxRw.setBsm(StringUtils.getUUID());
             hgxfxScxRwMapper.insert(scxRw);
         }
-        FixedThreadUtil.FIXED_THREAD_POOL.execute(() -> {
-            hxfxHandleService.hgxfxHandle(hgxfxDTO.getBsm(), ewkt);
-        });
-        return RequestResult.success(hgxfxDTO.getBsm());
+        return hgxfxDTO.getBsm();
     }
 
+
     @Override
     public RequestResult GetLog(String bsm) {
         if (StringUtils.isEmpty(bsm)) {
@@ -148,30 +157,17 @@ public class HgxfxServiceImpl implements IHgxfxService {
         return res;
     }
 
+    @Override
+    public RequestResult DeleteFxjg(String bsm) {
+        HgxfxDTO hgxfxDTO = new HgxfxDTO();
+        hgxfxDTO.setScsj(new Date());
 
-//
-//    @Override
-//    public RequestResult DeleteFxjg(String bsm) {
-//        QueryWrapper<HgxfxDTO> wrapper = new QueryWrapper<HgxfxDTO>();
-//        wrapper.eq("bsm", bsm);
-//        hgxfxEntityMapper.delete(wrapper);
-//        //分析因子表
-//        QueryWrapper<HgxfxHgscxDTO> wrapper1 = new QueryWrapper<HgxfxHgscxDTO>();
-//        wrapper1.eq("rwbsm", bsm);
-//        hgxfxHgscxMapper.delete(wrapper1);
-//        //分析范围sde表
-//        QueryWrapper<HgxfxGisDTO> wrapper4 = new QueryWrapper<HgxfxGisDTO>();
-//        wrapper4.eq("rwbsm", bsm);
-//        hgxfxGisMapper.delete(wrapper4);
-////        QueryWrapper<HgxfxRwGisDTO> wrapper2 = new QueryWrapper<HgxfxRwGisDTO>();
-////        wrapper2.eq("rwbsm", bsm);
-////        hgxfxRwGisMapper.delete(wrapper2);
-//        //分析日志
-//        QueryWrapper<FxrwrzDTO> wrapper3 = new QueryWrapper<FxrwrzDTO>();
-//        wrapper3.eq("rwbsm", bsm);
-//        fxrwrzMapper.delete(wrapper3);
-//        return RequestResult.success("删除成功", 1);
-//    }
+        //更新开始时间
+        QueryWrapper<HgxfxDTO> v1_update = new QueryWrapper<HgxfxDTO>();
+        v1_update.eq("bsm", bsm);
+        hgxfxMapper.update(hgxfxDTO, v1_update);
+        return RequestResult.success("删除成功", 1);
+    }
 //
 //    @Override
 //    public RequestResult UpdateScx(String params) {

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/fzss/HgxfxMapper.xml

@@ -18,7 +18,7 @@
         public.st_asewkt(t1.geom) AS geom
         from t_fzss_hgxfx t
         left join t_fzss_zhxz_file t1 on t1.id = t.xzfw
-        where 1 = 1
+        where t.scsj is null
         <if test="kssj != null and kssj != ''">
             and t.cjsj &gt;= to_date(#{kssj}, 'yyyy-MM-dd hh24:mi:ss')
         </if>

sql/pgsql/0_init.sql

@@ -1,46 +1,2 @@
--- 驾驶舱数据管理
--- delete from base.sys_menu where menu_id=3000;
--- delete from base.sys_menu where menu_id=3001;
--- delete from base.sys_menu where menu_id=3002;
--- delete from base.sys_menu where menu_id=3003;
--- delete from base.sys_menu where menu_id=3004;
--- delete from base.sys_menu where menu_id=3005;
-
--- 菜单 SQL
-insert into base.sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(3000,'驾驶舱数据管理', '1065', '9', 'sql', 'system/jsc/data/index', 1, 0, 'C', '0', '0', 'system:jsc:data:list', 'edit', 'admin', now(), '', null, '驾驶舱数据管理菜单');
-
--- 按钮 SQL
-insert into base.sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(3001,'数据查询', 3000, '1',  '#', '', 1, 0, 'F', '0', '0', 'system:jsc:data:query',        '#', 'admin', now(), '', null, '');
-
-insert into base.sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(3002,'数据新增', 3000, '2',  '#', '', 1, 0, 'F', '0', '0', 'system:jsc:data:add',          '#', 'admin', now(), '', null, '');
-
-insert into base.sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(3003,'数据修改', 3000, '3',  '#', '', 1, 0, 'F', '0', '0', 'system:jsc:data:edit',         '#', 'admin', now(), '', null, '');
-
-insert into base.sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(3004,'数据删除', 3000, '4',  '#', '', 1, 0, 'F', '0', '0', 'system:jsc:data:remove',       '#', 'admin', now(), '', null, '');
-
-insert into base.sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(3005,'数据导出', 3000, '5',  '#', '', 1, 0, 'F', '0', '0', 'system:jsc:data:export',       '#', 'admin', now(), '', null, '');
-
--- 土地卫片执法遥感监测分类表
--- delete from base.business_dic where "type"='土地卫片执法遥感监测分类表';
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增线性地物','11', '土地卫片执法遥感监测分类表', '新增线性地物', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增公路','111', '土地卫片执法遥感监测分类表', '新增公路', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增铁路','112', '土地卫片执法遥感监测分类表', '新增铁路', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增建（构）筑物','12', '土地卫片执法遥感监测分类表', '新增建（构）筑物', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增建筑物','121', '土地卫片执法遥感监测分类表', '新增建筑物', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增构筑物','122', '土地卫片执法遥感监测分类表', '新增构筑物', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增高尔夫运动用地','13', '土地卫片执法遥感监测分类表', '新增高尔夫运动用地', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增推堆土','21', '土地卫片执法遥感监测分类表', '新增推堆土', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增其他道路','22', '土地卫片执法遥感监测分类表', '新增其他道路', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增点状地物','23', '土地卫片执法遥感监测分类表', '新增点状地物', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增其他线形地物','31', '土地卫片执法遥感监测分类表', '新增其他线形地物', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增库塘','32', '土地卫片执法遥感监测分类表', '新增库塘', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增林业园地','33', '土地卫片执法遥感监测分类表', '新增林业园地', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('建筑物翻建、续建','34', '土地卫片执法遥感监测分类表', '建筑物翻建、续建', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增光伏方阵用地','35', '土地卫片执法遥感监测分类表', '新增光伏方阵用地', '1');
-INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('年度内续建','41', '土地卫片执法遥感监测分类表', '年度内续建', '1');
+-- 20240703，发布现场，以后sql表变动记录
+base.t_fzss_hgxfx 表添加字段了，需重新建表

sql/pgsql/t_jsc_sql.sql

@@ -1,32 +0,0 @@
--- 删除表 "t_jsc_sql"（如果存在）
-DROP TABLE IF EXISTS base."t_jsc_sql";
-
--- 创建表 "t_jsc_sql"
-CREATE TABLE base."t_jsc_sql"
-(
-    "id"          VARCHAR(50) NOT NULL PRIMARY KEY,  -- ID，UUID
-    "jsc_name"    VARCHAR(50) NOT NULL ,  -- 驾驶舱处理数据说明
-    "jsc_type"    VARCHAR(30) NOT NULL UNIQUE,    -- 驾驶舱处理数据类型
-    "jsc_view"    VARCHAR(1500),           -- 驾驶舱处理数据视图
-    "jsc_sql"     VARCHAR(1500)  NOT NULL, -- 驾驶舱处理数据SQL
-    "create_by"   VARCHAR(30) NOT NULL,    -- 创建者
-    "create_time" TIMESTAMP  NOT NULL,     -- 创建时间
-    "update_by"   VARCHAR(30),    -- 更新者
-    "update_time" TIMESTAMP,    -- 更新时间
-    "remark"      VARCHAR(500)    default null   -- 更新时间
-);
-
--- 添加表注释
-COMMENT ON TABLE base."t_jsc_sql" IS '驾驶舱数据处理表';
-
--- 添加字段注释
-COMMENT ON COLUMN base."t_jsc_sql"."id" IS 'ID，暂用UUID';
-COMMENT ON COLUMN base."t_jsc_sql"."jsc_name" IS '驾驶舱处理数据说明';
-COMMENT ON COLUMN base."t_jsc_sql"."jsc_type" IS '驾驶舱处理数据类型';
-COMMENT ON COLUMN base."t_jsc_sql"."jsc_view" IS '驾驶舱处理数据视图';
-COMMENT ON COLUMN base."t_jsc_sql"."jsc_sql" IS '驾驶舱处理数据SQL';
-COMMENT ON COLUMN base."t_jsc_sql"."create_by" IS '创建者';
-COMMENT ON COLUMN base."t_jsc_sql"."create_time" IS '创建时间';
-COMMENT ON COLUMN base."t_jsc_sql"."update_by" IS '更新者';
-COMMENT ON COLUMN base."t_jsc_sql"."update_time" IS '更新时间';
-COMMENT ON COLUMN base."t_jsc_sql"."remark" IS '备注';