Просмотр исходного кода

'新增基础信息管理-消防水源/接处警数据/消防车辆/消防站点建筑信息5个导出接口'

james 2 лет назад
Родитель
Сommit
32639f91bc
20 измененных файлов с 985 добавлено и 0 удалено
  1. 23 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseBuildController.java
  2. 25 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemMicroStationController.java
  3. 24 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemPoliceRecordController.java
  4. 24 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemVehicleController.java
  5. 20 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemWaterSourceController.java
  6. 10 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseBuildService.java
  7. 10 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemMicroStationService.java
  8. 11 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemPoliceRecordService.java
  9. 9 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemVehicleService.java
  10. 8 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemWaterSourceService.java
  11. 38 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseBuildServiceImpl.java
  12. 40 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemMicroStationServiceImpl.java
  13. 63 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemPoliceRecordServiceImpl.java
  14. 44 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemVehicleServiceImpl.java
  15. 38 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemWaterSourceServiceImpl.java
  16. 113 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseBuildExportVO.java
  17. 118 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemMicroStationExportVO.java
  18. 114 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemPoliceRecordExportVO.java
  19. 142 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemVehicleExportVO.java
  20. 111 0
      service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemWaterSourceExportVO.java

+ 23 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseBuildController.java

@@ -1,15 +1,20 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.BaseBuild;
 import com.usky.fire.service.BaseBuildService;
+import com.usky.fire.service.vo.BaseBuildExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 /**
  * <p>
  * 建筑信息 前端控制器
@@ -43,6 +48,24 @@ public class BaseBuildController {
         return ApiResult.success(baseBuildService.baseBuildList(buildNum, buildName, pageNum, pageSize));
     }
 
+    /**
+     * 建筑信息-列表查询-导出
+     *
+     * @param buildNum  建筑编号
+     * @param buildName 建筑名称
+     * @param exportTitle 文件名
+     * @throws IOException
+     */
+    @PostMapping("baseBuildListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "buildNum", required = false) String buildNum,
+                       @RequestParam(value = "buildName", required = false) String buildName,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
+        List<BaseBuildExportVO> list = baseBuildService.baseBuildListExport(buildNum, buildName);
+        ExcelUtil<BaseBuildExportVO> util = new ExcelUtil<BaseBuildExportVO>(BaseBuildExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 建筑信息-修改
      *

+ 25 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemMicroStationController.java

@@ -1,15 +1,19 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.DemMicroStation;
 import com.usky.fire.service.DemMicroStationService;
+import com.usky.fire.service.vo.DemMicroStationExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +37,7 @@ public class DemMicroStationController {
      *
      * @param squadron    所属中队
      * @param stationName 消防站名称
+     * @param stationType 消防站类型(1:微消站;2:专职站,3:重点微消站)
      * @param id          主键ID
      * @param pageNum     当前页
      * @param pageSize    每页条数
@@ -48,6 +53,26 @@ public class DemMicroStationController {
         return ApiResult.success(demMicroStationService.microStationList(squadron, stationName, stationType, id, pageNum, pageSize));
     }
 
+    /**
+     * 消防站点管理-列表-导出
+     *
+     * @param squadron    所属中队
+     * @param stationName 消防站名称
+     * @param stationType 消防站类型(1:微消站;2:专职站,3:重点微消站)
+     * @param exportTitle 文件名
+     * @throws IOException
+     */
+    @PostMapping("microStationListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "squadron", required = false) String squadron,
+                       @RequestParam(value = "stationName", required = false) String stationName,
+                       @RequestParam(value = "stationType", required = false) String stationType,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException {
+        List<DemMicroStationExportVO> list = demMicroStationService.microStationListExport(squadron, stationName, stationType);
+        ExcelUtil<DemMicroStationExportVO> util = new ExcelUtil<DemMicroStationExportVO>(DemMicroStationExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 消防站点管理-修改
      *

+ 24 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemPoliceRecordController.java

@@ -1,15 +1,21 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.DemPoliceRecord;
 import com.usky.fire.service.DemPoliceRecordService;
+import com.usky.fire.service.vo.DemPoliceRecordExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * <p>
  * 处警记录 前端控制器
@@ -44,6 +50,24 @@ public class DemPoliceRecordController {
         return ApiResult.success(demPoliceRecordService.policeRecordList(caseCode, branch, id, pageNum, pageSize));
     }
 
+    /**
+     * 接处警数据-列表-导出
+     *
+     * @param caseCode 案件编号
+     * @param branch   主管支队
+     * @param exportTitle   文件名
+     * @throws IOException
+     */
+    @PostMapping("policeRecordListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "caseCode", required = false) String caseCode,
+                       @RequestParam(value = "branch", required = false) String branch,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
+        List<DemPoliceRecordExportVO> list = demPoliceRecordService.policeRecordListExport(caseCode, branch);
+        ExcelUtil<DemPoliceRecordExportVO> util = new ExcelUtil<DemPoliceRecordExportVO>(DemPoliceRecordExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 接处警数据-修改
      *

+ 24 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemVehicleController.java

@@ -1,15 +1,21 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.DemVehicle;
 import com.usky.fire.service.DemVehicleService;
+import com.usky.fire.service.vo.DemVehicleExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * <p>
  * 车辆信息 前端控制器
@@ -44,6 +50,24 @@ public class DemVehicleController {
         return ApiResult.success(demVehicleService.vehicleList(vehicleCode, vehicleAbbreviat, id, pageNum, pageSize));
     }
 
+    /**
+     * 消防车辆管理-列表查询-导出
+     *
+     * @param vehicleCode      车辆编号
+     * @param vehicleAbbreviat 车辆简称
+     * @param exportTitle      文件名
+     * @throws java.io.IOException
+     */
+    @PostMapping("vehicleListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "vehicleCode", required = false) String vehicleCode,
+                       @RequestParam(value = "vehicleAbbreviat", required = false) String vehicleAbbreviat,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
+        List<DemVehicleExportVO> list = demVehicleService.vehicleListExport(vehicleCode, vehicleAbbreviat);
+        ExcelUtil<DemVehicleExportVO> util = new ExcelUtil<DemVehicleExportVO>(DemVehicleExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 消防车辆管理-修改
      *

+ 20 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemWaterSourceController.java

@@ -1,6 +1,7 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
@@ -8,10 +9,13 @@ import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.DemWaterSource;
 import com.usky.fire.service.DemWaterSourceService;
 import com.usky.fire.service.po.FireWaterPO;
+import com.usky.fire.service.vo.DemWaterSourceExportVO;
 import com.usky.fire.service.vo.FireWaterStatisticsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -47,6 +51,22 @@ public class DemWaterSourceController {
         return ApiResult.success(demWaterSourceService.waterSourceList(waterName, id, pageNum, pageSize));
     }
 
+    /**
+     * 消防水源管理-列表-导出
+     *
+     * @param waterName 水源名称
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("waterSourceListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "waterName", required = false) String waterName,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
+        List<DemWaterSourceExportVO> list = demWaterSourceService.waterSourceListExport(waterName);
+        ExcelUtil<DemWaterSourceExportVO> util = new ExcelUtil<DemWaterSourceExportVO>(DemWaterSourceExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 消防水源管理-修改
      *

+ 10 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseBuildService.java

@@ -3,8 +3,10 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.BaseBuild;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.service.vo.BaseBuildExportVO;
 import com.usky.fire.service.vo.BaseBuildVo;
 
+import java.util.List;
 /**
  * <p>
  * 建筑信息 服务类
@@ -25,6 +27,14 @@ public interface BaseBuildService extends CrudService<BaseBuild> {
      */
     CommonPage<Object> baseBuildList(String buildNum, String buildName, Integer pageNum, Integer pageSize);
 
+    /**
+     * 建筑信息-列表查询-导出
+     *
+     * @param buildNum 项目编号
+     * @param buildName 单位编号
+     */
+    List<BaseBuildExportVO> baseBuildListExport(String buildNum, String buildName);
+
     /**
      * 建筑信息-修改
      *

+ 10 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemMicroStationService.java

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemMicroStation;
+import com.usky.fire.service.vo.DemMicroStationExportVO;
 
 import java.util.List;
 import java.util.Map;
@@ -30,6 +31,15 @@ public interface DemMicroStationService extends CrudService<DemMicroStation> {
      */
     CommonPage<Map<String, Object>> microStationList(String squadron, String stationName,String stationType, Integer id, Integer pageNum, Integer pageSize);
 
+    /**
+     * 消防站点管理-列表-导出
+     *
+     * @param squadron    所属中队
+     * @param stationName 消防站名称
+     * @param stationType 消防站类型(1:微消站;2:专职站,3:重点微消站)
+     */
+    List<DemMicroStationExportVO> microStationListExport(String squadron, String stationName, String stationType);
+
     /**
      * 消防站点管理-修改
      *

+ 11 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemPoliceRecordService.java

@@ -3,6 +3,9 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemPoliceRecord;
+import com.usky.fire.service.vo.DemPoliceRecordExportVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -26,6 +29,14 @@ public interface DemPoliceRecordService extends CrudService<DemPoliceRecord> {
      */
     CommonPage<Object> policeRecordList(String caseCode, String branch, Integer id, Integer pageNum, Integer pageSize);
 
+    /**
+     * 接处警数据-列表-导出
+     *
+     * @param caseCode 案件编号
+     * @param branch   主管支队
+     */
+    List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch);
+
     /**
      * 接处警数据-修改
      *

+ 9 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemVehicleService.java

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemVehicle;
+import com.usky.fire.service.vo.DemVehicleExportVO;
 
 import java.util.List;
 
@@ -28,6 +29,14 @@ public interface DemVehicleService extends CrudService<DemVehicle> {
      */
     CommonPage<Object> vehicleList(String vehicleCode, String vehicleAbbreviat, Integer id, Integer pageNum, Integer pageSize);
 
+    /**
+     * 消防车辆管理-列表查询-导出
+     *
+     * @param vehicleCode      车辆编号
+     * @param vehicleAbbreviat 车辆简称
+     */
+    List<DemVehicleExportVO> vehicleListExport(String vehicleCode, String vehicleAbbreviat);
+
     /**
      * 消防车辆管理-修改
      *

+ 8 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemWaterSourceService.java

@@ -5,6 +5,7 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemMicroStation;
 import com.usky.fire.domain.DemWaterSource;
 import com.usky.fire.service.po.FireWaterPO;
+import com.usky.fire.service.vo.DemWaterSourceExportVO;
 import com.usky.fire.service.vo.FireWaterStatisticsVO;
 
 import java.util.List;
@@ -31,6 +32,13 @@ public interface DemWaterSourceService extends CrudService<DemWaterSource> {
      */
     CommonPage<Map<String, Object>> waterSourceList(String waterName, Integer id, Integer pageNum, Integer pageSize);
 
+    /**
+     * 消防水源管理-列表-导出
+     *
+     * @param waterName 水源名称
+     */
+    List<DemWaterSourceExportVO> waterSourceListExport(String waterName);
+
     /**
      * 消防水源管理-修改
      *

+ 38 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseBuildServiceImpl.java

@@ -12,10 +12,13 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.service.BaseBuildService;
 import com.usky.fire.domain.BaseBuild;
 import com.usky.fire.mapper.BaseBuildMapper;
+import com.usky.fire.service.vo.BaseBuildExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.swing.text.DateFormatter;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -68,6 +71,41 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<BaseBuildExportVO> baseBuildListExport(String buildNum, String buildName){
+        List<BaseBuildExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseBuild> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseBuild::getId, BaseBuild::getBuildNum, BaseBuild::getBuildName, BaseBuild::getAddress, BaseBuild::getBuildArea,
+                BaseBuild::getFireRating, BaseBuild::getUseCharacter, BaseBuild::getBuildStructure, BaseBuild::getBuildHigh,
+                BaseBuild::getCompleteYear, BaseBuild::getSafePerson, BaseBuild::getManagePerson, BaseBuild::getFireRisk, BaseBuild::getBuildPlan)
+                .eq(BaseBuild::getDeleteFlag, 0)
+                .like(StringUtils.isNotBlank(buildNum), BaseBuild::getBuildNum, buildNum)
+                .like(StringUtils.isNotBlank(buildName), BaseBuild::getBuildName, buildName)
+                .orderByDesc(BaseBuild::getId);
+        List<BaseBuild> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            for (int i = 0; i < list1.size(); i++) {
+                BaseBuildExportVO baseBuildExportVO = new BaseBuildExportVO();
+                baseBuildExportVO.setBuildNum(list1.get(i).getBuildNum());
+                baseBuildExportVO.setBuildName(list1.get(i).getBuildName());
+                baseBuildExportVO.setAddress(list1.get(i).getAddress());
+                baseBuildExportVO.setBuildArea(list1.get(i).getBuildArea());
+                baseBuildExportVO.setFireRating(list1.get(i).getFireRating());
+                baseBuildExportVO.setUseCharacter(list1.get(i).getUseCharacter());
+                baseBuildExportVO.setBuildStructure(list1.get(i).getBuildStructure());
+                baseBuildExportVO.setBuildHigh(list1.get(i).getBuildHigh());
+                baseBuildExportVO.setCompleteYear((list1.get(i).getCompleteYear()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+                baseBuildExportVO.setSafePerson(list1.get(i).getSafePerson());
+                baseBuildExportVO.setManagePerson(list1.get(i).getManagePerson());
+                baseBuildExportVO.setFireRisk(list1.get(i).getFireRisk());
+                baseBuildExportVO.setBuildPlan(list1.get(i).getBuildPlan());
+                list.add(baseBuildExportVO);
+            }
+        }
+
+        return list;
+    }
+
 
     @Override
     public void updateBaseBuild(BaseBuild baseBuild) {

+ 40 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemMicroStationServiceImpl.java

@@ -14,6 +14,7 @@ import com.usky.fire.mapper.DemMicroStationMapper;
 import com.usky.fire.service.BaseCompanyService;
 import com.usky.fire.service.DemMicroStationService;
 import com.usky.fire.service.DemWaterSourceService;
+import com.usky.fire.service.vo.DemMicroStationExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -76,6 +77,45 @@ public class DemMicroStationServiceImpl extends AbstractCrudService<DemMicroStat
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemMicroStationExportVO> microStationListExport(String squadron, String stationName, String stationType){
+        List<DemMicroStationExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemMicroStation> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemMicroStation::getId, DemMicroStation::getBranchName, DemMicroStation::getSquadron,
+                DemMicroStation::getStationName, DemMicroStation::getCompanyNature, DemMicroStation::getAddress,
+                DemMicroStation::getLocation, DemMicroStation::getFixedPhone, DemMicroStation::getChargeName,
+                DemMicroStation::getChargePhone, DemMicroStation::getStationType, DemMicroStation::getLongitude,
+                DemMicroStation::getDimension, DemMicroStation::getCreateTime, DemMicroStation::getUpdateTime)
+                .eq(DemMicroStation::getDeleteFlag, 0)
+                .eq(StringUtils.isNotBlank(stationType), DemMicroStation::getStationType, stationType)
+                .like(StringUtils.isNotBlank(squadron), DemMicroStation::getSquadron, squadron)
+                .like(StringUtils.isNotBlank(stationName), DemMicroStation::getStationName, stationName)
+                .orderByDesc(DemMicroStation::getId);
+        List<DemMicroStation> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            for (int i = 0; i < list1.size(); i++) {
+                DemMicroStationExportVO demMicroStationExportVO = new DemMicroStationExportVO();
+                demMicroStationExportVO.setBranchName(list1.get(i).getBranchName());
+                demMicroStationExportVO.setSquadron(list1.get(i).getSquadron());
+                demMicroStationExportVO.setStationName(list1.get(i).getStationName());
+                demMicroStationExportVO.setCompanyNature(list1.get(i).getCompanyNature());
+                demMicroStationExportVO.setAddress(list1.get(i).getAddress());
+                demMicroStationExportVO.setFixedPhone(list1.get(i).getFixedPhone());
+                demMicroStationExportVO.setChargeName(list1.get(i).getChargeName());
+                demMicroStationExportVO.setChargePhone(list1.get(i).getChargePhone());
+                demMicroStationExportVO.setStationType(list1.get(i).getStationType());
+                demMicroStationExportVO.setLongitude(list1.get(i).getLongitude());
+                demMicroStationExportVO.setDimension(list1.get(i).getDimension());
+                demMicroStationExportVO.setCreateTime(list1.get(i).getCreateTime());
+                demMicroStationExportVO.setUpdateTime(list1.get(i).getUpdateTime());
+                demMicroStationExportVO.setLocation(list1.get(i).getLocation());
+                list.add(demMicroStationExportVO);
+            }
+        }
+
+        return list;
+    }
+
     @Override
     public void updateMicroStation(DemMicroStation demMicroStation) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");

+ 63 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemPoliceRecordServiceImpl.java

@@ -13,6 +13,7 @@ import com.usky.fire.domain.DemPoliceRecord;
 import com.usky.fire.mapper.DemPoliceRecordMapper;
 import com.usky.fire.service.DemPoliceInfoService;
 import com.usky.fire.service.DemPoliceRecordService;
+import com.usky.fire.service.vo.DemPoliceRecordExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,6 +89,68 @@ public class DemPoliceRecordServiceImpl extends AbstractCrudService<DemPoliceRec
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch){
+        List<DemPoliceRecordExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemPoliceRecord> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemPoliceRecord::getCaseInfoId, DemPoliceRecord::getHandleStartTime, DemPoliceRecord::getHandleEndTime)
+                .eq(DemPoliceRecord::getDeleteFlag, "0")
+                .orderByDesc(DemPoliceRecord::getId);
+        List<DemPoliceRecord> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<String> policeIdList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                policeIdList.add(list1.get(i).getCaseInfoId());
+            }
+            if (CollectionUtils.isNotEmpty(policeIdList)) {
+                LambdaQueryWrapper<DemPoliceInfo> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
+                        DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
+                        DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
+                        DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle,
+                        DemPoliceInfo::getPoliceId)
+                        .in(DemPoliceInfo::getPoliceId, policeIdList)
+                        .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
+                        .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode);
+                List<DemPoliceInfo> list2 = demPoliceInfoService.list(queryWrapper1);
+                for (int i = 0; i < list1.size(); i++) {
+                    DemPoliceRecordExportVO demPoliceRecordExportVO = new DemPoliceRecordExportVO();
+                    demPoliceRecordExportVO.setCaseCode(null);
+                    demPoliceRecordExportVO.setHandleStartTime(list1.get(i).getHandleStartTime());
+                    demPoliceRecordExportVO.setHandleEndTime(list1.get(i).getHandleEndTime());
+                    demPoliceRecordExportVO.setBranch(null);
+                    demPoliceRecordExportVO.setTimeSlot(null);
+                    demPoliceRecordExportVO.setArea(null);
+                    demPoliceRecordExportVO.setCaseType(null);
+                    demPoliceRecordExportVO.setFilingDate(null);
+                    demPoliceRecordExportVO.setFilingTime(null);
+                    demPoliceRecordExportVO.setHandleObject(null);
+                    demPoliceRecordExportVO.setCaseStatus(null);
+                    demPoliceRecordExportVO.setCaseNature(null);
+                    demPoliceRecordExportVO.setDispatchVehicle(null);
+                    for (int j = 0; j < list2.size(); j++) {
+                        if (list1.get(i).getCaseInfoId().equals(list2.get(j).getPoliceId())) {
+                            demPoliceRecordExportVO.setCaseCode(list2.get(j).getCaseCode());
+                            demPoliceRecordExportVO.setBranch(list2.get(j).getBranch());
+                            demPoliceRecordExportVO.setTimeSlot(list2.get(j).getTimeSlot());
+                            demPoliceRecordExportVO.setArea(list2.get(j).getArea());
+                            demPoliceRecordExportVO.setCaseType(list2.get(j).getCaseType());
+                            demPoliceRecordExportVO.setFilingDate(list2.get(j).getFilingDate());
+                            demPoliceRecordExportVO.setFilingTime(list2.get(j).getFilingTime());
+                            demPoliceRecordExportVO.setHandleObject(list2.get(j).getHandleObject());
+                            demPoliceRecordExportVO.setCaseStatus(list2.get(j).getCaseStatus());
+                            demPoliceRecordExportVO.setCaseNature(list2.get(j).getCaseNature());
+                            demPoliceRecordExportVO.setDispatchVehicle(list2.get(j).getDispatchVehicle());
+                        }
+                    }
+                    list.add(demPoliceRecordExportVO);
+                }
+            }
+        }
+
+        return list;
+    }
+
     @Transactional
     @Override
     public void updatePoliceRecord(DemPoliceRecord demPoliceRecord) {

+ 44 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemVehicleServiceImpl.java

@@ -10,6 +10,8 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.DemVehicle;
 import com.usky.fire.mapper.DemVehicleMapper;
 import com.usky.fire.service.DemVehicleService;
+import com.usky.fire.service.vo.DemVehicleExportVO;
+import org.springframework.data.redis.support.collections.DefaultRedisList;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -72,6 +74,48 @@ public class DemVehicleServiceImpl extends AbstractCrudService<DemVehicleMapper,
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemVehicleExportVO> vehicleListExport(String vehicleCode, String vehicleAbbreviat){
+        List<DemVehicleExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemVehicle> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemVehicle::getId, DemVehicle::getVehicleCode, DemVehicle::getVehicleAbbreviat,
+                DemVehicle::getRadioChannel, DemVehicle::getRadioCallSign, DemVehicle::getFireOrga,
+                DemVehicle::getVehicleClassCode, DemVehicle::getLicensePlate, DemVehicle::getAssetCode,
+                DemVehicle::getEquipTime, DemVehicle::getFireFightStatus, DemVehicle::getRecordStatus,
+                DemVehicle::getPoliceListCode, DemVehicle::getCommanderName, DemVehicle::getReporter,
+                DemVehicle::getDriver, DemVehicle::getSoldier, DemVehicle::getTypeCode,
+                DemVehicle::getVehicleStatus)
+                .eq(DemVehicle::getDeleteFlag, 0)
+                .like(StringUtils.isNotBlank(vehicleAbbreviat), DemVehicle::getVehicleAbbreviat, vehicleAbbreviat)
+                .like(StringUtils.isNotBlank(vehicleCode), DemVehicle::getVehicleCode, vehicleCode)
+                .orderByDesc(DemVehicle::getId);
+        List<DemVehicle> list1= this.list(queryWrapper);
+        for (int i = 0; i < list1.size(); i++) {
+            DemVehicleExportVO demVehicleExportVO = new DemVehicleExportVO();
+            demVehicleExportVO.setVehicleAbbreviat(list1.get(i).getVehicleAbbreviat());
+            demVehicleExportVO.setRadioChannel(list1.get(i).getRadioChannel());
+            demVehicleExportVO.setRadioCallSign(list1.get(i).getRadioCallSign());
+            demVehicleExportVO.setFireOrga(list1.get(i).getFireOrga());
+            demVehicleExportVO.setVehicleClassCode(list1.get(i).getVehicleClassCode());
+            demVehicleExportVO.setLicensePlate(list1.get(i).getLicensePlate());
+            demVehicleExportVO.setEquipTime(list1.get(i).getEquipTime());
+            demVehicleExportVO.setFireFightStatus(list1.get(i).getFireFightStatus());
+            demVehicleExportVO.setRecordStatus(list1.get(i).getRecordStatus());
+            demVehicleExportVO.setCommanderName(list1.get(i).getCommanderName());
+            demVehicleExportVO.setDriver(list1.get(i).getDriver());
+            demVehicleExportVO.setSoldier(list1.get(i).getSoldier());
+            demVehicleExportVO.setTypeCode(list1.get(i).getTypeCode());
+            demVehicleExportVO.setVehicleStatus(list1.get(i).getVehicleStatus());
+            demVehicleExportVO.setAssetCode(list1.get(i).getAssetCode());
+            demVehicleExportVO.setVehicleCode(list1.get(i).getVehicleCode());
+            demVehicleExportVO.setPoliceListCode(list1.get(i).getPoliceListCode());
+            demVehicleExportVO.setReporter(list1.get(i).getReporter());
+            list.add(demVehicleExportVO);
+        }
+
+        return list;
+    }
+
     @Override
     public void updateVehicle(DemVehicle demVehicle) {
         this.updateById(demVehicle);

+ 38 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemWaterSourceServiceImpl.java

@@ -19,9 +19,11 @@ import com.usky.fire.service.DemWaterSourceService;
 import com.usky.fire.service.po.FireWaterPO;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.FireWaterStatisticsVO;
+import com.usky.fire.service.vo.DemWaterSourceExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -79,6 +81,42 @@ public class DemWaterSourceServiceImpl extends AbstractCrudService<DemWaterSourc
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemWaterSourceExportVO> waterSourceListExport(String waterName){
+        List<DemWaterSourceExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemWaterSource> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemWaterSource::getId, DemWaterSource::getWaterName, DemWaterSource::getWaterAddress,
+                DemWaterSource::getWaterType, DemWaterSource::getOrganizateName, DemWaterSource::getWaterForm,
+                DemWaterSource::getAvailableStatusName, DemWaterSource::getAvailableStatus, DemWaterSource::getWaterNature,
+                DemWaterSource::getBuildTime, DemWaterSource::getPipeCompany, DemWaterSource::getContactMode,
+                DemWaterSource::getFireAbbreviat, DemWaterSource::getPipePressure, DemWaterSource::getHydrantInterface)
+                .eq(DemWaterSource::getDeleteFlag, 0)
+                .like(StringUtils.isNotBlank(waterName), DemWaterSource::getWaterName, waterName)
+                .orderByDesc(DemWaterSource::getId);
+        List<DemWaterSource> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            for (int i = 0; i < list1.size(); i++) {
+                DemWaterSourceExportVO demWaterSourceExportVO = new DemWaterSourceExportVO();
+                demWaterSourceExportVO.setWaterName(list1.get(i).getWaterName());
+                demWaterSourceExportVO.setWaterAddress(list1.get(i).getWaterAddress());
+                demWaterSourceExportVO.setWaterType(list1.get(i).getWaterType());
+                demWaterSourceExportVO.setOrganizateName(list1.get(i).getOrganizateName());
+                demWaterSourceExportVO.setWaterForm(list1.get(i).getWaterForm());
+                demWaterSourceExportVO.setAvailableStatusName(list1.get(i).getAvailableStatusName());
+                demWaterSourceExportVO.setWaterNature(list1.get(i).getWaterNature());
+                demWaterSourceExportVO.setBuildTime((list1.get(i).getBuildTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demWaterSourceExportVO.setPipeCompany(list1.get(i).getPipeCompany());
+                demWaterSourceExportVO.setContactMode(list1.get(i).getContactMode());
+                demWaterSourceExportVO.setFireAbbreviat(list1.get(i).getFireAbbreviat());
+                demWaterSourceExportVO.setPipePressure(list1.get(i).getPipePressure());
+                demWaterSourceExportVO.setHydrantInterface(list1.get(i).getHydrantInterface());
+                list.add(demWaterSourceExportVO);
+            }
+        }
+
+        return list;
+    }
+
     @Override
     public void updateWaterSource(DemWaterSource demWaterSource) {
         this.updateById(demWaterSource);

+ 113 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseBuildExportVO.java

@@ -0,0 +1,113 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BaseBuildExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 建筑编号
+     */
+    @Excel(name = "建筑编号")
+    private String buildNum;
+
+    /**
+     * 建筑名称
+     */
+    @Excel(name = "建筑名称")
+    private String buildName;
+
+    /**
+     * 建筑地址
+     */
+    @Excel(name = "建筑地址")
+    private String address;
+
+    /**
+     * 建筑面积(㎡)
+     */
+    @Excel(name = "建筑面积(㎡)")
+    private Double buildArea;
+
+    /**
+     * 耐火等级
+     */
+    @Excel(name = "耐火等级")
+    private Integer fireRating;
+
+    /**
+     * 使用性质
+     */
+    @Excel(name = "使用性质")
+    private Integer useCharacter;
+
+    /**
+     * 建筑结构
+     */
+    @Excel(name = "建筑结构")
+    private Integer buildStructure;
+
+    /**
+     * 建筑高度(m)
+     */
+    @Excel(name = "建筑高度(m)")
+    private Double buildHigh;
+
+    /**
+     * 竣工日期
+     */
+    @Excel(name = "竣工日期")
+    private String completeYear;
+
+    /**
+     * 安全责任人
+     */
+    @Excel(name = "安全责任人")
+    private String safePerson;
+
+    /**
+     * 安全管理人
+     */
+    @Excel(name = "安全管理人")
+    private String managePerson;
+
+    /**
+     * 火灾危险性
+     */
+    @Excel(name = "火灾危险性")
+    private Integer fireRisk;
+
+    /**
+     * 建筑平面图
+     */
+    @Excel(name = "建筑平面图")
+    private String buildPlan;
+}

+ 118 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemMicroStationExportVO.java

@@ -0,0 +1,118 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemMicroStationExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 支队名称
+     */
+    @Excel(name = "支队名称")
+    private String branchName;
+
+    /**
+     * 所属辖区中队
+     */
+    @Excel(name = "所属辖区中队")
+    private String squadron;
+
+    /**
+     * 消防站名称
+     */
+    @Excel(name = "消防站名称")
+    private String stationName;
+
+    /**
+     * 单位性质
+     */
+    @Excel(name = "单位性质")
+    private String companyNature;
+
+    /**
+     * 地址
+     */
+    @Excel(name = "地址")
+    private String address;
+
+    /**
+     * 联动固定电话
+     */
+    @Excel(name = "联动固定电话")
+    private String fixedPhone;
+
+    /**
+     * 负责人姓名
+     */
+    @Excel(name = "负责人姓名")
+    private String chargeName;
+
+    /**
+     * 负责人电话
+     */
+    @Excel(name = "负责人电话")
+    private String chargePhone;
+
+    /**
+     * 消防站类型(1:微消站;2:专职站,3:重点微消站)
+     */
+    @Excel(name = "消防站类型")
+    private String stationType;
+
+    /**
+     * 经度
+     */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /**
+     * 维度
+     */
+    @Excel(name = "维度")
+    private BigDecimal dimension;
+
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @Excel(name = "更新时间")
+    private String updateTime;
+
+    /**
+     * 所在位置
+     */
+    @Excel(name = "所在位置")
+    private String location;
+}

+ 114 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemPoliceRecordExportVO.java

@@ -0,0 +1,114 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemPoliceRecordExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 案件编号
+     */
+    @Excel(name = "案件编号")
+    private String caseCode;
+
+    /**
+     * 处警开始时间
+     */
+    @Excel(name = "处警开始时间")
+    private String handleStartTime;
+
+    /**
+     * 处警结束时间
+     */
+    @Excel(name = "处警结束时间")
+    private String handleEndTime;
+
+    /**
+     * 主管支队
+     */
+    @Excel(name = "主管支队")
+    private String branch;
+
+    /**
+     * 案件时间段
+     */
+    @Excel(name = "案件时间段")
+    private String timeSlot;
+
+    /**
+     * 区域
+     */
+    @Excel(name = "区域")
+    private String area;
+
+    /**
+     * 案件类型
+     */
+    @Excel(name = "案件类型")
+    private String caseType;
+
+    /**
+     * 立案日期
+     */
+    @Excel(name = "立案日期")
+    private LocalDate filingDate;
+
+    /**
+     * 立案时间
+     */
+    @Excel(name = "立案时间")
+    private LocalDateTime filingTime;
+
+    /**
+     * 处置对象
+     */
+    @Excel(name = "处置对象")
+    private String handleObject;
+
+    /**
+     * 案件状态
+     */
+    @Excel(name = "案件状态")
+    private String caseStatus;
+
+    /**
+     * 案件性质
+     */
+    @Excel(name = "案件性质")
+    private String caseNature;
+
+    /**
+     * 出动车辆
+     */
+    @Excel(name = "出动车辆")
+    private BigDecimal dispatchVehicle;
+}

+ 142 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemVehicleExportVO.java

@@ -0,0 +1,142 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemVehicleExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 车辆简称
+     */
+    @Excel(name = "车辆简称")
+    private String vehicleAbbreviat;
+
+    /**
+     * 电台频道
+     */
+    @Excel(name = "电台频道")
+    private String radioChannel;
+
+    /**
+     * 电台呼号
+     */
+    @Excel(name = "电台呼号")
+    private String radioCallSign;
+
+    /**
+     * 所属消防机构
+     */
+    @Excel(name = "所属消防机构")
+    private String fireOrga;
+
+    /**
+     * 车辆等级代码
+     */
+    @Excel(name = "车辆等级代码")
+    private String vehicleClassCode;
+
+    /**
+     * 车牌号
+     */
+    @Excel(name = "车牌号")
+    private String licensePlate;
+
+    /**
+     * 装备日期
+     */
+    @Excel(name = "装备日期")
+    private LocalDateTime equipTime;
+
+    /**
+     * 车辆状态码
+     */
+    @Excel(name = "车辆状态码")
+    private String fireFightStatus;
+
+    /**
+     * 记录状态
+     */
+    @Excel(name = "记录状态")
+    private BigDecimal recordStatus;
+
+    /**
+     * 指挥员姓名
+     */
+    @Excel(name = "指挥员姓名")
+    private String commanderName;
+
+    /**
+     * 驾驶员
+     */
+    @Excel(name = "驾驶员")
+    private String driver;
+
+    /**
+     * 战士人员
+     */
+    @Excel(name = "战士人员")
+    private String soldier;
+
+    /**
+     * 类型编号
+     */
+    @Excel(name = "类型编号")
+    private String typeCode;
+
+    /**
+     * 车辆状态
+     */
+    @Excel(name = "车辆状态")
+    private String vehicleStatus;
+
+    /**
+     * 资产编号
+     */
+    @Excel(name = "资产编号")
+    private String assetCode;
+
+    /**
+     * 车辆编号
+     */
+    @Excel(name = "车辆编号")
+    private String vehicleCode;
+
+    /**
+     * 处警单编号
+     */
+    @Excel(name = "处警单编号")
+    private String policeListCode;
+
+    /**
+     * 通信员
+     */
+    @Excel(name = "通信员")
+    private String reporter;
+}

+ 111 - 0
service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemWaterSourceExportVO.java

@@ -0,0 +1,111 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemWaterSourceExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 水源名称;
+     */
+    @Excel(name = "水源名称")
+    private String waterName;
+
+    /**
+     * 水源地址;
+     */
+    @Excel(name = "水源地址")
+    private String waterAddress;
+
+    /**
+     * 水源类型;
+     */
+    @Excel(name = "水源类型")
+    private String waterType;
+
+    /**
+     * 管辖名称;
+     */
+    @Excel(name = "管辖名称")
+    private String organizateName;
+
+    /**
+     * 取水形式;
+     */
+    @Excel(name = "取水形式")
+    private String waterForm;
+
+    /**
+     * 可用状态;
+     */
+    @Excel(name = "可用状态")
+    private String availableStatusName;
+
+    /**
+     * 水源性质;
+     */
+    @Excel(name = "水源性质")
+    private String waterNature;
+
+    /**
+     * 建造时间;
+     */
+    @Excel(name = "建造时间")
+    private String buildTime;
+
+    /**
+     * 管网单位;
+     */
+    @Excel(name = "管网单位")
+    private String pipeCompany;
+
+    /**
+     * 联系方式;
+     */
+    @Excel(name = "联系方式")
+    private String contactMode;
+
+    /**
+     * 消防站简称;
+     */
+    @Excel(name = "消防站简称")
+    private String fireAbbreviat;
+
+    /**
+     * 管网压力;
+     */
+    @Excel(name = "管网压力")
+    private String pipePressure;
+
+    /**
+     * 消火栓接口;
+     */
+    @Excel(name = "消火栓接口")
+    private String hydrantInterface;
+}