灾后评估区域面积

src/main/java/com/sooka/sponest/event/centereventtforestfireloss/controller/CentereventTForestFireLossController.java

@@ -67,7 +67,7 @@ public class CentereventTForestFireLossController extends BaseController {
     }
 
     @GetMapping("/getFireRegion")
-    public R getFireRegion(String fireType) {
-        return R.ok(centereventTRegionalFlagService.getFireRegion(fireType));
+    public R getFireRegion(String fireType, String year) {
+        return R.ok(centereventTRegionalFlagService.getFireRegion(fireType, year));
     }
 }

src/main/java/com/sooka/sponest/event/centereventtregionalflag/mapper/CentereventTRegionalFlagMapper.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.event.centereventtregionalflag.mapper;
 
 import com.sooka.sponest.event.centereventtregionalflag.domain.RegionalFlag;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -19,5 +20,5 @@ public interface CentereventTRegionalFlagMapper {
 
     List<Map<String, Object>> getFireLocation(String eventId);
 
-    List<Map<String, Object>> getFireRegion(String fireType);
+    List<Map<String, Object>> getFireRegion(@Param("fireType") String fireType, @Param("year") String year);
 }

src/main/java/com/sooka/sponest/event/centereventtregionalflag/service/ICentereventTRegionalFlagService.java

@@ -13,5 +13,5 @@ public interface ICentereventTRegionalFlagService {
 
     List<Map<String, Object>> getFireLocation(String eventId);
 
-    List<Map<String, Object>> getFireRegion(String fireType);
+    List<Map<String, Object>> getFireRegion(String fireType, String year);
 }

src/main/java/com/sooka/sponest/event/centereventtregionalflag/service/impl/CentereventTRegionalFlagServiceImpl.java

@@ -26,7 +26,7 @@ public class CentereventTRegionalFlagServiceImpl implements ICentereventTRegiona
     }
 
     @Override
-    public List<Map<String, Object>> getFireRegion(String fireType) {
-        return centereventTRegionalFlagMapper.getFireRegion(fireType);
+    public List<Map<String, Object>> getFireRegion(String fireType, String year) {
+        return centereventTRegionalFlagMapper.getFireRegion(fireType, year);
     }
 }

src/main/resources/mapper/centereventtregionalflag/CentereventTRegionalFlagMapper.xml

@@ -37,9 +37,11 @@
     </select>
 
     <select id="getFireRegion" parameterType="String" resultType="map">
-        select event_id eventId,GROUP_CONCAT( concat( longitude, ',', latitude ) ORDER BY flag SEPARATOR ';' ) regional
-        from centerevent_t_regional_flag
-        where event_id in (select event_id from centerevent_t_fire_information where fire_type = #{fireType})
-        group by event_id
+        select a.event_id eventId,GROUP_CONCAT( concat( longitude, ',', latitude ) ORDER BY flag SEPARATOR ';' ) regional
+        from centerevent_t_regional_flag a
+        left join centerevent_t_forest_fire_loss l on l.event_id = a.event_id
+        where a.event_id in (select event_id from centerevent_t_fire_information where fire_type = #{fireType})
+        and report_time_y = #{year}
+        group by a.event_id
     </select>
 </mapper>