diff --git a/adc-da-base/pom.xml b/adc-da-base/pom.xml index cbf24270..538935fe 100644 --- a/adc-da-base/pom.xml +++ b/adc-da-base/pom.xml @@ -37,6 +37,12 @@ UserAgentUtils 1.21 + + com.itextpdf + itextpdf + 5.5.13 + compile + diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index 304e9f35..d33481f1 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -1,5 +1,13 @@ package com.adc.da.util; +import com.itextpdf.text.BaseColor; +import com.itextpdf.text.Element; +import com.itextpdf.text.Rectangle; +import com.itextpdf.text.pdf.*; + +import java.io.FileOutputStream; +import java.lang.reflect.Field; + /** * @Description:水印 * @Author: super_liu @@ -15,7 +23,7 @@ public class WaterMarkUtil { */ public static boolean waterMark(String inputFile, String outputFile, String waterMarkName) { -/* try { + try { PdfReader reader = new PdfReader(inputFile); Field f = PdfReader.class.getDeclaredField("encrypted"); f.setAccessible(true); @@ -65,8 +73,7 @@ public class WaterMarkUtil { } catch (Exception e) { e.printStackTrace(); return false; - }*/ -return false; + } } } diff --git a/adc-da-main/src/main/java/com/adc/da/main/file/FileUploadConfiuration.java b/adc-da-main/src/main/java/com/adc/da/main/file/FileUploadConfiuration.java new file mode 100644 index 00000000..778b921c --- /dev/null +++ b/adc-da-main/src/main/java/com/adc/da/main/file/FileUploadConfiuration.java @@ -0,0 +1,22 @@ +package com.adc.da.main.file; + +import org.springframework.boot.web.servlet.MultipartConfigFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.unit.DataSize; + +import javax.servlet.MultipartConfigElement; + +@Configuration +public class FileUploadConfiuration { + @Bean + public MultipartConfigElement multipartConfigElement() { + MultipartConfigFactory factory = new MultipartConfigFactory(); + //单个文件大小200mb + factory.setMaxFileSize(DataSize.ofMegabytes(200L)); + //设置总上传数据大小10GB + factory.setMaxRequestSize(DataSize.ofGigabytes(10L)); + + return factory.createMultipartConfig(); + } +} diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index fb339ca5..3512876a 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -146,4 +146,4 @@ elasticsearch.clustername=elasticsearch elasticsearch.ip=192.168.10.47 elasticsearch.port=9300 elasticsearch.poolSize=5 -elas.flag=true +elas.flag=false diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java index 5af267c8..478f2e20 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java @@ -60,6 +60,7 @@ public class TsInstitution extends BaseEntity { private String hasChild; + @TableField(exist = false) @ApiModelProperty("用户") private TsUserVO tsUserVO; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 75296465..c14be448 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -52,9 +52,6 @@ public class SarLawsAttrDetailedListController extends BaseController> map = iSarLawsAttrDetailedList.selectTimes(id); + Map> map = iSarLawsAttrDetailedList.selectTimes(id); return Result.success("200",map); } 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 381b50cb..7369ffb4 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 @@ -26,64 +26,66 @@ import lombok.NoArgsConstructor; public class LawsDto { @ApiModelProperty(value = "主键") private String id; - @ExcelProperty(value = "标准编号", index = 0) + @ExcelProperty(value = "标准编号") @ApiModelProperty(value = "标准编号") private String standNumber; - @ExcelProperty(value = "中文名称", index = 1) + @ExcelProperty(value = "中文名称") @ApiModelProperty(value = "中文名称") private String standName; - @ExcelProperty(value = "英文名称", index = 2) + @ExcelProperty(value = "英文名称") @ApiModelProperty(value = "英文名称") private String standEnName; - @ExcelProperty(value = "适用车型", index = 3) + @ExcelProperty(value = "适用车型") @ApiModelProperty(value = "适用车型") private String typeApplicable; - @ExcelProperty(value = "能源类型", index = 4) + @ExcelProperty(value = "能源类型") @ApiModelProperty(value = "能源类型") private String NYLX; - @ExcelProperty(value = "标准年份", index = 5) + @ExcelProperty(value = "标准年份") private String standYear; - @ExcelProperty(value = "标准类别", index = 6) + @ExcelProperty(value = "标准类别") private String standSortShow; + private String issueTime; @ColumnWidth(16) - @ExcelProperty(value = "标准实施日期", index = 7) + @ExcelProperty(value = "标准实施日期") @ApiModelProperty(value = "标准实施日期") @DateTimeFormat("yyyy年MM月dd日") private String putTime; @ColumnWidth(16) - @ExcelProperty(value = "新车型实施日期", index = 8) + @ExcelProperty(value = "新车型实施日期") @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat("yyyy年MM月dd日") private String XCXSSRQGJ; @ColumnWidth(16) - @ExcelProperty(value = "在产车实施日期", index = 8) + @ExcelProperty(value = "在产车实施日期") @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat("yyyy年MM月dd日") private String ZCCSSRQGJ; - @ExcelProperty(value = "责任部门", index = 9) + @ExcelProperty(value = "责任部门") @ApiModelProperty(value = "责任部门") private String ZRBM; @ColumnWidth(14) - @ExcelProperty(value = "适用产品线", index = 10) + @ExcelProperty(value = "适用产品线") @ApiModelProperty(value = "适用产品线") private String SYCPX; @ColumnWidth(20) - @ExcelProperty(value = "乘用车VPPS编码", index = 11) + @ExcelProperty(value = "乘用车VPPS编码") @ApiModelProperty(value = "乘用车VPPS编码") private String CYCVPPSBM; @ColumnWidth(20) - @ExcelProperty(value = "乘用车vpps中文名称", index = 12) + @ExcelProperty(value = "乘用车vpps中文名称") @ApiModelProperty(value = "乘用车vpps中文名称") private String CYCVPPSCN; @ColumnWidth(20) - @ExcelProperty(value = "卡车VPPS编码", index = 13) + @ExcelProperty(value = "卡车VPPS编码") @ApiModelProperty(value = "卡车VPPS编码") private String KCCVPPSBM; @ColumnWidth(20) - @ExcelProperty(value = "卡车vpps中文名称", index = 14) + @ExcelProperty(value = "卡车vpps中文名称") @ApiModelProperty(value = "卡车vpps中文名称") private String KCCVPPSCN; @ApiModelProperty(value = "责任工程师") - @ExcelProperty(value = "责任工程师", index = 15) + @ExcelProperty(value = "责任工程师") private String responsibleEngineer; + private String standType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java index fb9f6787..6805be5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelDto.java @@ -1,6 +1,5 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; -import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,7 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * //TODO 添加类、接口描述 + * //导出类 *用于导出标准数据信息 * 需要后期修改 * @author ZhangZhiYuan diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelVo.java index 1aba0157..a3a6fa8c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelVo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandExcelVo.java @@ -7,7 +7,7 @@ import lombok.Data; import java.util.List; /** - * //TODO 添加类、接口描述 + * //接收所导出的文件名 * * @author ZhangZhiYuan * @date 2021-06-24 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java index 9bdae697..7b50a568 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -1,10 +1,14 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** - * //TODO 添加类、接口描述 + * //新增清单进行时间的添加 * * @author ZhangZhiYuan * @date 2021-07-21 @@ -13,10 +17,19 @@ import lombok.Data; public class StandRegionalTimeDto { @ApiModelProperty(value = "国家") private String country; + @ApiModelProperty(value = "实施日期") - private String putTime; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date putTime; + @ApiModelProperty(value = "在产车实施日期") - private String zccssrq; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date zccssrq; + @ApiModelProperty(value = "新车型实施日期") - private String xcxssrq; + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date xcxssrq; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java index 9d3d62fe..1ea48e91 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandTimeDto.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * //TODO 添加类、接口描述 + * //标准时间 * * @author ZhangZhiYuan * @date 2021-07-21 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java index fa891d9a..0474c233 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java @@ -23,5 +23,5 @@ public interface ISarLawsAttrDetailedListService extends IService timeDtos); void exportExcel(HttpServletResponse response, StandExcelVo standExcelVo); int setTimes(SarLawsAttrDetailedList sarLawsAttrDetailedList); - Map> selectTimes(String id); + Map> selectTimes(String id); } 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 f6589b4e..9918bc69 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 @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; +import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; @@ -15,10 +16,8 @@ import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; /** *

@@ -58,6 +57,8 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl map= iDicTypeEOService.getDicTypeListCode(); @@ -225,25 +226,56 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> selectTimes(String id) { + public Map> selectTimes(String id) { List standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id); - Map> mapList = new HashMap>(); - for (StandRegionalTimeDto s:standRegionalTimeDto){ - List list; - if (mapList.containsKey(s.getCountry())){ - list = mapList.get(s.getCountry()); + Map map = iDicTypeEOService.getDicTypeListCode(); + List> arr = (List>) map.get("COUNTRY"); + for (StandRegionalTimeDto list1 : standRegionalTimeDto) { + if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) { + String[] split = list1.getCountry().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : arr) { + if (map1.get("value").equals(s)) { + s = map1.get("label"); + builder.append(s + ","); + break; + } + } + } + String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + list1.setCountry(completedString); }else { - list = new ArrayList<>(); + for (Map map1:arr) { + if (map1.get("value").equals(list1.getCountry())){ + list1.setCountry(map1.get("label")); + break; + } + } } - StandTimeDto standTimeDto = new StandTimeDto(); - standTimeDto.setPutTime(s.getPutTime()); - standTimeDto.setXcxssrq(s.getXcxssrq()); - standTimeDto.setZccssrq(s.getZccssrq()); - list.add(standTimeDto); - mapList.put(s.getCountry(),list); + } + LinkedHashMap> mapList = new LinkedHashMap>(); + List putTime = new ArrayList<>(); + List xcx = new ArrayList<>(); + List zcc= new ArrayList<>(); + for (StandRegionalTimeDto s:standRegionalTimeDto){ + if (mapList.containsKey("实施日期("+s.getCountry()+")")||mapList.containsKey("新车型实施日期("+s.getCountry()+")")||mapList.containsKey("在产车实施日期("+s.getCountry()+")")){ + putTime = mapList.get("实施日期("+s.getCountry()+")"); + xcx = mapList.get("新车型实施日期("+s.getCountry()+")"); + zcc = mapList.get("在产车实施日期("+s.getCountry()+")"); + + } + dateTime(mapList, putTime, xcx, zcc, s); } return mapList; } - + private void dateTime(LinkedHashMap> mapList, List putTime, List xcx, List zcc, StandRegionalTimeDto s) { + putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime())); + xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); + zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); + mapList.put("实施日期("+s.getCountry()+")",putTime); + mapList.put("新车型实施日期("+s.getCountry()+")",xcx); + mapList.put("在产车实施日期("+s.getCountry()+")",zcc); + } } 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 index 3ef12840..c9688764 100644 --- 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 @@ -9,7 +9,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * //TODO 添加类、接口描述 + * //继承类的数据转移 * * @author ZhangZhiYuan * @date 2021-07-26 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 0cc027c2..ce42e9cb 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 @@ -149,7 +149,6 @@ public class SarLawsDetailedListController extends BaseController timeDto = new ArrayList<>(); - if (detailedUpDto.getInforlist().indexOf(",") >= 0) { + if ("1".equals(detailedUpDto.getSortKey()) && detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); String[] putTime = detailedUpDto.getInforlist1().split(","); String[] zcc = detailedUpDto.getInforlist2().split(","); @@ -285,17 +259,17 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl { List selectMenuByRole(TsResource sarMenuEO); + int insertTsRoleResource(HashMap map); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 3713fbf3..c3f3a777 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -7,6 +7,7 @@ import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarResource.dao.TsResourceDao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.util.UUIDUtils; import com.adc.da.utils.treetool.Tree; import com.adc.da.utils.treetool.TreeNode; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,6 +18,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; /** @@ -145,6 +147,7 @@ public class TsResourceServiceImpl extends ServiceImpl TsResources=dao.selectList(tsResourceQueryWrapper); for(TsResource TsResource:TsResources){ TsResource.setChildren(recursionGetChildren((TsResource))); @@ -166,6 +169,12 @@ public class TsResourceServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("resourceId",TsResource.getId()); + map.put("roleId",1); + dao.insertTsRoleResource(map); + return Result.success(); } 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 fa5cf2f1..2275753d 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 @@ -22,6 +22,7 @@ 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; @@ -59,8 +60,22 @@ public class SarStandAttrDetailsController extends BaseController getInlandStandList = InitStandAttrUtil.standInlandAttrFieldList; resultMap.put(SarTypeEnum.INLAND_STAND.getValue(),getInlandStandList); + + List getForeignStandList = InitStandAttrUtil.standForeignAttrFieldList; + //新增字段 +// Iterator iterator = getInlandStandList.iterator(); +// while (iterator.hasNext()){ +// SarStandAttrDetails next = iterator.next(); +// +// if (next.getAttrName().matches("能源类型|适用产品线|适用认证|责任工程师|关联文件")){ +// getForeignStandList.add(next); +// } +// +// } resultMap.put(SarTypeEnum.FOREIGN_STAND.getValue(),getForeignStandList); + + // 政策属性字段 List getInlandLawsList = InitStandAttrUtil.lawsInlandAttrFieldList; resultMap.put(SarTypeEnum.INLAND_LAWS.getValue(),getInlandLawsList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 8985ecd5..55893831 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -5,11 +5,13 @@ import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; +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 org.springframework.format.annotation.DateTimeFormat; /** *

@@ -60,10 +62,14 @@ public class SarStandAttrInfo extends BaseEntity { @ApiModelProperty(value = "新车型实施日期（文本）") @TableField("XCXSSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String xcxssrq; @ApiModelProperty(value = "在产车实施日期（文本）") @TableField("ZCCSSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String zccssrq; @ApiModelProperty(value = "标签") @@ -148,6 +154,8 @@ public class SarStandAttrInfo extends BaseEntity { @ApiModelProperty(value = "实施日期(标准文本）") @TableField("SSRQ") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String ssrq; @ApiModelProperty(value = "实施日期(国际）") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 2c37c5fc..cf6e9944 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -4,9 +4,7 @@ package com.adc.da.slrs.sarStandIdea.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; -import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; -import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; -import com.adc.da.slrs.sarStandIdea.entity.GetExcelDto; +import com.adc.da.slrs.sarStandIdea.entity.*; import com.adc.da.slrs.sarStandIdea.service.Impl.SarPublicIdeaAllServiceImpl; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; @@ -18,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; @@ -51,7 +48,7 @@ public class SarPublicIdeaAllController extends BaseController @ApiOperation(value = "查询全部意见") @GetMapping("/getAllStand") public ResponseMessage getAllStand(DetAllStandDto detAllStandDto){ - IPage publicList =sarPublicIdeaAllImpl.selectAll(detAllStandDto); + IPage publicList =sarPublicIdeaAllImpl.selectAll(detAllStandDto); return Result.success("200",publicList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java index ef3e5e5a..b5a9a254 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java @@ -64,5 +64,16 @@ public class SarPublicIdeaController extends BaseController { return Result.success(publicList); } + @ApiOperation(value = "发起标准征求意见流程后自动公开征求意见") + @PostMapping("/addSarPublicIdea") + public ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea){ + try{ + sarPublicIdeaService.save(sarPublicIdea); + }catch(Exception e){ + return Result.error(); + } + return Result.success(); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java index b579ec29..a7541e83 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/DetAllStandDto.java @@ -1,40 +1,12 @@ package com.adc.da.slrs.sarStandIdea.entity; +import lombok.Data; + +@Data public class DetAllStandDto { Integer page; Integer size; String cid; String userId; - - public Integer getPage() { - return page; - } - - public void setPage(Integer page) { - this.page = page; - } - - public Integer getSize() { - return size; - } - - public void setSize(Integer size) { - this.size = size; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getCid() { - return cid; - } - - public void setCid(String cid) { - this.cid = cid; - } + String endTime; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java index e4774210..0e8f9a0a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java @@ -57,5 +57,8 @@ public class SarPublicIdea extends BaseEntity { @TableField("category_flag") private String categoryFlag; + @TableField("stand_id") + private String standId; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAllSUD.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAllSUD.java new file mode 100644 index 00000000..4226d043 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAllSUD.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +import lombok.Data; + +/** + * //用于增删查改的判断 + * + * @author ZhangZhiYuan + * @date 2021-07-27 + */ +@Data +public class SarPublicIdeaAllSUD extends SarPublicIdeaAll{ + public Integer ideaKey; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaDto.java new file mode 100644 index 00000000..b9243c90 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaDto.java @@ -0,0 +1,21 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +import java.util.Date; + +/** + * //用于查询标准关联信息 + * + * @author ZhangZhiYuan + * @date 2021-07-27 + */ +public class SarPublicIdeaDto { + private String id; + private String category; + private String cid; + private String cname; + private Date startTime; + private Date endTime; + private String categoryFlag; + private String standId; +// private String ; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java index 09540db3..65ad075f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/ISarPublicIdeaAllService.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandIdea.service; import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAllSUD; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -20,7 +21,7 @@ import javax.servlet.http.HttpServletResponse; public interface ISarPublicIdeaAllService extends IService { - IPage selectAll(DetAllStandDto detAllStandDto); + IPage selectAll(DetAllStandDto detAllStandDto); String add(SarPublicIdeaAll sarPublicIdeaAll); String updateById(SarPublicIdeaAll sarPublicIdeaAll, String autUserid); String delete(DelStandDto delStandDto); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 6b9f78a3..2d75de77 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -1,12 +1,12 @@ package com.adc.da.slrs.sarStandIdea.service.Impl; -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.IdUtil; +import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; import com.adc.da.slrs.sarStandIdea.dao.SarPublicIdeaAllDao; import com.adc.da.slrs.sarStandIdea.entity.DelStandDto; import com.adc.da.slrs.sarStandIdea.entity.DetAllStandDto; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; +import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAllSUD; import com.adc.da.slrs.sarStandIdea.service.ISarPublicIdeaAllService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,17 +14,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.nio.charset.StandardCharsets; +import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -44,14 +40,59 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl selectAll(DetAllStandDto detAllStandDto){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("CID",detAllStandDto.getCid()); - Page page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize()); - IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); - return userIPage; + public IPage selectAll(DetAllStandDto detAllStandDto){ + if (detAllStandDto.getEndTime()!=null){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date Time = null; + try { + Time = sdf.parse(detAllStandDto.getEndTime()); + } catch (ParseException e) { + e.printStackTrace(); + } + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("CID",detAllStandDto.getCid()); + Page page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize()); + IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + List list= userIPage.getRecords(); + List list1 = new ArrayList<>(); + list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class); + for (SarPublicIdeaAllSUD sud:list1){ + if (Time.compareTo(new Date())>=0)sud.setIdeaKey(0); + else {sud.setIdeaKey(1);} + } + IPage userIPage1 = new Page<>(); + userIPage1.setPages(userIPage.getPages()); + userIPage1.setSize(userIPage.getSize()); + userIPage1.setTotal(userIPage.getTotal()); + userIPage1.setCurrent(userIPage.getCurrent()); + userIPage1.setRecords(list1); + return userIPage1; + }else { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("CID",detAllStandDto.getCid()); + Page page = new Page<>(detAllStandDto.getPage(),detAllStandDto.getSize()); + IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + List list= userIPage.getRecords(); + List list1 = new ArrayList<>(); + list1 = BeanConverUtil.converList(list, SarPublicIdeaAllSUD.class); + for (SarPublicIdeaAllSUD sud:list1){ + sud.setIdeaKey(0); + } + IPage userIPage1 = new Page<>(); + userIPage1.setPages(userIPage.getPages()); + userIPage1.setSize(userIPage.getSize()); + userIPage1.setTotal(userIPage.getTotal()); + userIPage1.setCurrent(userIPage.getCurrent()); + userIPage1.setRecords(list1); + return userIPage1; + } + + + } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 4f8161c0..c5064cbb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -49,9 +49,8 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl list = new QueryWrapper<>(); list.like(StringUtils.isNotEmpty(category),"category",category) .like(StringUtils.isNotEmpty(cname),"cname",cname) - .ge(start!=null,"start_time",start). - le(end!=null,"end_time",end); - + .ge(start!=null,"start_time",start) + .le(end!=null,"end_time",end); Page page = new Page<>(p,size); IPage userIPage = sarPublicIdeaDao.selectPage(page, list); System.out.println("总条数"+userIPage.getTotal()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java index dfbbe661..48409480 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindStandDto.java @@ -3,7 +3,7 @@ package com.adc.da.slrs.sarStandItems.entity; import lombok.Data; /** - * //TODO 添加类、接口描述 + * //查询dto * * @author ZhangZhiYuan * @date 2021-07-19 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java index 3b71d80a..c894d55a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * //TODO 添加类、接口描述 + * //分解单dto * * @author ZhangZhiYuan * @date 2021-07-14 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index b7d68da5..e6292810 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -4,10 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import java.util.Date; - /** - * //TODO 添加类、接口描述 * * @author ZhangZhiYuan * @date 2021-07-08 @@ -31,11 +28,8 @@ public class SarStandItemsDto { @ApiModelProperty(value = "责任部门") private String responsibleUnit; - private String responsibleEngineer; - - @ApiModelProperty(value = "SVPPS") private String svpps; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java index a5ea5d3f..38521d39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * //TODO 添加类、接口描述 + * //时间查询 * * @author ZhangZhiYuan * @date 2021-07-14 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 25152da2..c06fe3fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -1,13 +1,15 @@ package com.adc.da.slrs.sarStandItems.service.impl; -import com.adc.da.http.Result; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.*; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; +import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -32,11 +34,12 @@ public class SarStandItemsServiceImpl extends ServiceImpl queryItemsByList(SarStandItemsEOPage page, String resType){ List itemsEOList = dao.queryItemsByList(page); @@ -144,7 +147,23 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectLawDto(FindStandDto findStandDto) { - List standId = dao.selectStandId((findStandDto.getPage())-1, findStandDto.getSize()); + SarStandardsInfoEOPage page = new SarStandardsInfoEOPage(); + page.setPage(findStandDto.getPage()); + page.setPageSize(findStandDto.getSize()); + page.setUserId(null); + List pageInfo = null; + try { + pageInfo = sarStandardsInfoController.getSarStandardsInfoPage(page).getData().getList(); + } catch (Exception e) { + e.printStackTrace(); + } + List standId = new ArrayList<>(); + for (SarStandardsInfo standardsInfo : pageInfo){ + if (standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ + standId.add(standardsInfo.getId()); + } + } + List list=new ArrayList<>(); if (standId==null || standId.size()==0){ list = null; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 39d3810c..432017a5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -109,14 +109,14 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.queryStandId(id); - List list1 = new ArrayList(); - for(SarStandProjectLibrary s:list){ - list1.add(s.getStandId()); - } - System.out.println(list1); - IPage list2 = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id); - return Result.success("200",list2); +// List list = sarStandProjectLibraryService.queryStandId(id); +// List list1 = new ArrayList(); +// for(SarStandProjectLibrary s:list){ +// list1.add(s.getStandId()); +// } +// System.out.println(list1); + IPage list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id); + return Result.success("200",list); } /** * @@ -156,7 +156,7 @@ public class SarStandProjectLibraryController extends BaseController data= sarStandProjectLibraryService.exportStandAttrInfoExcel(standAttrInfoExcelDto); + List data= sarStandProjectLibraryService.exportStandAttrInfoExcel(standAttrInfoExcelDto,id); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), StandAttrInfoDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + EasyExcel.write(response.getOutputStream(), StandAttrInfoDto.class).useDefaultStyle(false).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(data); } catch (Exception e) { System.out.println(e); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index fe780ba0..fa6a01be 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandProjectLibrary.entity; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.HeadRowHeight; @@ -18,11 +19,13 @@ import java.time.LocalDateTime; @Data @HeadRowHeight(35) @ColumnWidth(30) +@ExcelIgnoreUnannotated public class StandAttrInfoDto { - //标准编号 - @ExcelProperty("标准编号") private String standId; + //标准编号 + @ExcelProperty("标准号") + private String standNumber; //中文名称 @ExcelProperty("中文名称") private String standName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 589b0437..6c8745fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -16,6 +16,6 @@ public interface SarStandProjectLibraryService { IPage queryStandInfo(int current, int pageSize, String standId); void deleteByIds(List ids); void batchInsert(@Param("ids") List list); - List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto); + List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index f88e9faa..7599a4cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -165,7 +165,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryStandInfo(int current, int pageSize, String standId) { QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NAME","STAND_EN_NAME"); + wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME"); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='"+ standId+"'"); Page page1 = new Page<>(current, pageSize); IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); @@ -186,6 +186,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl userIPage = new Page<>(); userIPage.setRecords(list); @@ -222,60 +222,37 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto) { + public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) { List ids = standAttrInfoExcelDto.getIds(); List list = new ArrayList<>(); - if (ids==null||ids.size()==0){ - QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NAME","STAND_EN_NAME"); - wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID"); - List userList1 = SarStandardsInfoDao.selectList(wrapper1); - QueryWrapper wrapper2 = new QueryWrapper<>(); - wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN"); - wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID"); - List userList2 = sarStandAttrInfoDao.selectList(wrapper2); - for(SarStandardsInfo s:userList1){ - StandAttrInfoDto p =new StandAttrInfoDto(); - p.setStandId(s.getId()); - p.setStandName(s.getStandName()); - p.setStandEnName(s.getStandEnName()); - for (SarStandAttrInfo a:userList2){ - if(s.getId().equals(a.getStandId())){ - p.setCYCVPPSBM(a.getCycvppsbm()); - p.setCYCVPPSCN(a.getCycvppscn()); - p.setSSRQ(a.getSsrq()); - p.setXCXSSRQGJ(a.getXcxssrqgj()); - p.setZCCSSRQGJ(a.getZccssrqgj()); - p.setKCCVPPSBM(a.getKccvppsbm()); - p.setKCCVPPSCN(a.getKccvppscn()); - p.setZRBM(a.getZrbm()); - } - } - list.add(p); - } - }else { String idmis=String.join(",",ids); System.out.println(idmis); QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NAME","STAND_EN_NAME"); - wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +")"); + wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME"); + wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'"); List userList1 = SarStandardsInfoDao.selectList(wrapper1); QueryWrapper wrapper2 = new QueryWrapper<>(); wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN"); - wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.stand_id in ("+ idmis +")"); + wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'"); List userList2 = sarStandAttrInfoDao.selectList(wrapper2); for(SarStandardsInfo s:userList1){ StandAttrInfoDto p =new StandAttrInfoDto(); - p.setStandId(s.getId()); + p.setStandNumber(s.getStandNumber()); p.setStandName(s.getStandName()); p.setStandEnName(s.getStandEnName()); for (SarStandAttrInfo a:userList2){ if(s.getId().equals(a.getStandId())){ p.setCYCVPPSBM(a.getCycvppsbm()); p.setCYCVPPSCN(a.getCycvppscn()); - p.setSSRQ(a.getSsrq()); - p.setXCXSSRQGJ(a.getXcxssrqgj()); - p.setZCCSSRQGJ(a.getZccssrqgj()); + if (a.getSsrq()!=null){ + p.setSSRQ(a.getSsrq().substring(0,10)); + } + if (a.getXcxssrqgj()!=null){ + p.setXCXSSRQGJ(a.getXcxssrqgj().substring(0,10)); + } + if (a.getZccssrqgj()!=null){ + p.setZCCSSRQGJ(a.getZccssrqgj().substring(0,10)); + } p.setKCCVPPSBM(a.getKccvppsbm()); p.setKCCVPPSCN(a.getKccvppscn()); p.setZRBM(a.getZrbm()); @@ -283,7 +260,6 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl page.setAdvanceSearchStr(null); } } - page.setUserId(LoginUserUtil.getUserId()); + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0af77f7f..29b00573 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -185,16 +185,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - List getMenuIdList=tsUserService.getResourceId(new TsResource()); -// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } - List ids = iTsResourceService.getChildMenuList(page.getMenuId()); - if (ids != null && !ids.isEmpty()) { - page.setMenuAllChildrenIdList(ids); + if(page.getMenuId() != null ){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ + List getMenuIdList = tsUserService.getResourceId(new TsResource()); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } } Integer rowCount = dao.getSarStandardsInfoCount(page); page.getPager().setRowCount(rowCount); diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 1888d4e7..e0966339 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -30,8 +30,9 @@ public class FieldConvertUtil { public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," + "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 - public static String exportBaseFieldNamesForeign = "重要度,标准类别,标准编号,标准年份/系列,中文名称,英文名称," + - "标准状态,发布日期,文本说明"; // 导出基础表字段 + public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + + "文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用产品线,适用认证,能源类型,责任工程师," + + "关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段 public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," + "标签,发布稿（必读）,增补件（必读）,报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期（文本）,在产车实施日期（文本）," + 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 56b963c1..ac098d16 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 @@ -4,14 +4,17 @@ - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml index a09cbd84..09f9859f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml @@ -15,6 +15,8 @@ + + parent_id, menu_name, sor_divide, id, modify_time, creation_time, valid_flag, display_seq, parent_ids, remarks @@ -69,6 +71,12 @@ + + + INSERT INTO ts_role_resource + VALUES(#{roleId},#{resourceId} ) + + + + com.lowagie + itext + 2.1.7 + + + com.lowagie + itextasian + 2.1.7 + + + com.itextpdf + itextpdf + 5.5.9 + + + com.itextpdf + itext-asian + 5.2.0 + diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 456e39c7..f49b116c 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -1,13 +1,17 @@ package com.adc.da.att.controller; +import com.adc.da.att.dao.UserDao; import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.entity.TsUser; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; import com.adc.da.file.store.IFileStore; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.sys.entity.UserEO; import com.adc.da.util.MD5Util; import com.adc.da.util.UUIDUtils; +import com.adc.da.util.WaterMarkUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -46,6 +50,9 @@ public class AttFileEOController { @Autowired private IFileStore iFileStore; + @Autowired + private UserDao userDao; + @Value("${file.path}") private String filePath;//文件存储路径 @@ -249,7 +256,7 @@ public class AttFileEOController { @ApiOperation(value = "|File|下载文件加水印") @GetMapping("/downloadFileForSarWaterMark") // @RequiresPermissions("sys:file:downloadFileForSar") - public void downloadFileForSarWaterMark(String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception { + public void downloadFileForSarWaterMark(String userId,String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception { AttFileEO attFileEO = attFileEOService.getFileInfo(fileId); InputStream is = null; OutputStream os = null; @@ -265,24 +272,35 @@ public class AttFileEOController { } String waterFilePath = newFilePath + attFileEO.getOldFileName(); // 添加水印 - String waterContent = ""; -// String userId = LoginUserUtil.getUserId(); -// String userMsg = ""; -// UserEO userEO = userEOService.selectByPrimaryKey(userId); -// if (userEO != null) { -// userMsg = userEO.getUname() + ","; -// if (StringUtils.isNotEmpty(userEO.getWorkNum())) { -// userMsg += userEO.getWorkNum() + ","; -// } -// } - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 - String date = df.format(new Date()); -// waterContent = userMsg + date; + String userMsg = ""; + TsUser tsUser = userDao.selectById(userId); + if (tsUser != null) { + userMsg = tsUser.getUname() + ","; + if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { + userMsg += tsUser.getWorkNum() + ","; + } + } +// SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 +// String date = df.format(new Date()); + String waterContent = userMsg ; //2020年9月5日 去掉水印处理 -// WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); + //2021年7月25日要求下载生成水印 + WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); - File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); + + String downloadFilePath=""; + String fileName=attFileEO.getFileName(); + String suffix=fileName.substring(fileName.lastIndexOf(".")+1); + //只能在pdf中添加水印, + //非pdf文件直接下载原文件 + if (suffix.equals("pdf")){ + downloadFilePath=waterFilePath; + }else { + downloadFilePath=oldFilePath; + } + + File file = new File(downloadFilePath); is = new FileInputStream(file); os = response.getOutputStream(); IOUtils.copy(is, os); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java new file mode 100644 index 00000000..b7f6d6df --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java @@ -0,0 +1,8 @@ +package com.adc.da.att.dao; + +import com.adc.da.att.entity.TsUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +public interface UserDao extends BaseMapper { + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java b/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java new file mode 100644 index 00000000..c088351b --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java @@ -0,0 +1,24 @@ +package com.adc.da.att.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TsUser extends BaseEntity implements Serializable { + @TableId + private String usid; + @TableField + private String uname; + @TableField + private String workNum; + + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 600d4d9b..5ffdf75d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -93,7 +93,7 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect") // @RequiresPermissions("person:personCollect:update") public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { tsPersonCollect.setModifyTime(new Date());