大数据中台，永久基本农田

src/main/java/com/sooka/sponest/data/digitalresource/mapper/DigitalResourcesBigDataMapper.java

@@ -1,12 +1,15 @@
 package com.sooka.sponest.data.digitalresource.mapper;
 
-import com.ruoyi.system.api.domain.SysDictData;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestGrid;
 import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO;
-import com.sooka.sponest.data.digitalresource.domain.*;
+import com.sooka.sponest.data.digitalresource.domain.CenterdataTResourcesDeposit;
+import com.sooka.sponest.data.digitalresource.domain.CenterdataTResourcesGeologicHazard;
+import com.sooka.sponest.data.digitalresource.domain.CenterdataTResourcesIllegalConstruction;
+import com.sooka.sponest.data.digitalresource.domain.CenterdataTResourcesLandInfo;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicPatrolTask;
 import com.sooka.sponest.data.other.land.domain.CenterdataTResourcesLand;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -82,7 +85,7 @@ public interface DigitalResourcesBigDataMapper {
      * @return
      */
 
-    List<Map<String, Object>> selectFarmBasicFarmlandCount(List<SysDictData> list);
+    List<Map<String, Object>> selectFarmBasicFarmlandCount(@Param("map") Map<String,Object> map);
 
     /**
      * 日常巡护

src/main/java/com/sooka/sponest/data/digitalresource/service/impl/ResourceBigDataServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -153,7 +154,11 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
     @DataScopeMutiDept(deptAlias = "d")
     @Override
     public List<Map<String, Object>> selectFarmBasicFarmlandCount(CenterdataTFarmBasicFarmland centerdataTFarmBasicFarmland) {
-        return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(DictUtils.getDictCache("farm_field_attribute")));
+        setSookaDataBase(centerdataTFarmBasicFarmland);
+        Map<String, Object> map = new HashMap<>();
+        map.put("centerdataTFarmBasicFarmland",centerdataTFarmBasicFarmland);
+        map.put("dictList",DictUtils.getDictCache("farm_field_attribute"));
+        return deptLevelUtil.getDeptLevel(digitalResourcesBigDataMapper.selectFarmBasicFarmlandCount(map));
     }
     /**
      * 地质灾害易发区

src/main/resources/mapper/digitalresource/DigitalResourcesBigDataMapper.xml

@@ -305,16 +305,16 @@
         group by dict.dict_value
     </select>
 
-    <select id="selectFarmBasicFarmlandCount" parameterType="CenterdataTFarmBasicFarmland" resultType="java.util.Map">
+    <select id="selectFarmBasicFarmlandCount"  resultType="java.util.Map">
         select
         a.dept_id deptId,d.ancestors,
-        <foreach item="item" collection="list" open="" separator="," close="">
+        <foreach item="item" collection="map.dictList" open="" separator="," close="">
             IFNULL(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END ,0) AS #{item.dictLabel}
         </foreach>
         FROM
         centerdata_t_farm_basic_farmland a
-        LEFT JOIN onest_system.sys_dept d ON a.dept_id = d.dept_id
-        LEFT JOIN onest_system.sys_dict_data dict ON a.attribute = dict.dict_value
+        LEFT JOIN ${map.centerdataTFarmBasicFarmland.database_system}.sys_dept d ON a.dept_id = d.dept_id
+        LEFT JOIN ${map.centerdataTFarmBasicFarmland.database_system}.sys_dict_data dict ON a.attribute = dict.dict_value
         WHERE
         dict.dict_type = 'farm_field_attribute'
         GROUP BY a.id