修改查询

sxz-base/src/main/java/com/fdkk/sxz/base/impl/BaseServiceImpl.java

@@ -5,11 +5,11 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.fdkk.sxz.base.IBaseMapper;
 import com.fdkk.sxz.base.IBaseService;
 import com.fdkk.sxz.base.RequestBase;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,8 +21,6 @@ import java.util.List;
 public abstract class BaseServiceImpl<M extends IBaseMapper<T>, T> extends ServiceImpl<M, T> implements IBaseService<T> {
 
 
-
-
     @Override
     public boolean save(T entity) {
         return super.save(entity);
@@ -55,42 +53,57 @@ public abstract class BaseServiceImpl<M extends IBaseMapper<T>, T> extends Servi
     }
 
     @Override
-    public PageInfo<T>  listByPage(RequestBase page, T condition) {
+    public PageInfo<T> listByPage(RequestBase page, T condition) {
         if (ObjectUtil.isNotNull(page)) {
-            if (!page.getIsALL()){
+            if (!page.getIsALL()) {
                 PageHelper.startPage(page.getPageNum(), page.getPageSize());
                 if (StrUtil.isNotEmpty(page.getOrderBy())) {
                     PageHelper.orderBy(page.getOrderBy() + " " + page.getSortBy());
                 }
             }
         }
-        return  new PageInfo<T>(super.list(new QueryWrapper<>(condition)));
+        PageInfo<T> tPageInfo = new PageInfo<T>(super.list(new QueryWrapper<>(condition)));
+        if (tPageInfo.getPageNum() > tPageInfo.getPages() && !tPageInfo.isHasNextPage() && tPageInfo.isHasPreviousPage()) {
+            PageHelper.startPage(tPageInfo.getPages(), page.getPageSize());
+            tPageInfo = new PageInfo<T>(super.list(new QueryWrapper<>(condition)));
+        }
+        return tPageInfo;
     }
 
     @Override
     public PageInfo<T> listByPage(RequestBase page, Wrapper<T> queryWrapper) {
         if (ObjectUtil.isNotNull(page)) {
-            if (!page.getIsALL()){
-                PageHelper.startPage(page.getPageNum(),page.getPageSize());
-                if (StrUtil.isNotEmpty(page.getOrderBy())){
-                    PageHelper.orderBy(page.getOrderBy()+" "+page.getSortBy());
+            if (!page.getIsALL()) {
+                PageHelper.startPage(page.getPageNum(), page.getPageSize());
+                if (StrUtil.isNotEmpty(page.getOrderBy())) {
+                    PageHelper.orderBy(page.getOrderBy() + " " + page.getSortBy());
                 }
             }
         }
-        return new PageInfo<T>(super.list(queryWrapper));
+        PageInfo<T> tPageInfo = new PageInfo<>(super.list(queryWrapper));
+        if (tPageInfo.getPageNum() > tPageInfo.getPages() && !tPageInfo.isHasNextPage() && tPageInfo.isHasPreviousPage()) {
+            PageHelper.startPage(tPageInfo.getPages(), page.getPageSize());
+            tPageInfo = new PageInfo<>(super.list(queryWrapper));
+        }
+        return tPageInfo;
     }
 
     @Override
     public PageInfo<T> listByPage(RequestBase page) {
         if (ObjectUtil.isNotNull(page)) {
-            if (!page.getIsALL()){
+            if (!page.getIsALL()) {
                 PageHelper.startPage(page.getPageNum(), page.getPageSize());
                 if (StrUtil.isNotEmpty(page.getOrderBy())) {
                     PageHelper.orderBy(page.getOrderBy() + " " + page.getSortBy());
                 }
             }
         }
-        return new PageInfo<T>(super.list());
+        PageInfo<T> tPageInfo = new PageInfo<T>(super.list());
+        if (tPageInfo.getPageNum() > tPageInfo.getPages() && !tPageInfo.isHasNextPage() && tPageInfo.isHasPreviousPage()) {
+            PageHelper.startPage(tPageInfo.getPages(), page.getPageSize());
+            tPageInfo = new PageInfo<T>(super.list());
+        }
+        return tPageInfo;
     }
 
     @Override

sxz-base/src/main/java/com/fdkk/sxz/netty/NettyClient.java

@@ -0,0 +1,72 @@
+//package com.fdkk.sxz.netty;
+//
+//import io.netty.bootstrap.Bootstrap;
+//import io.netty.channel.ChannelFuture;
+//import io.netty.channel.ChannelOption;
+//import io.netty.channel.EventLoopGroup;
+//import io.netty.channel.nio.NioEventLoopGroup;
+//import io.netty.channel.socket.SocketChannel;
+//import io.netty.channel.socket.nio.NioSocketChannel;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * 接收自有项目消息，转发给监管平台
+// *
+// * @version V1.0
+// * @file: com.yjrj.presalehouse.client.NettyClient
+// * @description: 自定义业务处理handler
+// * @author: wanggd
+// * @date 2021-04-06
+// */
+//@Component
+//@Slf4j
+//public class NettyClient {
+//
+//    @Value("${netty.port:8081}")
+//    private int port;
+//    @Value("${netty.host:127.0.0.1}")
+//    private String host;
+//
+//    public static Bootstrap bootstrap = null;
+//    public static SocketChannel socketChannel = null;
+//    public static ChannelFuture future = null;
+//    public Map<String, Bootstrap> map = new HashMap<>();
+//
+//    /**
+//     * 向监管平台发送消息
+//     *
+//     * @param msg 接收到的自有项目传递过来的消息
+//     * @return
+//     * @throws InterruptedException
+//     */
+//    public String sendMessage(String msg) throws InterruptedException {
+//        if (!map.containsKey(host)) {
+//           NettyClient.log.info("\n\n\n\n\n\n-------------------------新建连接服务端：" + host + "：" + port + "---------------------------");
+//            EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
+//            NettyClient.bootstrap = new Bootstrap();
+//            NettyClient.bootstrap.channel(NioSocketChannel.class);
+//            NettyClient.bootstrap.group(eventLoopGroup);
+//            NettyClient.bootstrap.remoteAddress(host, port);
+//            // 设置超时时间
+//            NettyClient.bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 15000);
+//            map.put(host, NettyClient.bootstrap);
+//        } else {
+//           NettyClient.log.info("\n\n\n\n\n\n--------------------------已连接服务端：" + host + "：" + port + "-----------------------------");
+//            NettyClient.bootstrap = map.get(host);
+//        }
+//        NettyChannelInitializer customerChannelInitializer = new NettyChannelInitializer(msg);
+//        NettyClient.bootstrap.handler(customerChannelInitializer);
+//
+//        NettyClient.future = NettyClient.bootstrap.connect(host, port).sync();
+//        if (NettyClient.future.isSuccess()) {
+//            NettyClient.socketChannel = (SocketChannel) NettyClient.future.channel();
+//           NettyClient.log.info("远程服务器已经连接, 可以进行数据交换..");
+//        }
+//        return customerChannelInitializer.getResponse();
+//    }
+//}