大数据中台，地址灾害易发区

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

@@ -61,6 +61,7 @@ public interface DigitalResourcesBigDataMapper {
      */
     List<Map<String, Object>> getHazardResources(CenterdataTResourcesGeologicHazard centerdataTResourcesGeologicHazard);
 
+
     /**
      * 违建信息统计图
      *
@@ -82,7 +83,6 @@ public interface DigitalResourcesBigDataMapper {
      */
 
     List<Map<String, Object>> selectFarmBasicFarmlandCount(List<SysDictData> list);
-    List<Map<String, Object>> selectDept(CenterdataTFarmBasicFarmland centerdataTFarmBasicFarmland);
 
     /**
      * 日常巡护
@@ -90,4 +90,11 @@ public interface DigitalResourcesBigDataMapper {
      * @return
      */
     List<Map<String,Object>> getHydraulicPatrolTask(CenterdataTHydraulicPatrolTask centerdataTHydraulicPatrolTask);
+    /**
+     * 地质灾害易发区
+     *
+     * @param centerdataTResourcesGeologicHazard
+     * @return
+     */
+    List<Map<String, Object>> getGeologicHazard(CenterdataTResourcesGeologicHazard centerdataTResourcesGeologicHazard);
 }

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

@@ -163,7 +163,7 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
     @Override
     public List<Map<String, Object>> selectResourcesGeologicHazard(CenterdataTResourcesGeologicHazard centerdataTResourcesGeologicHazard) {
         setSookaDataBase(centerdataTResourcesGeologicHazard);
-        return digitalResourcesBigDataMapper.getHazardResources(centerdataTResourcesGeologicHazard);
+        return digitalResourcesBigDataMapper.getGeologicHazard(centerdataTResourcesGeologicHazard);
     }
 
     /**

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

@@ -273,6 +273,14 @@
         where dict.dict_type = 'centerdata_disaster_type'
         group by a.disaster_type
     </select>
+    <select id="getGeologicHazard" parameterType="CenterdataTResourcesGeologicHazard"
+            resultType="java.util.Map">
+        select dict.dict_label name ,count(a.id) value from ${database_system}.sys_dict_data dict
+        left join centerdata_t_resources_geologic_hazard a on dict.dict_value = a.disaster_type
+        left join ${database_system}.sys_dept d on a.dept_id=d.dept_id
+        where dict.dict_type = 'centerdata_disaster_type'
+        group by dict.dict_label
+    </select>
 
     <select id="getConstructionGroupByResourcesConservancy" parameterType="CenterdataTResourcesIllegalConstruction"
             resultType="java.util.Map">
@@ -297,14 +305,11 @@
         group by dict.dict_value
     </select>
 
-    <select id="selectDept" parameterType="list" resultType="java.util.Map">
-        select d.dept_id,d.dept_name from ${database_system}.sys_dept d where dept_type="sys_dept_type_17"
-    </select>
     <select id="selectFarmBasicFarmlandCount" parameterType="CenterdataTFarmBasicFarmland" resultType="java.util.Map">
         select
         a.dept_id deptId,d.ancestors,
         <foreach item="item" collection="list" open="" separator="," close="">
-            ifnull(MAX(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END) ,0) AS #{item.dictLabel}
+            IFNULL(CASE WHEN a.attribute = #{item.dictValue} THEN a.area END ,0) AS #{item.dictLabel}
         </foreach>
         FROM
         centerdata_t_farm_basic_farmland a