update

src/main/java/com/zhiqiyun/open/router/apis/PopularFeelingsApi.java

@@ -6,22 +6,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dliyun.oap.framework.annotation.ServiceMethod;
 import com.dliyun.oap.framework.annotation.ServiceMethodBean;
 import com.dliyun.oap.framework.response.OapResponse;
-import com.zhiqiyun.open.annotation.Permission;
 import com.zhiqiyun.open.core.models.statistics.PopularFeelings;
 import com.zhiqiyun.open.core.models.statistics.PopularFeelingsPage;
 import com.zhiqiyun.open.core.service.PopularFeelingsPageService;
 import com.zhiqiyun.open.core.service.PopularFeelingsService;
 import com.zhiqiyun.open.core.service.SequenceService;
-import com.zhiqiyun.open.mvc.Result;
-import com.zhiqiyun.open.mvc.params.statistics.QueryPopularFeelingsPageParam;
 import com.zhiqiyun.open.router.request.statistics.*;
 import com.zhiqiyun.open.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -39,7 +34,7 @@ public class PopularFeelingsApi {
 	private SequenceService sequenceService;
 
 	@ServiceMethod(method = "popular.feelings.findPage", title = "互联网舆情监控查询")
-	public OapResponse findPage(QueryPopularFeelingsRequest request) {
+	public OapResponse findPage(QueryRequest request) {
 
 		QueryWrapper<PopularFeelings> wrapper = new QueryWrapper<>();
 
@@ -64,7 +59,7 @@ public class PopularFeelingsApi {
 	}
 
 	@ServiceMethod(method = "popular.feelings.add", title = "新建舆情监控")
-	public OapResponse save(SavePopularFeelingsRequest request) {
+	public OapResponse save(SaveRequest request) {
 		PopularFeelings entity = new PopularFeelings();
 		BeanUtils.copyProperties(request, entity);
 
@@ -81,7 +76,7 @@ public class PopularFeelingsApi {
 	}
 
 	@ServiceMethod(method = "popular.feelings.updateById", title = "更新舆情监控")
-	public OapResponse updateById(UpdatePopularFeelingsRequest request) {
+	public OapResponse updateById(UpdateRequest request) {
 		PopularFeelings entity = new PopularFeelings();
 		BeanUtils.copyProperties(request, entity);
 
@@ -94,13 +89,13 @@ public class PopularFeelingsApi {
 	}
 
 	@ServiceMethod(method = "popular.feelings.deleteByIds", title = "删除舆情监控")
-	public OapResponse deleteByIds(PopularFeelingsIdsRequest request) {
+	public OapResponse deleteByIds(IdsRequest request) {
 		this.popularFeelingsService.removeByIds(request.getIds());
 		return OapResponse.success();
 	}
 
 	@ServiceMethod(method = "popular.feelings.start", title = "启动舆情监控")
-	public OapResponse startSpider(PopularFeelingsIdsRequest request) {
+	public OapResponse startSpider(IdsRequest request) {
 		List<PopularFeelings> listData = this.popularFeelingsService.listByIds(request.getIds());
 		for (PopularFeelings popularFeelings : listData) {
 			this.popularFeelingsService.start(popularFeelings);
@@ -109,7 +104,7 @@ public class PopularFeelingsApi {
 	}
 
 	@ServiceMethod(method = "popular.feelings.stop", title = "停止舆情监控")
-	public OapResponse stopSpider(PopularFeelingsIdsRequest request) {
+	public OapResponse stopSpider(IdsRequest request) {
 		List<PopularFeelings> listData = this.popularFeelingsService.listByIds(request.getIds());
 		for (PopularFeelings popularFeelings : listData) {
 			this.popularFeelingsService.stop(popularFeelings);
@@ -118,10 +113,10 @@ public class PopularFeelingsApi {
 	}
 
 	@ServiceMethod(method = "popular.feelings.findDetailPage", title = "分页查询舆情监控详情")
-	public OapResponse findDetailPage(QueryPopularFeelingsDetailPageRequest request) {
+	public OapResponse findDetailPage(QueryDetailPageRequest request) {
 
 		QueryWrapper<PopularFeelingsPage> wrapper = new QueryWrapper<>();
-		wrapper.select("id", "popular_feelings_id", "url", "title", "spider_time");
+		wrapper.select("id", "popular_feelings_id", "url", "title", "keywords", "description", "spider_time", "update_time");
 		wrapper.eq("popular_feelings_id", request.getPopularFeelingsId());
 
 		Page<PopularFeelingsPage> page = new Page<>(request.getCurrent(), request.getPageSize());
@@ -131,4 +126,12 @@ public class PopularFeelingsApi {
 
 		return OapResponse.success().setBody(resultData);
 	}
+
+	@ServiceMethod(method = "popular.feelings.findDetailInfo", title = "查询页面详情")
+	public OapResponse findDetailInfo(QueryDetailInfoRequest request) {
+
+		PopularFeelingsPage popularFeelingsPage = this.popularFeelingsPageService.getById(request.getId());
+
+		return OapResponse.success().setBody(popularFeelingsPage);
+	}
 }

src/main/java/com/zhiqiyun/open/router/request/statistics/PopularFeelingsIdsRequest.java → src/main/java/com/zhiqiyun/open/router/request/statistics/IdsRequest.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class PopularFeelingsIdsRequest extends AbstractOapRequest {
+public class IdsRequest extends AbstractOapRequest {
 	@NotEmpty
 	@ServiceParamField(describe = "ID数组")
 	private List<Long> ids;

src/main/java/com/zhiqiyun/open/router/request/statistics/QueryDetailInfoRequest.java

@@ -0,0 +1,18 @@
+package com.zhiqiyun.open.router.request.statistics;
+
+import com.dliyun.oap.framework.annotation.ServiceParamField;
+import com.dliyun.oap.framework.request.AbstractOapRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class QueryDetailInfoRequest extends AbstractOapRequest {
+	@NotNull
+	@ServiceParamField(describe = "页面详情Id")
+	private String id;
+}

src/main/java/com/zhiqiyun/open/router/request/statistics/QueryPopularFeelingsDetailPageRequest.java → src/main/java/com/zhiqiyun/open/router/request/statistics/QueryDetailPageRequest.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class QueryPopularFeelingsDetailPageRequest extends AbstractOapRequest {
+public class QueryDetailPageRequest extends AbstractOapRequest {
 	@NotNull
 	@ServiceParamField(describe = "页数")
 	private Integer current = 1;

src/main/java/com/zhiqiyun/open/router/request/statistics/QueryPopularFeelingsRequest.java → src/main/java/com/zhiqiyun/open/router/request/statistics/QueryRequest.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class QueryPopularFeelingsRequest extends AbstractOapRequest {
+public class QueryRequest extends AbstractOapRequest {
 	@NotNull
 	@ServiceParamField(describe = "页数")
 	private Integer current = 1;

src/main/java/com/zhiqiyun/open/router/request/statistics/SavePopularFeelingsRequest.java → src/main/java/com/zhiqiyun/open/router/request/statistics/SaveRequest.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SavePopularFeelingsRequest extends AbstractOapRequest {
+public class SaveRequest extends AbstractOapRequest {
 	@NotBlank
 	@ServiceParamField(describe = "网站名称")
 	private String siteName;

src/main/java/com/zhiqiyun/open/router/request/statistics/UpdatePopularFeelingsRequest.java → src/main/java/com/zhiqiyun/open/router/request/statistics/UpdateRequest.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class UpdatePopularFeelingsRequest extends AbstractOapRequest {
+public class UpdateRequest extends AbstractOapRequest {
 	@NotNull
 	@ServiceParamField(describe = "ID")
 	private Long id;