灾后评估需求变更

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

@@ -11,12 +11,10 @@ import com.sooka.sponest.event.centereventtforestfireloss.service.ICentereventTF
 import com.sooka.sponest.event.centereventtregionalflag.service.ICentereventTRegionalFlagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,19 +41,20 @@ public class CentereventTForestFireLossController extends BaseController {
     @PostMapping("/getFireLoss")
     public R getFireLoss(@RequestBody VisuForestFireLossVO visuForestFireLossVO) {
         Map<String, Object> resultMap = new HashMap<>();
-        if (StringUtils.isBlank(visuForestFireLossVO.getId())) {
+        if (StringUtils.isBlank(visuForestFireLossVO.getFireType())) {
             resultMap.put("visuForestFireLossBO", centereventTForestFireLossService.getFireLoss(visuForestFireLossVO));
-            List<Map<String, Object>> list = centereventTForestFireLossService.getFireList(visuForestFireLossVO);
-            resultMap.put("visuForestFireLossTimeBOList", list);
-            if (StringUtils.isNotEmpty(list)) {
-                visuForestFireLossVO.setYear(null);
-                visuForestFireLossVO.setId(MapUtils.getString(list.get(0), "id"));
-                resultMap.put("visuForestFireLossBOFirst", centereventTForestFireLossService.getFireLoss(visuForestFireLossVO));
-                resultMap.put("regionalFlagBOList", centereventTRegionalFlagService.getFireLocation(MapUtils.getString(list.get(0), "eventId")));
-            }
+            resultMap.put("regionalFlagBOList", centereventTRegionalFlagService.getFireRegion(visuForestFireLossVO.getFireType(), visuForestFireLossVO.getYear()));
+//            List<Map<String, Object>> list = centereventTForestFireLossService.getFireList(visuForestFireLossVO);
+//            resultMap.put("visuForestFireLossTimeBOList", list);
+//            if (StringUtils.isNotEmpty(list)) {
+//                visuForestFireLossVO.setYear(null);
+//                visuForestFireLossVO.setId(MapUtils.getString(list.get(0), "id"));
+//                resultMap.put("visuForestFireLossBOFirst", centereventTForestFireLossService.getFireLoss(visuForestFireLossVO));
+//                resultMap.put("regionalFlagBOList", centereventTRegionalFlagService.getFireLocation(MapUtils.getString(list.get(0), "eventId")));
+//            }
         } else {
             resultMap.put("visuForestFireLossBO", centereventTForestFireLossService.getFireLoss(visuForestFireLossVO));
-            resultMap.put("regionalFlagBOList", centereventTRegionalFlagService.getFireLocation(visuForestFireLossVO.getEventId()));
+            resultMap.put("regionalFlagBOList", centereventTRegionalFlagService.getFireRegion(visuForestFireLossVO.getFireType(), visuForestFireLossVO.getYear()));
         }
         return R.ok(resultMap);
     }

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

@@ -37,11 +37,18 @@
     </select>
 
     <select id="getFireRegion" parameterType="String" resultType="map">
-        select a.event_id eventId,GROUP_CONCAT( concat( longitude, ',', latitude ) ORDER BY flag SEPARATOR ';' ) regional
+        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}
+        <where>
+            <if test="fireType != null and fireType != ''">
+                and a.event_id in (select event_id from centerevent_t_fire_information where fire_type = #{fireType})
+            </if>
+            <if test="year != null and year != ''">
+                and report_time_y = #{year}
+            </if>
+        </where>
         group by a.event_id
     </select>
 </mapper>