diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index ae190b73..5a759a15 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -5,6 +5,7 @@ import com.adc.da.common.SarTypeEnum; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetailsDto; import com.adc.da.slrs.sarStandAttrDetails.page.SarStandAttrDetailsEOPage; import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService; import com.adc.da.sys.common.SelectionResult; @@ -15,16 +16,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -172,6 +171,24 @@ public class SarStandAttrDetailsController extends BaseController> getListData1(){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("ATTR_TYPE","file"); + List sarStandAttrDetails=sarStandAttrDetailsEOService.list(queryWrapper); + List sarStandAttrDetailsDtos = new ArrayList<>(); + for (SarStandAttrDetails sarStand:sarStandAttrDetails){ + SarStandAttrDetailsDto sarStandAttrDetailsDto = new SarStandAttrDetailsDto(); + BeanUtils.copyProperties(sarStand,sarStandAttrDetailsDto); + sarStandAttrDetailsDto.setLabel(sarStandAttrDetailsDto.getAttrName()); + sarStandAttrDetailsDto.setValue(sarStandAttrDetailsDto.getAttrField()); + sarStandAttrDetailsDtos.add(sarStandAttrDetailsDto); + } + return Result.success(sarStandAttrDetailsDtos); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/SarStandAttrDetailsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/SarStandAttrDetailsDto.java new file mode 100644 index 00000000..59289406 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/SarStandAttrDetailsDto.java @@ -0,0 +1,115 @@ +package com.adc.da.slrs.sarStandAttrDetails.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-06-01 + */ +@Data +public class SarStandAttrDetailsDto { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") +// @TableId("ID") + private String id; + + @ApiModelProperty(value = "属性字段") +// @TableField("ATTR_FIELD") + private String attrField; + + private String value; + + @ApiModelProperty(value = "属性名称") +// @TableField("ATTR_NAME") + private String attrName; + + private String label; + + @ApiModelProperty(value = "类型(INPUT_STR字符串输入框,INPUT_NUM数字输入框,SELECT_OPTION下拉框,DATE_PICKER日期选择,FILE文件,TEXTAREA文本框)") +// @TableField("ATTR_TYPE") + private String attrType; + + @ApiModelProperty(value = "属性字段长度") +// @TableField("ATTR_LEN") + private Long attrLen; + + @ApiModelProperty(value = "展示顺序") +// @TableField("ORDER_NUM") + private Long orderNum; + + @ApiModelProperty(value = "是否可编辑(0是,1否)") +// @TableField("IS_EDIT") + private String isEdit; + +// @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") +// @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "创建时间") +// @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") +// @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date modifyTime; + + @ApiModelProperty(value = "是否必填") +// @TableField("IS_MUST") + private String isMust; + + @ApiModelProperty(value = "是否展示") +// @TableField("IS_SHOW_IMP") + private String isShowImp; + + @ApiModelProperty(value = "展示区域") +// @TableField("SHOW_REGION_ID") + private String showRegionId; + + @ApiModelProperty(value = "下拉选项所用的值") +// @TableField("SEL_VAL") + private String selVal; + + @ApiModelProperty(value = "模块类型(STAND标准,LAWS政策)") +// @TableField("SAR_TYPE") + private String sarType; + + @ApiModelProperty(value = "是否作为检索条件") +// @TableField("IS_SEARCH") + private String isSearch; + + @ApiModelProperty(value = "是否预警") +// @TableField("IS_WARN") + private String isWarn; + + @ApiModelProperty(value = "是否检索字段") +// @TableField("IS_JANSUO") + private String isJansuo; + +// @TableField(exist = false) + private String attrValue; + +// @TableField(exist = false) + private String areaName; + +}