diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 5f50360..1b66d9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -123,4 +123,7 @@ String MESSAGE_TYPE = "messageType"; // APP全局查询类型 String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType"; + + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 5f50360..1b66d9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -123,4 +123,7 @@ String MESSAGE_TYPE = "messageType"; // APP全局查询类型 String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType"; + + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0151de1..0e8bbfa 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -9,6 +9,8 @@ import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,6 +41,7 @@ private String metaModuleName; @ApiModelProperty("业务类型") + @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) private String businessDownloadType; @TableField(exist = false) @@ -67,7 +70,6 @@ private Long createUser; @ApiModelProperty("更新人id") - @ExcelProperty(value = "描述备注", order = 6) private Long updateUser; @ApiModelProperty("创建时间") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 5f50360..1b66d9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -123,4 +123,7 @@ String MESSAGE_TYPE = "messageType"; // APP全局查询类型 String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType"; + + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0151de1..0e8bbfa 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -9,6 +9,8 @@ import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,6 +41,7 @@ private String metaModuleName; @ApiModelProperty("业务类型") + @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) private String businessDownloadType; @TableField(exist = false) @@ -67,7 +70,6 @@ private Long createUser; @ApiModelProperty("更新人id") - @ExcelProperty(value = "描述备注", order = 6) private Long updateUser; @ApiModelProperty("创建时间") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java index cb60f73..16445ab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java @@ -57,8 +57,8 @@ private String fileType; @ApiModelProperty("描述备注") - @TableField("desc") - private String desc; + @TableField("descn") + private String descn; /** * 创建人id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 5f50360..1b66d9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -123,4 +123,7 @@ String MESSAGE_TYPE = "messageType"; // APP全局查询类型 String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType"; + + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0151de1..0e8bbfa 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -9,6 +9,8 @@ import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,6 +41,7 @@ private String metaModuleName; @ApiModelProperty("业务类型") + @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) private String businessDownloadType; @TableField(exist = false) @@ -67,7 +70,6 @@ private Long createUser; @ApiModelProperty("更新人id") - @ExcelProperty(value = "描述备注", order = 6) private Long updateUser; @ApiModelProperty("创建时间") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java index cb60f73..16445ab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java @@ -57,8 +57,8 @@ private String fileType; @ApiModelProperty("描述备注") - @TableField("desc") - private String desc; + @TableField("descn") + private String descn; /** * 创建人id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index 23684ba..4ffa5ad 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -136,9 +136,9 @@ wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.apply(StringUtils.isNotBlank(request.getStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]); + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); wrapper.eq("is_del", 0); return wrapper; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 5f50360..1b66d9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -123,4 +123,7 @@ String MESSAGE_TYPE = "messageType"; // APP全局查询类型 String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType"; + + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0151de1..0e8bbfa 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -9,6 +9,8 @@ import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,6 +41,7 @@ private String metaModuleName; @ApiModelProperty("业务类型") + @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) private String businessDownloadType; @TableField(exist = false) @@ -67,7 +70,6 @@ private Long createUser; @ApiModelProperty("更新人id") - @ExcelProperty(value = "描述备注", order = 6) private Long updateUser; @ApiModelProperty("创建时间") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java index cb60f73..16445ab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java @@ -57,8 +57,8 @@ private String fileType; @ApiModelProperty("描述备注") - @TableField("desc") - private String desc; + @TableField("descn") + private String descn; /** * 创建人id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index 23684ba..4ffa5ad 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -136,9 +136,9 @@ wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.apply(StringUtils.isNotBlank(request.getStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]); + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); wrapper.eq("is_del", 0); return wrapper; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java index 0fde2e7..920d50c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java @@ -60,9 +60,9 @@ Collectors.groupingBy(ElectronicImage::getKeyWord) ); // 初始化world,pdf名称参数 - String[] filePrintType = filePrintRegister.getTemplatePath().split("\\."); String wordNewUrl = filePrintRegister.getTemplatePath(); - String pdfNewUrl = filePrintType[0] + "." + "pdf"; + //默认转为docx,只需要进行docx的替换即可 + String pdfNewUrl = filePrintRegister.getTemplatePath().replaceAll("docx", "pdf"); //3、根据关键字进行添加签章和签字 for (Map.Entry> entry : sameKeyWordSealMaps.entrySet()) { @@ -458,12 +458,12 @@ FilePrintRegisterUtils addStampUtils = new FilePrintRegisterUtils(); List electronicSealList = new ArrayList(11); int count = 0; - ElectronicImage electronicImage=defaultElectronicSignName("批准人"); + ElectronicImage electronicImage = defaultElectronicSignName("批准人"); electronicImage.setElectronicSealImageUrl(stampNameImgUr); electronicSealList.add(electronicImage); addSameKeyWordStamp(wordOldUrl, wordNewUrl, electronicSealList); // 将新word转化为pdf文件 - electronicImage=defaultElectronicSignSeal("",0); + electronicImage = defaultElectronicSignSeal("", 0); electronicImage.setElectronicSealImageUrl(stampSealImgUrl); electronicSealList.add(electronicImage); addAbsolutePathStamp(wordOldUrl, wordNewUrl, electronicImage); @@ -480,7 +480,7 @@ addStampUtils.wordToPdf(wordNewUrl, pdfNewUrl); } - protected static ElectronicImage defaultElectronicSignSeal(String keyWord,float horizontal) { + protected static ElectronicImage defaultElectronicSignSeal(String keyWord, float horizontal) { ElectronicImage electronicImage = ElectronicImage.builder() .keyWordIndex(-1) .keyWord(keyWord) @@ -492,6 +492,7 @@ .build(); return electronicImage; } + protected static ElectronicImage defaultElectronicSignName(String keyWord) { ElectronicImage electronicImage = ElectronicImage.builder() .keyWordIndex(-1) diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 5f50360..1b66d9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -123,4 +123,7 @@ String MESSAGE_TYPE = "messageType"; // APP全局查询类型 String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType"; + + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0151de1..0e8bbfa 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -9,6 +9,8 @@ import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,6 +41,7 @@ private String metaModuleName; @ApiModelProperty("业务类型") + @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) private String businessDownloadType; @TableField(exist = false) @@ -67,7 +70,6 @@ private Long createUser; @ApiModelProperty("更新人id") - @ExcelProperty(value = "描述备注", order = 6) private Long updateUser; @ApiModelProperty("创建时间") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java index cb60f73..16445ab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java @@ -57,8 +57,8 @@ private String fileType; @ApiModelProperty("描述备注") - @TableField("desc") - private String desc; + @TableField("descn") + private String descn; /** * 创建人id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index 23684ba..4ffa5ad 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -136,9 +136,9 @@ wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.apply(StringUtils.isNotBlank(request.getStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]); + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); wrapper.eq("is_del", 0); return wrapper; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java index 0fde2e7..920d50c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java @@ -60,9 +60,9 @@ Collectors.groupingBy(ElectronicImage::getKeyWord) ); // 初始化world,pdf名称参数 - String[] filePrintType = filePrintRegister.getTemplatePath().split("\\."); String wordNewUrl = filePrintRegister.getTemplatePath(); - String pdfNewUrl = filePrintType[0] + "." + "pdf"; + //默认转为docx,只需要进行docx的替换即可 + String pdfNewUrl = filePrintRegister.getTemplatePath().replaceAll("docx", "pdf"); //3、根据关键字进行添加签章和签字 for (Map.Entry> entry : sameKeyWordSealMaps.entrySet()) { @@ -458,12 +458,12 @@ FilePrintRegisterUtils addStampUtils = new FilePrintRegisterUtils(); List electronicSealList = new ArrayList(11); int count = 0; - ElectronicImage electronicImage=defaultElectronicSignName("批准人"); + ElectronicImage electronicImage = defaultElectronicSignName("批准人"); electronicImage.setElectronicSealImageUrl(stampNameImgUr); electronicSealList.add(electronicImage); addSameKeyWordStamp(wordOldUrl, wordNewUrl, electronicSealList); // 将新word转化为pdf文件 - electronicImage=defaultElectronicSignSeal("",0); + electronicImage = defaultElectronicSignSeal("", 0); electronicImage.setElectronicSealImageUrl(stampSealImgUrl); electronicSealList.add(electronicImage); addAbsolutePathStamp(wordOldUrl, wordNewUrl, electronicImage); @@ -480,7 +480,7 @@ addStampUtils.wordToPdf(wordNewUrl, pdfNewUrl); } - protected static ElectronicImage defaultElectronicSignSeal(String keyWord,float horizontal) { + protected static ElectronicImage defaultElectronicSignSeal(String keyWord, float horizontal) { ElectronicImage electronicImage = ElectronicImage.builder() .keyWordIndex(-1) .keyWord(keyWord) @@ -492,6 +492,7 @@ .build(); return electronicImage; } + protected static ElectronicImage defaultElectronicSignName(String keyWord) { ElectronicImage electronicImage = ElectronicImage.builder() .keyWordIndex(-1) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java index 00df056..d5c918b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; +import java.io.File; import java.util.*; /** @@ -40,7 +41,7 @@ * 3、设置文件id,作为操作空间文件名称,防止对其他同时处理的证书形成影响 */ protected void initialization(FilePrintRegister filePrintRegister, String templateFileDir, BusinessCertificateReport certificateReport) { - templateFileDir = templateFileDir + certificateReport.getId() + "\\"; + templateFileDir = templateFileDir + certificateReport.getId() + File.separator; String fileName = fileRegisterMapper.getSignFileSealById(certificateReport.getTemplateId(), "system_template"); filePrintRegister.setFileName(fileName); filePrintRegister.setTemDir(templateFileDir); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 5f50360..1b66d9d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -123,4 +123,7 @@ String MESSAGE_TYPE = "messageType"; // APP全局查询类型 String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType"; + + String BUSINESS_DOWNLOAD_TYPE = "businessDownloadType"; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java index 0151de1..0e8bbfa 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/DownloadListResponse.java @@ -9,6 +9,8 @@ import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,6 +41,7 @@ private String metaModuleName; @ApiModelProperty("业务类型") + @DictCodeField(message = "业务类型描述不合法", cacheName = MeterDictCode.BUSINESS_DOWNLOAD_TYPE) private String businessDownloadType; @TableField(exist = false) @@ -67,7 +70,6 @@ private Long createUser; @ApiModelProperty("更新人id") - @ExcelProperty(value = "描述备注", order = 6) private Long updateUser; @ApiModelProperty("创建时间") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java index cb60f73..16445ab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/DownloadCenter.java @@ -57,8 +57,8 @@ private String fileType; @ApiModelProperty("描述备注") - @TableField("desc") - private String desc; + @TableField("descn") + private String descn; /** * 创建人id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index 23684ba..4ffa5ad 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -136,9 +136,9 @@ wrapper.like(StringUtils.isNotBlank(request.getFileName()), "file_name", request.getFileName()); wrapper.like(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType()); wrapper.apply(StringUtils.isNotBlank(request.getStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime().split(" ")[0]); + "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime()); wrapper.apply(StringUtils.isNotBlank(request.getEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime().split(" ")[0]); + "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime()); wrapper.eq("is_del", 0); return wrapper; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java index 0fde2e7..920d50c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java @@ -60,9 +60,9 @@ Collectors.groupingBy(ElectronicImage::getKeyWord) ); // 初始化world,pdf名称参数 - String[] filePrintType = filePrintRegister.getTemplatePath().split("\\."); String wordNewUrl = filePrintRegister.getTemplatePath(); - String pdfNewUrl = filePrintType[0] + "." + "pdf"; + //默认转为docx,只需要进行docx的替换即可 + String pdfNewUrl = filePrintRegister.getTemplatePath().replaceAll("docx", "pdf"); //3、根据关键字进行添加签章和签字 for (Map.Entry> entry : sameKeyWordSealMaps.entrySet()) { @@ -458,12 +458,12 @@ FilePrintRegisterUtils addStampUtils = new FilePrintRegisterUtils(); List electronicSealList = new ArrayList(11); int count = 0; - ElectronicImage electronicImage=defaultElectronicSignName("批准人"); + ElectronicImage electronicImage = defaultElectronicSignName("批准人"); electronicImage.setElectronicSealImageUrl(stampNameImgUr); electronicSealList.add(electronicImage); addSameKeyWordStamp(wordOldUrl, wordNewUrl, electronicSealList); // 将新word转化为pdf文件 - electronicImage=defaultElectronicSignSeal("",0); + electronicImage = defaultElectronicSignSeal("", 0); electronicImage.setElectronicSealImageUrl(stampSealImgUrl); electronicSealList.add(electronicImage); addAbsolutePathStamp(wordOldUrl, wordNewUrl, electronicImage); @@ -480,7 +480,7 @@ addStampUtils.wordToPdf(wordNewUrl, pdfNewUrl); } - protected static ElectronicImage defaultElectronicSignSeal(String keyWord,float horizontal) { + protected static ElectronicImage defaultElectronicSignSeal(String keyWord, float horizontal) { ElectronicImage electronicImage = ElectronicImage.builder() .keyWordIndex(-1) .keyWord(keyWord) @@ -492,6 +492,7 @@ .build(); return electronicImage; } + protected static ElectronicImage defaultElectronicSignName(String keyWord) { ElectronicImage electronicImage = ElectronicImage.builder() .keyWordIndex(-1) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java index 00df056..d5c918b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileDataSupport.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; +import java.io.File; import java.util.*; /** @@ -40,7 +41,7 @@ * 3、设置文件id,作为操作空间文件名称,防止对其他同时处理的证书形成影响 */ protected void initialization(FilePrintRegister filePrintRegister, String templateFileDir, BusinessCertificateReport certificateReport) { - templateFileDir = templateFileDir + certificateReport.getId() + "\\"; + templateFileDir = templateFileDir + certificateReport.getId() + File.separator; String fileName = fileRegisterMapper.getSignFileSealById(certificateReport.getTemplateId(), "system_template"); filePrintRegister.setFileName(fileName); filePrintRegister.setTemDir(templateFileDir); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java index ca4b65d..e6d50a3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/PrintFileRegister.java @@ -60,7 +60,7 @@ if (fileDataGeneric != null) { FilePrintRegister metaData = fileDataGeneric.CustomizedPrintFileRegister(printFileRegister, tempLocalFileDir); //获取文件夹目录,没有则创建 - tempLocalFileDir = tempLocalFileDir + metaData.getFileNameId() + "\\"; + tempLocalFileDir = tempLocalFileDir + metaData.getFileNameId() + File.separator; getLocalFileDir(tempLocalFileDir); //证书产生准备工作,将相应的文件下载到本地的工作空间,获取相应的模板的读取权限 for (String fileName : metaData.getBeDownloadedFileNames()) {