From 404730d5228b2d3fe6a05b2106408e1df8ad1cb1 Mon Sep 17 00:00:00 2001 From: zzy <2041873787@qq.com> Date: Mon, 26 Jul 2021 14:53:51 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=B8=85=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsDto.java | 25 ++++---- .../SarLawsAttrDetailedListServiceImpl.java | 32 ++++++++++ .../Util/BeanConverUtil.java | 60 +++++++++++++++++++ .../SarLawsDetailedListController.java | 37 +++++++++++- .../entity/FindFileNameDto.java | 21 +++++++ .../impl/SarLawsDetailedListServiceImpl.java | 7 +++ .../SarLawsAttrDetailedListMapper.xml | 6 +- 7 files changed, 174 insertions(+), 14 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index e97d82df..381b50cb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -1,13 +1,11 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; -import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -43,44 +41,49 @@ public class LawsDto { @ExcelProperty(value = "能源类型", index = 4) @ApiModelProperty(value = "能源类型") private String NYLX; + @ExcelProperty(value = "标准年份", index = 5) + private String standYear; + @ExcelProperty(value = "标准类别", index = 6) + private String standSortShow; @ColumnWidth(16) - @ExcelProperty(value = "标准实施日期", index = 5) + @ExcelProperty(value = "标准实施日期", index = 7) @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") private String putTime; @ColumnWidth(16) - @ExcelProperty(value = "新车型实施日期", index = 6) + @ExcelProperty(value = "新车型实施日期", index = 8) @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat("yyyy年MM月dd日") private String XCXSSRQGJ; @ColumnWidth(16) - @ExcelProperty(value = "在产车实施日期", index = 7) + @ExcelProperty(value = "在产车实施日期", index = 8) @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat("yyyy年MM月dd日") private String ZCCSSRQGJ; - @ExcelProperty(value = "责任部门", index = 8) + @ExcelProperty(value = "责任部门", index = 9) @ApiModelProperty(value = "责任部门") private String ZRBM; @ColumnWidth(14) - @ExcelProperty(value = "适用产品线", index = 9) + @ExcelProperty(value = "适用产品线", index = 10) @ApiModelProperty(value = "适用产品线") private String SYCPX; @ColumnWidth(20) - @ExcelProperty(value = "乘用车VPPS编码", index = 10) + @ExcelProperty(value = "乘用车VPPS编码", index = 11) @ApiModelProperty(value = "乘用车VPPS编码") private String CYCVPPSBM; @ColumnWidth(20) - @ExcelProperty(value = "乘用车vpps中文名称", index = 11) + @ExcelProperty(value = "乘用车vpps中文名称", index = 12) @ApiModelProperty(value = "乘用车vpps中文名称") private String CYCVPPSCN; @ColumnWidth(20) - @ExcelProperty(value = "卡车VPPS编码", index = 12) + @ExcelProperty(value = "卡车VPPS编码", index = 13) @ApiModelProperty(value = "卡车VPPS编码") private String KCCVPPSBM; @ColumnWidth(20) - @ExcelProperty(value = "卡车vpps中文名称", index = 13) + @ExcelProperty(value = "卡车vpps中文名称", index = 14) @ApiModelProperty(value = "卡车vpps中文名称") private String KCCVPPSCN; @ApiModelProperty(value = "责任工程师") + @ExcelProperty(value = "责任工程师", index = 15) private String responsibleEngineer; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 40385d8d..f6589b4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -78,6 +78,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map1:typeApplicable) { + if (map1.get("value").equals(list1.getTypeApplicable())){ + list1.setTypeApplicable(map1.get("label")); + break; + } + } + } } //能源类型 List> nylx = (List>)map.get("NYLXCLASS"); @@ -97,6 +105,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map1:nylx) { + if (map1.get("value").equals(list1.getNYLX())){ + list1.setNYLX(map1.get("label")); + break; + } + } + } } //责任部门 List> zrbn = (List>)map.get("ZRBMCLASS"); @@ -116,6 +132,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map1:zrbn) { + if (map1.get("value").equals(list1.getZRBM())){ + list1.setZRBM(map1.get("label")); + break; + } + } + } } //产品线 List> sycpx = (List>)map.get("SYCPXCLASS"); @@ -135,6 +159,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map1:sycpx) { + if (map1.get("value").equals(list1.getSYCPX())){ + list1.setSYCPX(map1.get("label")); + break; + } + } + } } return list; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java new file mode 100644 index 00000000..3ef12840 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/Util/BeanConverUtil.java @@ -0,0 +1,60 @@ +package com.adc.da.slrs.sarLawsDetailedList.Util; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.util.CollectionUtils; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-26 + */ +@Slf4j +public class BeanConverUtil { + + + /** + * 单个类转换 + * + * @param sourceObj + * @param targetClass + * @param + * @return + */ + public static T conver(Object sourceObj, Class targetClass) { + if (sourceObj == null || targetClass == null) { + return null; + } + T targetObj = null; + try { + targetObj = targetClass.newInstance(); + } catch (InstantiationException | IllegalAccessException e) { + log.error("sourceObj:{},targetClass:{}", sourceObj, targetClass, e); + return null; + } + BeanUtils.copyProperties(sourceObj, targetObj); + return targetObj; + } + + /** + * List之间转换 + * + * @param sourceList + * @param targetClass + * @param + * @return + */ + public static List converList(List sourceList, Class targetClass) { + if (CollectionUtils.isEmpty(sourceList) || targetClass == null) { + return Collections.emptyList(); + } + return sourceList.stream().map(sourceObj -> conver(sourceObj, targetClass)).collect(Collectors.toList()); + } + +} + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index eeaa8d2c..0cc027c2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -2,24 +2,31 @@ package com.adc.da.slrs.sarLawsDetailedList.controller; import com.adc.da.att.controller.AttFileEOController; +import com.adc.da.att.entity.AttFileEO; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; +import com.adc.da.slrs.sarLawsDetailedList.entity.FindFileNameDto; import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; import com.adc.da.slrs.sarLawsDetailedList.service.impl.SarLawsDetailedListServiceImpl; +import com.adc.da.util.utils.CollectionUtils; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -37,6 +44,7 @@ public class SarLawsDetailedListController extends BaseController publicList = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, + IPage publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey, countryArea, projectName, detailedList, detailedListName); + List list= publicList1.getRecords();//从封装中取出数据 + List list1;//继承类集合实现 + list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类 + List attFileEOS;//新建文件信息的集合 + for (int a=0;a idList = attFileEOS.stream().map(AttFileEO::getOldFileName).collect(Collectors.toList());//多个数据取出数据 + String FileNames = StringUtils.join(idList.toArray(),",");//拼接 + fileNameDto.setFileName(FileNames);//存入 + + } + list1.set(a,fileNameDto); + }else if (null!=list.get(a).getFileIds()){ + AttFileEO attFileEO = attFileEOController.getAttFileInfo(list.get(a).getFileIds()).getData(); + } + } + IPage publicList = new Page<>(); + publicList.setCurrent(publicList1.getCurrent()); + publicList.setRecords(list1); + publicList.setTotal(publicList1.getTotal()); + publicList.setSize(publicList1.getSize()); + publicList.setPages(publicList1.getPages()); return Result.success("200", publicList); } else { return Result.success("200", null); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java new file mode 100644 index 00000000..639d228c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/FindFileNameDto.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarLawsDetailedList.entity; + + + +/** + * //TODO 添加类、接口描述 + * + * @author ZhangZhiYuan + * @date 2021-07-26 + */ +public class FindFileNameDto extends SarLawsDetailedList { + private String fileName; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 9a04b236..721a5a1e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -210,6 +210,13 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl map1:arr) { + if (map1.get("value").equals(list1.getCountryArea())){ + list1.setCountryArea(map1.get("label")); + break; + } + } } } userIPage.setRecords(list); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 6dbff739..56b963c1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -3,9 +3,11 @@