1、修改ctfx 中建设用地接口

2、修改ctfx模块处理逻辑

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/CtfxSchedule.java

@@ -34,6 +34,8 @@ public class CtfxSchedule {
     //冲突分析python方法名标识
     @Value("${Fxpj.Xmydsyx.functionId}")
     private String xmydsyxFunctionId;
+    @Value("${Fxpj.jsyd.functionId}")
+    private String jsydFunctionId;
     private static final Logger log = LoggerFactory.getLogger(CtfxSchedule.class);
 
     @Async("taskExecutor")
@@ -46,8 +48,10 @@ public class CtfxSchedule {
             wrapper.orderByAsc("cjsj");
             //每次只操作一条记录
             List<TCtfxMainDTO> ress = ctfxMapper.selectList(wrapper);
+            log.info(ress.toString());
             if (ress.size() > 0) {
                 TCtfxMainDTO ctfxMainDTO = ress.get(0);
+                log.info(ctfxMainDTO.toString());
                 String id = ctfxMainDTO.getId();
                 ctfxMainDTO.setRwzt("1");
                 ctfxMainDTO.setRwkssj(new Date());
@@ -87,6 +91,11 @@ public class CtfxSchedule {
                         Map<String, String> params = new HashMap<>();
                         params.put("bsm", id);
                         result = PythonExecute.Run(xmydsyxFunctionId, params);
+                    } else if ("7".equals(ctfxMainDTO.getSsmk())) {//建设用地完成情况分析
+                        //执行python
+                        Map<String, String> params = new HashMap<>();
+                        params.put("bsm", id);
+                        result = PythonExecute.Run(jsydFunctionId, params);
                     } else {
                         //执行python
                         Map<String, String> params = new HashMap<>();

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/PythonExecute.java

@@ -12,11 +12,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Component
 public class PythonExecute {
@@ -69,7 +67,6 @@ public class PythonExecute {
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
-        //Runtime方式
         JSONObject json = new JSONObject(params);
         String[] arguments = new String[]{pythonexe, pythonfile, functionName, Base64Utils.base64Encode(json.toJSONString())};
         try {
@@ -248,4 +245,4 @@ public class PythonExecute {
             this.value = value;
         }
     }
-}
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fxpj/CtfxController.java

@@ -16,7 +16,7 @@ import static com.onemap.common.core.utils.PageUtils.startRecordPage;
 
 /**
  * 冲突分析
- * 所属模块（1：生态保护，2：农业生产，3：城镇建设，4：村庄用地）
+ * 所属模块（1：生态保护，2：农业生产，3：城镇建设，4：村庄用地，7：建设用地）
  */
 @RestController
 @RequestMapping("/fxpj/ctfx")

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fxpj/CtfxServiceImpl.java

@@ -127,6 +127,9 @@ public class CtfxServiceImpl implements CtfxService {
             mainDto.setFxtable("SDE." + mainDto.getFxtable());
             mainDto.setSjy(sjy.getTablename());
         }
+        if ("7".equals(mainDto.getSsmk())){
+            mainDto.setFxtable("SDE." + mainDto.getFxtable());
+        }
         tCtfxMainMapper.insert(mainDto);
         if ("6".equals(mainDto.getSsmk())) {
             String fxyz = mainDto.getFxyz();

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/task/CgjcSchedule.java

@@ -3,7 +3,7 @@ package com.onemap.apply.task;
 import com.onemap.apply.mapper.cggl.EscalationMapper;
 import com.onemap.apply.utils.HttpClientUtil;
 import com.onemap.common.core.utils.StringUtils;
-import com.sun.org.apache.xpath.internal.operations.Bool;
+//import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;