Commit 7d3b17df authored by tangwei's avatar tangwei

修改导出

parent 4e989399
...@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint; import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -80,7 +81,7 @@ public class FireChemicalDto extends BaseDto { ...@@ -80,7 +81,7 @@ public class FireChemicalDto extends BaseDto {
@ApiModelProperty(value = "类型code") @ApiModelProperty(value = "类型code")
private String typeCode; private String typeCode;
@ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 13, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ApiModelProperty(value = "类型名称") @ApiModelProperty(value = "类型名称")
@ExcelProperty(value = "类型名称", index = 13) @ExcelProperty(value = "类型名称", index = 13)
private String type; private String type;
......
...@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint; import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -29,7 +30,7 @@ public class FireExpertsDto extends BaseDto { ...@@ -29,7 +30,7 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "单位") @ApiModelProperty(value = "单位")
private String companyName; private String companyName;
@ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "证件类型", index = 2) @ExcelProperty(value = "证件类型", index = 2)
@ApiModelProperty(value = "证件类型") @ApiModelProperty(value = "证件类型")
private String certificatesType; private String certificatesType;
...@@ -79,12 +80,12 @@ public class FireExpertsDto extends BaseDto { ...@@ -79,12 +80,12 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "移动电话") @ApiModelProperty(value = "移动电话")
private String mobilePhone; private String mobilePhone;
@ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "最高学历", index = 13) @ExcelProperty(value = "最高学历", index = 13)
@ApiModelProperty(value = "最高学历") @ApiModelProperty(value = "最高学历")
private String highestEducation; private String highestEducation;
@ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "岗位名称", index = 14) @ExcelProperty(value = "岗位名称", index = 14)
@ApiModelProperty(value = "岗位名称") @ApiModelProperty(value = "岗位名称")
private String jobs; private String jobs;
...@@ -93,7 +94,7 @@ public class FireExpertsDto extends BaseDto { ...@@ -93,7 +94,7 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "岗位名称code") @ApiModelProperty(value = "岗位名称code")
private String jobsCode; private String jobsCode;
@ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防专家领域", index = 15) @ExcelProperty(value = "消防专家领域", index = 15)
@ApiModelProperty(value = "消防专家领域") @ApiModelProperty(value = "消防专家领域")
private String expert; private String expert;
......
...@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint; import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -41,7 +42,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -41,7 +42,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "资源类型(消火栓、消防水鹤、天然水源、消防水池)") @ApiModelProperty(value = "资源类型(消火栓、消防水鹤、天然水源、消防水池)")
private String resourceType; private String resourceType;
@ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "资源类型", index = 2) @ExcelProperty(value = "资源类型", index = 2)
@ApiModelProperty(value = "资源类型名称(消火栓、消防水鹤、天然水源、消防水池)") @ApiModelProperty(value = "资源类型名称(消火栓、消防水鹤、天然水源、消防水池)")
private String resourceTypeName; private String resourceTypeName;
...@@ -186,7 +187,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -186,7 +187,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "供水单位名称") @ApiModelProperty(value = "供水单位名称")
private String waterSupplyName; private String waterSupplyName;
@ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消火栓系统类型", index = 23) @ExcelProperty(value = "消火栓系统类型", index = 23)
@ApiModelProperty(value = "消火栓系统类型") @ApiModelProperty(value = "消火栓系统类型")
private String systemType; private String systemType;
...@@ -207,7 +208,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -207,7 +208,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "道路路口路段简要情况") @ApiModelProperty(value = "道路路口路段简要情况")
private String roadJunctionInfo; private String roadJunctionInfo;
@ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消火栓放置形式", index = 26) @ExcelProperty(value = "消火栓放置形式", index = 26)
@ApiModelProperty(value = "消火栓放置形式") @ApiModelProperty(value = "消火栓放置形式")
private String placeForm; private String placeForm;
...@@ -216,7 +217,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -216,7 +217,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "消火栓放置形式code") @ApiModelProperty(value = "消火栓放置形式code")
private String placeFormCode; private String placeFormCode;
@ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防水带接口", index = 27) @ExcelProperty(value = "消防水带接口", index = 27)
@ApiModelProperty(value = "消防水带接口") @ApiModelProperty(value = "消防水带接口")
private String hoseConnection; private String hoseConnection;
......
//package com.yeejoin.amos.boot.module.common.api.excel; package com.yeejoin.amos.boot.module.common.api.excel;
//
//import java.util.List; /***
//import java.util.stream.Collectors; *
// * 获取动态值
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; *
//import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary; * **/
//import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper; public class RoleNameExplicitConstraint implements ExplicitInterface {
//
///*** @Override
// * public String[] source(String type, String method, DataSources dataDictionaryMapper) {
// * 获取动态值
// * return dataDictionaryMapper.selectList(type, method);
// * **/ }
//public class RoleNameExplicitConstraint implements ExplicitInterface { }
//
// @Override
// public String[] source(String type, DataSources dataDictionaryMapper) {
// QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("type", type);
// queryWrapper.isNull("parent");
// queryWrapper.orderByAsc("sort_num");
// List<DataDictionary> list = dataDictionaryMapper.selectList(queryWrapper);
// List<String> names = list.stream().map(dataDictionary -> {
// return dataDictionary.getName() + "@" + dataDictionary.getCode();
// }
// ).collect(Collectors.toList());
// String[] str = names.toArray(new String[names.size()]);
// return str;
// }
//}
...@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint; import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -56,7 +57,7 @@ public class AircraftDto extends BaseDto { ...@@ -56,7 +57,7 @@ public class AircraftDto extends BaseDto {
@ApiModelProperty(value = "翼展面积") @ApiModelProperty(value = "翼展面积")
private Double wingspanArea; private Double wingspanArea;
@ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "发动机类型", index = 8) @ExcelProperty(value = "发动机类型", index = 8)
@ApiModelProperty(value = "发动机类型") @ApiModelProperty(value = "发动机类型")
private String engineType; private String engineType;
...@@ -73,7 +74,7 @@ public class AircraftDto extends BaseDto { ...@@ -73,7 +74,7 @@ public class AircraftDto extends BaseDto {
@ApiModelProperty(value = "发动机型号") @ApiModelProperty(value = "发动机型号")
private String engineModel; private String engineModel;
@ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = ExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "燃油类型", index = 11) @ExcelProperty(value = "燃油类型", index = 11)
@ApiModelProperty(value = "燃油类型") @ApiModelProperty(value = "燃油类型")
private String fuelType; private String fuelType;
......
package com.yeejoin.amos.boot.module.jcs.api.excel; //package com.yeejoin.amos.boot.module.jcs.api.excel;
//
import com.yeejoin.amos.boot.module.common.api.excel.DataSources; //import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
import com.yeejoin.amos.boot.module.common.api.excel.ExplicitInterface; //import com.yeejoin.amos.boot.module.common.api.excel.ExplicitInterface;
//
/*** ///***
* // *
* 获取动态值 // * 获取动态值
* // *
* **/ // * **/
public class RoleNameExplicitConstraint implements ExplicitInterface { //public class RoleNameExplicitConstraint implements ExplicitInterface {
//
@Override // @Override
public String[] source(String type, String method, DataSources dataDictionaryMapper) { // public String[] source(String type, String method, DataSources dataDictionaryMapper) {
//
return dataDictionaryMapper.selectList(type, method); // return dataDictionaryMapper.selectList(type, method);
} // }
} //}
...@@ -45,7 +45,7 @@ public class ExcelController extends BaseController { ...@@ -45,7 +45,7 @@ public class ExcelController extends BaseController {
DataSourcesImpl dataSourcesImpl; DataSourcesImpl dataSourcesImpl;
@Autowired @Autowired
FireChemicalServiceImpl fireChemicalServiceImpl; FireChemicalServiceImpl fireChemicalServiceImpl;
private final String packageUrl="com.yeejoin.amos.boot.module.jcs.api.dto."; private final String packageUrl="com.yeejoin.amos.boot.module.common.api.dto.";
@TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
@ApiOperation(value = "下载模板") @ApiOperation(value = "下载模板")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment