大屏 灾后评估接口修改

guoshilong

2023-03-14 2c6c1bef7406c4fac77505c2fcc5ba24443da055

大屏 灾后评估接口修改

 blade-service-api/blade-fire-api/src/main/java/org/springblade/fire/vo/FireSupplementVO.java

@@ -31,4 +31,40 @@
public class FireSupplementVO extends FireSupplementEntity {
    private static final long serialVersionUID = 1L;

    /**
     * 报告单位
     */
    private String reportDept;
    /**
     * 填报人
     */
    private String writeReportPerson;
    /**
     * 火灾发生时间
     */
    private String alarmTime;
    /**
     * 经度
     */
    private String lon;
    /**
     * 纬度
     */
    private String lat;
    /**
     * 省
     */
    private String province;
    /**
     * 市
     */
    private String city;
    /**
     * 县/区
     */
    private String district;
    /**
     * 伤亡人数合计
     */
    private String sumInjuryPerson;
}

 blade-service/blade-dp/src/main/java/org/springblade/modules/dp/controller/MilitaryLocalCoordinationController.java

@@ -8,6 +8,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.fire.entity.FireSupplementEntity;
import org.springblade.fire.feign.IFireClient;
import org.springblade.fire.vo.FireSupplementVO;
import org.springblade.modules.dp.service.IMilitaryLocalCoordinationService;
import org.springblade.fire.vo.FireVO;
import org.springblade.system.feign.ISysClient;
@@ -49,8 +50,9 @@
     */
    @GetMapping("/disasterAssessment")
    @ApiOperation(value = "详情", notes = "传入fireSupplement")
    public R<FireSupplementEntity> detail(FireSupplementEntity fireSupplement) {
        return R.data(fireClient.getSupplementOne(fireSupplement));
    public R<FireSupplementVO> detail(FireSupplementEntity fireSupplement) {
        FireSupplementVO fireAllDetail = militaryLocalCoordinationService.getFireAllDetail(fireSupplement.getFireId());
        return R.data(fireAllDetail);
    }

    /**

 blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/IMilitaryLocalCoordinationService.java

@@ -1,5 +1,7 @@
package org.springblade.modules.dp.service;

import org.springblade.fire.vo.FireSupplementVO;

import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
@@ -14,5 +16,10 @@
     */
    HashMap<String, List<HashMap<String, String>>> getSurroundingQueryList(String lon,String lat,String distance);

    void getFireAllDetail(String fireId, HttpServletResponse response);
    /**
     * 获取vo详情
     * @param fireId
     * @return
     */
    FireSupplementVO getFireAllDetail(String fireId);
}

 blade-service/blade-dp/src/main/java/org/springblade/modules/dp/service/impl/MilitaryLocalCoordinationServiceImpl.java

@@ -33,13 +33,8 @@
    }

    @Override
    public void getFireAllDetail(String fireId, HttpServletResponse response){
    public FireSupplementVO getFireAllDetail(String fireId){
        FireSupplementVO fireAllDetail = militaryLocalCoordinationMapper.getFireAllDetail(fireId);

    }



    public void excelExport(String fileName,HttpServletResponse response,List data) throws IOException {
        return fireAllDetail;
    }
}