Skip to content

A
amos-boot-biz
Commit a2c65bbd authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.隐患相关-防火监督

parent 9ae27903
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 414 additions and 214 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyCarExcelDto.java
View file @ a2c65bbd
...@@ -3,15 +3,12 @@ package com.yeejoin.amos.boot.module.common.api.dto; ...@@ -3,15 +3,12 @@ package com.yeejoin.amos.boot.module.common.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.typroject.tyboot.core.foundation.utils.Bean;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/** /**
* 值班班次 * 值班班次
...@@ -58,12 +55,12 @@ public class DutyCarExcelDto implements Serializable { ...@@ -58,12 +55,12 @@ public class DutyCarExcelDto implements Serializable {
@ApiModelProperty(value = "车辆id") @ApiModelProperty(value = "车辆id")
private String carId; private String carId;
@ExplicitConstraint(indexNum = 4, sourceClass = RoleNameExplicitConstraint.class, method = "getCarList") //固定下拉内容 @ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getCarList") //固定下拉内容
@ExcelProperty(value = "车辆名称（车牌）", index = 4) @ExcelProperty(value = "车辆名称（车牌）", index = 4)
@ApiModelProperty(value = "车辆名称") @ApiModelProperty(value = "车辆名称")
private String carName; private String carName;
// 需求 958 新增值班区域 值班区域id 字段 导出字段 by kongfm 2021-09-15 // 需求 958 新增值班区域 值班区域id 字段 导出字段 by kongfm 2021-09-15
@ExplicitConstraint(indexNum = 5, sourceClass = RoleNameExplicitConstraint.class, method = "getDutyArea") //固定下拉内容 @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getDutyArea") //固定下拉内容
@ExcelProperty(value = "值班区域", index = 5) @ExcelProperty(value = "值班区域", index = 5)
@ApiModelProperty(value = "值班区域") @ApiModelProperty(value = "值班区域")
private String dutyArea; private String dutyArea;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyPersonExcelDto.java
View file @ a2c65bbd
...@@ -3,13 +3,12 @@ package com.yeejoin.amos.boot.module.common.api.dto; ...@@ -3,13 +3,12 @@ package com.yeejoin.amos.boot.module.common.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* 值班班次 * 值班班次
...@@ -48,12 +47,12 @@ public class DutyPersonExcelDto implements Serializable { ...@@ -48,12 +47,12 @@ public class DutyPersonExcelDto implements Serializable {
@ApiModelProperty(value = "岗位id") @ApiModelProperty(value = "岗位id")
private String postType; private String postType;
@ExplicitConstraint(type = "DUTY_POST_TYPE", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "DUTY_POST_TYPE", indexNum = 4, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "岗位", index = 4) @ExcelProperty(value = "岗位", index = 4)
@ApiModelProperty(value = "岗位名称") @ApiModelProperty(value = "岗位名称")
private String postTypeName; private String postTypeName;
// 需求 958 新增值班区域 值班区域id 字段 导出字段 by kongfm 2021-09-15 // 需求 958 新增值班区域 值班区域id 字段 导出字段 by kongfm 2021-09-15
@ExplicitConstraint(indexNum = 5, sourceClass = RoleNameExplicitConstraint.class, method = "getDutyArea") //固定下拉内容 @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getDutyArea") //固定下拉内容
@ExcelProperty(value = "值班区域", index = 5) @ExcelProperty(value = "值班区域", index = 5)
@ApiModelProperty(value = "值班区域") @ApiModelProperty(value = "值班区域")
private String dutyArea; private String dutyArea;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/EquipmentDetailDownloadTemplateDto.java
View file @ a2c65bbd
...@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.dto; ...@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.dto;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -55,13 +55,13 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable { ...@@ -55,13 +55,13 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable {
//@Excel(name = "消防系统编码", width = 30, orderNum = "10") //@Excel(name = "消防系统编码", width = 30, orderNum = "10")
private String fightingSysCodes; private String fightingSysCodes;
@ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getFireTeam") //动态下拉内容 @ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class,method="getFireTeam") //动态下拉内容
@ExcelProperty(value = "所属队伍", index = 10) @ExcelProperty(value = "所属队伍", index = 10)
//@Excel(name = "所属队伍",width = 30,orderNum = "11") //@Excel(name = "所属队伍",width = 30,orderNum = "11")
private String fireTeam; private String fireTeam;
//动态下拉内容 //动态下拉内容
@ExplicitConstraint(indexNum = 11, sourceClass = RoleNameExplicitConstraint.class,method="getCompany") //动态下拉内容 @ExplicitConstraint(indexNum = 11, sourceClass = CommonExplicitConstraint.class,method="getCompany") //动态下拉内容
@ExcelProperty(value = "所属单位", index = 11) @ExcelProperty(value = "所属单位", index = 11)
//@Excel(name = "所属单位",width = 30,orderNum = "12") //@Excel(name = "所属单位",width = 30,orderNum = "12")
private String companyName; private String companyName;
......
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 @ a2c65bbd
...@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,7 +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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -81,7 +81,7 @@ public class FireChemicalDto extends BaseDto { ...@@ -81,7 +81,7 @@ public class FireChemicalDto extends BaseDto {
@ApiModelProperty(value = "类型code") @ApiModelProperty(value = "类型code")
private String typeCode; private String typeCode;
@ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ApiModelProperty(value = "类型名称") @ApiModelProperty(value = "类型名称")
@ExcelProperty(value = "类型名称", index = 12) @ExcelProperty(value = "类型名称", index = 12)
private String type; 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 @ a2c65bbd
...@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,7 +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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -30,7 +30,7 @@ public class FireExpertsDto extends BaseDto { ...@@ -30,7 +30,7 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "单位") @ApiModelProperty(value = "单位")
private String companyName; private String companyName;
@ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "证件类型", index = 2) @ExcelProperty(value = "证件类型", index = 2)
@ApiModelProperty(value = "证件类型") @ApiModelProperty(value = "证件类型")
private String certificatesType; private String certificatesType;
...@@ -52,7 +52,7 @@ public class FireExpertsDto extends BaseDto { ...@@ -52,7 +52,7 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "出生日期") @ApiModelProperty(value = "出生日期")
private Date birthdayTime; private Date birthdayTime;
@ExplicitConstraint(indexNum = 6, sourceClass = RoleNameExplicitConstraint.class, method = "getNations") //固定下拉内容 @ExplicitConstraint(indexNum = 6, sourceClass = CommonExplicitConstraint.class, method = "getNations") //固定下拉内容
@ExcelProperty(value = "民族", index = 6) @ExcelProperty(value = "民族", index = 6)
@ApiModelProperty(value = "民族") @ApiModelProperty(value = "民族")
private String nation; private String nation;
...@@ -62,7 +62,7 @@ public class FireExpertsDto extends BaseDto { ...@@ -62,7 +62,7 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "籍贯") @ApiModelProperty(value = "籍贯")
private String nativePlace; private String nativePlace;
@ExplicitConstraint(indexNum = 8, sourceClass = RoleNameExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容 @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
@ExcelProperty(value = "政治面貌", index = 8) @ExcelProperty(value = "政治面貌", index = 8)
@ApiModelProperty(value = "政治面貌") @ApiModelProperty(value = "政治面貌")
private String politicalOutlook; private String politicalOutlook;
...@@ -84,12 +84,12 @@ public class FireExpertsDto extends BaseDto { ...@@ -84,12 +84,12 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "移动电话") @ApiModelProperty(value = "移动电话")
private String mobilePhone; private String mobilePhone;
@ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = CommonExplicitConstraint.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 = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "岗位名称", index = 14) @ExcelProperty(value = "岗位名称", index = 14)
@ApiModelProperty(value = "岗位名称") @ApiModelProperty(value = "岗位名称")
private String jobs; private String jobs;
...@@ -98,7 +98,7 @@ public class FireExpertsDto extends BaseDto { ...@@ -98,7 +98,7 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "岗位名称code") @ApiModelProperty(value = "岗位名称code")
private String jobsCode; private String jobsCode;
@ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防专家领域", index = 15) @ExcelProperty(value = "消防专家领域", index = 15)
@ApiModelProperty(value = "消防专家领域") @ApiModelProperty(value = "消防专家领域")
private String expert; 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/FireStationDto.java
View file @ a2c65bbd
...@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty; ...@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -34,7 +34,7 @@ public class FireStationDto extends BaseDto { ...@@ -34,7 +34,7 @@ public class FireStationDto extends BaseDto {
@ApiModelProperty(value = "所在建筑物id") @ApiModelProperty(value = "所在建筑物id")
private String whereBuildingId; private String whereBuildingId;
@ExplicitConstraint(indexNum = 1, sourceClass = RoleNameExplicitConstraint.class, method = "getBuildingList") @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class, method = "getBuildingList")
@ExcelProperty(value = "所在建筑", index = 1) @ExcelProperty(value = "所在建筑", index = 1)
@ApiModelProperty(value = "所在建筑物名称") @ApiModelProperty(value = "所在建筑物名称")
private String whereBuilding; private String whereBuilding;
...@@ -59,7 +59,7 @@ public class FireStationDto extends BaseDto { ...@@ -59,7 +59,7 @@ public class FireStationDto extends BaseDto {
@ApiModelProperty(value = "单位id") @ApiModelProperty(value = "单位id")
private Long bizCompanyId; private Long bizCompanyId;
@ExplicitConstraint(indexNum = 6, sourceClass = RoleNameExplicitConstraint.class, method = "getBizCompanyList") @ExplicitConstraint(indexNum = 6, sourceClass = CommonExplicitConstraint.class, method = "getBizCompanyList")
@ExcelProperty(value = "所属单位", index = 6) @ExcelProperty(value = "所属单位", index = 6)
@ApiModelProperty(value = "所属单位名称") @ApiModelProperty(value = "所属单位名称")
private String bizCompany; private String bizCompany;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireStationzhDto.java
View file @ a2c65bbd
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/** /**
* 微型消防站 * 微型消防站
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamDto.java
View file @ a2c65bbd
...@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,7 +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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -28,7 +28,7 @@ public class FireTeamDto extends BaseDto { ...@@ -28,7 +28,7 @@ public class FireTeamDto extends BaseDto {
@ExcelProperty(value = "所属单位", index = 0) @ExcelProperty(value = "所属单位", index = 0)
@ApiModelProperty(value = "机构名称") @ApiModelProperty(value = "机构名称")
@ExplicitConstraint(indexNum = 0, sourceClass = RoleNameExplicitConstraint.class,method="getCompanyDetailTree") //动态下拉内容 @ExplicitConstraint(indexNum = 0, sourceClass = CommonExplicitConstraint.class,method="getCompanyDetailTree") //动态下拉内容
private String companyName; private String companyName;
@ExcelIgnore @ExcelIgnore
...@@ -39,7 +39,7 @@ public class FireTeamDto extends BaseDto { ...@@ -39,7 +39,7 @@ public class FireTeamDto extends BaseDto {
@ApiModelProperty(value = "机构code") @ApiModelProperty(value = "机构code")
private String companyCode; private String companyCode;
@ExplicitConstraint(indexNum = 1, sourceClass = RoleNameExplicitConstraint.class,method="getFireTeam") //动态下拉内容 @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class,method="getFireTeam") //动态下拉内容
@ExcelProperty(value = "上级队伍", index = 1) @ExcelProperty(value = "上级队伍", index = 1)
@ApiModelProperty(value = "父级名称") @ApiModelProperty(value = "父级名称")
private String parentName; private String parentName;
...@@ -52,7 +52,7 @@ public class FireTeamDto extends BaseDto { ...@@ -52,7 +52,7 @@ public class FireTeamDto extends BaseDto {
@ApiModelProperty(value = "单位名称") @ApiModelProperty(value = "单位名称")
private String name; private String name;
@ExplicitConstraint(type = "XFJGLX", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XFJGLX", indexNum = 3, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "队伍类型", index = 3) @ExcelProperty(value = "队伍类型", index = 3)
@ApiModelProperty(value = "消防队类型（专职消防队，监控大队）") @ApiModelProperty(value = "消防队类型（专职消防队，监控大队）")
private String type; private String type;
...@@ -77,7 +77,7 @@ public class FireTeamDto extends BaseDto { ...@@ -77,7 +77,7 @@ public class FireTeamDto extends BaseDto {
@ApiModelProperty(value = "联系人id") @ApiModelProperty(value = "联系人id")
private Long contactUserId; private Long contactUserId;
@ExplicitConstraint(indexNum = 7, sourceClass = RoleNameExplicitConstraint.class,method = "getFirefighters") //动态下拉内容 @ExplicitConstraint(indexNum = 7, sourceClass = CommonExplicitConstraint.class,method = "getFirefighters") //动态下拉内容
@ExcelProperty(value = "联系人", index = 7) @ExcelProperty(value = "联系人", index = 7)
@ApiModelProperty(value = "联系人") @ApiModelProperty(value = "联系人")
private String contactUser; private String contactUser;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamZhDto.java
View file @ a2c65bbd
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/** /**
* 消防队伍 * 消防队伍
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteExcleDto.java
View file @ a2c65bbd
...@@ -5,7 +5,7 @@ import java.io.Serializable; ...@@ -5,7 +5,7 @@ import java.io.Serializable;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -29,7 +29,7 @@ public class KeySiteExcleDto implements Serializable { ...@@ -29,7 +29,7 @@ public class KeySiteExcleDto implements Serializable {
private String name; private String name;
@ExcelProperty(value = "所属单位/部门id", index = 1) @ExcelProperty(value = "所属单位/部门id", index = 1)
@ExplicitConstraint(indexNum = 1, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyDetailTree") //固定下拉内容 @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class, method = "getCompanyDetailTree") //固定下拉内容
@ApiModelProperty(value = "所属单位/部门id") @ApiModelProperty(value = "所属单位/部门id")
private String belongName; private String belongName;
...@@ -37,7 +37,7 @@ public class KeySiteExcleDto implements Serializable { ...@@ -37,7 +37,7 @@ public class KeySiteExcleDto implements Serializable {
private Long belongId; private Long belongId;
@ExcelProperty(value = "所属建筑id", index = 2) @ExcelProperty(value = "所属建筑id", index = 2)
@ExplicitConstraint(indexNum = 2, sourceClass = RoleNameExplicitConstraint.class, method = "getBuildTree") //固定下拉内容 @ExplicitConstraint(indexNum = 2, sourceClass = CommonExplicitConstraint.class, method = "getBuildTree") //固定下拉内容
@ApiModelProperty(value = "所属建筑id") @ApiModelProperty(value = "所属建筑id")
private String buildingName; private String buildingName;
...@@ -55,12 +55,12 @@ public class KeySiteExcleDto implements Serializable { ...@@ -55,12 +55,12 @@ public class KeySiteExcleDto implements Serializable {
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "建筑高度(m)") @ApiModelProperty(value = "建筑高度(m)")
private String buildingHeight; private String buildingHeight;
@ExplicitConstraint(type = "NHDJ", indexNum =5, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "NHDJ", indexNum =5, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "耐火等级", index = 5) @ExcelProperty(value = "耐火等级", index = 5)
@ApiModelProperty(value = "耐火等级") @ApiModelProperty(value = "耐火等级")
private String fireEnduranceRate; private String fireEnduranceRate;
@ExplicitConstraint(type = "JZWSYXZ", indexNum =6, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "JZWSYXZ", indexNum =6, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "使用性质", index = 6) @ExcelProperty(value = "使用性质", index = 6)
@ApiModelProperty(value = "使用性质") @ApiModelProperty(value = "使用性质")
private String useNature; private String useNature;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LinkageUnitDto.java
View file @ a2c65bbd
...@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty; ...@@ -5,7 +5,7 @@ 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.entity.SourceFile; import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -40,7 +40,7 @@ public class LinkageUnitDto extends BaseDto { ...@@ -40,7 +40,7 @@ public class LinkageUnitDto extends BaseDto {
private String parentId; private String parentId;
@ExcelProperty(value = "服务类别", index = 1) @ExcelProperty(value = "服务类别", index = 1)
@ExplicitConstraint(type = "LDDWLB", indexNum =1, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "LDDWLB", indexNum =1, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ApiModelProperty(value = "服务类别") @ApiModelProperty(value = "服务类别")
private String linkageUnitType; private String linkageUnitType;
...@@ -72,7 +72,7 @@ public class LinkageUnitDto extends BaseDto { ...@@ -72,7 +72,7 @@ public class LinkageUnitDto extends BaseDto {
@ApiModelProperty(value = "协议结束日期") @ApiModelProperty(value = "协议结束日期")
private Date agreementEndDate; private Date agreementEndDate;
@ExcelProperty(value = "应急联动单位类别", index = 7) @ExcelProperty(value = "应急联动单位类别", index = 7)
@ExplicitConstraint(type = "YJLDDW", indexNum =7, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "YJLDDW", indexNum =7, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ApiModelProperty(value = "应急联动单位类别") @ApiModelProperty(value = "应急联动单位类别")
private String emergencyLinkageUnit; private String emergencyLinkageUnit;
@ExcelIgnore @ExcelIgnore
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/MaintenancePersonExcleDto.java
View file @ a2c65bbd
...@@ -6,7 +6,7 @@ import java.util.Date; ...@@ -6,7 +6,7 @@ import java.util.Date;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -34,7 +34,7 @@ public class MaintenancePersonExcleDto implements Serializable { ...@@ -34,7 +34,7 @@ public class MaintenancePersonExcleDto implements Serializable {
@ApiModelProperty(value = "员工编号") @ApiModelProperty(value = "员工编号")
protected String code; protected String code;
@ExplicitConstraint(indexNum = 2, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容 @ExplicitConstraint(indexNum = 2, sourceClass = CommonExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
@ExcelProperty(value = "所属单位及部门", index =2) @ExcelProperty(value = "所属单位及部门", index =2)
@ApiModelProperty(value = "所属单位及部门") @ApiModelProperty(value = "所属单位及部门")
private String parentName; private String parentName;
...@@ -42,7 +42,7 @@ public class MaintenancePersonExcleDto implements Serializable { ...@@ -42,7 +42,7 @@ public class MaintenancePersonExcleDto implements Serializable {
@ExcelIgnore @ExcelIgnore
private Long parentId; private Long parentId;
@ExplicitConstraint(type = "XB", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class) @ExplicitConstraint(type = "XB", indexNum = 3, sourceClass = CommonExplicitConstraint.class)
@ExcelProperty(value = "性别", index =3) @ExcelProperty(value = "性别", index =3)
@ApiModelProperty(value = "性别") @ApiModelProperty(value = "性别")
private String gender; private String gender;
...@@ -68,17 +68,17 @@ public class MaintenancePersonExcleDto implements Serializable { ...@@ -68,17 +68,17 @@ public class MaintenancePersonExcleDto implements Serializable {
@ApiModelProperty(value = "系统账户") @ApiModelProperty(value = "系统账户")
private String systemAccount; private String systemAccount;
@ExplicitConstraint(type = "WBRYZT", indexNum =9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "WBRYZT", indexNum =9, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "人员状态", index =9) @ExcelProperty(value = "人员状态", index =9)
@ApiModelProperty(value = "人员状态") @ApiModelProperty(value = "人员状态")
private String status; private String status;
@ExplicitConstraint(type = "WBZYZS", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "WBZYZS", indexNum = 10, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "职业资格证书", index =10) @ExcelProperty(value = "职业资格证书", index =10)
@ApiModelProperty(value = "职业资格证书") @ApiModelProperty(value = "职业资格证书")
private String professionalCertificate; private String professionalCertificate;
@ExplicitConstraint(type = "WBZYZG", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "WBZYZG", indexNum = 11, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "职业资格", index =11) @ExcelProperty(value = "职业资格", index =11)
@ApiModelProperty(value = "职业资格") @ApiModelProperty(value = "职业资格")
private String qualification; private String qualification;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgPersonExcelDto.java
View file @ a2c65bbd
...@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.constants.CommonConstant; import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -54,7 +54,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -54,7 +54,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "员工编号") @ApiModelProperty(value = "员工编号")
private String personNumber; private String personNumber;
@ExplicitConstraint(type = "XB", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XB", indexNum = 4, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "性别", index = 4) @ExcelProperty(value = "性别", index = 4)
@ApiModelProperty(value = "性别") @ApiModelProperty(value = "性别")
private String gender; private String gender;
...@@ -63,7 +63,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -63,7 +63,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "性别code") @ApiModelProperty(value = "性别code")
private String genderCode; private String genderCode;
@ExplicitConstraint(type = "RYZJLX", indexNum = 5, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RYZJLX", indexNum = 5, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "证件类型", index = 5) @ExcelProperty(value = "证件类型", index = 5)
@ApiModelProperty(value = "证件类型") @ApiModelProperty(value = "证件类型")
private String certificatesType; private String certificatesType;
...@@ -80,7 +80,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -80,7 +80,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "联系电话") @ApiModelProperty(value = "联系电话")
private String telephone; private String telephone;
@ExplicitConstraint(type = "RYZT", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RYZT", indexNum = 8, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "人员状态", index = 8) @ExcelProperty(value = "人员状态", index = 8)
@ApiModelProperty(value = "人员状态") @ApiModelProperty(value = "人员状态")
private String state; private String state;
...@@ -89,7 +89,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -89,7 +89,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "人员状态code") @ApiModelProperty(value = "人员状态code")
private String stateCode; private String stateCode;
@ExplicitConstraint(type = "AQPX", indexNum = 9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "AQPX", indexNum = 9, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "是否进行安全培训", index = 9) @ExcelProperty(value = "是否进行安全培训", index = 9)
@ApiModelProperty(value = "是否进行安全培训") @ApiModelProperty(value = "是否进行安全培训")
private String safetyTraining; private String safetyTraining;
...@@ -98,7 +98,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -98,7 +98,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "是否进行安全培训code") @ApiModelProperty(value = "是否进行安全培训code")
private String safetyTrainingCode; private String safetyTrainingCode;
@ExplicitConstraint(type = "XZZW", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XZZW", indexNum = 10, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "行政职务", index = 10) @ExcelProperty(value = "行政职务", index = 10)
@ApiModelProperty(value = "行政职务") @ApiModelProperty(value = "行政职务")
private String administrativePosition; private String administrativePosition;
...@@ -107,7 +107,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -107,7 +107,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "行政职务code") @ApiModelProperty(value = "行政职务code")
private String administrativePositionCode; private String administrativePositionCode;
@ExplicitConstraint(type = "JGNBZW", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "JGNBZW", indexNum = 11, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防管理组织机构内部职务", index = 11) @ExcelProperty(value = "消防管理组织机构内部职务", index = 11)
@ApiModelProperty(value = "消防管理组织机构内部职务") @ApiModelProperty(value = "消防管理组织机构内部职务")
private String internalPosition; private String internalPosition;
...@@ -116,7 +116,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -116,7 +116,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "消防管理组织机构内部职务code") @ApiModelProperty(value = "消防管理组织机构内部职务code")
private String internalPositionCode; private String internalPositionCode;
@ExplicitConstraint(type = "XFGLGW", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XFGLGW", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防管理岗位", index = 12) @ExcelProperty(value = "消防管理岗位", index = 12)
@ApiModelProperty(value = "消防管理岗位") @ApiModelProperty(value = "消防管理岗位")
private String fireManagementPost; private String fireManagementPost;
...@@ -125,7 +125,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -125,7 +125,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "消防管理岗位code") @ApiModelProperty(value = "消防管理岗位code")
private String fireManagementPostCode; private String fireManagementPostCode;
@ExplicitConstraint(type = "GWMC", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "GWMC", indexNum = 13, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "岗位类型", index = 13) @ExcelProperty(value = "岗位类型", index = 13)
@ApiModelProperty(value = "岗位类型") @ApiModelProperty(value = "岗位类型")
private String positionType; private String positionType;
...@@ -134,7 +134,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -134,7 +134,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "岗位类型code") @ApiModelProperty(value = "岗位类型code")
private String positionTypeCode; private String positionTypeCode;
@ExplicitConstraint(type = "CZLB", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "CZLB", indexNum = 14, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "持证类别", index = 14) @ExcelProperty(value = "持证类别", index = 14)
@ApiModelProperty(value = "持证类别") @ApiModelProperty(value = "持证类别")
private String certificateType; private String certificateType;
...@@ -147,7 +147,7 @@ public class OrgPersonExcelDto extends BaseDto { ...@@ -147,7 +147,7 @@ public class OrgPersonExcelDto extends BaseDto {
@ApiModelProperty(value = "持证时间") @ApiModelProperty(value = "持证时间")
private Date holdingTime; private Date holdingTime;
@ExplicitConstraint(type = "SHZQ", indexNum = 16, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "SHZQ", indexNum = 16, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "审核周期", index = 16) @ExcelProperty(value = "审核周期", index = 16)
@ApiModelProperty(value = "审核周期") @ApiModelProperty(value = "审核周期")
private String auditCycle; private String auditCycle;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrExcelDto.java
View file @ a2c65bbd
...@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
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.entity.DynamicFormInstance; import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -54,7 +54,7 @@ public class OrgUsrExcelDto extends BaseDto { ...@@ -54,7 +54,7 @@ public class OrgUsrExcelDto extends BaseDto {
private String buildId; private String buildId;
@ExcelProperty(value = "所属单位部门", index = 1) @ExcelProperty(value = "所属单位部门", index = 1)
@ExplicitConstraint(indexNum = 1, sourceClass = RoleNameExplicitConstraint.class, method = "getparent") //固定下拉内容 @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class, method = "getparent") //固定下拉内容
@ApiModelProperty(value = "归属机构/部门/人员") @ApiModelProperty(value = "归属机构/部门/人员")
private String parentId; private String parentId;
...@@ -89,38 +89,38 @@ public class OrgUsrExcelDto extends BaseDto { ...@@ -89,38 +89,38 @@ public class OrgUsrExcelDto extends BaseDto {
@ExcelProperty(value = "行政职务", index = 2) @ExcelProperty(value = "行政职务", index = 2)
@ExplicitConstraint(type = "XZZW", indexNum =2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "XZZW", indexNum =2, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String administrativePositionCode;// 行政职务 private String administrativePositionCode;// 行政职务
@ExcelProperty(value = "审核周期", index = 3) @ExcelProperty(value = "审核周期", index = 3)
@ExplicitConstraint(type = "SHZQ", indexNum =3, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "SHZQ", indexNum =3, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String auditCycle; //审核周期 private String auditCycle; //审核周期
@ExcelProperty(value = "证件号码", index = 4) @ExcelProperty(value = "证件号码", index = 4)
private String certificatesNumber;// 证件号码 private String certificatesNumber;// 证件号码
@ExcelProperty(value = "证件类型", index = 5) @ExcelProperty(value = "证件类型", index = 5)
@ExplicitConstraint(type = "RYZJLX", indexNum =5, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "RYZJLX", indexNum =5, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String certificatesTypeCode; //证件类型 private String certificatesTypeCode; //证件类型
@ExcelProperty(value = "持证类别", index = 6) @ExcelProperty(value = "持证类别", index = 6)
@ExplicitConstraint(type = "CZLB", indexNum =6, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "CZLB", indexNum =6, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String certificateType; //持证类别 private String certificateType; //持证类别
@ExcelProperty(value = "消防管理岗位", index = 7) @ExcelProperty(value = "消防管理岗位", index = 7)
@ExplicitConstraint(type = "XFGLGW", indexNum =7, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "XFGLGW", indexNum =7, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String fireManagementPostCode; //消防管理岗位 private String fireManagementPostCode; //消防管理岗位
@ExcelProperty(value = "性别", index = 8) @ExcelProperty(value = "性别", index = 8)
@ExplicitConstraint(type = "XB", indexNum =8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "XB", indexNum =8, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String gender; //性别 private String gender; //性别
@ExcelProperty(value = "消防管理组织机构内部职务", index = 9) @ExcelProperty(value = "消防管理组织机构内部职务", index = 9)
@ExplicitConstraint(type = "JGNBZW", indexNum =9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "JGNBZW", indexNum =9, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String internalPositionCode; //消防管理组织机构内部职务 private String internalPositionCode; //消防管理组织机构内部职务
@ExcelProperty(value = "员工编号", index = 10) @ExcelProperty(value = "员工编号", index = 10)
private String personNumber; //员工编号 private String personNumber; //员工编号
@ExcelProperty(value = "岗位类型", index = 11) @ExcelProperty(value = "岗位类型", index = 11)
@ExplicitConstraint(type = "GWMC", indexNum =11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "GWMC", indexNum =11, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String positionType; //岗位类型 private String positionType; //岗位类型
@ExcelProperty(value = "是否进行安全培训", index = 12) @ExcelProperty(value = "是否进行安全培训", index = 12)
@ExplicitConstraint(type = "AQPX", indexNum =12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "AQPX", indexNum =12, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String safetyTraining; //是否进行安全培训 private String safetyTraining; //是否进行安全培训
@ExcelProperty(value = "人员状态", index = 13) @ExcelProperty(value = "人员状态", index = 13)
@ExplicitConstraint(type = "RYZT", indexNum =13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内 @ExplicitConstraint(type = "RYZT", indexNum =13, sourceClass = CommonExplicitConstraint.class) //动态下拉内
private String stateCode; //人员状态 private String stateCode; //人员状态
@ExcelProperty(value = "联系电话", index = 14) @ExcelProperty(value = "联系电话", index = 14)
private String telephone; //联系电话 private String telephone; //联系电话
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RescueEquipmentDto.java
View file @ a2c65bbd
...@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty; ...@@ -5,7 +5,7 @@ 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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -27,7 +27,7 @@ public class RescueEquipmentDto extends BaseDto { ...@@ -27,7 +27,7 @@ public class RescueEquipmentDto extends BaseDto {
@ExcelProperty(value = "车辆类型", index = 0) @ExcelProperty(value = "车辆类型", index = 0)
@ExplicitConstraint(type = "JYZBLX", indexNum = 0, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "JYZBLX", indexNum = 0, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ApiModelProperty(value = "车辆类型") @ApiModelProperty(value = "车辆类型")
private String vehicleType; private String vehicleType;
...@@ -44,7 +44,7 @@ public class RescueEquipmentDto extends BaseDto { ...@@ -44,7 +44,7 @@ public class RescueEquipmentDto extends BaseDto {
private Double fee; private Double fee;
@ExcelProperty(value = "单位名称", index =3) @ExcelProperty(value = "单位名称", index =3)
@ExplicitConstraint(indexNum = 3, sourceClass = RoleNameExplicitConstraint.class,method="getUnitTeam") //动态下拉内容 @ExplicitConstraint(indexNum = 3, sourceClass = CommonExplicitConstraint.class,method="getUnitTeam") //动态下拉内容
@ApiModelProperty(value = "单位名称") @ApiModelProperty(value = "单位名称")
private String company; private String company;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/SpecialPositionStaffDto.java
View file @ a2c65bbd
...@@ -3,15 +3,13 @@ package com.yeejoin.amos.boot.module.common.api.dto; ...@@ -3,15 +3,13 @@ package com.yeejoin.amos.boot.module.common.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
/** /**
* 特岗人员 * 特岗人员
* *
...@@ -27,7 +25,7 @@ public class SpecialPositionStaffDto extends BaseDto { ...@@ -27,7 +25,7 @@ public class SpecialPositionStaffDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelProperty(value = "岗位名称", index = 0) @ExcelProperty(value = "岗位名称", index = 0)
@ExplicitConstraint(type = "GWMC", indexNum = 0, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "GWMC", indexNum = 0, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ApiModelProperty(value = "岗位名称") @ApiModelProperty(value = "岗位名称")
private String positionName; private String positionName;
...@@ -40,7 +38,7 @@ public class SpecialPositionStaffDto extends BaseDto { ...@@ -40,7 +38,7 @@ public class SpecialPositionStaffDto extends BaseDto {
private Long personNumber; private Long personNumber;
@ExcelProperty(value = "单位名称", index = 2) @ExcelProperty(value = "单位名称", index = 2)
@ExplicitConstraint(indexNum = 2, sourceClass = RoleNameExplicitConstraint.class,method="getUnitTeam") //动态下拉内容 @ExplicitConstraint(indexNum = 2, sourceClass = CommonExplicitConstraint.class,method="getUnitTeam") //动态下拉内容
@ApiModelProperty(value = "单位名称") @ApiModelProperty(value = "单位名称")
private String company; private String company;
......
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 @ a2c65bbd
...@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,7 +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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -46,7 +46,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -46,7 +46,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）") @ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）")
private String resourceType; private String resourceType;
@ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "资源类型", index = 2) @ExcelProperty(value = "资源类型", index = 2)
@ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）") @ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
private String resourceTypeName; private String resourceTypeName;
...@@ -55,7 +55,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -55,7 +55,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "所在建筑id") @ApiModelProperty(value = "所在建筑id")
private Long belongBuildingId; private Long belongBuildingId;
@ExplicitConstraint(indexNum = 3, sourceClass = RoleNameExplicitConstraint.class, method = "getBuildingList") @ExplicitConstraint(indexNum = 3, sourceClass = CommonExplicitConstraint.class, method = "getBuildingList")
@ExcelProperty(value = "所在建筑", index = 3) @ExcelProperty(value = "所在建筑", index = 3)
@ApiModelProperty(value = "所在建筑") @ApiModelProperty(value = "所在建筑")
private String belongBuilding; private String belongBuilding;
...@@ -64,7 +64,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -64,7 +64,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "所属消防系统id") @ApiModelProperty(value = "所属消防系统id")
private Long belongFightingSystemId; private Long belongFightingSystemId;
@ExplicitConstraint(indexNum = 4, sourceClass = RoleNameExplicitConstraint.class, method = "getFireSystemList") @ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getFireSystemList")
@ExcelProperty(value = "所属消防系统", index = 4) @ExcelProperty(value = "所属消防系统", index = 4)
@ApiModelProperty(value = "所属消防系统") @ApiModelProperty(value = "所属消防系统")
private String belongFightingSystem; private String belongFightingSystem;
...@@ -73,7 +73,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -73,7 +73,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "管理单位id") @ApiModelProperty(value = "管理单位id")
private Long managementUnitId; private Long managementUnitId;
@ExplicitConstraint(indexNum = 5, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyList") @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ExcelProperty(value = "管理单位", index = 5) @ExcelProperty(value = "管理单位", index = 5)
@ApiModelProperty(value = "管理单位") @ApiModelProperty(value = "管理单位")
private String managementUnit; private String managementUnit;
...@@ -82,7 +82,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -82,7 +82,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "维保单位id") @ApiModelProperty(value = "维保单位id")
private Long maintenanceUnitId; private Long maintenanceUnitId;
@ExplicitConstraint(indexNum = 6, sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyList") @ExplicitConstraint(indexNum = 6, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ExcelProperty(value = "维保单位", index = 6) @ExcelProperty(value = "维保单位", index = 6)
@ApiModelProperty(value = "维保单位") @ApiModelProperty(value = "维保单位")
private String maintenanceUnit; private String maintenanceUnit;
...@@ -151,7 +151,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -151,7 +151,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "水源可用状态类别代码") @ApiModelProperty(value = "水源可用状态类别代码")
private String statusCode; private String statusCode;
@ExplicitConstraint(type = "SYKYZT", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "SYKYZT", indexNum = 14, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "水源可用状态", index = 14) @ExcelProperty(value = "水源可用状态", index = 14)
@ApiModelProperty(value = "水源可用状态类别名称") @ApiModelProperty(value = "水源可用状态类别名称")
private String status; private String status;
...@@ -168,7 +168,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -168,7 +168,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "消防给水管网形式类型代码") @ApiModelProperty(value = "消防给水管网形式类型代码")
private String pipeTypeCode; private String pipeTypeCode;
@ExplicitConstraint(type = "XFJSGWXS", indexNum = 17, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XFJSGWXS", indexNum = 17, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防给水管网形式", index = 17) @ExcelProperty(value = "消防给水管网形式", index = 17)
@ApiModelProperty(value = "消防给水管网形式") @ApiModelProperty(value = "消防给水管网形式")
private String pipeTypeName; private String pipeTypeName;
...@@ -193,7 +193,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -193,7 +193,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "供水单位名称") @ApiModelProperty(value = "供水单位名称")
private String waterSupplyName; private String waterSupplyName;
@ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消火栓系统类型", index = 23) @ExcelProperty(value = "消火栓系统类型", index = 23)
@ApiModelProperty(value = "消火栓系统类型") @ApiModelProperty(value = "消火栓系统类型")
private String systemType; private String systemType;
...@@ -214,7 +214,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -214,7 +214,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "道路路口路段简要情况") @ApiModelProperty(value = "道路路口路段简要情况")
private String roadJunctionInfo; private String roadJunctionInfo;
@ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消火栓放置形式", index = 26) @ExcelProperty(value = "消火栓放置形式", index = 26)
@ApiModelProperty(value = "消火栓放置形式") @ApiModelProperty(value = "消火栓放置形式")
private String placeForm; private String placeForm;
...@@ -223,7 +223,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -223,7 +223,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "消火栓放置形式code") @ApiModelProperty(value = "消火栓放置形式code")
private String placeFormCode; private String placeFormCode;
@ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防水带接口", index = 27) @ExcelProperty(value = "消防水带接口", index = 27)
@ApiModelProperty(value = "消防水带接口") @ApiModelProperty(value = "消防水带接口")
private String hoseConnection; private String hoseConnection;
...@@ -232,7 +232,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -232,7 +232,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "消防水带接口code") @ApiModelProperty(value = "消防水带接口code")
private String hoseConnectionCode; private String hoseConnectionCode;
@ExplicitConstraint(type = "QSXS", indexNum = 28, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "QSXS", indexNum = 28, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "取水形式", index = 28) @ExcelProperty(value = "取水形式", index = 28)
@ApiModelProperty(value = "取水形式") @ApiModelProperty(value = "取水形式")
private String intakeForm; private String intakeForm;
...@@ -241,7 +241,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -241,7 +241,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "水源类型代码") @ApiModelProperty(value = "水源类型代码")
private String typeCode; private String typeCode;
@ExplicitConstraint(type = "TRSYLX", indexNum = 29, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "TRSYLX", indexNum = 29, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "水源类型", index = 29) @ExcelProperty(value = "水源类型", index = 29)
@ApiModelProperty(value = "水源类型") @ApiModelProperty(value = "水源类型")
private String type; private String type;
...@@ -321,7 +321,7 @@ public class WaterResourceDto extends BaseDto { ...@@ -321,7 +321,7 @@ public class WaterResourceDto extends BaseDto {
private Long equipCategoryId; private Long equipCategoryId;
// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17 // BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
@ApiModelProperty("设施分类名称") @ApiModelProperty("设施分类名称")
@ExplicitConstraint(indexNum = 44, sourceClass = RoleNameExplicitConstraint.class, method = "getEquipCategory") @ExplicitConstraint(indexNum = 44, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory")
@ExcelProperty(value = "设施分类名称", index = 44) @ExcelProperty(value = "设施分类名称", index = 44)
private String equipCategoryName; private String equipCategoryName;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceTypeDto.java
View file @ a2c65bbd
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
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.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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/** /**
* @author system_generator * @author system_generator
* @date 2021-06-29 * @date 2021-06-29
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceZhDto.java
View file @ a2c65bbd
package com.yeejoin.amos.boot.module.common.api.dto; package com.yeejoin.amos.boot.module.common.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/** /**
* @author system_generator * @author system_generator
......
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 → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/CommonExplicitConstraint.java
View file @ a2c65bbd
...@@ -5,7 +5,7 @@ package com.yeejoin.amos.boot.module.common.api.excel; ...@@ -5,7 +5,7 @@ package com.yeejoin.amos.boot.module.common.api.excel;
* 获取动态值 * 获取动态值
* *
* **/ * **/
public class RoleNameExplicitConstraint implements ExplicitInterface { public class CommonExplicitConstraint implements ExplicitInterface {
@Override @Override
public String[] source(String type, String method, DataSources dataDictionaryMapper) throws Exception { public String[] source(String type, String method, DataSources dataDictionaryMapper) throws Exception {
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/DataSources.java
View file @ a2c65bbd
...@@ -3,10 +3,13 @@ package com.yeejoin.amos.boot.module.common.api.excel; ...@@ -3,10 +3,13 @@ package com.yeejoin.amos.boot.module.common.api.excel;
import java.util.List; import java.util.List;
/** /**
* *
* 字段列动态值获取 * 字段列动态值获取
* *
* ***/ * ***/
public interface DataSources { public interface DataSources {
String[] selectList(String type,String method) throws Exception; String[] selectList(String type,String method) throws Exception;
} }
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 @ a2c65bbd
...@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,7 +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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -59,7 +59,7 @@ public class AircraftDto extends BaseDto { ...@@ -59,7 +59,7 @@ public class AircraftDto extends BaseDto {
@ApiModelProperty(value = "翼展面积") @ApiModelProperty(value = "翼展面积")
private Double wingspanArea; private Double wingspanArea;
@ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "发动机类型", index = 8) @ExcelProperty(value = "发动机类型", index = 8)
@ApiModelProperty(value = "发动机类型") @ApiModelProperty(value = "发动机类型")
private String engineType; private String engineType;
...@@ -76,7 +76,7 @@ public class AircraftDto extends BaseDto { ...@@ -76,7 +76,7 @@ public class AircraftDto extends BaseDto {
@ApiModelProperty(value = "发动机型号") @ApiModelProperty(value = "发动机型号")
private String engineModel; private String engineModel;
@ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "燃油类型", index = 11) @ExcelProperty(value = "燃油类型", index = 11)
@ApiModelProperty(value = "燃油类型") @ApiModelProperty(value = "燃油类型")
private String fuelType; 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/dto/AircraftDtos.java
View file @ a2c65bbd
...@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore; ...@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.metadata.BaseRowModel; import com.alibaba.excel.metadata.BaseRowModel;
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 com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -47,7 +47,7 @@ public class AircraftDtos extends BaseRowModel { ...@@ -47,7 +47,7 @@ public class AircraftDtos extends BaseRowModel {
@ApiModelProperty(value = "翼展面积") @ApiModelProperty(value = "翼展面积")
private Double wingspanArea; private Double wingspanArea;
@ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "发动机类型", index = 8) @ExcelProperty(value = "发动机类型", index = 8)
@ApiModelProperty(value = "发动机类型") @ApiModelProperty(value = "发动机类型")
private String engineType; private String engineType;
...@@ -64,7 +64,7 @@ public class AircraftDtos extends BaseRowModel { ...@@ -64,7 +64,7 @@ public class AircraftDtos extends BaseRowModel {
@ApiModelProperty(value = "发动机型号") @ApiModelProperty(value = "发动机型号")
private String engineModel; private String engineModel;
@ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容 @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "燃油类型", index = 11) @ExcelProperty(value = "燃油类型", index = 11)
@ApiModelProperty(value = "燃油类型") @ApiModelProperty(value = "燃油类型")
private String fuelType; private String fuelType;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java
View file @ a2c65bbd
...@@ -48,11 +48,6 @@ public class DangerDto { ...@@ -48,11 +48,6 @@ public class DangerDto {
private Boolean deleted; private Boolean deleted;
/** /**
* 治理方式
*/
private String governWay;
/**
* 业务类型（不同业务创建的隐患以此区分:巡检隐患、防火监督隐患、其他隐患。。。） * 业务类型（不同业务创建的隐患以此区分:巡检隐患、防火监督隐患、其他隐患。。。）
*/ */
private String bizType; private String bizType;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/pom.xml
View file @ a2c65bbd
...@@ -74,12 +74,6 @@ ...@@ -74,12 +74,6 @@
<artifactId>poi-scratchpad</artifactId> <artifactId>poi-scratchpad</artifactId>
<version>3.15</version> <version>3.15</version>
</dependency> </dependency>
<dependency>
<groupId>fr.opensagres.xdocreport</groupId>
<artifactId>xdocreport</artifactId>
<version>1.0.6</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.tika</groupId> <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId> <artifactId>tika-core</artifactId>
...@@ -102,6 +96,21 @@ ...@@ -102,6 +96,21 @@
<groupId>cn.jpush.api</groupId> <groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId> <artifactId>jpush-client</artifactId>
</dependency> </dependency>
</dependencies> <dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</exclusion>
<exclusion>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-rule</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project> </project>
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/HiddenDangerController.java
View file @ a2c65bbd
...@@ -69,12 +69,19 @@ public class HiddenDangerController extends AbstractBaseController { ...@@ -69,12 +69,19 @@ public class HiddenDangerController extends AbstractBaseController {
} }
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@ApiOperation(value = "下载模板")
@GetMapping("/download/template")
public void downloadTemplate(HttpServletResponse response) {
iHiddenDangerService.templateExport(response);
}
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "导入隐患", notes = "导入隐患") @ApiOperation(value = "导入隐患", notes = "导入隐患")
@RequestMapping(value = "/import", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/import", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public ResponseModel importDanger( public ResponseModel importDanger(
@RequestParam(value = "planId") Long planId, @RequestParam(value = "planId") Long planId,
@RequestParam(value = "pointId") Long pointId,
@ApiParam(value = "导入数据文件", required = true) @RequestBody MultipartFile file) { @ApiParam(value = "导入数据文件", required = true) @RequestBody MultipartFile file) {
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
assert fileName != null; assert fileName != null;
...@@ -82,7 +89,7 @@ public class HiddenDangerController extends AbstractBaseController { ...@@ -82,7 +89,7 @@ public class HiddenDangerController extends AbstractBaseController {
throw new RuntimeException("文件格式不正确"); throw new RuntimeException("文件格式不正确");
} }
List<HiddenDangerImportDto> list = FileHelper.importExcel(file, 0, 1, HiddenDangerImportDto.class); List<HiddenDangerImportDto> list = FileHelper.importExcel(file, 0, 1, HiddenDangerImportDto.class);
iHiddenDangerService.importDanger(planId, pointId, list); iHiddenDangerService.importDanger(planId, list);
return ResponseHelper.buildResponse("导入成功"); return ResponseHelper.buildResponse("导入成功");
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PointMapper.java
View file @ a2c65bbd
...@@ -11,6 +11,7 @@ import com.yeejoin.amos.supervision.business.param.PointImportQueryParam; ...@@ -11,6 +11,7 @@ import com.yeejoin.amos.supervision.business.param.PointImportQueryParam;
import com.yeejoin.amos.supervision.business.vo.LeavelMovePointVo; import com.yeejoin.amos.supervision.business.vo.LeavelMovePointVo;
import com.yeejoin.amos.supervision.business.vo.PointInputItemVo; import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
import com.yeejoin.amos.supervision.business.vo.PointVo; import com.yeejoin.amos.supervision.business.vo.PointVo;
import com.yeejoin.amos.supervision.dao.entity.Point;
import com.yeejoin.amos.supervision.dao.entity.PointInputItem; import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -163,4 +164,11 @@ public interface PointMapper extends BaseMapper { ...@@ -163,4 +164,11 @@ public interface PointMapper extends BaseMapper {
* 查询点id，name * 查询点id，name
*/ */
List<Map<String, Object>> getPlanExecuteTeams(); List<Map<String, Object>> getPlanExecuteTeams();
/**
* 查询计划下的单位信息
* @param planId
* @return
*/
List<Point> getPointByPlanId(String planId);
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerExportDto.java
View file @ a2c65bbd
...@@ -30,7 +30,7 @@ public class HiddenDangerExportDto { ...@@ -30,7 +30,7 @@ public class HiddenDangerExportDto {
* 治理方式 * 治理方式
*/ */
@Excel(name = "治理方式", orderNum = "3") @Excel(name = "治理方式", orderNum = "3")
private String governWayName; private String reformType;
/** /**
* 整改期限 * 整改期限
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerImportDto.java
View file @ a2c65bbd
package com.yeejoin.amos.supervision.business.dto; package com.yeejoin.amos.supervision.business.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
public class HiddenDangerImportDto { public class HiddenDangerImportDto {
...@@ -11,37 +11,32 @@ public class HiddenDangerImportDto { ...@@ -11,37 +11,32 @@ public class HiddenDangerImportDto {
/** /**
* 隐患名称 * 隐患名称
*/ */
@Excel(name = "隐患名称", orderNum = "1")
private String name; private String name;
/**
* 检查项记录id
*/
private Long bizId;
/** /**
* 隐患级别 * 隐患级别名称
*/ */
private String dangerLevel; @Excel(name = "隐患级别名称", orderNum = "2")
private String dangerLevelName;
/** /**
* 治理方式 * 治理方式
*/ */
private String governWay; @Excel(name = "治理方式", orderNum = "3")
private String reformTypeName;
/**
* 业务类型（不同业务创建的隐患以此区分:巡检隐患、防火监督隐患、其他隐患。。。）
*/
private String bizType;
/** /**
* 整改期限 * 整改期限
*/ */
@Excel(name = "整改期限", orderNum = "4")
private Date reformLimitDate; private Date reformLimitDate;
/** /**
* 检查类型:1-自行检查 ；2计划检查 * 责任单位
*/ */
private String checkMode; @Excel(name = "责任单位", orderNum = "5")
private String pointName;
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/HiddenDangerTemplateDto.java 0 → 100644
View file @ a2c65bbd
package com.yeejoin.amos.supervision.business.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @author DELL
*/
@Data
public class HiddenDangerTemplateDto implements Serializable {
/**
* 隐患名称
*/
@ExcelProperty(value = "隐患名称", index = 0)
private String name;
/**
* 检查项名称
*/
@ExcelIgnore
@ExcelProperty(value = "检查项", index = 1)
private String inputItemName;
/**
* 隐患级别
*/
@ExcelProperty(value = "隐患级别", index = 2)
@ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getDangerLevelData")
private String dangerLevelName;
/**
* 治理方式
*/
@ExcelProperty(value = "治理方式", index = 3)
@ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getReformTypeData")
private String reformTypeName;
/**
* 整改期限
*/
@ExcelProperty(value = "整改期限", index = 4)
private Date reformLimitDate;
/**
* 检查时间
*/
@ExcelIgnore
@ExcelProperty(value = "检查时间", index = 5)
private String checkTime;
/**
* 2470 49 2052
* 检查人员名称
*/
@ExcelIgnore
@ExcelProperty(value = "检查人员名称", index = 6)
private String checkUserName;
/**
* 责任单位
*/
@ExcelProperty(value = "责任单位", index = 7)
@ExplicitConstraint(sourceClass = CommonExplicitConstraint.class, method = "getCompanyData")
private String pointName;
/**
* 状态
*/
@ExcelIgnore
@ExcelProperty(value = "状态", index = 8)
private String stateName;
/**
* 隐患来源
*/
@ExcelIgnore
@ExcelProperty(value = "隐患来源", index = 9)
private String dangerTypeName;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/DangerFeignClient.java
View file @ a2c65bbd
...@@ -4,16 +4,20 @@ package com.yeejoin.amos.supervision.business.feign; ...@@ -4,16 +4,20 @@ package com.yeejoin.amos.supervision.business.feign;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import com.yeejoin.amos.supervision.core.common.dto.DangerDto; import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
/** /**
* @author DELL * @author DELL
*/ */
@FeignClient(value = "AMOS-LATENT-DANGER", path = "latentDanger/api/latent/danger",configuration = FeignConfiguration.class) @FeignClient(value = "AMOS-LATENT-DANGER", path = "latentDanger/api/latent/danger", configuration = FeignConfiguration.class)
public interface DangerFeignClient { public interface DangerFeignClient {
/** /**
...@@ -38,9 +42,9 @@ public interface DangerFeignClient { ...@@ -38,9 +42,9 @@ public interface DangerFeignClient {
/** /**
* 隐患分页查询 * 隐患分页查询
* *
* @param page 分页信息 * @param page 分页信息
* @param ids 隐患ids * @param ids 隐患ids
* @param dangerLevel 隐患级别 * @param dangerLevel 隐患级别
* @param dangerState 隐患状态 * @param dangerState 隐患状态
* @return FeignClientResult * @return FeignClientResult
*/ */
...@@ -51,11 +55,28 @@ public interface DangerFeignClient { ...@@ -51,11 +55,28 @@ public interface DangerFeignClient {
/** /**
* 查询所有的隐患 * 查询所有的隐患
* *
* @param ids 隐患ids * @param ids 隐患ids
* @param dangerLevel 隐患级别 * @param dangerLevel 隐患级别
* @param dangerState 隐患状态 * @param dangerState 隐患状态
* @return FeignClientResult * @return FeignClientResult
*/ */
@GetMapping(value = "/list-all") @GetMapping(value = "/list-all")
FeignClientResult<List<DangerDto>> listAll(@RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState); FeignClientResult<List<DangerDto>> listAll(@RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
/**
* 隐患等级
*
* @return List<Object>
*/
@GetMapping(value = "/dangerLevel")
FeignClientResult<List<DictionarieValueModel>> getDangerLevelData();
/**
* 治理方式
*
* @return List<Object>
*/
@GetMapping(value = "/dangerGovernance")
FeignClientResult<List<DictionarieValueModel>> getDangerGovernanceData();
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/FeignConfiguration.java
View file @ a2c65bbd
package com.yeejoin.amos.supervision.business.feign; package com.yeejoin.amos.supervision.business.feign;
import feign.codec.Encoder;
import feign.form.spring.SpringFormEncoder;
import org.springframework.beans.factory.ObjectFactory; import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.cloud.openfeign.support.SpringEncoder; import org.springframework.cloud.openfeign.support.SpringEncoder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import feign.codec.Encoder;
import feign.form.spring.SpringFormEncoder;
public class FeignConfiguration { public class FeignConfiguration {
@Autowired @Autowired
private ObjectFactory<HttpMessageConverters> messageConverters; private ObjectFactory<HttpMessageConverters> messageConverters;
@Bean
public Encoder feignFormEncoder() { @Bean
return new SpringFormEncoder(new SpringEncoder(messageConverters)); public Encoder feignFormEncoder() {
} return new SpringFormEncoder(new SpringEncoder(messageConverters));
@Bean }
public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
return new FeignBasicAuthRequestInterceptor(); @Bean
} public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
return new FeignBasicAuthRequestInterceptor();
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/DataSourcesImpl.java 0 → 100644
View file @ a2c65bbd
package com.yeejoin.amos.supervision.business.service.impl;
import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import com.yeejoin.amos.supervision.business.dao.mapper.PointMapper;
import com.yeejoin.amos.supervision.business.feign.DangerFeignClient;
import com.yeejoin.amos.supervision.dao.entity.Point;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author DELL
*/
@Service
public class DataSourcesImpl implements DataSources {
@Autowired
HttpServletRequest request;
@Autowired
DangerFeignClient dangerFeignClient;
@Autowired
PointMapper pointMapper;
@Override
public String[] selectList(String type, String method) {
String[] str = {};
FeignClientResult<List<DictionarieValueModel>> feignClientResult;
List<DictionarieValueModel> models;
switch (method) {
//隐患级别
case "getDangerLevelData":
feignClientResult = dangerFeignClient.getDangerLevelData();
models = feignClientResult.getResult();
str = models.stream().map(p -> p.getDictDataValue() + "@" + p.getDictCode()).toArray(String[]::new);
break;
//治理方式
case "getReformTypeData":
feignClientResult = dangerFeignClient.getDangerGovernanceData();
models = feignClientResult.getResult();
str = models.stream().map(p -> p.getDictDataValue() + "@" + p.getDictCode()).toArray(String[]::new);
break;
//责任单位
case "getCompanyData":
Map<String, String> param = getRequestParamMap();
List<Point> points = pointMapper.getPointByPlanId(param.get("planId"));
str = points.stream().map(p -> p.getName() + "@" + p.getId()).toArray(String[]::new);
break;
default:
break;
}
return str;
}
private Map<String, String> getRequestParamMap() {
Map<String, String[]> parameterMap = request.getParameterMap();
Map<String, String[]> localMap = new HashMap<>();
localMap.putAll(parameterMap);
localMap.remove("current");
localMap.remove("size");
Map<String, String> params = new HashMap<>();
if (!ValidationUtil.isEmpty(localMap)) {
for (String key : localMap.keySet()) {
if (!ValidationUtil.isEmpty(localMap.get(key))) {
params.put(key, localMap.get(key)[0]);
}
}
}
return params;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java
View file @ a2c65bbd
...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Sequence; ...@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper; import com.yeejoin.amos.supervision.business.dao.mapper.HiddenDangerMapper;
import com.yeejoin.amos.supervision.business.dao.repository.IHiddenDangerDao; import com.yeejoin.amos.supervision.business.dao.repository.IHiddenDangerDao;
...@@ -22,6 +24,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext; ...@@ -22,6 +24,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean; import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.restful.exception.instance.DataNotFound; import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
import javax.servlet.http.HttpServletResponse;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -44,12 +47,15 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -44,12 +47,15 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
@Autowired @Autowired
HiddenDangerMapper hiddenDangerMapper; HiddenDangerMapper hiddenDangerMapper;
@Value("${spring.application.name}") @Value("${server.servlet.context-path}")
private String applicationName; private String contextPath;
@Autowired @Autowired
Sequence sequence; Sequence sequence;
@Autowired
DataSources dataSources;
@Override @Override
public List<HiddenDangerExportDto> listAll(String planId, Long pointId, String level, String status) { public List<HiddenDangerExportDto> listAll(String planId, Long pointId, String level, String status) {
//1.查询指定计划和公司的关联隐患数据 //1.查询指定计划和公司的关联隐患数据
...@@ -119,13 +125,19 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -119,13 +125,19 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
} }
@Override @Override
public void importDanger(Long planId, Long pointId, List<HiddenDangerImportDto> list) { public void importDanger(Long planId, List<HiddenDangerImportDto> list) {
//1.调用创建隐患 //1.调用创建隐患
List<DangerDto> dtoList = list.stream().map(s -> { List<DangerDto> dtoList = list.stream().map(s -> {
String[] dangerArray = s.getDangerLevelName().split("@");
String[] reformTypeArray = s.getReformTypeName().split("@");
DangerDto dangerDto = new DangerDto(); DangerDto dangerDto = new DangerDto();
Bean.copyExistPropertis(s, dangerDto); Bean.copyExistPropertis(s, dangerDto);
dangerDto.setBizType(applicationName); dangerDto.setBizType(contextPath);
dangerDto.setBizId(sequence.nextId()); dangerDto.setBizId(sequence.nextId());
dangerDto.setDangerLevel(dangerArray.length > 1 ? dangerArray[1] : "");
dangerDto.setDangerLevelName(dangerArray.length > 1 ? dangerArray[0] : "");
dangerDto.setReformType(reformTypeArray.length > 1 ? reformTypeArray[1] : "");
dangerDto.setReformTypeName(reformTypeArray.length > 1 ? reformTypeArray[0] : "");
//自行检查 //自行检查
dangerDto.setCheckMode("1"); dangerDto.setCheckMode("1");
return dangerDto; return dangerDto;
...@@ -137,7 +149,6 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -137,7 +149,6 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
HiddenDanger hiddenDanger = new HiddenDanger(); HiddenDanger hiddenDanger = new HiddenDanger();
hiddenDanger.setCreateBy(RequestContext.getExeUserId()); hiddenDanger.setCreateBy(RequestContext.getExeUserId());
hiddenDanger.setPlanId(planId); hiddenDanger.setPlanId(planId);
hiddenDanger.setPointId(pointId);
hiddenDanger.setLatentDangerId(d.getId()); hiddenDanger.setLatentDangerId(d.getId());
hiddenDanger.setCheckInputId(d.getBizId()); hiddenDanger.setCheckInputId(d.getBizId());
hiddenDanger.setDangerType("1"); hiddenDanger.setDangerType("1");
...@@ -145,6 +156,15 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -145,6 +156,15 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
hiddenDanger.setCreateDate(new Date()); hiddenDanger.setCreateDate(new Date());
return hiddenDanger; return hiddenDanger;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
for (int i = 0; i <= hiddenDangers.size(); i++) {
String[] pointArray = list.get(i).getPointName().split("@");
hiddenDangers.get(i).setPointId(pointArray.length > 1 ? Long.parseLong(pointArray[1]) : null);
}
iHiddenDangerDao.saveAll(hiddenDangers); iHiddenDangerDao.saveAll(hiddenDangers);
} }
@Override
public void templateExport(HttpServletResponse response) {
ExcelUtil.createTemplate(response, "隐患清单", "隐患清单", null, HiddenDangerExportDto.class, dataSources, true);
}
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IHiddenDangerService.java
View file @ a2c65bbd
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDto; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.supervision.business.dto.HiddenDangerExportDto;
import com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto; import com.yeejoin.amos.supervision.business.dto.HiddenDangerImportDto;
import com.yeejoin.amos.supervision.core.common.dto.DangerDto; import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
/** /**
...@@ -56,8 +57,13 @@ public interface IHiddenDangerService { ...@@ -56,8 +57,13 @@ public interface IHiddenDangerService {
/** /**
* 导入 * 导入
* @param planId 计划id * @param planId 计划id
* @param pointId 点id
* @param list 数据 * @param list 数据
*/ */
void importDanger(Long planId, Long pointId, List<HiddenDangerImportDto> list); void importDanger(Long planId, List<HiddenDangerImportDto> list);
/**
* 下载模板
* @param response 输出
*/
void templateExport(HttpServletResponse response);
} }
amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml
View file @ a2c65bbd
...@@ -1175,5 +1175,17 @@ ...@@ -1175,5 +1175,17 @@
FROM FROM
p_point p_point
</select> </select>
<select id="getPointByPlanId" resultType="com.yeejoin.amos.supervision.dao.entity.Point">
select
*
from p_point po
where EXISTS
(SELECT
DISTINCT rp.point_id FROM
p_plan pl,
p_route_point rp
where pl.route_id = rp.route_id
and pl.id = #{planId}
and po.id = rp.point_id)
</select>
</mapper> </mapper>
\ No newline at end of file
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