Skip to content

K
know-base
提交 1c5186b7 作者: obcy
操作

Merge remote-tracking branch 'origin/master'

上级 30dbf49f 925554b9
正在显示 包含 967 行增加 和 268 行删除
pom.xml
......@@ -184,19 +184,35 @@
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<!--word-html处理工具-->
<dependency>
<groupId>com.aspose</groupId>
<artifactId>aspose-words</artifactId>
<version>15.12.0</version>
<scope>system</scope>
<systemPath>${basedir}/lib/aspose-words-15.12.0-jdk16.jar</systemPath>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.aspose</groupId>-->
<!-- <artifactId>aspose-words</artifactId>-->
<!-- <version>15.12.0</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${basedir}/lib/aspose-words-15.12.0-jdk16.jar</systemPath>-->
<!-- </dependency>-->
<dependency>
<groupId>com.aspose</groupId>
<artifactId>aspose-words</artifactId>
<version>18.6</version>
<scope>system</scope>
<systemPath>${basedir}/lib/aspose-words-18.6-jdk16-crack.jar</systemPath>
</dependency>
<dependency>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
<version>1.11</version>
</dependency>
<!-- excel工具包 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>2.2.10</version>
</dependency>
</dependencies>
<build>
......
src/main/java/com/zzsn/knowbase/controller/KbFileController.java
......@@ -59,6 +59,19 @@ public class KbFileController {
}
/**
* 预览文档接口
* @param fileName
* @param filePath
* @param userName
* @param model
* @return
*/
@GetMapping("/viewer")
public String viewerDocFile(String fileName, String filePath, String userName, Model model) {
return localFileService.viewerDocFile(fileName,filePath,userName,model);
}
/**
* 编辑文档时的回调接口
* @param request
* @param response
......
src/main/java/com/zzsn/knowbase/controller/KnowledgeController.java
......@@ -6,11 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zzsn.knowbase.entity.KbAuthorizedUser;
import com.zzsn.knowbase.entity.KnowFile;
import com.zzsn.knowbase.entity.Knowledge;
import com.zzsn.knowbase.entity.KnowledgeExcel;
import com.zzsn.knowbase.service.IKnowledgeService;
import com.zzsn.knowbase.service.ILocalFileService;
import com.zzsn.knowbase.util.DocUtil;
import com.zzsn.knowbase.util.HttpUtil;
import com.zzsn.knowbase.util.SpringContextUtils;
import com.zzsn.knowbase.util.*;
import com.zzsn.knowbase.vo.IntelligentQaParam;
import com.zzsn.knowbase.vo.KnowledgeParam;
import com.zzsn.knowbase.vo.KnowledgeVO;
......@@ -26,7 +25,11 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.util.WebUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
......@@ -101,6 +104,7 @@ public class KnowledgeController {
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
List<Result<KnowFile>> resultList = localFileService.upload(fileMap);
KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
knowledge.setImportData(0);
CompletableFuture.runAsync(()-> this.add(resultList,knowledge,userInfo));
return Result.OK("添加成功！");
}
......@@ -137,7 +141,7 @@ public class KnowledgeController {
*/
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "ids") String ids) {
CompletableFuture.runAsync(()-> knowledgeService.deleteKnowledge(ids));
knowledgeService.deleteKnowledge(ids);
return Result.OK("删除成功!");
}
......@@ -168,4 +172,33 @@ public class KnowledgeController {
}
return Result.error("响应失败");
}
/**
* 通过excel导入
*
* @return
*/
@RequestMapping(value = "/importInfo", method = RequestMethod.POST)
public Result<?> importInfo(HttpServletRequest request, HttpServletResponse response) {
KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
assert userInfo != null;
knowledgeService.doImportInfo(request,userInfo.getId());
return Result.OK("导入正在后台进行");
}
/**
* 下载导入模板
*/
@RequestMapping(value = "/download")
public Result<?> download(HttpServletRequest request, HttpServletResponse response) {
try {
File fileDir = ExcelExportUtil.getFileDir();
List<KnowledgeExcel> dataList = new ArrayList<>();
String filePath = fileDir.getAbsolutePath() + File.separator + "info.xlsx";
ExcelExportUtil.writeExcelFront(dataList, "知识库列表导入模板", filePath, KnowledgeExcel.class);
ExcelExportUtil.download(response, filePath, true);
} catch (Exception e) {
e.printStackTrace();
}
return Result.OK();
}
}
src/main/java/com/zzsn/knowbase/entity/Knowledge.java
......@@ -102,6 +102,7 @@ public class Knowledge implements Serializable {
* 知识库id
*/
private String kbKnowledgeId;
private String content;
/**
* 类型
*/
......@@ -111,6 +112,7 @@ public class Knowledge implements Serializable {
private List<Content> contents;
private List<KnowFile> files;
private Integer score;
private Integer importData;
}
......
src/main/java/com/zzsn/knowbase/entity/KnowledgeExcel.java 0 → 100644
package com.zzsn.knowbase.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.List;
/**
* @Description: 知识
* @Author: chenshiqiang
* @Version: V1.0
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class KnowledgeExcel {
/**
* 标题
*/
@ExcelProperty(value = "标题", index = 0)
private String title;
@ExcelProperty(value = "正文", index = 1)
private String content;
/**
* 作者
*/
@ExcelProperty(value = "作者", index = 2)
private String author;
/**
* 来源
*/
@ExcelProperty(value = "来源", index = 3)
private String origin;
/**
* 发布时间
*/
@ExcelProperty(value = "发布时间", index = 4)
private String publishDate;
}
src/main/java/com/zzsn/knowbase/kafka/cloudstream/KnowledgeChannel.java
......@@ -3,6 +3,8 @@ package com.zzsn.knowbase.kafka.cloudstream;
import org.springframework.cloud.stream.annotation.Output;
import org.springframework.messaging.MessageChannel;
import java.net.DatagramSocket;
/**
* @author chenshiqiang
* @Description 知识信息通道
......@@ -18,5 +20,6 @@ public interface KnowledgeChannel {
@Output
MessageChannel knowledgeContents();
@Output
MessageChannel knowledgeExcelContents();
}
src/main/java/com/zzsn/knowbase/kafka/message/KnowledgeMessage.java
......@@ -35,6 +35,7 @@ public class KnowledgeMessage {
* 审核状态
*/
private Integer verifyStatus;
private Integer verifyTime;
/**
* 审核人名字
*/
......@@ -48,6 +49,7 @@ public class KnowledgeMessage {
* 类型
*/
private String type;
private String author;
private List<Content> contents;
......
src/main/java/com/zzsn/knowbase/kafka/producer/ProduceInfo.java
......@@ -32,4 +32,10 @@ public class ProduceInfo {
Message<String> message = MessageBuilder.withPayload(msg).build();
channel.knowledgeContents().send(message);
}
public void sendKnowledgeExcelContents(KnowledgeMessage knowledgeMessage) {
String msg = JSON.toJSONString(knowledgeMessage);
Message<String> message = MessageBuilder.withPayload(msg).build();
channel.knowledgeExcelContents().send(message);
}
}
src/main/java/com/zzsn/knowbase/service/IKnowledgeService.java
......@@ -6,6 +6,9 @@ import com.zzsn.knowbase.entity.KnowFile;
import com.zzsn.knowbase.entity.Knowledge;
import com.zzsn.knowbase.vo.KnowledgeParam;
import com.zzsn.knowbase.vo.KnowledgeVO;
import com.zzsn.knowbase.vo.Result;
import javax.servlet.http.HttpServletRequest;
/**
* @Description: 知识服务
......@@ -45,4 +48,8 @@ public interface IKnowledgeService {
IPage<KnowledgeVO> listFromPython(KnowledgeParam knowledgeParam, Integer pageNo, Integer pageSize, String column, String order);
KnowledgeVO getById(String id);
Result<?> doImportInfo(HttpServletRequest request,String userId);
void doExcel(HttpServletRequest request, String fileSuffix,String userId);
}
src/main/java/com/zzsn/knowbase/service/ILocalFileService.java
......@@ -56,6 +56,16 @@ public interface ILocalFileService {
String editDocFile(String fileName, String filePath, String userName, Model model);
/**
* 预览文档
* @param fileName
* @param filePath
* @param userName
* @param model
* @return
*/
String viewerDocFile(String fileName, String filePath, String userName, Model model);
/**
* 编辑文档时的回调接口
* @param request
* @param response
......
src/main/java/com/zzsn/knowbase/service/impl/AsyncService.java 0 → 100644
package com.zzsn.knowbase.service.impl;
import com.zzsn.knowbase.service.IKnowledgeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
/**
* Description: 异步处理service
* Author: EDY
* Date: 2023/7/26
*/
@Service
public class AsyncService {
@Autowired
@Lazy
IKnowledgeService knowledgeService;
//异步执行文件解析
@Async
public void doimport(HttpServletRequest request, String fileSuffix,String userId) {
knowledgeService.doExcel(request, fileSuffix,userId);
}
}
src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java
......@@ -8,14 +8,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zzsn.knowbase.constant.Constants;
import com.zzsn.knowbase.entity.*;
import com.zzsn.knowbase.enums.KnowTypeEnum;
import com.zzsn.knowbase.kafka.message.KnowledgeMessage;
import com.zzsn.knowbase.kafka.producer.ProduceInfo;
import com.zzsn.knowbase.service.IKnowledgeService;
import com.zzsn.knowbase.service.KbKnowledgeProjectService;
import com.zzsn.knowbase.service.KbKnowledgeProjectTypeService;
import com.zzsn.knowbase.util.*;
import com.zzsn.knowbase.vo.KnowledgeParam;
import com.zzsn.knowbase.vo.KnowledgeVO;
import com.zzsn.knowbase.vo.Result;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -36,11 +37,16 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
......@@ -60,6 +66,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
@Autowired
private KbKnowledgeProjectService knowledgeProjectService;
@Autowired
private KbKnowledgeProjectTypeService kbKnowledgeProjectTypeService;
@Autowired
private ProduceInfo produceInfo;
@Value("${python.searchUrl:}")
private String searchUrl;
......@@ -71,6 +79,9 @@ class KnowledgeServiceImpl implements IKnowledgeService {
@Value("${files.storage}")
String filesStorage;
@Autowired
private AsyncService asyncService;
@Override
public void addKnowledge(KnowFile knowFile, Knowledge knowledge, KbAuthorizedUser userInfo) {
......@@ -78,60 +89,68 @@ class KnowledgeServiceImpl implements IKnowledgeService {
if (null == knowledge.getVerifyStatus()) {
knowledge.setVerifyStatus(0);
}
knowledge.setCreateTime(cn.hutool.core.date.DateUtil.formatDateTime(new Date()).replace(" ", "T"));
knowledge.setDeleteFlag(0);
List<KnowFile> knowFileList = new ArrayList<>();
knowFileList.add(knowFile);
knowledge.setFiles(knowFileList);
List<Content> contentList = new ArrayList<>();
List<String> contentStringList = new ArrayList<>();
String html = null;
try {
File file = new File(filesStorage + knowledge.getFiles().get(0).getFilePath());
html = DocUtil.convertDocStream2Html(new FileInputStream(file));
String htmlWithTable = html.replace("</p>", "######</p>");
htmlWithTable = htmlWithTable.replace("</title>", "######</title>");
htmlWithTable = htmlWithTable.replace("</h1>", "######</h1>");
contentStringList = Arrays.asList(htmlWithTable.split("######"));
} catch (Exception e) {
e.printStackTrace();
}
KnowledgeMessage knowledgeMessage = new KnowledgeMessage();
if (Integer.valueOf("0").equals(knowledge.getImportData())) {
List<KnowFile> knowFileList = new ArrayList<>();
knowFileList.add(knowFile);
knowledge.setFiles(knowFileList);
List<Content> contentList = new ArrayList<>();
List<String> contentStringList = new ArrayList<>();
String html = null;
try {
File file = new File(filesStorage + knowledge.getFiles().get(0).getFilePath());
html = DocUtil.convertDocStream2Html(new FileInputStream(file));
String htmlWithTable = html.replace("</p>", "######</p>");
htmlWithTable = htmlWithTable.replace("</title>", "######</title>");
htmlWithTable = htmlWithTable.replace("</h1>", "######</h1>");
contentStringList = Arrays.asList(htmlWithTable.split("######"));
} catch (Exception e) {
e.printStackTrace();
}
if (null == knowledge.getTitle()) {
for (String tem : contentStringList) {
String text = Jsoup.parse(tem).text();
log.info("info:{}", text);
if ((!tem.contains("<title>"))&&(!text.isEmpty())) {
knowledge.setTitle(text);
break;
if (null == knowledge.getTitle()) {
for (String tem : contentStringList) {
String text = Jsoup.parse(tem).text();
log.info("info:{}", text);
if ((!tem.contains("<title>")) && (!text.isEmpty())) {
knowledge.setTitle(text);
break;
}
}
}
}
List<String> messageContentList = contentStringList.stream()
.filter(item -> !item.contains("<img"))
.filter(item -> !item.contains("<table"))
.filter(item -> !item.contains("<tr>"))
.filter(item -> !item.contains("</tr>"))
.filter(item -> !item.contains("<td>"))
.filter(item -> !item.contains("</td>"))
.map(item -> Jsoup.parse(item).text())
.collect(Collectors.toList());
messageContentList = messageContentList.
stream().filter(item -> item.length() > 10)
.collect(Collectors.toList());
if (!messageContentList.isEmpty()) {
for (String tem : messageContentList) {
contentList.add(Content.builder()
.contentId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8))
.content(tem)
.build());
List<String> messageContentList = contentStringList.stream()
.filter(item -> !item.contains("<img"))
.filter(item -> !item.contains("<table"))
.filter(item -> !item.contains("<tr>"))
.filter(item -> !item.contains("</tr>"))
.filter(item -> !item.contains("<td>"))
.filter(item -> !item.contains("</td>"))
.map(item -> Jsoup.parse(item).text())
.collect(Collectors.toList());
messageContentList = messageContentList.
stream().filter(item -> item.length() > 10)
.collect(Collectors.toList());
if (!messageContentList.isEmpty()) {
for (String tem : messageContentList) {
contentList.add(Content.builder()
.contentId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8))
.content(tem)
.build());
}
}
knowledge.setContents(contentList);
knowledgeMessage.setContents(contentList);
} else {
if (null == knowledge.getContents().get(0).getContentId()) {
knowledge.getContents().get(0).setContentId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8));
}
knowledgeMessage.setContents(knowledge.getContents());
}
knowledge.setContents(contentList);
//id为空表示新增
if (null == knowledge.getId()) {
knowledge.setId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8));
......@@ -142,15 +161,10 @@ class KnowledgeServiceImpl implements IKnowledgeService {
}
//删除
deleteForPython(knowledge.getId());
KnowledgeMessage knowledgeMessage = new KnowledgeMessage();
BeanUtils.copyProperties(knowledge, knowledgeMessage);
// CleanerProperties props = new CleanerProperties();
// props.setPruneTags("table");
// String htmlWithoutTable = new HtmlCleaner(props).clean(html).getText().toString();
// htmlWithoutTable = htmlWithoutTable.replace("<p>", "");
// List<String>contentStringWithoutTableList = Arrays.asList(htmlWithoutTable.split("</p>"));
knowledgeMessage.setType(knowledge.getTypeId());
knowledgeMessage.setContents(contentList);
produceInfo.sendKnowledgeContents(knowledgeMessage);
}
......@@ -164,7 +178,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
String[] split = ids.split(",");
for (String id : split) {
esOpUtil.docDeleteById(Constants.ES_DATA_FOR_KNOWLEDGE, id);
deleteForPython(id);
CompletableFuture.runAsync(() -> deleteForPython(id));
}
}
......@@ -360,7 +374,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
if (null == userInfo) {
return null;
}
if (Integer.valueOf("0").equals(userInfo.getIsAll())) {
if (!Integer.valueOf("0").equals(userInfo.getIsAll())) {
List<KbAuthuserKnowledgeprojectMap> permitKnowProjectList = knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
//all permit
List<String> allPermitList = permitKnowProjectList.stream()
......@@ -372,19 +386,16 @@ class KnowledgeServiceImpl implements IKnowledgeService {
.filter(item -> item.getSign() == 1)
.map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
.collect(Collectors.toList());
permitKnowList = knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(), knowPermitList);
if (!knowPermitList.isEmpty()) {
permitKnowList = knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(), knowPermitList);
}
catList = (List<String>) CollectionUtils.intersection(treeList, allPermitList);
} else {
catList = treeList;
}
StringBuilder typeNames = new StringBuilder();
if (null != knowledgeParam.getTypeIds()) {
for (String type : knowledgeParam.getTypeIds().split(",")) {
typeNames.append(KnowTypeEnum.getByType(type).getDes()).append(",");
}
}
List<String> split = Arrays.asList(knowledgeParam.getTypeIds().split(","));
JSONObject params = new JSONObject();
params.put("type", typeNames);
params.put("type", split);
params.put("startTime", knowledgeParam.getStartTime());
params.put("endTime", knowledgeParam.getEndTime());
params.put("author", knowledgeParam.getAuthor());
......@@ -392,7 +403,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
params.put("verifierName", knowledgeParam.getVerifierName());
params.put("verifyStatus", knowledgeParam.getVerifyStatus());
params.put("verifyStartTime", knowledgeParam.getVerifyStartTime());
// params.put("knowledge_base_id", treeList);
params.put("knowledge_base_id", knowledgeParam.getKbKnowledgeId().split(","));
params.put("id", permitKnowList);
params.put("knowledgeProjectId", catList);
params.put("verifyEndTime", knowledgeParam.getVerifyEndTime());
......@@ -408,12 +419,12 @@ class KnowledgeServiceImpl implements IKnowledgeService {
} catch (IOException e) {
e.printStackTrace();
}
if (result == null || !result.contains("results")) {
if (result == null || !result.contains("result")) {
return null;
}
JSONObject jsonObject = JSONObject.parseObject(result);
data = jsonObject.get("results");
redisUtil.set(genKey(knowledgeParam), data, 100000000);
data = jsonObject.get("result");
redisUtil.set(genKey(knowledgeParam), data, 1);
}
JSONArray jsonArray = JSONObject.parseArray(data.toString());
List<KnowledgeVO> knowledgeList = new ArrayList<>(jsonArray.size());
......@@ -421,6 +432,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
JSONObject one = JSONObject.parseObject(o.toString());
knowledgeList.add(KnowledgeVO.builder()
.id((String) one.get("id"))
.title((String) one.get("title"))
.author((String) one.get("author"))
.score((int) one.get("score"))
.verifyStatus("".equals(one.get("verifyStatus")) ? 0 : Integer.parseInt(one.get("verifyStatus").toString()))
.verifyTime(one.get("verifyTime").toString())
......@@ -445,6 +458,101 @@ class KnowledgeServiceImpl implements IKnowledgeService {
return null;
}
@Override
public Result<?> doImportInfo(HttpServletRequest request, String userId) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
if (fileMap.size() < 1) {
return Result.error("请上传excel或者word文件");
}
MultipartFile multipartFile = fileMap.get(new ArrayList<String>(fileMap.keySet()).get(0));
int index = multipartFile.getOriginalFilename().lastIndexOf(".");
String fileSuffix = multipartFile.getOriginalFilename().substring(index + 1);
if ("doc".equals(fileSuffix) || "docx".equals(fileSuffix) || "xls".equals(fileSuffix) || "xlsx".equals(fileSuffix)) {
asyncService.doimport(request, fileSuffix, userId);
return Result.OK("已进行处理");
} else {
return Result.error("不支持的文件类型");
}
}
@Override
public void doExcel(HttpServletRequest request, String fileSuffix, String userId) {
String kbKnowledgeId = request.getParameter("kbKnowledgeId");
String knowledgeProjectId = request.getParameter("knowledgeProjectId");
String typeId = request.getParameter("typeId");
try {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
MultipartFile multipartFile = fileMap.get(new ArrayList<String>(fileMap.keySet()).get(0));
//1.上传文件到文件服务器
// 将MultipartFile的文件内容保存到字节数组
byte[] fileData = multipartFile.getBytes();
List<List<String>> lists = ExcelExportUtil.readExcel(new ByteArrayInputStream(fileData), 1, 5);
//存入es
importInfo(lists, kbKnowledgeId, knowledgeProjectId, typeId, userId);
} catch (Exception e) {
e.printStackTrace();
}
}
//导入发布库数据
public void importInfo(List<List<String>> lists, String kbKnowledgeId, String knowledgeProjectId, String typeId, String createBy) {
for (List<String> info : lists) {
try {
Knowledge specialInformation = Knowledge.builder()
.kbKnowledgeId(kbKnowledgeId)
.knowledgeProjectId(knowledgeProjectId)
.typeId(typeId)
.createBy(createBy)
.verifyStatus(0)
.importData(1)
.build();
specialInformation.setId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8));
if (StringUtils.isNotEmpty(info.get(0))) {
specialInformation.setTitle(info.get(0));
} else {
log.error("上传的数据{}标题为空，此条数据忽略", info.get(0));
continue;
}
if (StringUtils.isNotEmpty(info.get(1))) {
specialInformation.setContent(info.get(1));
//段落切分
specialInformation.setContents(Collections.singletonList(Content.builder()
.contentId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8))
.content(info.get(1)).build()));
} else {
log.error("上传的数据{}正文为空，此条数据忽略", info.get(0));
continue;
}
if (StringUtils.isNotEmpty(info.get(2))) {
specialInformation.setAuthor(info.get(2));
}
if (StringUtils.isNotEmpty(info.get(3))) {
specialInformation.setOrigin(info.get(3));
}
if (StringUtils.isNotEmpty(info.get(4))) {
specialInformation.setPublishDate(EsDateUtil.esFieldDateFormat(info.get(4)));
}
specialInformation.setDeleteFlag(0);
specialInformation.setCreateTime(cn.hutool.core.date.DateUtil.format(new Date(), "yyyy-MM-dd'T'HH:mm:ss"));
esOpUtil.docSavaByEntity(Constants.ES_DATA_FOR_KNOWLEDGE, specialInformation.getId(), specialInformation);
KnowledgeMessage knowledgeMessage = new KnowledgeMessage();
BeanUtils.copyProperties(specialInformation, knowledgeMessage);
knowledgeMessage.setType(specialInformation.getTypeId());
knowledgeMessage.setContents(specialInformation.getContents());
produceInfo.sendKnowledgeExcelContents(knowledgeMessage);
} catch (NumberFormatException e) {
log.error("处理异常");
}
}
}
private String genKey(KnowledgeParam knowledgeParam) {
String type = (knowledgeParam.getTypeIds() == null ? "" : knowledgeParam.getTypeIds());
String knowledgeProjectId = (knowledgeParam.getKnowledgeProjectId() == null ? "" : knowledgeParam.getKnowledgeProjectId());
......
src/main/java/com/zzsn/knowbase/service/impl/LocalFileServiceImpl.java
......@@ -164,12 +164,23 @@ public class LocalFileServiceImpl implements ILocalFileService {
model.addAttribute("document", document);
// 如果该格式不支持编辑，则返回预览页面
if (!documentService.canEdit(document)) {
return "/demo";
return "/view";
}
model.addAttribute("documentEditParam", documentService.buildDocumentEditParam(userName, userName,filePath));
return "/editor";
}
@Override
public String viewerDocFile(String fileName, String filePath, String userName, Model model) {
Document document = documentService.getDocument(documentService.buildDocument(filePath, fileName));
model.addAttribute("document", document);
// // 如果该格式不支持编辑，则返回预览页面
// if (!documentService.canEdit(document)) {
// return "/view";
// }
model.addAttribute("documentEditParam", documentService.buildDocumentEditParam(userName, userName,filePath));
return "/view";
}
//编辑文档时回调接口
@Override
public void callBack(HttpServletRequest request, HttpServletResponse response) throws IOException{
......@@ -279,16 +290,11 @@ public class LocalFileServiceImpl implements ILocalFileService {
@Override
public Result<?> editKnowledge(Knowledge knowledge) {
Result result = Result.OK();
String id = knowledge.getId();
if(id == null || "".equals(id))
return Result.error("文章id不能为空");
String publish = EsDateUtil.esFieldDateFormat(knowledge.getPublishDate());
knowledge.setPublishDate(publish);
KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
knowledge.setUpdateBy(userInfo.getName());
knowledge.setUpdateTime(cn.hutool.core.date.DateUtil.formatDateTime(new Date()).replace(" ", "T"));
......@@ -299,30 +305,38 @@ public class LocalFileServiceImpl implements ILocalFileService {
knowledge.setVerifierId(userInfo.getUserId());
knowledge.setVerifierName(userInfo.getUsername());
List<KnowFile> files = knowledge.getFiles();
KnowFile knowFile = files.get(0);
String filePath = knowFile.getFilePath();
try {
getDoucmentEditStatus(filePath,knowFile.getFileName());
} catch (ParseException e) {
e.printStackTrace();
result = Result.error("文件保存失败！");
}
if(Integer.valueOf("0").equals(knowledge.getImportData())){
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
List<KnowFile> files = knowledge.getFiles();
KnowFile knowFile = files.get(0);
String filePath = knowFile.getFilePath();
try {
getDoucmentEditStatus(filePath,knowFile.getFileName());
} catch (ParseException e) {
e.printStackTrace();
result = Result.error("文件保存失败！");
}
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
String fileType = fileUtility.getFileType(knowFile.getFileName());
knowFile.setFileType(fileType);
File file = new File(filesStorage + knowFile.getFilePath());
Long size = file.length();
knowFile.setFileSize(size);
knowledgeService.addKnowledge(knowFile,knowledge,userInfo);
String fileType = fileUtility.getFileType(knowFile.getFileName());
knowFile.setFileType(fileType);
File file = new File(filesStorage + knowFile.getFilePath());
Long size = file.length();
knowFile.setFileSize(size);
knowledgeService.addKnowledge(knowFile,knowledge,userInfo);
}else {
knowledgeService.addKnowledge(null,knowledge,userInfo);
}
return result;
}
public ResponseEntity<Object> getDoucmentEditStatus(String filePath,String fileName) throws ParseException {
String url = officeUrl+officeCommand;
......
src/main/java/com/zzsn/knowbase/util/DocUtil.java
......@@ -139,20 +139,21 @@ public class DocUtil {
* @throws Exception
*/
public static byte[] convertDocHtml2Doc(String content, Boolean isPage) throws Exception {
getLicense();
if (SystemUtils.IS_OS_LINUX) {
logger.info("doc set font folder");
FontSettings.setFontsFolder(fontsPath, false);
}
Document doc = new Document();
DataByteArrayOutputStream dataByteArrayOutputStream = new DataByteArrayOutputStream();
DocumentBuilder builder = new DocumentBuilder(doc);
if (!isPage)
content = convertDocHtml2Page(content);
builder.insertHtml(content);
doc.save(dataByteArrayOutputStream, SaveFormat.DOCX);
return dataByteArrayOutputStream.getData();
// getLicense();
// if (SystemUtils.IS_OS_LINUX) {
// logger.info("doc set font folder");
// FontSettings.setFontsFolder(fontsPath, false);
// }
// Document doc = new Document();
// DataByteArrayOutputStream dataByteArrayOutputStream = new DataByteArrayOutputStream();
// DocumentBuilder builder = new DocumentBuilder(doc);
// if (!isPage)
// content = convertDocHtml2Page(content);
// builder.insertHtml(content);
// doc.save(dataByteArrayOutputStream, SaveFormat.DOCX);
//
// return dataByteArrayOutputStream.getData();
return null;
}
/**
......@@ -160,39 +161,39 @@ public class DocUtil {
* @return
* @throws Exception
*/
public static byte[] convertDocHtml2Png(String content, Boolean isPage) throws Exception {
getLicense();
if (SystemUtils.IS_OS_LINUX) {
logger.info("cover png set font folder");
FontSettings.setFontsFolder(fontsPath, false);
}
Document doc = new Document();
DataByteArrayOutputStream dataByteArrayOutputStream = new DataByteArrayOutputStream();
DocumentBuilder builder = new DocumentBuilder(doc);
if (!isPage)
content = convertDocHtml2Page(content);
builder.insertHtml(content);
doc.save(dataByteArrayOutputStream, SaveFormat.PNG);
return dataByteArrayOutputStream.getData();
}
public static byte[] convertDocHtml2Pdf(String content, boolean isPage) throws Exception {
getLicense();
if (SystemUtils.IS_OS_LINUX) {
logger.info("pdf set font folder");
FontSettings.setFontsFolder(fontsPath, false);
}
Document doc = new Document();
DataByteArrayOutputStream dataByteArrayOutputStream = new DataByteArrayOutputStream();
DocumentBuilder builder = new DocumentBuilder(doc);
if (!isPage)
content = convertDocHtml2Page(content);
builder.insertHtml(content);
doc.save(dataByteArrayOutputStream, SaveFormat.PDF);
// public static byte[] convertDocHtml2Png(String content, Boolean isPage) throws Exception {
// getLicense();
// if (SystemUtils.IS_OS_LINUX) {
// logger.info("cover png set font folder");
// FontSettings.setFontsFolder(fontsPath, false);
// }
// Document doc = new Document();
// DataByteArrayOutputStream dataByteArrayOutputStream = new DataByteArrayOutputStream();
// DocumentBuilder builder = new DocumentBuilder(doc);
// if (!isPage)
// content = convertDocHtml2Page(content);
// builder.insertHtml(content);
// doc.save(dataByteArrayOutputStream, SaveFormat.PNG);
//
// return dataByteArrayOutputStream.getData();
// }
return dataByteArrayOutputStream.getData();
}
// public static byte[] convertDocHtml2Pdf(String content, boolean isPage) throws Exception {
// getLicense();
// if (SystemUtils.IS_OS_LINUX) {
// logger.info("pdf set font folder");
// FontSettings.setFontsFolder(fontsPath, false);
// }
// Document doc = new Document();
// DataByteArrayOutputStream dataByteArrayOutputStream = new DataByteArrayOutputStream();
// DocumentBuilder builder = new DocumentBuilder(doc);
// if (!isPage)
// content = convertDocHtml2Page(content);
// builder.insertHtml(content);
// doc.save(dataByteArrayOutputStream, SaveFormat.PDF);
//
// return dataByteArrayOutputStream.getData();
// }
/**
......
src/main/java/com/zzsn/knowbase/util/ExcelExportUtil.java 0 → 100644
package com.zzsn.knowbase.util;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.style.WriteCellStyle;
import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.zzsn.knowbase.entity.KnowledgeExcel;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
public class ExcelExportUtil {
/**
* 读取excel数据
*
* @param firstRow 第一行有用数据(0表示第一行)
* @param columnNum 有用数据的总列数
* @return java.util.List<java.util.List < java.lang.String>>
*/
public static List<List<String>> readExcel(InputStream inputStream, Integer firstRow, Integer columnNum) throws Exception {
List<List<String>> dataList = new ArrayList<>();
//获取整个excel
XSSFWorkbook hb = new XSSFWorkbook(inputStream);
int sheets = hb.getNumberOfSheets();
for (int i = 0; i < sheets; i++) {
XSSFSheet sheet = hb.getSheetAt(i);
//第一行
int firstRowNum = sheet.getFirstRowNum();
//最后一行
int lastRowNum = sheet.getPhysicalNumberOfRows();
for (int j = firstRowNum + firstRow; j < lastRowNum; j++) {
//获取行
XSSFRow row = sheet.getRow(j);
if (row != null) {
List<String> list = new ArrayList<>();
for (int m = 0; m < columnNum; m++) {
String data = ExcelExportUtil.getValue(row.getCell(m)).trim();
list.add(data);
}
dataList.add(list);
}
}
}
return dataList;
}
public static String getValue(XSSFCell xssfCell) {
if (xssfCell == null || xssfCell.toString().trim().equals("")) {
return "";
}
int cellType = xssfCell.getCellType();
if (cellType == HSSFCell.CELL_TYPE_NUMERIC) {
if (HSSFDateUtil.isCellDateFormatted(xssfCell)) {
return TimeUtil.getDateString(xssfCell.getDateCellValue());
} else {
//防止数字变成科学计数法的形式
DecimalFormat df = new DecimalFormat("0");
return df.format(xssfCell.getNumericCellValue());
}
} else {
return xssfCell.getStringCellValue();
}
}
public static File getFileDir() {
// 构建上传文件的存放 "文件夹" 路径
String fileDirPath = new String("src/main/resources/static/uploadFiles" );
File fileDir = new File(fileDirPath);
if (!fileDir.exists()) {
// 递归生成文件夹
fileDir.mkdirs();
}
return fileDir;
}
/**
* 导出
* @param data
* @param sheetName
* @param filePath
* @param clazz
* @throws Exception
*/
public static Boolean writeExcelFront(List data, String sheetName, String filePath, Class clazz) throws Exception {
//表头样式
System.out.println("开始写入");
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
//设置表头居中对齐
headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
//内容样式
WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
//设置内容靠左对齐
contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT);
HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
int total = data.size();//总数
int max = 50000;//每sheet页允许最大数
int avg = total / max;//sheet页个数
ExcelWriter excelWriter= EasyExcel.write(filePath, clazz).excelType(ExcelTypeEnum.XLSX).registerWriteHandler(horizontalCellStyleStrategy).build();
try{
for (int j = 0; j < avg + 1; j++) {
String sheetnames=sheetName;
int num = j * max;
List dataList1 = new ArrayList<>();
if (StringUtils.isNotBlank(sheetnames)) {
sheetnames = sheetnames + (j + 1);
} else {
sheetnames = j + "";
}
for (int n = num; n < total; n++) {//n即为每个sheet页应该开始的数
if(n>=num+50000){
break;
}
dataList1.add(data.get(n));//从总的list数据里面取出该处于哪个sheet页的数据，然后加进exportList，exportList即为当前sheet页应该有的数据
}
WriteSheet writeSheet = EasyExcel.writerSheet(j, sheetnames).build();
excelWriter.write(dataList1,writeSheet);
}
}finally {
// 千万别忘记finish 会帮忙关闭流
if (excelWriter != null) {
excelWriter.finish();
}
}
System.out.println("写入完成");
return true;
}
public static void download(HttpServletResponse response, String filePath, boolean delete) throws UnsupportedEncodingException {
File file = new File(filePath);
if (file.exists()) {
response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(file.getName(), "utf8"));
//加上设置大小 下载下来的excel文件才不会在打开前提示修复
response.addHeader("Content-Length", String.valueOf(file.length()));
byte[] buffer = new byte[1024];
//输出流
OutputStream os = null;
FileInputStream fis = null;
BufferedInputStream bis = null;
try {
fis = new FileInputStream(file);
bis = new BufferedInputStream(fis);
os = response.getOutputStream();
int i = bis.read(buffer);
while (i != -1) {
os.write(buffer);
os.flush();
i = bis.read(buffer);
}
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (os != null) {
os.close();
}
if (fis != null) {
fis.close();
}
if (bis != null) {
bis.close();
}
} catch (IOException e) {
e.printStackTrace();
}
}
if (delete) {
//文件下载结束后，删除上传到项目的文件
file.delete();
}
}
}
}
src/main/java/com/zzsn/knowbase/util/TimeUtil.java 0 → 100644
package com.zzsn.knowbase.util;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class TimeUtil {
static SimpleDateFormat format;
private static Pattern patDate0 = Pattern.compile("\\d+-\\d{1,2}-\\d+");
private static Pattern patDate1 = Pattern.compile("\\d+[-\\s/年月日]\\d{1,2}-\\d+", Pattern.CASE_INSENSITIVE);
private static Pattern patDate2 = Pattern.compile("\\d+\\s+[A-Z][a-z]+\\s+\\d+");
private static Pattern patDate3 = Pattern.compile("[A-Z][a-z.]+\\s+\\d{1,2},\\s+\\d+");
private static Pattern patDate4 = Pattern.compile("\\d+年\\d+月\\d+日");
private static Pattern patDate4_1 = Pattern.compile("\\d+年\\d+月\\d+号");
private static Pattern patDate5 = Pattern.compile("\\d+/\\d{1,2}/\\d+");
private static Pattern patDate6 = Pattern.compile("\\d+\\.\\d+\\.\\d+");
private static Date thresholdDate = null;
private static SimpleDateFormat formatter0 = new SimpleDateFormat("yyyy-MM-dd");
private static SimpleDateFormat formatter0_1 = new SimpleDateFormat("yy-MM-dd");
private static SimpleDateFormat formatter2 = new SimpleDateFormat("dd MMM yyyy", Locale.ENGLISH);
private static SimpleDateFormat formatter3_1 = new SimpleDateFormat("MMM dd, yyyy", Locale.ENGLISH);
private static SimpleDateFormat formatter3_2 = new SimpleDateFormat("MMM. dd, yyyy", Locale.ENGLISH);
private static SimpleDateFormat formatter4 = new SimpleDateFormat("yyyy年MM月dd");
private static SimpleDateFormat formatter5_1 = new SimpleDateFormat("yyyy/MM/dd");
private static SimpleDateFormat formatter5_2 = new SimpleDateFormat("dd/MM/yyyy");
private static SimpleDateFormat formatter5_4 = new SimpleDateFormat("yy/MM/dd");
private static SimpleDateFormat formatter5_3 = new SimpleDateFormat("dd/MM/yy");
private static SimpleDateFormat formatter6 = new SimpleDateFormat("yyyy.MM.dd");
private static SimpleDateFormat formatter6_1 = new SimpleDateFormat("dd.MM.yyyy");
public static String dateToString(Date date) {
format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return TimeUtil.format.format(date);
}
public static String getPublishDate(String raw) {
if (raw == null) {
return null;
}
Date date = transDate(raw);
if (date != null) {
Calendar c = Calendar.getInstance(TimeZone.getTimeZone("Asia/Shanghai"));
c.setTime(date);
Pattern p = Pattern.compile("(\\d{1,2})[:|：](\\d{1,2})([:|：]\\d{1,2}){0,1}");
Matcher m = p.matcher(raw);
while (m.find()) {
String hour = m.group(1);
if (hour != null) {
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour));
}
String minute = m.group(2);
if (minute != null) {
c.set(Calendar.MINUTE, Integer.parseInt(minute));
}
String second = m.group(3);
if (second != null) {
c.set(Calendar.SECOND, Integer.parseInt(second.replaceAll("[:：]", "")));
}
}
return format(c.getTime(), "yyyy-MM-dd");
} else {
return null;
}
}
private static String format(Date d, String format) {
if (d == null)
return "";
SimpleDateFormat myFormatter = new SimpleDateFormat(format);
return myFormatter.format(d);
}
private static Date transDate(String content) {
try {
Matcher dateMatcher = null;
Date date = null;
if (((dateMatcher = patDate0.matcher(content)).find() && ((date = transDate(dateMatcher.group(), 0)) != null))
|| ((dateMatcher = patDate1.matcher(content)).find() && ((date = transDate(dateMatcher.group(), 1)) != null))
|| ((dateMatcher = patDate2.matcher(content)).find() && ((date = transDate(dateMatcher.group(), 2)) != null))
|| ((dateMatcher = patDate3.matcher(content)).find() && ((date = transDate(dateMatcher.group(), 3)) != null))
|| ((dateMatcher = patDate4.matcher(content)).find() && ((date = transDate(dateMatcher.group(), 4)) != null))
|| ((dateMatcher = patDate4_1.matcher(content)).find() && ((date = transDate(dateMatcher.group(), 4)) != null))
|| ((dateMatcher = patDate5.matcher(content)).find() && ((date = transDate(dateMatcher.group(), 5)) != null))
|| ((dateMatcher = patDate6.matcher(content)).find() && ((date = transDate(dateMatcher.group(), 6)) != null))
) {
return date;
}
return null;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
private static Date transDate(String source, int type) {
try {
if (thresholdDate == null) {
thresholdDate = formatter0.parse("1970-01-01");
}
Date date = null;
switch (type) {
case 0:
date = formatter0.parse(source);
if (date.before(thresholdDate)) {
date = formatter0_1.parse(source);
if (date.before(thresholdDate)) {
return null;
}
}
break;
case 1:
//date = formatter1.parse(source);
break;
case 2:
date = formatter2.parse(source);
break;
case 3:
try {
date = formatter3_1.parse(source);
} catch (Exception e) {
date = null;
}
if (date == null) {
date = formatter3_2.parse(source);
}
break;
case 4:
date = formatter4.parse(source);
break;
case 5:
try {
date = formatter5_1.parse(source);
} catch (Exception e) {
date = null;
}
if ((date == null) || (date.before(thresholdDate))) {
date = formatter5_2.parse(source);
}
if ((date == null) || (date.before(thresholdDate))) {
date = formatter5_3.parse(source);
}
if ((date == null) || (date.before(thresholdDate))) {
date = formatter5_4.parse(source);
}
break;
case 6:
try {
date = formatter6.parse(source);
} catch (ParseException e) {
date = null;
}
if ((date == null) || (date.before(thresholdDate))) {
date = formatter6_1.parse(source);
}
break;
}
if ((date != null) && (date.before(thresholdDate))) {
return null;
}
return date;
} catch (Exception e) {
return null;
}
}
/**
* 获取前7天的时间
* @param date
* @return
*/
public static String beforeWeek(Date date){
format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar c = Calendar.getInstance();
//设置为指定日期
c.setTime(date);
c.add(Calendar.DATE,-7);
Date time = c.getTime();
return format.format(time);
}
/**
* 获取前30天的时间
* @param date
* @return
*/
public static String beforeMonth(Date date){
format = new SimpleDateFormat("yyyy-MM-dd");
Calendar c = Calendar.getInstance();
//设置为指定日期
c.setTime(date);
c.add(Calendar.DATE,-30);
return format.format(c.getTime()) + " 00:00:00";
}
public static String getDateString(Date date) {
format = new SimpleDateFormat("yyyy-MM-dd");
return TimeUtil.format.format(date);
}
public static Date StringToDate(String dateString) throws ParseException {
format = new SimpleDateFormat("yyyy-MM-dd");
return format.parse(dateString);
}
public static String dateConvert(String dateString) throws ParseException {
format = new SimpleDateFormat("MM/dd/yyyy");
Date parse = format.parse(dateString);
return getDateString(parse);
}
/**
* 获取指定某一天的开始时间戳
*
* @param timeStamp 毫秒级时间戳
* @param timeZone 如 GMT+8:00
* @return
*/
public static Long getDailyStartTime(Long timeStamp, String timeZone) {
Calendar calendar = Calendar.getInstance();
calendar.setTimeZone(TimeZone.getTimeZone(timeZone));
calendar.setTimeInMillis(timeStamp);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.MILLISECOND, 0);
return calendar.getTimeInMillis();
}
/**
* 获取指定某一天的结束时间戳
*
* @param timeStamp 毫秒级时间戳
* @param timeZone 如 GMT+8:00
* @return
*/
public static Long getDailyEndTime(Long timeStamp, String timeZone) {
Calendar calendar = Calendar.getInstance();
calendar.setTimeZone(TimeZone.getTimeZone(timeZone));
calendar.setTimeInMillis(timeStamp);
calendar.set(Calendar.HOUR_OF_DAY, 23);
calendar.set(Calendar.MINUTE, 59);
calendar.set(Calendar.SECOND, 59);
calendar.set(Calendar.MILLISECOND, 999);
return calendar.getTimeInMillis();
}
/**
* 判断两个时间是否为同一天
* @param date1
* @param date2
* @return
*/
public static boolean isSameDay(final Date date1, final Date date2) {
if(date1 == null || date2 == null) {
return false;
}
final Calendar cal1 = Calendar.getInstance();
cal1.setTime(date1);
final Calendar cal2 = Calendar.getInstance();
cal2.setTime(date2);
return isSame(cal1, cal2);
}
private static boolean isSame(final Calendar cal1, final Calendar cal2) {
if (cal1 == null || cal2 == null) {
return false;
}
return (cal1.get(Calendar.ERA) == cal2.get(Calendar.ERA) &&
cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR));
}
}
src/main/java/com/zzsn/knowbase/vo/KnowledgeVO.java
......@@ -33,6 +33,7 @@ public class KnowledgeVO {
private String author;
private Integer score;
private Integer verifyStatus;
private Integer importData;
private List<Content> contents;
private List<KnowFile> files;
......
src/main/resources/static/js/demo.js
......@@ -41,20 +41,24 @@ $(function () {
};
var getDocument = function () {
var title = document.title;
var storage = document.storage
var URL = document.URL
var url = URL.replace("viewer", "download");
// 文件名（此处先从连接参数中获取，方便调试）
var fileName = getUrlParam('file');
// var fileName = getUrlParam('file');
//console.log(fileName);
!fileName && (fileName = "doc.doc");
// !fileName && (fileName = "doc.doc");
//console.log(fileName);
// 文件类型（扩展名）
var ext = fileName.substr(fileName.lastIndexOf(".") + 1);
var ext = title.substr(title.lastIndexOf(".") + 1);
return {
"document": {
"fileType": ext,
"key": "sherlocky_oss_office_" + new Date().getMilliseconds() + "_" + fileName, // 不同文件key必须唯一
"title": "测试文档" + fileName,
"url": "http://192.168.0.58:20053//download"
"key": "sherlocky_oss_office_" + new Date().getMilliseconds() + "_" + ext, // 不同文件key必须唯一,不能有中文
"title": title, //"测试文档" + fileName,
"url": url //"http://192.168.1.75:9088/api/file/download?fileName=aaa.docx&filePath=20240117/24011700012138.docx"
}
};
};
......@@ -74,8 +78,7 @@ $(function () {
config.editorConfig = {
//"actionLink": ACTION_DATA,
// edit时必须的字段
"callbackUrl": "http://10.4.89.60:8080/api/callback",
//"createUrl": "https://example.com/url-to-create-document/",
"callbackUrl": "http://192.168.1.75:4000/callback",
"lang": "zh-CN",//"en-US",
"mode": "view",//"edit",
"recent": [
......
src/main/resources/static/js/viewer.js deleted 100644 → 0
var Viewer = function() {
var docEditor;
var innerAlert = function (message) {
if (console && console.log)
console.log(message);
};
var onAppReady = function () {
innerAlert("文档查看已就绪~");
};
var onDocumentStateChange = function (event) {
var title = document.title.replace(/\*$/g, "");
document.title = title + (event.data ? "*" : "");
};
var onError = function (event) {
if (event) {
innerAlert(event.data);
}
};
var onOutdatedVersion = function (event) {
location.reload(true);
};
var getUrlParam = function (name) {
//构造一个含有目标参数的正则表达式对象
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
//匹配目标参数
var r = window.location.search.substr(1).match(reg);
//返回参数值
if (r != null) {
return decodeURI(r[2]);
}
return null;
};
var getDocumentConfig = function (document) {
if (document) {
return {
"document": document
};
}
innerAlert("文档未指定！");
return null;
};
var сonnectEditor = function (document) {
var config = getDocumentConfig(document);
config.width = "100%";
config.height = "100%";
config.events = {
"onAppReady": onAppReady,
"onDocumentStateChange": onDocumentStateChange,
"onError": onError,
"onOutdatedVersion": onOutdatedVersion
};
config.editorConfig = {
"lang": "zh-CN",
"mode": "view",
"recent": [],
// 自定义一些配置
"customization": {
"chat": false, // 禁用聊天菜单按钮
"commentAuthorOnly": true, // 仅能编辑和删除其注释
"comments": false, // 隐藏文档注释菜单按钮
"compactHeader": false, // 隐藏附加操作按钮
"compactToolbar": false, // 完整工具栏(true代表紧凑工具栏)
"feedback": {
"visible": false // 隐藏反馈按钮
},
"forcesave": false, // true 表示强制文件保存请求添加到回调处理程序
"goback": false,/*{
"blank": true, // 转到文档时，在新窗口打开网站(false表示当前窗口打开)
"text": "转到文档位置（可以考虑放文档打开源页面）",
// 文档打开失败时的跳转也是该地址
"url": "http://www.lezhixing.com.cn"
},*/
"help": false, // 隐藏帮助按钮
"hideRightMenu": false, // 首次加载时隐藏右侧菜单(true 为显示)
"showReviewChanges": false, // 加载编辑器时自动显示/隐藏审阅更改面板(true显示 false隐藏)
"toolbarNoTabs": false, // 清楚地显示顶部工具栏选项卡(true 代表仅突出显示以查看选择了哪一个)
"zoom": 100 // 定义文档显示缩放百分比值
}
};
docEditor = new DocsAPI.DocEditor("iframeEditor", config);
};
return {
init : function(document) {
сonnectEditor(document);
}
}
}();
\ No newline at end of file
src/main/resources/templates/kk.html deleted 100644 → 0
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
This is a page
</body>
</html>
src/main/resources/templates/view.html 0 → 100644
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
<head>
<title th:text="${document.title}"></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" th:href="@{/css/viewer.css}">
</head>
<body>
<div class="form">
<div id="iframeEditor"></div>
</div>
<script type="text/javascript" th:src="@{/js/jquery-1.8.2.js}"></script>
<script type="text/javascript" th:src="@{${documentServerApiJs}}"></script>
<script type="text/javascript" th:src="@{/js/demo.js}"></script>
<!-- 先通过 th:inline=“javascript” 添加到标签，这样js代码即可访问model中的属性 -->
<script th:inline="javascript">
// js 中可以通过“[[${xxx}]]” 格式获得实际的值
Editor.init([[${document}]], [[${documentEditParam}]]);
</script>
</body>
</html>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论