From 560bde3f7857401ec373255957b5145551c6cde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Mon, 12 Apr 2021 14:21:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B7=E6=9C=AC=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/chafangtong-service/pom.xml | 4 +- projects/fangjia-bkoff/pom.xml | 2 +- .../bkoff/controllers/SeawaterController.java | 9 ++++ .../src/main/webapp/seawater/houseList.ftl | 53 +++++++++++++++++-- .../java/com/fangjia/dal/ElasticDaoImpl.java | 1 - .../fangjia/dal/seawater/dao/SeawaterDao.java | 2 - .../dal/seawater/dao/SeawaterDaoImpl.java | 46 ++++++++++++++++ .../mongo/fangjia/SeawaterService.java | 7 ++- .../mongo/fangjia/SeawaterServiceImpl.java | 11 ++-- projects/geluke-service/pom.xml | 4 +- 10 files changed, 122 insertions(+), 17 deletions(-) diff --git a/projects/chafangtong-service/pom.xml b/projects/chafangtong-service/pom.xml index c38bee1c1..d2c64b841 100644 --- a/projects/chafangtong-service/pom.xml +++ b/projects/chafangtong-service/pom.xml @@ -29,7 +29,7 @@ org.sothis sothis-core - 0.2.0-SNAPSHOT + 0.2.0 provided @@ -154,7 +154,7 @@ com.poseidon poseidon-message - 0.0.1-SNAPSHOT + 0.0.1 org.mongodb diff --git a/projects/fangjia-bkoff/pom.xml b/projects/fangjia-bkoff/pom.xml index 28b93ccc1..41b8a352d 100644 --- a/projects/fangjia-bkoff/pom.xml +++ b/projects/fangjia-bkoff/pom.xml @@ -99,7 +99,7 @@ org.sothis sothis-web - 0.2.0-SNAPSHOT + 0.2.0 org.springframework diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java index 1ea3ac457..a223c1674 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/SeawaterController.java @@ -12,6 +12,7 @@ import com.fangjia.service.mongo.fangjia.SeawaterService; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import org.sothis.core.util.Pager; +import org.sothis.web.mvc.annotation.Param; import java.io.UnsupportedEncodingException; import java.util.Arrays; @@ -116,6 +117,14 @@ public class SeawaterController { return ret; } + public Object batchDeleteAction(@Param(name="ids") String ids) throws UnsupportedEncodingException { + JsonModel ret = new JsonModel(); + if (StringUtils.isNotBlank(ids)){ + seawaterService.deleteByIds(ids); + } + return ret; + } + public void setSeawaterService(SeawaterService seawaterService) { this.seawaterService = seawaterService; } diff --git a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl index 97bc38d1f..69d4cd0f7 100644 --- a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl @@ -118,9 +118,13 @@ - 查询到${pager.totalRows!}条记录 +
+ 查询到${pager.totalRows!}条记录 + +
+ @@ -142,6 +146,7 @@ <#if seawaterList??> <#list seawaterList as it> +
全选 类型 区域 小区名
<#if it.category! == 'sell'> 二手房 @@ -249,7 +254,7 @@ } }); } - + changeCity('${cityDisplay!}'); $(".hrefClick").click(function(){ @@ -336,8 +341,48 @@ $("#roomSpan").hide(); } } - - + + // 全选 + $("#checkAll").click(function(){ + $('input[name="houseCheck"]').each(function() { + var _this = this + if (_this.checked == true) { + _this.checked = false + } else { + _this.checked = true + } + + }) + }) + + $("#batchDelete").click(function(){ + if(confirm('确认要删除所选的数据吗?')) { + var ids = ""; + $('input:checkbox[name=houseCheck]:checked').each(function() { + var _this = $(this); + ids += _this.val() + "," + }); + if (ids == "") { + alert("请选择数据") + return false; + } + jQuery.ajax({ + type: 'POST', + url: '../seawater/batchDelete', + data:{ids:ids}, + dataType: 'json', + timeout: 100000, + success: function(model) { + alert("批量删除操作成功"); + location.reload(); + }, + error : function() { + //alert("操作失败"); + } + }); + } + }); + \ No newline at end of file diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/ElasticDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/ElasticDaoImpl.java index 0e45edde5..ea6749194 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/ElasticDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/ElasticDaoImpl.java @@ -205,7 +205,6 @@ public abstract class ElasticDaoImpl extends AbstractJpaC @Override public void deleteByIds(List idList) { - } @Override diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java index dd28f68b7..edbd0546e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDao.java @@ -14,10 +14,8 @@ public interface SeawaterDao extends com.fangjia.dal.SeawaterDao { Seawater findByIdFromEs(String id,String table); - List findSeawatersFromEs(String category, String city, String region, String name, List alias, List regionAlias, Integer startDate, Integer endDate, Double startArea, Double endArea, Integer startPrice, Integer endPrice, Integer room, String root, String sort, boolean order, int start, int limit , String table); List findHouses(String city, String region, List alias, Integer minPrice, Integer maxPrice, Integer limit); - } 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 9ff57486c..a565fa061 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 @@ -96,6 +96,44 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i return new ArrayList(); } + @Override + public void deleteById(String id) { + deleteByIds(Arrays.asList(id)); + } + + private Map buildHeader() { + Base64 token = new Base64(); + String authenticationEncoding = token.encodeAsString(new String("" + ES_USER + ":" + ES_PASSWORD + "").getBytes()); + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + headers.put("Authorization", "Basic " + authenticationEncoding + ""); + return headers; + } + + @Override + public void deleteByIds(List idList) { + HttpRequest request = new HttpRequest(); + + JSONObject reqBody = new JSONObject(); + JSONObject query = new JSONObject(); + JSONObject bool = new JSONObject(); + JSONArray must = new JSONArray(); + must.add(addTerms("_id", idList)); + bool.put("must", must); + query.put("bool", bool); + reqBody.put("query", query); + + JSONObject script = new JSONObject(); + script.put("source", "ctx._source.status=1"); + reqBody.put("script", script); + + try { + request.postWithBody("http://es.fangjia.com:9200/seawater/_update_by_query", reqBody, this.buildHeader(), "UTF-8"); + } catch (HttpRequestException e) { + e.printStackTrace(); + } + } + private JSONObject addMatch(String name, String value){ JSONObject term = new JSONObject(); JSONObject match = new JSONObject(); @@ -338,6 +376,14 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i if(limit >= 0){ reqBody.put("size", limit); } + + // ²»չʾɾ³ý + JSONObject param = new JSONObject(); + param.put("status", 0); + JSONObject temp = new JSONObject(); + temp.put("term", param); + jsonList.add(temp); + query.put("must", jsonList); q.put("bool", query); reqBody.put("query", q); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java index edc15e855..4fafa6663 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterService.java @@ -31,10 +31,15 @@ public interface SeawaterService { void deleteById(String id); + /** + * ÅúÁ¿ɾ³ý£¬ӢÎĶººŷָÈç1,2,3 + * @param ids + */ + void deleteByIds(String ids); + @Deprecated List findAllSeawater(String category, String city, String name, String region, Integer room, String root, String sort, Integer startDate, Integer endDate, int start, int limit, boolean order, String[] fields); @Deprecated int findAllSeawaterCount(String category, String city, String name, String region, Integer room, String root, Integer startDate, Integer endDate); - } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java index d7e31ca58..2dc484035 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeawaterServiceImpl.java @@ -12,10 +12,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.TermQuery; import org.apache.solr.client.solrj.util.ClientUtils; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import java.util.*; public class SeawaterServiceImpl implements SeawaterService { private SeawaterDao seawaterDao; @@ -188,6 +185,12 @@ public class SeawaterServiceImpl implements SeawaterService { seawaterDao.deleteById(id); } + @Override + public void deleteByIds(String ids) { + String[] idArr = ids.split(","); + seawaterDao.deleteByIds(Arrays.asList(idArr)); + } + public void setSeawaterDao(SeawaterDao seawaterDao) { this.seawaterDao = seawaterDao; } diff --git a/projects/geluke-service/pom.xml b/projects/geluke-service/pom.xml index 5dc163edc..08acecd69 100644 --- a/projects/geluke-service/pom.xml +++ b/projects/geluke-service/pom.xml @@ -29,7 +29,7 @@ org.sothis sothis-core - 0.2.0-SNAPSHOT + 0.2.0 provided @@ -154,7 +154,7 @@ com.poseidon poseidon-message - 0.0.1-SNAPSHOT + 0.0.1 org.mongodb