Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PageDto.java

@@ -11,9 +11,15 @@ import lombok.Data;
 public class PageDto {
     private int current;
     private int size;
+    private String   name;
+    private String   code;
+    private String   typeCode;
 
     public PageDto(int current, int size) {
         this.current = current;
         this.size = size;
     }
+
+    public PageDto() {
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -193,6 +193,17 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "/video/pageVideo", method = RequestMethod.GET)
     ResponseModel<Page<Map<String, Object>>> pageVideo( @RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam Double longitude,@RequestParam Double latitude,@RequestParam Double distance);
+
+
+    @RequestMapping(value = "/video/pageList", method = RequestMethod.GET)
+    ResponseModel<Page<Map<String, Object>>> pageList( @RequestParam Integer current,
+                                                       @RequestParam Integer size,
+                                                       @RequestParam String code,
+                                                       @RequestParam String name,
+                                                       @RequestParam String typeCode);
+
+
+
     /**
      *
      *获取视频列表

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/VideoFeignClient.java

+package com.yeejoin.amos.boot.module.common.api.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/10/20
+ */
+@FeignClient(name = "${video.fegin.name}", path = "video", configuration = {MultipartSupportConfig.class})
+public interface VideoFeignClient {
+
+
+    @RequestMapping(value = "/video-original/url/video/{indexCode}", method = RequestMethod.GET)
+    ResponseModel<String> videoUrlByIndexCode(@PathVariable String indexCode);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,6 +7,8 @@ import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
 
+import java.util.List;
+
 /**
  * 重点部位 Mapper 接口
  *
@@ -26,7 +26,8 @@ public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long bu
  * 获取所有的重点部位数据
  * @return
  */
-public List<KeySiteDto> getKeySiteList();
+public List<KeySiteDto> getKeySiteList( String name, Long buildingId, String fireEnduranceRate,
+										String useNature, String fireFacilitiesInfo, Long belongId);
 /**
  * 根据id查找
  * @param sequenceNbr

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface WaterResourceMapper extends BaseMapper<WaterResource> {
 
-    List<WaterResourceDto> exportToExcel(Boolean isDelete);
+    List<WaterResourceDto> exportToExcel(@Param("isDelete")Boolean isDelete,@Param("name")String name, @Param("resourceType")String resourceType);
 
 
     /***

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IKeySiteService.java

@@ -42,7 +42,8 @@ public  List<OrgMenuDto> getOrguserTree();
  * 
  * @return
  */
-public List<KeySiteDto> queryForKeySiteList() ;
+public List<KeySiteDto> queryForKeySiteList( String name, Long buildingId, String fireEnduranceRate,
+											String useNature, String fireFacilitiesInfo, Long belongId) ;
 /**根据id查找
  * 
  * @param sequenceNbr
@@ -50,7 +51,8 @@ public List<KeySiteDto> queryForKeySiteList() ;
  */
 public KeySiteDto getSequenceNbr(Long sequenceNbr);
 
-public List<KeySiteExcleDto> exportToExcel();
+public List<KeySiteExcleDto> exportToExcel(String name, Long buildingId, String fireEnduranceRate,
+										   String useNature, String fireFacilitiesInfo, Long belongId);
 
 /**获取所在建筑的树结构信息
  * 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -118,7 +118,25 @@
 			   c.use_nature_name            as useNatureName
 		FROM cb_key_site c
 				 left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
-		where c.is_delete = FALSE;
+		where c.is_delete = FALSE
+		<if test="name != null and name != ''">
+			AND c.`name` like concat('%',#{name}, '%')
+		</if>
+		<if test="buildingId != null and buildingId != -1">
+			AND c.`building_id`= #{buildingId}
+		</if>
+		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
+			AND c.`fire_endurance_rate`= #{fireEnduranceRate}
+		</if>
+		<if test="useNature != null and useNature != ''">
+			AND c.`use_nature`= #{useNature}
+		</if>
+		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
+			AND c.`fire_facilities_info`= #{fireFacilitiesInfo}
+		</if>
+		<if test="belongId != null and belongId!='-1' and belongId != -1">
+			AND c.`belong_id`= #{belongId}
+		</if>
 	</select>
 
 	<select id="getKeySiteDate" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto">

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -65,6 +65,12 @@
             left join cb_water_resource_natural rn on r.sequence_nbr = rn.resource_id
             left join cb_water_resource_iot ri on r.sequence_nbr = ri.resource_id
         where r.is_delete = #{isDelete}
+        <if test='name!=null and name!=""'>
+            and r.name  like concat('%',#{name}, '%')
+        </if>
+        <if test='resourceType!=null and resourceType!=""'>
+            and r.resource_type= #{resourceType}
+        </if>
     </select>
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
+import com.yeejoin.amos.boot.module.common.api.feign.VideoFeignClient;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
 import com.yeejoin.amos.boot.module.common.api.service.IFireChemicalService;
@@ -123,6 +124,9 @@ public class CommandController extends BaseController {
  	private String readUrl;
  	 @Autowired
      EquipFeignClient equipFeignClient;
+
+    @Autowired
+    VideoFeignClient videoFeignClient;
     @Autowired
     IKeySiteService keySiteService;
     @Autowired
@@ -287,6 +291,30 @@ public class CommandController extends BaseController {
     }
 
 
+
+    /**
+     * 水源列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "video/pageList")
+    @ApiOperation(httpMethod = "POST", value = " app视频分页查询88", notes = "app视频分页查询88")
+    public ResponseModel<Object> pageList(@RequestBody PageDto pageDto) {
+        ResponseModel<Page<Map<String, Object>>> data=  equipFeignClient.pageList(pageDto.getCurrent(),
+                pageDto.getSize(),
+                pageDto.getCode()==null?"":pageDto.getCode(),
+                pageDto.getName()==null?"":pageDto.getName(),
+                pageDto.getTypeCode()==null?"":pageDto.getTypeCode());
+        return ResponseHelper.buildResponse(data!=null?data.getResult():null);
+    }
+
+
+
+
+
+
+
     /**
      * 水源列表分页查询
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireChemicalController.java

@@ -2,24 +2,25 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
-import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireChemicalServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -125,6 +126,6 @@ public class FireChemicalController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "危化品列表全部数据查询", notes = "危化品列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<FireChemicalDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalList(false));
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalList(null,null,null,null,false));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireChemicalServiceImpl.java

@@ -36,8 +36,8 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
         /**
          * 列表查询 示例
          */
-        public List<FireChemicalDto> queryForFireChemicalList(@Condition(Operator.eq) Boolean isDelete)   {
-                return this.queryForList("" , false,isDelete);
+        public List<FireChemicalDto> queryForFireChemicalList(@Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode,boolean isDelete)   {
+                return this.queryForList("" , false,casNo, formula, name,  typeCode, isDelete);
         }
         /**
          * 删除

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -78,13 +78,15 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	 * 列表查询 示例
 	 */
 	@Override
-	public List<KeySiteDto> queryForKeySiteList() {
-		return keySiteMapper.getKeySiteList();
+	public List<KeySiteDto> queryForKeySiteList( String name, Long buildingId, String fireEnduranceRate,
+												 String useNature, String fireFacilitiesInfo, Long belongId) {
+		return keySiteMapper.getKeySiteList(name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId);
 	}
 
 	@Override
-	public List<KeySiteExcleDto> exportToExcel() {
-		List<KeySiteDto> list = this.queryForKeySiteList();
+	public List<KeySiteExcleDto> exportToExcel(String name, Long buildingId, String fireEnduranceRate,
+											   String useNature, String fireFacilitiesInfo, Long belongId) {
+		List<KeySiteDto> list = this.queryForKeySiteList(name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId);
 		List<KeySiteExcleDto> excleList = new ArrayList<>();
 		list.stream().forEach(i -> {
 			KeySiteExcleDto keySiteExcleDto = new KeySiteExcleDto();

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import javax.annotation.Resource;
-
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
-import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
-import com.yeejoin.amos.boot.module.common.api.dto.*;
-import com.yeejoin.amos.boot.module.common.api.entity.*;
+import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIotDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIot;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool;
+import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
-import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
-import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper;
-import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * 服务实现类
@@ -162,8 +171,9 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     /**
      * 导出列表
      */
-    public List<WaterResourceDto> exportToExcel(@Condition(Operator.eq) Boolean isDelete) {
-        return waterResourceMapper.exportToExcel(isDelete);
+    public List<WaterResourceDto> exportToExcel(Boolean isDelete,String name,
+                                                String resourceType) {
+        return waterResourceMapper.exportToExcel(isDelete,name,resourceType);
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.EasyExcelFactory;
-import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.excel.metadata.Sheet;
-import com.alibaba.excel.metadata.TableStyle;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
-import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDtos;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AircraftServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.apache.commons.collections.map.HashedMap;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.slf4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -234,24 +219,24 @@ public class AircraftController extends BaseController {
     /**
      *
      * 导出航空器信息
-     *
+     *   已废弃
      * **/
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-        @GetMapping(value = "/exportData")
-    @ApiOperation(httpMethod = "GET", value = "导出航空器信息", notes = "导出航空器信息")
-    public void exportData ( HttpServletResponse response)throws IOException {
-        String fileName = "Aircraft";
-        response.setContentType("multipart/form-data");
-        response.setCharacterEncoding("utf-8");
-        response.addHeader("Content-Disposition", "attachment;filename=" + fileName+ ".xlsx");
-        String sheetName = "航空器信息";
-        ExcelWriter writer = new ExcelWriter(response.getOutputStream(), ExcelTypeEnum.XLSX);
-        Sheet sheet = new Sheet(1, 0,AircraftDtos.class);
-        List<AircraftDto> list = aircraftServiceImpl.queryAircraftDtoForList(false);
-        sheet.setSheetName(sheetName);
-        writer.write(list, sheet);
-        writer.finish();
-    }
+//    @TycloudOperation(ApiLevel = UserType.AGENCY)
+//        @GetMapping(value = "/exportData")
+//    @ApiOperation(httpMethod = "GET", value = "导出航空器信息", notes = "导出航空器信息")
+//    public void exportData ( HttpServletResponse response)throws IOException {
+//        String fileName = "Aircraft";
+//        response.setContentType("multipart/form-data");
+//        response.setCharacterEncoding("utf-8");
+//        response.addHeader("Content-Disposition", "attachment;filename=" + fileName+ ".xlsx");
+//        String sheetName = "航空器信息";
+//        ExcelWriter writer = new ExcelWriter(response.getOutputStream(), ExcelTypeEnum.XLSX);
+//        Sheet sheet = new Sheet(1, 0,AircraftDtos.class);
+//        List<AircraftDto> list = aircraftServiceImpl.queryAircraftDtoForList(false);
+//        sheet.setSheetName(sheetName);
+//        writer.write(list, sheet);
+//        writer.finish();
+//    }
 
     /**
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
-import org.apache.commons.collections.map.HashedMap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
@@ -34,8 +15,25 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
+import org.apache.commons.collections.map.HashedMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * 航空器信息服务实现类
@@ -170,6 +168,14 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
     }
 
     /**
+     * 列表查询 示例
+     */
+    public List<AircraftDto> queryAircraftDtoForList(@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String aircraftModel,
+                                                     String engineTypeCode, String fuelTypeCode) {
+        return this.queryForList("", false, isDelete,aircraftModel, engineTypeCode, fuelTypeCode);
+    }
+
+    /**
      * <pre>
      * 持久化航空器附件信息
      * </pre>
@@ -256,12 +262,7 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
         return fileInfoModels.stream().filter(x -> fileCategory.equals(x.getFileCategory())).map(FileInfoModel::getFilename).collect(Collectors.joining(","));
     }
 
-    /**
-     * 列表查询 示例
-     */
-    public List<AircraftDto> queryAircraftDtoForList(@Condition(Operator.eq) Boolean isDelete) {
-        return this.queryForList("", false, isDelete);
-    }
+
 
 	@Override
 	public Aircraft queryByaircraftModel(String seq) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -87,11 +87,7 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.ExcelEnums;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-
-import ch.qos.logback.core.joran.conditional.IfAction;
-
 import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -107,9 +103,6 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.servlet.http.HttpServletResponse;
-
-import static org.hamcrest.CoreMatchers.nullValue;
-
 import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -209,7 +202,13 @@ public class ExcelServiceImpl {
 		switch (excelDto.getType()) {
 
 		case "WHP":
-			List<FireChemicalDto> data = fireChemicalServiceImpl.queryForFireChemicalList(false);
+			List<FireChemicalDto> data = null;
+			if(par.size()>0) {
+				data = fireChemicalServiceImpl.queryForFireChemicalList(par.containsKey("casNo")?par.get("casNo").toString():null,par.containsKey("formula")?par.get("formula").toString():null,
+						par.containsKey("name")?par.get("name").toString():null,par.containsKey("typeCode")?par.get("typeCode").toString():null,false);
+			}else{
+				data = fireChemicalServiceImpl.queryForFireChemicalList(null,null,null,null,false);
+			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
 					FireChemicalDto.class, dataSourcesImpl, false);
 			break;
@@ -237,12 +236,24 @@ public class ExcelServiceImpl {
 					FireExpertsDto.class, dataSourcesImpl, false);
 			break;
 		case "SYXX":
-			List<WaterResourceDto> waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true);
+			List<WaterResourceDto> waterResourceDtoList = null;
+			if(par.size()>0) {
+				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true,par.containsKey("name")?par.get("name").toString():null,
+						par.containsKey("resourceType")?par.get("resourceType").toString():null);
+			}else{
+				waterResourceDtoList = waterResourceServiceImpl.exportToExcel(false,null,null);
+			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
 					WaterResourceDto.class, dataSourcesImpl, false);
 			break;
 		case "HKQ":
-			List<AircraftDto> aircraftDtoList = aircraftServiceImpl.queryAircraftDtoForList(false);
+			List<AircraftDto> aircraftDtoList = null;
+			if(par.size()>0) {
+				aircraftDtoList = aircraftServiceImpl.queryAircraftDtoForList(false,par.containsKey("aircraftModel")?par.get("aircraftModel").toString():null,
+						par.containsKey("engineTypeCode")?par.get("engineTypeCode").toString():null,par.containsKey("fuelTypeCode")?par.get("fuelTypeCode").toString():null);
+			}else{
+				aircraftDtoList = aircraftServiceImpl.queryAircraftDtoForList(false,null,null,null);
+			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), aircraftDtoList,
 					AircraftDto.class, dataSourcesImpl, false);
 			break;
@@ -274,11 +285,22 @@ public class ExcelServiceImpl {
 					maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
 			break;
 		case "KEYSITE":
-			List<KeySiteExcleDto> keySiteDtoList = keySiteService.exportToExcel();
+			List<KeySiteExcleDto> keySiteDtoList = null;
+			if(par.size()>0) {
+				keySiteDtoList = keySiteService.exportToExcel(par.containsKey("name")?par.get("name").toString():null,
+						par.containsKey("buildingId")?Long.valueOf(par.get("buildingId").toString()):null,
+						par.containsKey("fireEnduranceRate")?par.get("fireEnduranceRate").toString():null,
+						par.containsKey("useNature")?par.get("useNature").toString():null,
+						par.containsKey("fireFacilitiesInfo")?par.get("fireFacilitiesInfo").toString():null,
+						par.containsKey("belongId")?Long.valueOf(par.get("belongId").toString()):null);
+			}else{
+				keySiteDtoList = keySiteService.exportToExcel(null,null,null,null,null,null);
+			}
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), keySiteDtoList,
 					KeySiteExcleDto.class, null, false);
 			break;
-		case "JCDWRY":
			List<OrgUsrExcelDto> orgUsrList = orgUsrService.exportToExcel(par);
+		case "JCDWRY":
+			List<OrgUsrExcelDto> orgUsrList = orgUsrService.exportToExcel(par);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), orgUsrList,
 					OrgUsrExcelDto.class, null, false);
 			break;
@@ -1539,26 +1561,26 @@ public class ExcelServiceImpl {
 	public void exportByParams(HttpServletResponse response, ExcelDto excelDto, String params) {
 		switch (excelDto.getType()) {
 
-		case "WHP":
-			List<FireChemicalDto> data = fireChemicalServiceImpl.queryForFireChemicalList(false);
-			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
-					FireChemicalDto.class, dataSourcesImpl, false);
-			break;
+//		case "WHP": 已废弃
+//			List<FireChemicalDto> data = fireChemicalServiceImpl.queryForFireChemicalList(false);
+//			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
+//					FireChemicalDto.class, dataSourcesImpl, false);
+//			break;
 		case "XFZJ":
 			List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireExpertsDtoList,
 					FireExpertsDto.class, dataSourcesImpl, false);
 			break;
-		case "SYXX":
-			List<WaterResourceDto> waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true);
-			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
-					WaterResourceDto.class, dataSourcesImpl, false);
-			break;
-		case "HKQ":
-			List<AircraftDto> aircraftDtoList = aircraftServiceImpl.queryAircraftDtoForList(false);
-			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), aircraftDtoList,
-					AircraftDto.class, dataSourcesImpl, false);
-			break;
+//		case "SYXX": 已废弃
+//			List<WaterResourceDto> waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true);
+//			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
+//					WaterResourceDto.class, dataSourcesImpl, false);
+//			break;
+//		case "HKQ": 已废弃
+//			List<AircraftDto> aircraftDtoList = aircraftServiceImpl.queryAircraftDtoForList(false);
+//			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), aircraftDtoList,
+//					AircraftDto.class, dataSourcesImpl, false);
+//			break;
 		case "XFDW":
 			List<FireTeamDto> fireTeamDtoList = fireTeamService.queryFireTeamForList(false,null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireTeamDtoList,
@@ -1580,11 +1602,11 @@ public class ExcelServiceImpl {
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
 					maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
 			break;
-		case "KEYSITE":
-			List<KeySiteExcleDto> keySiteDtoList = keySiteService.exportToExcel();
-			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), keySiteDtoList,
-					KeySiteExcleDto.class, null, false);
-			break;
+//		case "KEYSITE":
+//			List<KeySiteExcleDto> keySiteDtoList = keySiteService.exportToExcel();
+//			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), keySiteDtoList,
+//					KeySiteExcleDto.class, null, false);
+//			break;
 		case "JCDWRY":
 			// 机场单位人员参数传递为 parentId = xxxxxxx
 			String parentIdStr = params.split("=")[1];