射洪车辆监管
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
昨天 185b6c7f14d8324540f39913e2b92146636cc5e0 
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPExgMsgTakeEwayBillAckController.java


@@ -5,12 +5,28 @@


import com.ruoyi.dataInterchange.api.vo.UPExgMsgTakeEwayBillAckVo;


import com.ruoyi.dataInterchange.dao.UPExgMsgTakeEwayBillAckDao;


import com.ruoyi.dataInterchange.model.UPExgMsgTakeEwayBillAck;


import org.elasticsearch.index.query.MatchAllQueryBuilder;


import org.elasticsearch.index.query.RangeQueryBuilder;


import org.elasticsearch.search.sort.FieldSortBuilder;


import org.elasticsearch.search.sort.SortBuilders;


import org.elasticsearch.search.sort.SortOrder;


import org.springframework.data.domain.PageRequest;


import org.springframework.data.domain.Sort;


import org.springframework.data.elasticsearch.client.elc.QueryBuilders;


import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;


import org.springframework.data.elasticsearch.core.SearchHit;


import org.springframework.data.elasticsearch.core.SearchHits;


import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;


import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RestController;




import javax.annotation.Resource;


import javax.naming.directory.SearchResult;


import java.time.LocalDateTime;


import java.time.ZoneOffset;


import java.util.ArrayList;


import java.util.Iterator;


import java.util.List;


@@ -25,6 +41,9 @@


   


   @Resource


   private UPExgMsgTakeEwayBillAckDao upExgMsgTakeEwayBillAckDao;




   @Resource


   private ElasticsearchRestTemplate elasticsearchRestTemplate;


   


   


   /**


@@ -36,8 +55,16 @@


   @PostMapping("/findByCreateTimeAfter")


   public R<List<UPExgMsgTakeEwayBillAckVo>> findByCreateTimeAfter(@RequestParam("createTime") Long createTime) {


      List<UPExgMsgTakeEwayBillAckVo> list = new ArrayList<>();


      if (-1 == createTime) {


         Iterator<UPExgMsgTakeEwayBillAck> iterator = upExgMsgTakeEwayBillAckDao.findAll().iterator();


         if (-1 == createTime) {


            //设置排序(排序方式，正序还是倒序，排序的 id)


            Sort sort = Sort.by(Sort.Direction.ASC, "createTime");


            //设置分页(页码，每页显示的条数)


            //当前页码0开始


            int currentPage = 0;


            //每页显示的条数


            int pageSize = 10000;


            PageRequest pageRequest = PageRequest.of(currentPage, pageSize, sort);


         Iterator<UPExgMsgTakeEwayBillAck> iterator = upExgMsgTakeEwayBillAckDao.findAll(pageRequest).iterator();


         if (iterator.hasNext()) {


            UPExgMsgTakeEwayBillAck takeEwayBillAck = iterator.next();


            UPExgMsgTakeEwayBillAckVo vo = new UPExgMsgTakeEwayBillAckVo();


@@ -45,10 +72,11 @@


            list.add(vo);


         }


      } else {


         List<UPExgMsgTakeEwayBillAck> takeEwayBillAcks = upExgMsgTakeEwayBillAckDao.findByCreateTimeAfter(createTime);


         for (UPExgMsgTakeEwayBillAck takeEwayBillAck : takeEwayBillAcks) {


         //查询,获取查询结果


         List<UPExgMsgTakeEwayBillAck> byCreateTimeIsAfter = upExgMsgTakeEwayBillAckDao.findByCreateTimeIsAfter(createTime);


         for (UPExgMsgTakeEwayBillAck searchHit : byCreateTimeIsAfter) {


            UPExgMsgTakeEwayBillAckVo vo = new UPExgMsgTakeEwayBillAckVo();


            BeanUtils.copyProperties(takeEwayBillAck, vo);


            BeanUtils.copyProperties(searchHit, vo);


            list.add(vo);


         }


      }