将数据源设定到具体的mapper上

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/FzssController.java

@@ -39,14 +39,10 @@ public class FzssController extends BaseController {
      */
     @PostMapping("/AddFzxz")
     public RequestResult AddFzxz(@RequestBody Map params) {
-        // 解析规划参数
-        FzxzCalc fzxzCalc = fzssService.GetFzxzParam(params);
         // 存储规划参数
-        fzssService.saveScheduleParam(fzxzCalc);
-        // 获取筛选区域
-        String geomWkt = fzssService.getWktGeom(fzxzCalc.getFzxzDTO().getGeomId());
+        FzxzCalc fzxzCalc = fzssService.saveScheduleParam(params);
         // 开始规划任务
-        RequestResult res = fzssService.startSchedule(geomWkt,fzxzCalc);
+        RequestResult res = fzssService.startSchedule( fzxzCalc);
         return res;
     }
 

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/vector/GhdkaMapper.java

@@ -1,14 +1,14 @@
 package com.onemap.analyse.mapper.vector;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.onemap.analyse.domain.FzxzXzyzDTO;
 import com.onemap.analyse.domain.query.GhdkaFilter;
 import com.onemap.analyse.domain.vector.GhdkaDTO;
-import org.springframework.data.repository.query.Param;
+import com.onemap.common.datasource.annotation.Slave;
 
 import java.util.List;
 import java.util.Map;
 
+@Slave
 public interface GhdkaMapper extends BaseMapper<GhdkaDTO> {
     List<Integer> getIdByGeom(Map<String, String> params);
 

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/IFzssService.java

@@ -11,13 +11,9 @@ import java.util.Map;
 public interface IFzssService {
     RequestResult AddHgxfx(HgxfxEntityDTO hgxfxEntityDTO) throws IOException;
 
-    FzxzCalc GetFzxzParam(Map params);
+    FzxzCalc saveScheduleParam(Map params);
 
-    void saveScheduleParam(FzxzCalc fzxzCalc);
-
-    String getWktGeom(String geomId);
-
-    RequestResult startSchedule(String geomWkt,FzxzCalc fzxzCalc);
+    RequestResult startSchedule(FzxzCalc fzxzCalc);
 
     RequestResult GetXzjg(String bsm);
 

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

@@ -97,7 +97,8 @@ public class FzssServiceImpl implements IFzssService {
     }
 
     @Override
-    public FzxzCalc GetFzxzParam(Map params) {
+    @Master
+    public FzxzCalc saveScheduleParam(Map params) {
         FzxzCalc fzxzCalc = new FzxzCalc();
         // 辅助选址
         FzxzDTO fzxzDTO = DozerUtils.map(params, FzxzDTO.class);
@@ -121,24 +122,12 @@ public class FzssServiceImpl implements IFzssService {
 
         fzxzCalc.setFzxzDTO(fzxzDTO);
         fzxzCalc.setXzyxList(xzyxList);
-        return fzxzCalc;
-    }
 
-    @Override
-    @Master
-    public void saveScheduleParam(FzxzCalc fzxzCalc) {
         for (FzxzXzyzDTO dto : fzxzCalc.getXzyxList()) {
             fzxzXzyzMapper.insert(dto);
         }
         fzxzMapper.insert(fzxzCalc.getFzxzDTO());
-    }
-
-    @Override
-    @Master
-    public String getWktGeom(String geomId) {
-        // 0.获取geom
-        GeomRes geomRes = shpFileMapper.getOne(geomId);
-        return geomRes.getGeom();
+        return fzxzCalc;
     }
 
     /**
@@ -148,12 +137,13 @@ public class FzssServiceImpl implements IFzssService {
      * @return
      */
     @Override
-    @Slave
-    public RequestResult startSchedule(String geomWkt, FzxzCalc fzxzCalc) {
+    public RequestResult startSchedule(FzxzCalc fzxzCalc) {
         FzxzDTO fzxzDTO = fzxzCalc.getFzxzDTO();
+        // 0.获取空间数据
+        GeomRes geomRes = shpFileMapper.getOne(fzxzDTO.getGeomId());
         // 1.区域筛选
         Map<String, String> paramMap = new HashMap<>();
-        paramMap.put("geom", geomWkt);
+        paramMap.put("geom", geomRes.getGeom());
         paramMap.put("sjy", fzxzDTO.getSjy());
         List<Integer> ids = ghdkaMapper.getIdByGeom(paramMap);
         // 2.面积筛选