diff --git a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
index 5e55e3fbd..38771bc5d 100644
--- a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
+++ b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
@@ -149,9 +149,9 @@
面积 |
单价 |
总价 |
- <#if sort?? && sort == 'p_date_desc'>发布时间↓
- <#elseif sort?? && sort == 'p_date_asc'>发布时间↑
- <#else>发布时间↓#if>
+ | <#if sort?? && sort == 'p_date_desc'>发布时间↓
+ <#elseif sort?? && sort == 'p_date_asc'>发布时间↑
+ <#else>发布时间↓#if>
|
室厅卫 |
楼层 |
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java
index 55c659222..9ca810b1a 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java
@@ -12,6 +12,7 @@ import com.fangjia.dal.seawater.model.Seawater;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import org.sothis.core.util.Pager;
public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl implements SeawaterDao {
@@ -33,8 +34,10 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i
SeawaterQuery query = new SeawaterQuery();
query.setId(id);
query.setTable(table);
- query.getPager().setStartRow(-1);
- query.getPager().setPageSize(-1);
+ Pager pager = new Pager();
+ pager.setStartRow(-1);
+ pager.setPageSize(-1);
+ query.setPager(pager);
List jsonList = queryList(query);
if(jsonList == null){
return null;
@@ -66,8 +69,10 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i
query.setRoom(room);
query.setRootName(root);
query.setOrder(order);
- query.getPager().setStartRow(-1);
- query.getPager().setPageSize(-1);
+ Pager pager = new Pager();
+ pager.setStartRow(start);
+ pager.setPageSize(limit);
+ query.setPager(pager);
query.setTable(table);
List jsonList = queryList(query);
if(jsonList == null){
@@ -80,7 +85,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i
@Override
public List findSeawatersByQuery(SeawaterQuery query){
- List seawaterList= new ArrayList();
+ List seawaterList;
List jsonList = queryList(query);
if(jsonList == null){
return null;
@@ -190,7 +195,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i
reqBody.put("script", script);
try {
- request.postWithBody("http://es.fangjia.com:9200/seawater/_update_by_query", reqBody, this.buildHeader(), "UTF-8");
+ request.postWithBody("http://es.fangjia.com:9200/seawater/_update_by_query?conflicts=proceed&wait_for_completion=false", reqBody, this.buildHeader(), "UTF-8");
} catch (HttpRequestException e) {
e.printStackTrace();
}
@@ -208,7 +213,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i
reqBody.put("script", script);
try {
- request.postWithBody("http://es.fangjia.com:9200/seawater/_update_by_query", reqBody, this.buildHeader(), "UTF-8");
+ request.postWithBody("http://es.fangjia.com:9200/seawater/_update_by_query?conflicts=proceed&wait_for_completion=false", reqBody, this.buildHeader(), "UTF-8");
} catch (HttpRequestException e) {
e.printStackTrace();
}
@@ -647,7 +652,7 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i
jsonOrder.put("order", "desc");
}
JSONObject jsonSort = new JSONObject();
- jsonSort.put(query.getOrder(), jsonOrder);
+ jsonSort.put(query.getSortField(), jsonOrder);
List sortJsonList = new ArrayList();
sortJsonList.add(jsonSort);
reqBody.put("sort", sortJsonList);
@@ -733,8 +738,10 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i
query.setRoom(room);
query.setRootName(root);
query.setOrder(order);
- query.getPager().setStartRow(-1);
- query.getPager().setPageSize(-1);
+ Pager pager = new Pager();
+ pager.setStartRow(start);
+ pager.setPageSize(limit);
+ query.setPager(pager);
query.setTable(table);
JSONObject json = query(query);
if(!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("total")){