修改选址因子

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

@@ -1,22 +1,43 @@
 package com.onemap.analyse.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
-import org.python.compiler.Filename;
+import lombok.NoArgsConstructor;
 
 /**
  * 辅助选址计算中用到的因子
  */
+@NoArgsConstructor
 @TableName("t_fzss_fzxz_factor_use")
 @Data
 public class FactorUseDTO {
+    @JsonProperty("id")
     private String id;
-    @Filename("task_id")
+
+    @JsonProperty("task_id")
+    @TableField("task_id")
     private String taskId;
-    @Filename("factor_bsm")
+
+
+    @JsonProperty("bsm")
+    @TableField("factor_bsm")
     private String factorBsm;
-    @Filename("factor_name")
+
+    @JsonProperty("name")
+    @TableField("factor_name")
     private String factorName;
-    @Filename("condition_info")
-    private String conditionInfo;
+
+
+    @JsonProperty("spatial_type")
+    @TableField("spatial_type")
+    private String spatialType;
+
+    @JsonProperty("default")
+    @TableField("default_type")
+    private String default_type;
+
+    @TableField("default_value")
+    private Float defaultValue;
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/FzxzFactorDTO.java

@@ -0,0 +1,13 @@
+package com.onemap.analyse.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+/**
+ * 辅助选址计算解析中用到的因子
+ */
+@Data
+public class FzxzFactorDTO {
+
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -7,6 +7,7 @@ import com.onemap.analyse.domain.calculation.FzxzCalc;
 import com.onemap.analyse.domain.query.GhdkaFilter;
 import com.onemap.analyse.domain.res.FzxzResultDTO;
 import com.onemap.analyse.domain.res.GeomRes;
+import com.onemap.analyse.domain.vo.FzxzFactorDTO;
 import com.onemap.analyse.mapper.*;
 import com.onemap.analyse.mapper.base.FzxzResMapper;
 import com.onemap.analyse.mapper.base.ShpFileMapper;
@@ -194,7 +195,6 @@ public class FzssServiceImpl implements IFzssService {
         for (FactorUseDTO fzxzXzyzDTO : fzxzCalc.getXzyxList()) {
             factorBsmList.add(fzxzXzyzDTO.getFactorBsm());
         }
-        String logs = "选址参数：数据源=" + sjyName + "，用地面积=" + fzxzDTO.getYdmjbegin() + "-" + fzxzDTO.getYdmjend() + "，影响因子=" + String.join(", ", yzs);
         iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "选址参数", "info");
 
         // 1.区域筛选
@@ -238,7 +238,7 @@ public class FzssServiceImpl implements IFzssService {
             return RequestResult.error("用地性质条件筛选未找到符合条件数据！", null);
         }
 
-        // 4.条件筛选
+        // 4.规划因子筛选
         GhdkaFilter ghdkaFilter = new GhdkaFilter();
         ghdkaFilter.setSjy(fzxzDTO.getSjy());
         ghdkaFilter.setIdList(ids);