From c159a9fe4d8269dd7d29f879db6ef7202a074154 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:28 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。
---
src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
index 6e38228..e064724 100644
--- a/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
+++ b/src/main/java/com/moral/common/util/MyBatisBaseMapUtil.java
@@ -3,14 +3,8 @@
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.PageBean;
import com.moral.common.mapper.BaseMapper;
-import com.moral.entity.Account;
import lombok.extern.log4j.Log4j;
import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.mapperhelper.MapperHelper;
-import tk.mybatis.mapper.mapperhelper.MapperTemplate;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Type;
import java.util.List;
@Log4j
@@ -28,8 +22,10 @@
return page;
}
public static PageBean queryPage(BaseMapper baseMapper,PageBean pageBean, Example example){
- PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
+ if(pageBean.getPageSize()>0){
+ PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
+ }
List page = baseMapper.selectByExample(example);
return new PageBean(page);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0