--no commit message

com.zrqx.works/pom.xml

@@ -23,6 +23,11 @@
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.8.3</version>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-zipkin</artifactId>
 		</dependency>

com.zrqx.works/src/main/java/com/zrqx/works/bg/controller/solr/SolrController.java

 package com.zrqx.works.bg.controller.solr;
 
-import java.text.SimpleDateFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -10,10 +12,11 @@ import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,12 +32,8 @@ import com.zrqx.core.util.PageParam;
 import com.zrqx.core.vo.sysuser.bg.user.UserVO;
 import com.zrqx.core.vo.works.solr.SolrListVo;
 import com.zrqx.works.bg.client.sysuser.SysuserClient;
-import com.zrqx.works.bg.service.apply.ApplyService;
 import com.zrqx.works.commons.Redis;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
 @RestController
 @RequestMapping(WorksRequestPath.BG + WorksRequestPath.SOLR)
 @Api(description = "工作台-资源广场-全文检索")
@@ -113,7 +112,12 @@ public class SolrController {
 				slv.setAuthor((String) result.get("author"));
 				slv.setPublishTime((String) result.get("publishTime"));
 				slv.setEdition((String) result.get("edition"));
-				slv.setIntro((String) result.get("intro"));
+				if((String)result.get("intro")!=null){
+					Document d = Jsoup.parse((String)result.get("intro"));
+					slv.setIntro(d.text());
+				}else{
+					slv.setIntro((String)result.get("intro"));
+				}
 				slv.setBookName((String) result.get("bookName"));
 				slv.setUpdateTime((Date) result.get("updateTime"));
 				slv.setStatus((Integer) result.get("status"));

com.zrqx.works/src/main/java/com/zrqx/works/bg/service/apply/ApplyServiceImpl.java

@@ -6,6 +6,7 @@ package com.zrqx.works.bg.service.apply;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.solr.client.solrj.SolrClient;
@@ -112,7 +113,7 @@ public class ApplyServiceImpl extends BaseServiceImpl<Apply, Integer> implements
 				arVo.setResourceType((Integer) result.get("resourceType"));
 				arVo.setIsbn((String) result.get("isbn"));
 				arVo.setEditionNum((String) result.get("edition"));
-				arVo.setUploadTime((String) result.get("uploadTime"));
+				arVo.setUploadTime((Date) result.get("uploadTime"));
 			}
 			voList.add(arVo);
 		}