Skip to content

A
amos-boot-biz
Commit 7d3b17df authored by tangwei's avatar tangwei
Browse files
Options

修改导出

parent 4e989399
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 61 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireChemicalDto.java
View file @ 7d3b17df
......@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
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.RoleNameExplicitConstraint;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -80,7 +81,7 @@ public class FireChemicalDto extends BaseDto {
@ApiModelProperty(value = "类型code")
private String typeCode;
@ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 13, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ApiModelProperty(value = "类型名称")
@ExcelProperty(value = "类型名称", index = 13)
private String type;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireExpertsDto.java
View file @ 7d3b17df
......@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
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.RoleNameExplicitConstraint;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -29,7 +30,7 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "单位")
private String companyName;
@ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "证件类型", index = 2)
@ApiModelProperty(value = "证件类型")
private String certificatesType;
......@@ -79,12 +80,12 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "移动电话")
private String mobilePhone;
@ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "最高学历", index = 13)
@ApiModelProperty(value = "最高学历")
private String highestEducation;
@ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "岗位名称", index = 14)
@ApiModelProperty(value = "岗位名称")
private String jobs;
......@@ -93,7 +94,7 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "岗位名称code")
private String jobsCode;
@ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防专家领域", index = 15)
@ApiModelProperty(value = "消防专家领域")
private String expert;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java
View file @ 7d3b17df
......@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
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.RoleNameExplicitConstraint;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -41,7 +42,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "资源类型（消火栓、消防水鹤、天然水源、消防水池）")
private String resourceType;
@ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "资源类型", index = 2)
@ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
private String resourceTypeName;
......@@ -186,7 +187,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "供水单位名称")
private String waterSupplyName;
@ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消火栓系统类型", index = 23)
@ApiModelProperty(value = "消火栓系统类型")
private String systemType;
......@@ -207,7 +208,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "道路路口路段简要情况")
private String roadJunctionInfo;
@ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消火栓放置形式", index = 26)
@ApiModelProperty(value = "消火栓放置形式")
private String placeForm;
......@@ -216,7 +217,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "消火栓放置形式code")
private String placeFormCode;
@ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防水带接口", index = 27)
@ApiModelProperty(value = "消防水带接口")
private String hoseConnection;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/RoleNameExplicitConstraint.java
View file @ 7d3b17df
//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, 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;
// }
//}
package com.yeejoin.amos.boot.module.common.api.excel;
/***
*
* 获取动态值
*
* **/
public class RoleNameExplicitConstraint implements ExplicitInterface {
@Override
public String[] source(String type, String method, DataSources dataDictionaryMapper) {
return dataDictionaryMapper.selectList(type, method);
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AircraftDto.java
View file @ 7d3b17df
......@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
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.RoleNameExplicitConstraint;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -56,7 +57,7 @@ public class AircraftDto extends BaseDto {
@ApiModelProperty(value = "翼展面积")
private Double wingspanArea;
@ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "发动机类型", index = 8)
@ApiModelProperty(value = "发动机类型")
private String engineType;
......@@ -73,7 +74,7 @@ public class AircraftDto extends BaseDto {
@ApiModelProperty(value = "发动机型号")
private String engineModel;
@ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = ExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "燃油类型", index = 11)
@ApiModelProperty(value = "燃油类型")
private String fuelType;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/excel/RoleNameExplicitConstraint.java
View file @ 7d3b17df
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.ExplicitInterface;
/***
*
* 获取动态值
*
* **/
public class RoleNameExplicitConstraint implements ExplicitInterface {
@Override
public String[] source(String type, String method, DataSources dataDictionaryMapper) {
return dataDictionaryMapper.selectList(type, method);
}
}
//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.ExplicitInterface;
//
///***
// *
// * 获取动态值
// *
// * **/
//public class RoleNameExplicitConstraint implements ExplicitInterface {
//
// @Override
// public String[] source(String type, String method, DataSources dataDictionaryMapper) {
//
// return dataDictionaryMapper.selectList(type, method);
// }
//}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java
View file @ 7d3b17df
......@@ -45,7 +45,7 @@ public class ExcelController extends BaseController {
DataSourcesImpl dataSourcesImpl;
@Autowired
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)
@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