From 39cb7288879f63112c92c189e4a7fd7f9e0cc342 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 20:16:41 +0800
Subject: [PATCH] 武汉接口
---
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java
index ea4ef2d..cc8f9ca 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1201PR.java
@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
@@ -13,15 +14,27 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1201;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @Author: YYC
@@ -45,14 +58,46 @@
* @return
*/
@DataProvider
- public List<WhjlApi1201> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1201);
- if (null == result || result.isEmpty()) {
- return null;
- }
+ public void listData(Page<WhjlApi1201> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1201);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
List<WhjlApi1201> list = new ArrayList<>();
WhjlApi1201 whjlApi1201;
- for (ApiInfoData infoData : result) {
+ for (ApiInfoData infoData : japPage.getContent()) {
whjlApi1201 = JSONObject.parseObject(infoData.getData(), WhjlApi1201.class);
whjlApi1201.setKqdm(infoData.getKqdm());
whjlApi1201.setCzbz(infoData.getCzbz());
@@ -60,7 +105,8 @@
whjlApi1201.setBizId(infoData.getDataId());
list.add(whjlApi1201);
}
- return list;
+ page.setEntities(list);
+
}
/**
--
Gitblit v1.9.3