灾后评估需求变更

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

@@ -1,7 +1,6 @@
 package com.sooka.sponest.event.centereventtforestfireloss.controller;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.event.centereventtfireinformation.domain.FireInformation;
@@ -41,21 +40,8 @@ public class CentereventTForestFireLossController extends BaseController {
     @PostMapping("/getFireLoss")
     public R getFireLoss(@RequestBody VisuForestFireLossVO visuForestFireLossVO) {
         Map<String, Object> resultMap = new HashMap<>();
-        if (StringUtils.isBlank(visuForestFireLossVO.getFireType())) {
-            resultMap.put("visuForestFireLossBO", centereventTForestFireLossService.getFireLoss(visuForestFireLossVO));
-            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.getFireRegion(visuForestFireLossVO.getFireType(), visuForestFireLossVO.getYear()));
-        }
+        resultMap.put("visuForestFireLossBO", centereventTForestFireLossService.getFireLoss(visuForestFireLossVO));
+        resultMap.put("regionalFlagBOList", centereventTRegionalFlagService.getFireRegion(visuForestFireLossVO.getFireType(), visuForestFireLossVO.getYear()));
         return R.ok(resultMap);
     }
 

src/main/java/com/sooka/sponest/event/centereventtforestfireloss/domain/VisuForestFireLossVO.java

@@ -8,9 +8,5 @@ public class VisuForestFireLossVO extends BaseBusinessEntity {
 
     private String year;
 
-    private String id;
-
-    private String eventId;
-
     private String fireType;
 }

src/main/java/com/sooka/sponest/event/centereventtforestfireloss/mapper/CentereventTForestFireLossMapper.java

@@ -3,7 +3,6 @@ package com.sooka.sponest.event.centereventtforestfireloss.mapper;
 import com.sooka.sponest.event.centereventtforestfireloss.domain.ForestFireLoss;
 import com.sooka.sponest.event.centereventtforestfireloss.domain.VisuForestFireLossVO;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,8 +16,5 @@ public interface CentereventTForestFireLossMapper {
     // 新增火险报告（森林火灾损失）
     int addForestFireLoss(ForestFireLoss forestFireLoss);
 
-
     Map<String, Object> getFireLoss(VisuForestFireLossVO visuForestFireLossVO);
-
-    List<Map<String, Object>> getFireList(VisuForestFireLossVO visuForestFireLossVO);
 }

src/main/java/com/sooka/sponest/event/centereventtforestfireloss/service/ICentereventTForestFireLossService.java

@@ -3,7 +3,6 @@ package com.sooka.sponest.event.centereventtforestfireloss.service;
 import com.sooka.sponest.event.centereventtforestfireloss.domain.ForestFireLoss;
 import com.sooka.sponest.event.centereventtforestfireloss.domain.VisuForestFireLossVO;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,6 +18,4 @@ public interface ICentereventTForestFireLossService {
 
 
     Map<String, Object> getFireLoss(VisuForestFireLossVO visuForestFireLossVO);
-
-    List<Map<String, Object>> getFireList(VisuForestFireLossVO visuForestFireLossVO);
 }

src/main/java/com/sooka/sponest/event/centereventtforestfireloss/service/impl/CentereventTForestFireLossServiceImpl.java

@@ -10,7 +10,6 @@ import com.sooka.sponest.event.centereventtforestfireloss.service.ICentereventTF
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,18 +31,10 @@ public class CentereventTForestFireLossServiceImpl extends BaseService implement
         return centereventTForestFireLossMapper.addForestFireLoss(forestFireLoss);
     }
 
-
     @DataScopeMutiDept(deptAlias = "d")
     @Override
     public Map<String, Object> getFireLoss(VisuForestFireLossVO visuForestFireLossVO) {
         setSookaDataBase(visuForestFireLossVO);
         return centereventTForestFireLossMapper.getFireLoss(visuForestFireLossVO);
     }
-
-    @DataScopeMutiDept(deptAlias = "d")
-    @Override
-    public List<Map<String, Object>> getFireList(VisuForestFireLossVO visuForestFireLossVO) {
-        setSookaDataBase(visuForestFireLossVO);
-        return centereventTForestFireLossMapper.getFireList(visuForestFireLossVO);
-    }
 }

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

@@ -17,8 +17,5 @@ public interface CentereventTRegionalFlagMapper {
     // 新增区域标记
     int addRegionalFlag(RegionalFlag regionalFlag);
 
-
-    List<Map<String, Object>> getFireLocation(String eventId);
-
     List<Map<String, Object>> getFireRegion(@Param("fireType") String fireType, @Param("year") String year);
 }

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

@@ -11,7 +11,5 @@ import java.util.Map;
  */
 public interface ICentereventTRegionalFlagService {
 
-    List<Map<String, Object>> getFireLocation(String eventId);
-
     List<Map<String, Object>> getFireRegion(String fireType, String year);
 }

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

@@ -21,11 +21,6 @@ public class CentereventTRegionalFlagServiceImpl implements ICentereventTRegiona
     private CentereventTRegionalFlagMapper centereventTRegionalFlagMapper;
 
     @Override
-    public List<Map<String, Object>> getFireLocation(String eventId) {
-        return centereventTRegionalFlagMapper.getFireLocation(eventId);
-    }
-
-    @Override
     public List<Map<String, Object>> getFireRegion(String fireType, String year) {
         return centereventTRegionalFlagMapper.getFireRegion(fireType, year);
     }

src/main/resources/mapper/centereventtforestfireloss/CentereventTForestFireLossMapper.xml

@@ -104,7 +104,6 @@
         </trim>
     </insert>
 
-
     <select id="getFireLoss" parameterType="VisuForestFireLossVO" resultType="map">
         select
         sum(forest_fire_loss_total) forestFireLossTotal, sum(fire_loss_total) fireLossTotal,
@@ -131,15 +130,4 @@
             ${params.dataScope}
         </where>
     </select>
-
-    <select id="getFireList" parameterType="VisuForestFireLossVO" resultType="map">
-        select a.id,event_id eventId,CONCAT_WS("-",report_time_y,report_time_m,report_time_d) reportTime,
-        b.event_code eventCode,b.event_name eventName,b.longitude,b.latitude,b.reportor,b.event_status eventStatus,
-        b.event_status_value eventStatusValue,DATE_FORMAT(b.create_time,'%Y-%m-%d') createTime,b.urge_count urgeCount
-        from centerevent_t_forest_fire_loss a
-        left join centerevent_t_eventcatalogue b on b.event_code = a.event_id
-        left join ${database_system}.sys_dept d on d.dept_id = b.dept_id
-        where report_time_y = #{year} ${params.dataScope}
-        order by STR_TO_DATE( reportTime, '%Y-%m-%d' ) desc
-    </select>
 </mapper>

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

@@ -30,12 +30,6 @@
         </trim>
     </insert>
 
-
-    <select id="getFireLocation" parameterType="String" resultType="map">
-        select id,event_id eventId,longitude,latitude,flag from centerevent_t_regional_flag
-        where event_id = #{eventId} order by flag
-    </select>
-
     <select id="getFireRegion" parameterType="String" resultType="map">
         select a.event_id eventId,GROUP_CONCAT( concat( longitude, ',', latitude ) ORDER BY flag SEPARATOR ';' )
         regional