修改试用因子module

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

@@ -0,0 +1,22 @@
+package com.onemap.analyse.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.python.compiler.Filename;
+
+/**
+ * 辅助选址计算中用到的因子
+ */
+@TableName("t_fzss_fzxz_factor_use")
+@Data
+public class FactorUseDTO {
+    private String id;
+    @Filename("task_id")
+    private String taskId;
+    @Filename("factor_bsm")
+    private String factorBsm;
+    @Filename("factor_name")
+    private String factorName;
+    @Filename("condition_info")
+    private String conditionInfo;
+}

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

@@ -6,21 +6,21 @@ import lombok.Data;
 import org.springframework.stereotype.Repository;
 
 // 辅助选址选址因子,任务中使用
-@TableName("t_fzss_fzxz_xzyz")
-@Repository
-@Data
-public class FzxzXzyzDTO {
-    // 标识码
-    private String bsm;
-    // 选址任务标识码
-    private String rwbsm;
-    // 因子标识码
-    private String yzbsm;
-    // 影响因子名称
-    private String yxyzmc;
-    // 因子条件,包含：contain,n_contain,相交:identity,n_identity
-    @TableField(value = "spatial_type")
-    private String spatialType;
-    // 影响值
-    private Float yxz;
-}
+// @TableName("t_fzss_fzxz_xzyz")
+// @Repository
+// @Data
+// public class FzxzXzyzDTO {
+//     // 标识码
+//     private String bsm;
+//     // 选址任务标识码
+//     private String rwbsm;
+//     // 因子标识码
+//     private String yzbsm;
+//     // 影响因子名称
+//     private String yxyzmc;
+//     // 因子条件,包含：contain,n_contain,相交:identity,n_identity
+//     @TableField(value = "spatial_type")
+//     private String spatialType;
+//     // 影响值
+//     private Float yxz;
+// }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/calculation/FzxzCalc.java

@@ -1,7 +1,7 @@
 package com.onemap.analyse.domain.calculation;
 
+import com.onemap.analyse.domain.FactorUseDTO;
 import com.onemap.analyse.domain.FzxzDTO;
-import com.onemap.analyse.domain.FzxzXzyzDTO;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -10,5 +10,5 @@ import java.util.List;
 @Data
 public class FzxzCalc {
     FzxzDTO fzxzDTO;
-    List<FzxzXzyzDTO> xzyxList=new ArrayList<>();
+    List<FactorUseDTO> xzyxList=new ArrayList<>();
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/query/GhdkaFilter.java

@@ -1,6 +1,6 @@
 package com.onemap.analyse.domain.query;
 
-import com.onemap.analyse.domain.FzxzXzyzDTO;
+import com.onemap.analyse.domain.FactorUseDTO;
 import lombok.Data;
 
 import java.util.List;
@@ -12,5 +12,5 @@ import java.util.List;
 public class GhdkaFilter {
     List<Integer> idList;
     String sjy;
-    FzxzXzyzDTO fzxzXzyzDTO;
+    FactorUseDTO fzxzXzyzDTO;
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/res/FzxzResultDTO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.onemap.analyse.domain.FzxzXzyzDTO;
+import com.onemap.analyse.domain.FactorUseDTO;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -34,5 +34,5 @@ public class FzxzResultDTO {
     // TODO 选址条件信息，数据源，面积起始、终止
     // 结果返回选址因子信息
     @TableField(exist = false)
-    private List<FzxzXzyzDTO> xzyz = new ArrayList<>();
+    private List<FactorUseDTO> xzyz = new ArrayList<>();
 }

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

@@ -0,0 +1,19 @@
+package com.onemap.analyse.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 计算中用到的因子
+ */
+@Data
+public class FactorSpatialVo {
+    @JsonProperty("spatial_type")
+    private String spatialType;
+    @JsonProperty("default")
+    private String defaultX;
+    @JsonProperty("hasValue")
+    private Boolean hasValue;
+    @JsonProperty("defaultValue")
+    private Integer defaultValue;
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzXzyzMapper.java → onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FactorUseMapper.java

@@ -1,13 +1,13 @@
 package com.onemap.analyse.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.analyse.domain.FzxzXzyzDTO;
+import com.onemap.analyse.domain.FactorUseDTO;
 
 /**
  * 辅助选址 数据层
  *
  * @author onemap
  */
-public interface FzxzXzyzMapper extends BaseMapper<FzxzXzyzDTO> {
+public interface FactorUseMapper extends BaseMapper<FactorUseDTO> {
 
 }

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

@@ -19,7 +19,6 @@ import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.common.datasource.annotation.Master;
 import com.onemap.common.security.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,37 +36,35 @@ public class FzssServiceImpl implements IFzssService {
     private String temp;
     // 任务状态标识码
     private RwztDTO Rwzt = new RwztDTO();
-    @Autowired
+    @Resource
     private HgxfxScxMapper hgxfxScxMapper;
-    @Autowired
+    @Resource
     private HgxfxHgscxMapper hgxfxHgscxMapper;
-    @Autowired
+    @Resource
     private HgxfxMapper hgxfxMapper;
-    // @Autowired
-    // FzxzSchedule fzxzSchedule;
 
     //**后写逻辑**//
-    @Autowired
+    @Resource
     GhdkaMapper ghdkaMapper;
     // 空间范围记录
-    @Autowired
+    @Resource
     ShpFileMapper shpFileMapper;
     // 辅助选址结果
-    @Autowired
+    @Resource
     private FzxzResMapper fzxzResMapper;
     // 选址任务
-    @Autowired
+    @Resource
     private FzxzMapper fzxzMapper;
     // 选址因子
-    @Autowired
-    private FzxzXzyzMapper fzxzXzyzMapper;
+    @Resource
+    private FactorUseMapper fzxzXzyzMapper;
 
     // 报告服务
-    @Autowired
+    @Resource
     private IReportService iReportService;
 
     // 日志服务
-    @Autowired
+    @Resource
     private ILogService iLogService;
 
     // 选址结果汇总
@@ -127,12 +124,12 @@ public class FzssServiceImpl implements IFzssService {
 
         // 选址因子
         ArrayList xzyx = (ArrayList) params.get("yxyz");
-        List<FzxzXzyzDTO> xzyxList = new ArrayList<>();
+        List<FactorUseDTO> xzyxList = new ArrayList<>();
         for (int i = 0; i < xzyx.size(); i++) {
-            FzxzXzyzDTO dto = DozerUtils.map(xzyx.get(i), FzxzXzyzDTO.class);
-            dto.setBsm(StringUtils.getUUID());
-            dto.setRwbsm(fzxzDTO.getBsm());
-            xzyxList.add(dto);
+            FactorUseDTO factorUseDTO = DozerUtils.map(xzyx.get(i), FactorUseDTO.class);
+            factorUseDTO.setId(StringUtils.getUUID());
+            factorUseDTO.setTaskId(fzxzDTO.getBsm());
+            xzyxList.add(factorUseDTO);
         }
 
         // 存储规划任务
@@ -142,7 +139,7 @@ public class FzssServiceImpl implements IFzssService {
         fzxzCalc.setFzxzDTO(fzxzDTO);
         fzxzCalc.setXzyxList(xzyxList);
 
-        for (FzxzXzyzDTO dto : fzxzCalc.getXzyxList()) {
+        for (FactorUseDTO dto : fzxzCalc.getXzyxList()) {
             fzxzXzyzMapper.insert(dto);
         }
         fzxzMapper.insert(fzxzCalc.getFzxzDTO());
@@ -193,9 +190,9 @@ public class FzssServiceImpl implements IFzssService {
 
         // 开始分析
         iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "开始分析", "info");
-        List<String> yzs = new ArrayList<>();
-        for (FzxzXzyzDTO fzxzXzyzDTO : fzxzCalc.getXzyxList()) {
-            yzs.add(fzxzXzyzDTO.getYzbsm());
+        List<String> factorBsmList = new ArrayList<>();
+        for (FactorUseDTO fzxzXzyzDTO : fzxzCalc.getXzyxList()) {
+            factorBsmList.add(fzxzXzyzDTO.getFactorBsm());
         }
         String logs = "选址参数：数据源=" + sjyName + "，用地面积=" + fzxzDTO.getYdmjbegin() + "-" + fzxzDTO.getYdmjend() + "，影响因子=" + String.join(", ", yzs);
         iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "选址参数", "info");
@@ -245,20 +242,20 @@ public class FzssServiceImpl implements IFzssService {
         GhdkaFilter ghdkaFilter = new GhdkaFilter();
         ghdkaFilter.setSjy(fzxzDTO.getSjy());
         ghdkaFilter.setIdList(ids);
-        for (FzxzXzyzDTO fzxzXzyzDTO : fzxzCalc.getXzyxList()) {
+        for (FactorUseDTO fzxzXzyzDTO : fzxzCalc.getXzyxList()) {
             ghdkaFilter.setFzxzXzyzDTO(fzxzXzyzDTO);
             ids = ghdkaMapper.getIdByFilter(ghdkaFilter);
             if (ids.size() == 0) {
                 iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "计算完成，未找到符合条件数据", "info");
-                return RequestResult.error(fzxzXzyzDTO.getYxyzmc() + "条件筛选未找到符合条件数据！", null);
+                return RequestResult.error(fzxzXzyzDTO.getFactorName() + "条件筛选未找到符合条件数据！", null);
             }
-            iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", fzxzXzyzDTO.getYxyzmc() + "因子影响分析完成", "info");
+            iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", fzxzXzyzDTO.getFactorName() + "因子影响分析完成", "info");
             ghdkaFilter.setIdList(ids);
         }
 
         if (ids.size() == 0) {
             iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "计算完成，未找到符合条件数据", "info");
-            String yxyzmc = fzxzCalc.getXzyxList().size() != 0 ? fzxzCalc.getXzyxList().get(0).getYxyzmc() : "";
+            String yxyzmc = fzxzCalc.getXzyxList().size() != 0 ? fzxzCalc.getXzyxList().get(0).getFactorName() : "";
             return RequestResult.error(yxyzmc + "条件筛选未找到符合条件数据！", null);
         }
 
@@ -389,9 +386,9 @@ public class FzssServiceImpl implements IFzssService {
         result.setDks(dkMaps);
 
         // 查询选址因子
-        QueryWrapper<FzxzXzyzDTO> xzyzWrapper = new QueryWrapper<>();
-        xzyzWrapper.eq("rwbsm", result.getBsm());
-        List<FzxzXzyzDTO> fzxzXzyzDTOS = fzxzXzyzMapper.selectList(xzyzWrapper);
+        QueryWrapper<FactorUseDTO> xzyzWrapper = new QueryWrapper<>();
+        xzyzWrapper.eq("task_id", result.getBsm());
+        List<FactorUseDTO> fzxzXzyzDTOS = fzxzXzyzMapper.selectList(xzyzWrapper);
         result.setXzyz(fzxzXzyzDTOS);
         return RequestResult.success("查询成功！", result);
     }

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.onemap.analyse.domain.*;
 import com.onemap.analyse.mapper.FzxzMapper;
 import com.onemap.analyse.mapper.FzxzTbMapper;
-import com.onemap.analyse.mapper.FzxzXzyzMapper;
+import com.onemap.analyse.mapper.FactorUseMapper;
 import com.onemap.analyse.mapper.base.FzxzResMapper;
 import com.onemap.analyse.service.ILogService;
 import com.onemap.analyse.service.IReportService;
@@ -42,7 +42,7 @@ public class ReportServiceImpl implements IReportService {
     @Autowired
     private FzxzTbMapper fzxzTbMapper;
     @Resource
-    private FzxzXzyzMapper fzxzXzyzMapper;
+    private FactorUseMapper fzxzXzyzMapper;
 
     @Value("${Hgxfx.temp}")
     private String temp;