获取选址结果列表

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

@@ -27,5 +27,6 @@ public class FzxzDTO {
     @TableField(value = "geom_id")
     private String geomId; // 选址范围信息
     private String xmmc;//项目名称
+    // TODO:字段待确认
     private String jsdw;
 }

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

@@ -8,21 +8,21 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-@TableName("t_fzss_fzxz_res")
-@Data
-public class FzxzJgGisDTO {
-    // private Integer objectid;
-    private String bsm;
-    private String rwbsm;
-    private String dlb;
-    private String dlbm;
-    private String dlmc;
-    private Date cjsj;
-    private String yxfa;
-    private String bz;
-    private Double tbmj;
-    private String xzqdm;
-    private String xzqmc;
-    @TableField(exist = false)
-    private List<FzxzJgyzDTO> fxyzjg = new ArrayList<>();
-}
+// @TableName("t_fzss_fzxz_res")
+// @Data
+// public class FzxzJgGisDTO {
+//     // private Integer objectid;
+//     private String bsm;
+//     private String rwbsm;
+//     private String dlb;
+//     private String dlbm;
+//     private String dlmc;
+//     private Date cjsj;
+//     private String yxfa;
+//     private String bz;
+//     private Double tbmj;
+//     private String xzqdm;
+//     private String xzqmc;
+//     @TableField(exist = false)
+//     private List<FzxzJgyzDTO> fxyzjg = new ArrayList<>();
+// }

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

@@ -1,73 +1,19 @@
 package com.onemap.analyse.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 /**
  * 辅助选址结果因子
  */
-@TableName("t_fzss_fzxz_jgyz")
-public class FzxzJgyzDTO {
-    private String bsm;
-    private String jbbsm;
-    private String yzbsm;
-    private String yxyzmc;
-    private String yztj;
-    private String yxz;
-    private String fxjg;
-
-    public String getBsm() {
-        return bsm;
-    }
-
-    public void setBsm(String bsm) {
-        this.bsm = bsm;
-    }
-
-    public String getJbbsm() {
-        return jbbsm;
-    }
-
-    public void setJbbsm(String jbbsm) {
-        this.jbbsm = jbbsm;
-    }
-
-    public String getYzbsm() {
-        return yzbsm;
-    }
-
-    public void setYzbsm(String yzbsm) {
-        this.yzbsm = yzbsm;
-    }
-
-    public String getYxyzmc() {
-        return yxyzmc;
-    }
-
-    public void setYxyzmc(String yxyzmc) {
-        this.yxyzmc = yxyzmc;
-    }
-
-    public String getYztj() {
-        return yztj;
-    }
-
-    public void setYztj(String yztj) {
-        this.yztj = yztj;
-    }
-
-    public String getYxz() {
-        return yxz;
-    }
-
-    public void setYxz(String yxz) {
-        this.yxz = yxz;
-    }
-
-    public String getFxjg() {
-        return fxjg;
-    }
-
-    public void setFxjg(String fxjg) {
-        this.fxjg = fxjg;
-    }
-}
+// @TableName("t_fzss_fzxz_jgyz")
+// @Data
+// public class FzxzJgyzDTO {
+//     // private String bsm;
+//     // private String jbbsm;
+//     // private String yzbsm;
+//     // private String yxyzmc;
+//     // private String yztj;
+//     // private String yxz;
+//     // private String fxjg;
+// }

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

@@ -13,7 +13,7 @@ public class FzxzReport {
     private String fxbg;
     private String jsdw;
     private String xmmc;
-    private List<FzxzJgGisDTO> items;
+    private List<FzxzResDTO> items;
 
     public String getMessage() {
         return message;
@@ -87,11 +87,11 @@ public class FzxzReport {
         this.xmmc = xmmc;
     }
 
-    public List<FzxzJgGisDTO> getItems() {
+    public List<FzxzResDTO> getItems() {
         return items;
     }
 
-    public void setItems(List<FzxzJgGisDTO> items) {
+    public void setItems(List<FzxzResDTO> items) {
         this.items = items;
     }
 }

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

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 辅助选址结果
+ * 辅助选址结果地块信息
  */
 @TableName("t_fzss_fzxz_res")
 @Data

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

@@ -1,55 +0,0 @@
-package com.onemap.analyse.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@TableName("t_fzss_fzxz")
-public class FzxzResultDTO {
-    private String bsm;
-    private String xmmc;
-    private String jsdw;
-    private String fxbg;
-    private List<FzxzJgGisDTO> items = new ArrayList<FzxzJgGisDTO>();
-
-    public String getBsm() {
-        return bsm;
-    }
-
-    public void setBsm(String bsm) {
-        this.bsm = bsm;
-    }
-
-    public String getXmmc() {
-        return xmmc;
-    }
-
-    public void setXmmc(String xmmc) {
-        this.xmmc = xmmc;
-    }
-
-    public String getJsdw() {
-        return jsdw;
-    }
-
-    public void setJsdw(String jsdw) {
-        this.jsdw = jsdw;
-    }
-
-    public String getFxbg() {
-        return fxbg;
-    }
-
-    public void setFxbg(String fxbg) {
-        this.fxbg = fxbg;
-    }
-
-    public List<FzxzJgGisDTO> getItems() {
-        return items;
-    }
-
-    public void setItems(List<FzxzJgGisDTO> items) {
-        this.items = items;
-    }
-}

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

@@ -2,9 +2,11 @@ package com.onemap.analyse.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springframework.stereotype.Repository;
 
 // 辅助选址选址因子,任务中使用
 @TableName("t_fzss_fzxz_xzyz")
+@Repository
 @Data
 public class FzxzXzyzDTO {
     // 标识码

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

@@ -0,0 +1,28 @@
+package com.onemap.analyse.domain.res;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.onemap.analyse.domain.FzxzResDTO;
+import com.onemap.analyse.domain.FzxzXzyzDTO;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@TableName("t_fzss_fzxz")
+@Data
+public class FzxzResultDTO {
+    private String bsm;
+    private String xmmc;
+    private String jsdw;
+    private String fxbg;
+
+    // 结果返回地块信息
+    @TableField(exist = false)
+    private List<FzxzResDTO> dks = new ArrayList<>();
+
+    // TODO 选址条件信息，数据源，面积起始、终止
+    // 结果返回选址因子信息
+    @TableField(exist = false)
+    private List<FzxzXzyzDTO> xzyz = new ArrayList<>();
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzJgGISMapper.java

@@ -1,14 +1,10 @@
 package com.onemap.analyse.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.analyse.domain.FzxzDTO;
-import com.onemap.analyse.domain.FzxzJgGisDTO;
-
 /**
  * 辅助选址 数据层
  *
  * @author onemap
  */
-public interface FzxzJgGISMapper extends BaseMapper<FzxzJgGisDTO> {
-
-}
+// public interface FzxzJgGISMapper extends BaseMapper<FzxzJgGisDTO> {
+//
+// }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/FzxzJgyzMapper.java

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

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.onemap.analyse.domain.*;
 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.mapper.*;
 import com.onemap.analyse.mapper.base.ShpFileMapper;
@@ -15,14 +16,13 @@ import com.onemap.analyse.utils.DozerUtils;
 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.datasource.annotation.Slave;
 import com.onemap.common.security.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.onemap.common.datasource.annotation.Slave;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
 
@@ -45,14 +45,8 @@ public class FzssServiceImpl implements IFzssService {
     private HgxfxHgscxMapper hgxfxHgscxMapper;
     @Autowired
     private HgxfxMapper hgxfxMapper;
-    @Autowired
-    private FzxzMapper fzxzMapper;
-    @Autowired
-    private FzxzXzyzMapper fzxzXzyzMapper;
-    @Autowired
-    private FzxzJgGISMapper fzxzJgGISMapper;
-    @Autowired
-    private FzxzJgyzMapper fzxzJgyzMapper;
+
+
     @Autowired
     FzxzSchedule fzxzSchedule;
 
@@ -67,6 +61,12 @@ public class FzssServiceImpl implements IFzssService {
     private FxrwrzMapper fxrwrzMapper;
     @Autowired
     private FzxzResMapper fzxzResMapper;
+    // 选址任务
+    @Autowired
+    private FzxzMapper fzxzMapper;
+    // 选址因子
+    @Autowired
+    private FzxzXzyzMapper fzxzXzyzMapper;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -282,21 +282,20 @@ public class FzssServiceImpl implements IFzssService {
         if (fzxzinfo == null) {
             return RequestResult.error("辅助选址记录查为未空！", null);
         }
+
+        // 构建返回结果
         FzxzResultDTO result = DozerUtils.map(fzxzinfo, FzxzResultDTO.class);
-        // 查询分析结果图斑信息
-        QueryWrapper<FzxzJgGisDTO> giswrapper = new QueryWrapper<FzxzJgGisDTO>();
-        giswrapper.eq("rwbsm", result.getBsm());
-        List<FzxzJgGisDTO> gisinfo = fzxzJgGISMapper.selectList(giswrapper);
-        if (gisinfo.size() > 0) {
-            for (FzxzJgGisDTO gisDto : gisinfo) {
-                // 查询分析因子结果信息
-                QueryWrapper<FzxzJgyzDTO> jgyzwrapper = new QueryWrapper<FzxzJgyzDTO>();
-                jgyzwrapper.eq("jbbsm", gisDto.getBsm()).eq("yztj", "F");
-                List<FzxzJgyzDTO> jgyzinfo = fzxzJgyzMapper.selectList(jgyzwrapper);
-                gisDto.setFxyzjg(jgyzinfo);
-            }
-        }
-        result.setItems(gisinfo);
+        // 查询分析结果地块信息
+        QueryWrapper<FzxzResDTO> fzxzWrapper = new QueryWrapper<>();
+        fzxzWrapper.eq("rwbsm", result.getBsm());
+        List<FzxzResDTO> fzxzResDTOS = fzxzResMapper.selectList(fzxzWrapper);
+        result.setDks(fzxzResDTOS);
+        // 查询选址因子
+        QueryWrapper<FzxzXzyzDTO> xzyzWrapper = new QueryWrapper<>();
+        xzyzWrapper.eq("rwbsm", result.getBsm());
+        List<FzxzXzyzDTO> fzxzXzyzDTOS = fzxzXzyzMapper.selectList(xzyzWrapper);
+        result.setXzyz(fzxzXzyzDTOS);
+
         return RequestResult.success("查询成功！", result);
     }
 

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

@@ -39,14 +39,17 @@ public class FzxzSchedule {
     private FzxzMapper fzxzMapper;
     @Resource
     private FxrwrzMapper fxrwrzMapper;
-    @Resource
-    private FzxzJgGISMapper fzxzJgGISMapper;
+    // @Resource
+    // private FzxzJgGISMapper fzxzJgGISMapper;
     @Resource
     private FzxzXzyzMapper fzxzXzyzMapper;
     @Resource
     private FzxzTbMapper fzxzTbMapper;
     @Resource
-    private FzxzJgyzMapper fzxzJgyzMapper;
+    private FzxzXzyzDTO fzxzXzyzDTO;
+
+    @Resource
+    private FzxzResMapper fzxzResMapper;
 
     //辅助选址python方法名标识
     @Value("${Fzxz.functionId}")
@@ -183,9 +186,9 @@ public class FzxzSchedule {
             fzxzReport.setJsdw(res.getJsdw());
             fzxzReport.setXmmc(res.getXmmc());
             //查询分析结果图斑信息
-            QueryWrapper<FzxzJgGisDTO> giswrapper = new QueryWrapper<FzxzJgGisDTO>();
+            QueryWrapper<FzxzResDTO> giswrapper = new QueryWrapper<>();
             giswrapper.eq("rwbsm", res.getBsm());
-            List<FzxzJgGisDTO> gisinfo = fzxzJgGISMapper.selectList(giswrapper);
+            List<FzxzResDTO> gisinfo = fzxzResMapper.selectList(giswrapper);
             fzxzReport.setItems(gisinfo);
         }
         //插入开始生成报告日志
@@ -655,20 +658,20 @@ public class FzxzSchedule {
                 ctTblWidth.setType(STTblWidth.DXA);
             }
             //查询结果GIS FzxzJgGisDTO
-            QueryWrapper<FzxzJgGisDTO> giswrapper = new QueryWrapper<FzxzJgGisDTO>();
+            QueryWrapper<FzxzResDTO> giswrapper = new QueryWrapper<>();
             giswrapper.eq("rwbsm", res.getBsm());
             //筛选方案，根据传参或者预选方案
 //            giswrapper.ne("yxfa", "0");
             if (xzbsmList != null) {
                 giswrapper.in("bsm", xzbsmList);
             }
-            List<FzxzJgGisDTO> fzxzJgGisDTOList = fzxzJgGISMapper.selectList(giswrapper);
+            List<FzxzResDTO> fzxzJgGisDTOList = fzxzResMapper.selectList(giswrapper);
             int index = 1;
             NpoiHelper.Option optionIsBold = new NpoiHelper.Option();
             optionIsBold.setBold(true);
             int rowIndex = 0;
             for (int i = 0; i < fzxzJgGisDTOList.size(); i++) {
-                FzxzJgGisDTO item = fzxzJgGisDTOList.get(i);
+                FzxzResDTO item = fzxzJgGisDTOList.get(i);
                 XWPFTableRow mr = tableFx.createRow();
                 rowIndex++;
                 mr.getCell(0).setColor("DBE5F1");
@@ -678,16 +681,16 @@ public class FzxzSchedule {
                 mr = tableFx.createRow();
                 rowIndex++;
                 mr.getCell(0).setParagraph(NpoiHelper.setCellText(tableFx, "地类编码", optionIsBoldCENTER));
-                mr.getCell(1).setParagraph(NpoiHelper.setCellText(tableFx, item.getDlbm(), null));
+                // mr.getCell(1).setParagraph(NpoiHelper.setCellText(tableFx, item.getDlbm(), null));
                 mr.getCell(2).setParagraph(NpoiHelper.setCellText(tableFx, "地类名称", optionIsBoldCENTER));
-                mr.getCell(3).setParagraph(NpoiHelper.setCellText(tableFx, item.getDlmc(), null));
+                // mr.getCell(3).setParagraph(NpoiHelper.setCellText(tableFx, item.getDlmc(), null));
                 //tableFx 表格第三行
                 mr = tableFx.createRow();
                 rowIndex++;
                 mr.getCell(0).setParagraph(NpoiHelper.setCellText(tableFx, "地块面积", optionIsBoldCENTER));
-                mr.getCell(1).setParagraph(NpoiHelper.setCellText(tableFx, Math.round(item.getTbmj()) + "平方米", null));
+                // mr.getCell(1).setParagraph(NpoiHelper.setCellText(tableFx, Math.round(item.getTbmj()) + "平方米", null));
                 mr.getCell(2).setParagraph(NpoiHelper.setCellText(tableFx, "土地位置", optionIsBoldCENTER));
-                mr.getCell(3).setParagraph(NpoiHelper.setCellText(tableFx, item.getXzqmc(), null));
+                // mr.getCell(3).setParagraph(NpoiHelper.setCellText(tableFx, item.getXzqmc(), null));
                 //tableFx 表格第四行
                 mr = tableFx.createRow();
                 rowIndex++;
@@ -697,27 +700,27 @@ public class FzxzSchedule {
                 XWPFParagraph para6 = mr.getCell(1).addParagraph();
                 para6.setAlignment(ParagraphAlignment.LEFT);
                 //查询选址因子 因子条件（包含:C、不包含:N、分析:A）
-                QueryWrapper<FzxzJgyzDTO> fzxzJgyzDTOQueryWrapper = new QueryWrapper<FzxzJgyzDTO>();
-                fzxzJgyzDTOQueryWrapper.eq("jbbsm", item.getBsm());
-                fzxzJgyzDTOQueryWrapper.eq("yztj", "F");
-                List<FzxzJgyzDTO> fzxzJgyzDTOList = fzxzJgyzMapper.selectList(fzxzJgyzDTOQueryWrapper);
-                int jgyzid = 1;
-                for (int j = 0; j < fzxzJgyzDTOList.size(); j++) {
-                    FzxzJgyzDTO jgyz = fzxzJgyzDTOList.get(j);
-                    XWPFRun run = para6.createRun();
-                    String jg = jgyz.getFxjg();
-                    Double jgDouble = 0.0;
-                    try {
-                        jgDouble = Double.parseDouble(jg);
-                        run.setText(jgyzid + "、压占" + jgyz.getYxyzmc() + "面积" + jg + "平方米");
-                    } catch (Exception e) {
-                        run.setText(jgyzid + "、" + jg);
-                    }
-
-                    if (jgyzid < fzxzJgyzDTOList.size())
-                        run.addBreak(BreakType.TEXT_WRAPPING);
-                    jgyzid++;
-                }
+                // QueryWrapper<fzxzXzyzDTO> fzxzJgyzDTOQueryWrapper = new QueryWrapper<>();
+                // fzxzJgyzDTOQueryWrapper.eq("jbbsm", item.getBsm());
+                // fzxzJgyzDTOQueryWrapper.eq("yztj", "F");
+                // List<fzxzXzyzDTO> fzxzJgyzDTOList = fzxzXzyzMapper.selectList(fzxzJgyzDTOQueryWrapper);
+                // int jgyzid = 1;
+                // for (int j = 0; j < fzxzJgyzDTOList.size(); j++) {
+                //     FzxzXzyzDTO jgyz = fzxzJgyzDTOList.get(j);
+                //     XWPFRun run = para6.createRun();
+                //     String jg = jgyz.getFxjg();
+                //     Double jgDouble = 0.0;
+                //     try {
+                //         jgDouble = Double.parseDouble(jg);
+                //         run.setText(jgyzid + "、压占" + jgyz.getYxyzmc() + "面积" + jg + "平方米");
+                //     } catch (Exception e) {
+                //         run.setText(jgyzid + "、" + jg);
+                //     }
+                //
+                //     if (jgyzid < fzxzJgyzDTOList.size())
+                //         run.addBreak(BreakType.TEXT_WRAPPING);
+                //     jgyzid++;
+                // }
                 index++;
             }
             tableFx.removeRow(0);
@@ -810,18 +813,18 @@ public class FzxzSchedule {
      */
     private List<String> ReportImg(FzxzEntityDTO res, List<String> xzbsmList) {
         //查询分析结果图斑信息
-        QueryWrapper<FzxzJgGisDTO> giswrapper = new QueryWrapper<FzxzJgGisDTO>();
+        QueryWrapper<FzxzResDTO> giswrapper = new QueryWrapper<>();
         giswrapper.eq("rwbsm", res.getBsm());
         //筛选方案，根据传参或者预选方案
 //            giswrapper.ne("yxfa", "0");
         if (xzbsmList != null) {
             giswrapper.in("bsm", xzbsmList);
         }
-        List<FzxzJgGisDTO> fzxzJgGisDTOList = fzxzJgGISMapper.selectList(giswrapper);
+        List<FzxzResDTO> fzxzJgGisDTOList = fzxzResMapper.selectList(giswrapper);
         //SDE转SHP
         String inShp = fzxzShp;
         List objidlist = new ArrayList<>();
-        for (FzxzJgGisDTO cur : fzxzJgGisDTOList) {
+        for (FzxzResDTO cur : fzxzJgGisDTOList) {
             // objidlist.add(cur.getObjectid());
         }
         String objids = Joiner.on(",").join(objidlist);