添加合规性分析添加删除接口

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>