diff --git a/dsp/src/main/java/com/jsc/dsp/controller/ExportController.java b/dsp/src/main/java/com/jsc/dsp/controller/ExportController.java index dd65dcb..d1c8ba5 100644 --- a/dsp/src/main/java/com/jsc/dsp/controller/ExportController.java +++ b/dsp/src/main/java/com/jsc/dsp/controller/ExportController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jsc.dsp.model.ReturnT; import com.jsc.dsp.utils.AutoExportAndUpload; import com.jsc.dsp.utils.DatabaseConnector; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -13,6 +14,7 @@ import javax.annotation.Resource; @RestController @RequestMapping("/export") +@ConditionalOnProperty(name = "switch.auto-export-and-upload", havingValue = "true", matchIfMissing = true) public class ExportController { @Resource diff --git a/dsp/src/main/java/com/jsc/dsp/model/EsDataNewsView.java b/dsp/src/main/java/com/jsc/dsp/model/EsDataNewsView.java index ac9ec5b..d6cfd5b 100644 --- a/dsp/src/main/java/com/jsc/dsp/model/EsDataNewsView.java +++ b/dsp/src/main/java/com/jsc/dsp/model/EsDataNewsView.java @@ -24,10 +24,12 @@ public class EsDataNewsView { String esSitename; String esSrcname; String esUrlcontent; + String esUrlcontentRaw; String esUrlimage; String esUrlname; String esUrltime; String esUrltitle; + String esUrltitleRaw; String esAbstract; String esKeywords; String file; diff --git a/dsp/src/main/java/com/jsc/dsp/utils/AutoExportAndUpload.java b/dsp/src/main/java/com/jsc/dsp/utils/AutoExportAndUpload.java index 1265ab1..01a3708 100644 --- a/dsp/src/main/java/com/jsc/dsp/utils/AutoExportAndUpload.java +++ b/dsp/src/main/java/com/jsc/dsp/utils/AutoExportAndUpload.java @@ -4,6 +4,7 @@ import com.jsc.dsp.service.ConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -28,6 +29,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @Component +@ConditionalOnProperty(name = "switch.auto-export-and-upload", havingValue = "true", matchIfMissing = true) public class AutoExportAndUpload { @Resource diff --git a/dsp/src/main/java/com/jsc/dsp/utils/DatabaseConnector.java b/dsp/src/main/java/com/jsc/dsp/utils/DatabaseConnector.java index 13ef2e3..563299e 100644 --- a/dsp/src/main/java/com/jsc/dsp/utils/DatabaseConnector.java +++ b/dsp/src/main/java/com/jsc/dsp/utils/DatabaseConnector.java @@ -116,18 +116,24 @@ public class DatabaseConnector { row.createCell(5).setCellValue(item.getEsDoclength()); row.createCell(6).setCellValue(item.getEsLang()); row.createCell(7).setCellValue(item.getEsLasttime()); - row.createCell(8).setCellValue(item.getEsLinks()); + if (item.getEsLinks().length() > 10000) { + row.createCell(8).setCellValue(item.getEsLinks().substring(0, 10000)); + } else { + row.createCell(8).setCellValue(item.getEsLinks()); + } row.createCell(9).setCellValue(item.getEsLoadtime()); row.createCell(10).setCellValue(item.getEsSitename()); row.createCell(11).setCellValue(item.getEsSrcname()); row.createCell(12).setCellValue(item.getEsUrlcontent()); - row.createCell(13).setCellValue(item.getEsUrlimage()); - row.createCell(14).setCellValue(item.getEsUrlname()); - row.createCell(15).setCellValue(item.getEsUrltime()); - row.createCell(16).setCellValue(item.getEsUrltitle()); - row.createCell(17).setCellValue(item.getEsAbstract()); - row.createCell(18).setCellValue(item.getEsKeywords()); - row.createCell(19).setCellValue(item.getFile()); + row.createCell(13).setCellValue(item.getEsUrlcontentRaw()); + row.createCell(14).setCellValue(item.getEsUrlimage()); + row.createCell(15).setCellValue(item.getEsUrlname()); + row.createCell(16).setCellValue(item.getEsUrltime()); + row.createCell(17).setCellValue(item.getEsUrltitle()); + row.createCell(18).setCellValue(item.getEsUrltitleRaw()); + row.createCell(19).setCellValue(item.getEsAbstract()); + row.createCell(20).setCellValue(item.getEsKeywords()); + row.createCell(21).setCellValue(item.getFile()); } logger.info("完成excel数据写入,共" + rowNum + "行"); diff --git a/dsp/src/main/resources/application.yml b/dsp/src/main/resources/application.yml index e47458a..fe43a5a 100644 --- a/dsp/src/main/resources/application.yml +++ b/dsp/src/main/resources/application.yml @@ -63,6 +63,7 @@ switch: enable-storage-service: false enable-file-dl-service: false enable-protobuf-service: false + auto-export-and-upload: true ftp: host: 144.34.185.108