guomengjiao hace 9 meses
padre
commit
7f644faf2a

+ 0 - 44
modules/report/src/main/java/com/jeesite/modules/report/entity/ResearchBriefReport.java

@@ -24,12 +24,8 @@ import java.util.Date;
 		@Column(name="publish_date", attrName="publishDate", label="发布日期"),
 		@Column(name="outline", attrName="outline", label="概要"),
 		@Column(name="market_type", attrName="marketType", label="所属分类"),
-		@Column(name="file_name", attrName="fileName", label="图片名称"),
 		@Column(name="top_label_id", attrName="topLabelId", label="一级标签id"),
 		@Column(name="second_label_id", attrName="secondLabelId", label="二级标签id"),
-		@Column(name="preview_pdf_file", attrName="previewPdfFile", label="预览pdf文件"),
-		@Column(name="pdf_file", attrName="pdfFile", label="pdf文件"),
-		@Column(name="ppt_file", attrName="pptFile", label="ppt文件"),
 		@Column(name="use_down_pay", attrName="useDownPay", label="下载是否需要支付 0否 1是"),
 		@Column(name="use_down_pay_price", attrName="useDownPayPrice", label="下载需要支付单价"),
 	}, orderBy="a.update_date DESC"
@@ -41,12 +37,8 @@ public class ResearchBriefReport extends DataEntity<ResearchBriefReport> {
 	private Date publishDate;		// 发布日期
 	private String outline;		// 概要
 	private String marketType;		// 所属分类
-	private String fileName;		// 图片名称
 	private String topLabelId;		// 一级标签id
 	private String secondLabelId;		// 二级标签id
-	private String previewPdfFile;		// 预览pdf文件
-	private String pdfFile;		// pdf文件
-	private String pptFile;		// ppt文件
 	private String useDownPay;		// 下载是否需要支付 0否 1是
 	private BigDecimal useDownPayPrice;		// 下载需要支付单价
 	private Date publishDateStr;	//发布日期起
@@ -97,15 +89,6 @@ public class ResearchBriefReport extends DataEntity<ResearchBriefReport> {
 		this.marketType = marketType;
 	}
 	
-	@Size(min=0, max=128, message="图片名称长度不能超过 128 个字符")
-	public String getFileName() {
-		return fileName;
-	}
-
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-	
 	@Size(min=0, max=64, message="一级标签id长度不能超过 64 个字符")
 	public String getTopLabelId() {
 		return topLabelId;
@@ -124,33 +107,6 @@ public class ResearchBriefReport extends DataEntity<ResearchBriefReport> {
 		this.secondLabelId = secondLabelId;
 	}
 	
-	@Size(min=0, max=255, message="预览pdf文件长度不能超过 255 个字符")
-	public String getPreviewPdfFile() {
-		return previewPdfFile;
-	}
-
-	public void setPreviewPdfFile(String previewPdfFile) {
-		this.previewPdfFile = previewPdfFile;
-	}
-	
-	@Size(min=0, max=255, message="pdf文件长度不能超过 255 个字符")
-	public String getPdfFile() {
-		return pdfFile;
-	}
-
-	public void setPdfFile(String pdfFile) {
-		this.pdfFile = pdfFile;
-	}
-	
-	@Size(min=0, max=255, message="ppt文件长度不能超过 255 个字符")
-	public String getPptFile() {
-		return pptFile;
-	}
-
-	public void setPptFile(String pptFile) {
-		this.pptFile = pptFile;
-	}
-	
 	@Size(min=0, max=2, message="下载是否需要支付 0否 1是长度不能超过 2 个字符")
 	public String getUseDownPay() {
 		return useDownPay;

+ 5 - 0
modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java

@@ -2,6 +2,7 @@ package com.jeesite.modules.report.service;
 
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.CrudService;
+import com.jeesite.modules.file.utils.FileUploadUtils;
 import com.jeesite.modules.report.dao.ResearchBriefReportDao;
 import com.jeesite.modules.report.dao.ResearchBriefReportLabelDao;
 import com.jeesite.modules.report.entity.ResearchBriefReport;
@@ -75,6 +76,10 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 	@Transactional
 	public void save(ResearchBriefReport researchBriefReport) {
 		super.save(researchBriefReport);
+		FileUploadUtils.saveFileUpload(researchBriefReport,researchBriefReport.getId(),"briefing_info_image");
+		FileUploadUtils.saveFileUpload(researchBriefReport,researchBriefReport.getId(),"briefing_info_preview_pdf");
+		FileUploadUtils.saveFileUpload(researchBriefReport,researchBriefReport.getId(),"briefing_info_pdf");
+		FileUploadUtils.saveFileUpload(researchBriefReport,researchBriefReport.getId(),"briefing_info_ppt");
 	}
 	
 	/**

+ 2 - 2
web/src/main/resources/config/application.yml

@@ -907,8 +907,8 @@ msg:
   # 邮件发送参数
   email:
     beanName: emailSendService
-    fromAddress: 17798203568@163.com
-    fromPassword: LVTMfpQYCCTeucLf
+    fromAddress: wpqingfeng@163.com
+    fromPassword: GEbp9QBYWpeRsWFM
     fromHostName: smtp.163.com
     sslOnConnect: false
     sslSmtpPort: 994